X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=conf%2Finvoice_html;h=65c777e769b58273ba3b63b760f9c265c8c4fd4d;hp=14b25c671306e37f3dcfd7fc88a7f4618fdfa9ff;hb=6fb3ca52b569e131e082d3fe3f141ec3a307b164;hpb=dc3217c61d6a62a8e599d8804e05ba45b3224c7e

diff --git a/conf/invoice_html b/conf/invoice_html
index 14b25c671..65c777e76 100644
--- a/conf/invoice_html
+++ b/conf/invoice_html
@@ -70,6 +70,16 @@
 
   <%=
       foreach my $section ( @sections ) {
+        if ($section->{'pretotal'}) {
+          $OUT .=
+            '<table width="100%"><tr><td>'.
+            '<p align="right"><b><font size="+1">'.
+            uc(substr($section->{'pretotal'},0,1)).
+            '</font><font size="+0">'. uc(substr($section->{'pretotal'},1)).
+            '</font></b>'.
+            '<p>'.
+            '</td></tr></table>';
+        }
         $OUT .= '<table><tr><td>';
         if ($section->{'description'}) {
           $OUT .=
@@ -89,6 +99,11 @@
           '<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>';
 
@@ -103,11 +118,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>';
+            $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">'.
@@ -125,13 +148,23 @@
           $OUT .=
             '<tr class="invoice_totaldesc">'.
               qq(<td style="$style">&nbsp;</td>).
-              qq(<td align="left" style="$style">).
+              qq(<td align="left" style="$style"> colspan=3).
                 $section->{'description'}. ' Total </td>'.
               qq(<td align="right" style="$style">).
                 $section->{'subtotal'}. '</td>'.
             '</tr>'
         ;
         }
+
+        if ($section->{'posttotal'}) {
+          $OUT .= '<tr><td align="right" colspan=3>';
+          $OUT .=
+            '<p><font size="+1">'. $section->{'posttotal'}.
+            '</font>'.
+            '<p>';
+          $OUT .= '</td></tr>';
+        }
+
       }
 
       my $style = 'border-top: 3px solid #000000;';
@@ -145,7 +178,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>'.