X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=conf%2Finvoice_html;h=d5e24b812bb1427272ce544a91c163b96eb86552;hb=f14d53ff0e570cc24395b9d7953ea427ac468de3;hp=0e7021e3baed1c86fed5e6807e6a2edb0656c833;hpb=a8be11120336b0f1a8565f4abe4758f8211e1f5a;p=freeside.git

diff --git a/conf/invoice_html b/conf/invoice_html
index 0e7021e3b..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>
@@ -70,8 +71,6 @@
                                                        ' ',
                                                        ' ',
                               ).
-                           ($agent_custid ? "<b>ID:</b> $agent_custid<BR>" : '').
-                           ($ship_fax ? "<b>Fax:</b> $ship_fax<BR>" : '').
                            '</td><tr><td></td><td></td>'
                          )
                        : ''
@@ -123,6 +122,7 @@
             '<th align="right">Amount</th>'.
           '</tr>';
 
+        my $lastref = 0;
         foreach my $line (
           grep { ( scalar(@sections) > 1 
                  ? $section->{'description'} eq $_->{'section'}->{'description'}
@@ -131,8 +131,11 @@
           @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>'.
@@ -143,6 +146,7 @@
               '<td align="right">'. $line->{'amount'}. '</td>'.
             '</tr>'
           ;
+          $lastref = $line->{'ref'};
           if ( @{$line->{'ext_description'} } ) {
             $OUT .= '<tr class="invoice_extdesc"><td></td><td';
             $OUT .= $unitprices ? ' colspan=3>' : '>';
@@ -150,7 +154,10 @@
             foreach my $ext_desc ( @{$line->{'ext_description'} } ) {
               $OUT .=
                 '<tr class="invoice_extdesc">'.
-                  '<td align="left">&nbsp;&nbsp;'. $ext_desc. '</td>'.
+                  '<td align="left" '.
+                       ( $ext_desc =~ /<\/?TD>/i ? '' : 'colspan=99' ). '>'.
+                    '&nbsp;&nbsp;'. $ext_desc.
+                  '</td>'.
                 '</tr>'
             }
             $OUT .= '</table></td><td></td></tr>';
@@ -164,7 +171,8 @@
           $OUT .=
             '<tr class="invoice_totaldesc">'.
               qq(<td style="$style">&nbsp;</td>).
-              qq(<td align="left" style="$style">).   #colspan=3???
+              qq(<td align="left" style="$style"). 
+                ( $unitprices ? ' colspan=3>' : '>' ).
                 $section->{'description'}. ' Total </td>'.
               qq(<td align="right" style="$style">).
                 $section->{'subtotal'}. '</td>'.