projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix one-time charge inadvertantly checking the "tax exempt" checkbox when the tax...
[freeside.git]
/
conf
/
invoice_html
diff --git
a/conf/invoice_html
b/conf/invoice_html
index
806c5de
..
d5e24b8
100644
(file)
--- a/
conf/invoice_html
+++ b/
conf/invoice_html
@@
-11,16
+11,16
@@
.invoice_totaldesc TD { font-size: 10pt; empty-cells: show }
</STYLE>
.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>
<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="left"><%= $returnaddress %></td>
<td align="right">
<table CLASS="invoice_headerright" cellspacing=0>
<tr>
- <td align="
right
">
+ <td align="
center
">
Invoice date<BR>
<B><%= $date %></B>
</td>
Invoice date<BR>
<B><%= $date %></B>
</td>
@@
-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>'
)
: ''
'</td><tr><td></td><td></td>'
)
: ''
@@
-156,7
+154,10
@@
foreach my $ext_desc ( @{$line->{'ext_description'} } ) {
$OUT .=
'<tr class="invoice_extdesc">'.
foreach my $ext_desc ( @{$line->{'ext_description'} } ) {
$OUT .=
'<tr class="invoice_extdesc">'.
- '<td align="left"> '. $ext_desc. '</td>'.
+ '<td align="left" '.
+ ( $ext_desc =~ /<\/?TD>/i ? '' : 'colspan=99' ). '>'.
+ ' '. $ext_desc.
+ '</td>'.
'</tr>'
}
$OUT .= '</table></td><td></td></tr>';
'</tr>'
}
$OUT .= '</table></td><td></td></tr>';