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

diff --git a/conf/invoice_html b/conf/invoice_html
index 65c777e76..49c11877c 100644
--- a/conf/invoice_html
+++ b/conf/invoice_html
@@ -6,6 +6,7 @@
 .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>
@@ -19,7 +20,7 @@
       <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 %>
@@ -107,6 +122,7 @@
             '<th align="right">Amount</th>'.
           '</tr>';
 
+        my $lastref = 0;
         foreach my $line (
           grep { ( scalar(@sections) > 1 
                  ? $section->{'description'} eq $_->{'section'}->{'description'}
@@ -115,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>'.
@@ -127,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>' : '>';
@@ -134,7 +154,10 @@
             foreach my $ext_desc ( @{$line->{'ext_description'} } ) {
               $OUT .=
                 '<tr class="invoice_extdesc">'.
-                  '<td align="left">-&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>';
@@ -148,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>'.
@@ -157,7 +181,7 @@
         }
 
         if ($section->{'posttotal'}) {
-          $OUT .= '<tr><td align="right" colspan=3>';
+          $OUT .= '<tr><td align="right" colspan=5>';
           $OUT .=
             '<p><font size="+1">'. $section->{'posttotal'}.
             '</font>'.