X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=conf%2Finvoice_html;h=fe826ff2fa49b33e265ae7cd9b96650241604881;hb=5bc6e3dc0b986d70b7b5b1a63916dbe7e8c33faa;hp=4dd1078f87bf4ceb118988a74ca0b33f2ea81cfd;hpb=943ed94ca5c48732ed064598c49599199e3b6d53;p=freeside.git

diff --git a/conf/invoice_html b/conf/invoice_html
index 4dd1078f8..fe826ff2f 100644
--- a/conf/invoice_html
+++ b/conf/invoice_html
@@ -60,6 +60,22 @@
                 )
         %>
       </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,
+                                                       ' ',
+                                                       ' ',
+                              ).
+                           ($agent_custid ? "<b>ID:</b> $agent_custid<BR>" : '').
+                           ($ship_fax ? "<b>Fax:</b> $ship_fax<BR>" : '').
+                           '</td><tr><td></td><td></td>'
+                         )
+                       : ''
+      %>
       <td align="right">
         Terms: <%= $terms %><BR>
         <%= $po_line %>
@@ -134,7 +150,7 @@
             foreach my $ext_desc ( @{$line->{'ext_description'} } ) {
               $OUT .=
                 '<tr class="invoice_extdesc">'.
-                  '<td align="left">-&nbsp;'. $ext_desc. '</td>'.
+                  '<td align="left">&nbsp;&nbsp;'. $ext_desc. '</td>'.
                 '</tr>'
             }
             $OUT .= '</table></td><td></td></tr>';
@@ -148,7 +164,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>'.