X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=conf%2Finvoice_html;h=d5e24b812bb1427272ce544a91c163b96eb86552;hb=4e1e828e7ef0437b002544cc30f9934ca1c9751b;hp=9d97243e4d0b41e4b98bb0ed9888d4d3b9016ddf;hpb=5e05724a635a22776f1b973f5d7e77989da4e048;p=freeside.git

diff --git a/conf/invoice_html b/conf/invoice_html
index 9d97243e4..d5e24b812 100644
--- a/conf/invoice_html
+++ b/conf/invoice_html
@@ -6,20 +6,21 @@
 .invoice_longtable table { cellspacing: none }
 .invoice_longtable TH { border-top: 2px solid #000000; border-bottom: 1px solid #000000; padding-left: none; padding-right: none; font-size: 10pt }
 .invoice_desc TD { border-top: 2px solid #000000; font-weight: bold; font-size: 10pt }
+.invoice_desc_more TD { font-weight: bold; font-size: 10pt }
 .invoice_extdesc TD { font-size: 8pt }
 .invoice_totaldesc TD { font-size: 10pt; empty-cells: show }
 </STYLE>
 
-<table class="invoice" bgcolor="#ffffff" WIDTH=768 CELLSPACING=8><tr><td>
+<table class="invoice" bgcolor="#ffffff" WIDTH=625 CELLSPACING=8><tr><td>
 
   <table class="invoice_header" width="100%">
     <tr>
-     <td><img src="<%= $cid ? "cid:$cid" : "cust_bill-logo.cgi?$template" %>"></td>
+     <td><img src="<%= $cid ? "cid:$cid" : "cust_bill-logo.cgi?invnum=$invnum;template=$template" %>"></td>
      <td align="left"><%= $returnaddress %></td>
       <td align="right">
         <table CLASS="invoice_headerright" cellspacing=0>
           <tr>
-            <td align="right">
+            <td align="center">
               Invoice&nbsp;date<BR>
               <B><%= $date %></B>
             </td>
@@ -60,6 +61,20 @@
                 )
         %>
       </td>
+      <%= $ship_enable ? ('<td align="left">'.
+                          join('<BR>',grep length($_), '<b>Service Address</b>',
+                                                       $ship_company,
+                                                       $ship_address1,
+                                                       $ship_address2,
+                                                       "$ship_city,&nbsp;$ship_state&nbsp;$ship_zip",
+                                                       $ship_country,
+                                                       ' ',
+                                                       ' ',
+                              ).
+                           '</td><tr><td></td><td></td>'
+                         )
+                       : ''
+      %>
       <td align="right">
         Terms: <%= $terms %><BR>
         <%= $po_line %>
@@ -70,6 +85,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,9 +114,15 @@
           '<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>';
 
+        my $lastref = 0;
         foreach my $line (
           grep { ( scalar(@sections) > 1 
                  ? $section->{'description'} eq $_->{'section'}->{'description'}
@@ -100,19 +131,36 @@
           @detail_items )
         {
           $OUT .=
-            '<tr class="invoice_desc">'.
-              '<td align="center">'. $line->{'ref'}. '</td>'.
+            '<tr class="invoice_desc'.
+              ( ($line->{'ref'} && $line->{'ref'} ne $lastref) ? '' : '_more' ).
+              '">'.
+              '<td align="center">'. 
+              ( $line->{'ref'} ne $lastref ? $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>'
           ;
-          foreach my $ext_desc ( @{$line->{'ext_description'} } ) {
-            $OUT .=
-              '<tr class="invoice_extdesc">'.
-                '<td></td>'.
-                '<td align="left">-&nbsp;'. $ext_desc. '</td>'.
-                '<td></td>'.
-              '</tr>'
+          $lastref = $line->{'ref'};
+          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" '.
+                       ( $ext_desc =~ /<\/?TD>/i ? '' : 'colspan=99' ). '>'.
+                    '&nbsp;&nbsp;'. $ext_desc.
+                  '</td>'.
+                '</tr>'
+            }
+            $OUT .= '</table></td><td></td></tr>';
           }
         }
 
@@ -123,13 +171,24 @@
           $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>' : '>' ).
                 $section->{'description'}. ' Total </td>'.
               qq(<td align="right" style="$style">).
                 $section->{'subtotal'}. '</td>'.
             '</tr>'
         ;
         }
+
+        if ($section->{'posttotal'}) {
+          $OUT .= '<tr><td align="right" colspan=5>';
+          $OUT .=
+            '<p><font size="+1">'. $section->{'posttotal'}.
+            '</font>'.
+            '<p>';
+          $OUT .= '</td></tr>';
+        }
+
       }
 
       my $style = 'border-top: 3px solid #000000;';
@@ -143,7 +202,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>'.