X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=conf%2Finvoice_html;h=d5e24b812bb1427272ce544a91c163b96eb86552;hb=4e1e828e7ef0437b002544cc30f9934ca1c9751b;hp=58d49563333f16fcfa4b81ea2a390326355e11a1;hpb=7ae002203388977c178ffbf0e2ceaea17ab46bce;p=freeside.git

diff --git a/conf/invoice_html b/conf/invoice_html
index 58d495633..d5e24b812 100644
--- a/conf/invoice_html
+++ b/conf/invoice_html
@@ -11,11 +11,11 @@
 .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>
@@ -71,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>'
                          )
                        : ''
@@ -156,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>';