more voxline invoice formatting

diff --git a/conf/invoice_html b/conf/invoice_html
index a3ab6c0..fe149b5 100644 (file)
--- a/conf/invoice_html
+++ b/conf/invoice_html
@@ -99,6 +99,12 @@
           '<tr>'.
             '<th align="center">Ref</th>'.
             '<th align="left">Description</th>'.
           '<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>';
 
             '<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>'.
             '<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'} } ) {
               '<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">'.
             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>).
         $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>'.
               $line->{'total_item'}. '</td>'.
             qq(<td align="right" style="$style">).
               $line->{'total_amount'}. '</td>'.