.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>
-<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>
<tr>
- <td align="right">
+ <td align="center">
Invoice date<BR>
<B><%= $date %></B>
</td>
' ',
' ',
).
- ($agent_custid ? "<b>ID:</b> $agent_custid<BR>" : '').
- ($ship_fax ? "<b>Fax:</b> $ship_fax<BR>" : '').
'</td><tr><td></td><td></td>'
)
: ''
'<th align="right">Amount</th>'.
'</tr>';
+ my $lastref = 0;
foreach my $line (
grep { ( scalar(@sections) > 1
? $section->{'description'} eq $_->{'section'}->{'description'}
@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>'.
'<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>' : '>';
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 class="invoice_totaldesc">'.
qq(<td style="$style"> </td>).
qq(<td align="left" style="$style").
- ( unitprices ? ' colspan=3>' : '>' ).
+ ( $unitprices ? ' colspan=3>' : '>' ).
$section->{'description'}. ' Total </td>'.
qq(<td align="right" style="$style">).
$section->{'subtotal'}. '</td>'.