this should fix the occasional extra ticket showing up on wrong customer record

[freeside.git] / conf / invoice_html

diff --git a/conf/invoice_html b/conf/invoice_html
index b13b08f..d55ac83 100644 (file)
--- a/conf/invoice_html
+++ b/conf/invoice_html
@@ -10,7 +10,7 @@
 .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>
@@ -19,7 +19,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 +60,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 %>
@@ -74,6 +88,12 @@
     <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>
     <%=
@@ -83,16 +103,25 @@
           '<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>'
         ;
-        foreach my $ext_desc ( @{$line->{'ext_description'} } ) {
-          $OUT .=
-            '<tr class="invoice_extdesc">'.
-              '<td></td>'.
-              '<td align="left">-&nbsp;'. $ext_desc. '</td>'.
-              '<td></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;&nbsp;'. $ext_desc. '</td>'.
+              '</tr>'
+          }
+          $OUT .= '</table></td><td></td></tr>';
         }
       }
 
@@ -107,7 +136,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>'.