[freeside-commits] freeside/conf invoice_html,1.12,1.13

[Jeff Finucane,420,,]

Update of /home/cvs/cvsroot/freeside/conf
In directory wavetail.420.am:/tmp/cvs-serv27249/conf

Modified Files:
	invoice_html 
Log Message:
more voxline invoice formatting

Index: invoice_html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/conf/invoice_html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- invoice_html	4 Jun 2008 17:59:07 -0000	1.12
+++ invoice_html	4 Jun 2008 18:40:54 -0000	1.13
@@ -99,6 +99,12 @@
           '<tr>'.
             '<th align="center">Ref</th>'.
             '<th align="left">Description</th>'.
+            <%= ( $unitprices 
+                    ? '<th align="left">Unit Price</th>'.
+                      '<th align="left">Quantity</th>'
+                    : ''
+                  )
+            %>
             '<th align="right">Amount</th>'.
           '</tr>';
 
@@ -113,11 +119,19 @@
             '<tr class="invoice_desc">'.
               '<td align="center">'. $line->{'ref'}. '</td>'.
               '<td align="left">'. $line->{'description'}. '</td>'.
+              ( $unitprices 
+                  ? '<td align="left">'. $line->{'unit_amount'}. '</td>'.
+                    '<td align="left">'. $line->{'quantity'}. '</td>'
+                  : ''
+              ).
+
               '<td align="right">'. $line->{'amount'}. '</td>'.
             '</tr>'
           ;
           if ( @{$line->{'ext_description'} } ) {
-            $OUT .= '<tr class="invoice_extdesc"><td></td><td><table width="100%">';
+            $OUT .= '<tr class="invoice_extdesc"><td></td><td';
+            $OUT .= $unitprices ? ' colspan=3>' : '>';
+            $OUT .= '<table width="100%">';
             foreach my $ext_desc ( @{$line->{'ext_description'} } ) {
               $OUT .=
                 '<tr class="invoice_extdesc">'.
@@ -165,7 +179,8 @@
         $OUT .=
           '<tr class="invoice_totaldesc">'.
             qq(<td style="$style">&nbsp;</td>).
-            qq(<td align="left" style="$style">).
+            qq(<td align="left" style="$style").
+            ( $unitprices ? ' colspan=3>' : '>' ).
               $line->{'total_item'}. '</td>'.
             qq(<td align="right" style="$style">).
               $line->{'total_amount'}. '</td>'.