X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=conf%2Finvoice_html;h=fe149b5f39425ce0e912599b10b5851541292c70;hb=5e9fa0e297a01cd0d89361f8dc4ae6808627229c;hp=32e5362f9d3385c81a6989191cb3a2e49e3254e7;hpb=0452430dac4d639796581be77e8674207653f42b;p=freeside.git

diff --git a/conf/invoice_html b/conf/invoice_html
index 32e5362f9..fe149b5f3 100644
--- a/conf/invoice_html
+++ b/conf/invoice_html
@@ -25,14 +25,20 @@
             </td>
             <td>
             </td>
-            <td align="left">
-              Invoice&nbsp;number<BR>
+            <td align="center">
+              Invoice&nbsp;#<BR>
               <B><%= $invnum %></B>
             </td>
+            <td>
+            </td>
+            <td align="center">
+              Customer #<BR>
+              <B><%= $custnum %></B>
+            </td>
           </tr>
           <tr>
             <th>&nbsp;</th>
-            <th colspan=1 align="center">
+            <th colspan=3 align="center">
               <FONT SIZE="+3">I</FONT><FONT SIZE="+2">NVOICE</FONT>
             </th>
             <th>&nbsp;</th>
@@ -62,32 +68,104 @@
 
   </table>
 
-  <p><b><font size="+1">C</font><font size="+0">HARGES</font></b>
-  <p>
-  <table class="invoice_longtable" CELLSPACING=0 WIDTH="100%">
-    <tr>
-      <th align="center">Ref</th>
-      <th align="left">Description</th>
-      <th align="right">Amount</th>
-    </tr>
-    <%=
+  <%=
+      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 .=
+            '<p><b><font size="+1">'. uc(substr($section->{'description'},0,1)).
+            '</font><font size="+0">'. uc(substr($section->{'description'},1)).
+            '</font></b>'.
+            '<p>';
+        }else{
+          $OUT .=
+            '<p><b><font size="+1">C</font><font size="+0">HARGES</font></b>'.
+            '<p>';
+        }
+        $OUT .= '</td></tr></table>';
 
-      foreach my $line ( @detail_items ) {
         $OUT .=
-          '<tr class="invoice_desc">'.
-            '<td align="center">'. $line->{'ref'}. '</td>'.
-            '<td align="left">'. $line->{'description'}. '</td>'.
-            '<td align="right">'. $line->{'amount'}. '</td>'.
-          '</tr>'
-        ;
-        foreach my $ext_desc ( @{$line->{'ext_description'} } ) {
+          '<table class="invoice_longtable" CELLSPACING=0 WIDTH="100%">'.
+          '<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>';
+
+        foreach my $line (
+          grep { ( scalar(@sections) > 1 
+                 ? $section->{'description'} eq $_->{'section'}->{'description'}
+                 : 1
+               ) }
+          @detail_items )
+        {
           $OUT .=
-            '<tr class="invoice_extdesc">'.
-              '<td></td>'.
-              '<td align="left">-&nbsp;'. $ext_desc. '</td>'.
-              '<td></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'} } ) {
+            $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">'.
+                  '<td align="left">-&nbsp;'. $ext_desc. '</td>'.
+                '</tr>'
+            }
+            $OUT .= '</table></td><td></td></tr>';
+          }
         }
+
+
+        if (scalar(@sections) > 1) {
+          my $style = 'border-top: 3px solid #000000;'.
+                      'border-bottom: 3px solid #000000;';
+          $OUT .=
+            '<tr class="invoice_totaldesc">'.
+              qq(<td style="$style">&nbsp;</td>).
+              qq(<td align="left" style="$style">).
+                $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;';
@@ -101,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>'.
@@ -116,13 +195,6 @@
   </table>
   <br><br>
 
-<!--  <p><b><font size="+1">N</font><font size="+0">OTES</font></b>
-
-  <ol>
-    <li>Please make your check payable to <b>Ivan Kohler</b>
-    <li>If you have any questions please email or telephone.
-  </ol>
--->
 <%= $notes %>
 
   <hr NOSHADE SIZE=2 COLOR="#000000">