X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=conf%2Finvoice_html;h=806c5deb49b8d48420e4da42df0ad9d0f70ce0cf;hb=f0e99fc9288c22e1830a45d3e67d6d0241d98fd9;hp=5afbb7ad32c35362b5445d272fc6abfe2a5b0539;hpb=3b54099d7b5532a411bb477006d78844c0597745;p=freeside.git
diff --git a/conf/invoice_html b/conf/invoice_html
index 5afbb7ad3..806c5deb4 100644
--- a/conf/invoice_html
+++ b/conf/invoice_html
@@ -6,6 +6,7 @@
.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 }
@@ -60,6 +61,22 @@
)
%>
+ <%= $ship_enable ? ('
'.
+ join(' ',grep length($_), 'Service Address',
+ $ship_company,
+ $ship_address1,
+ $ship_address2,
+ "$ship_city, $ship_state $ship_zip",
+ $ship_country,
+ ' ',
+ ' ',
+ ).
+ ($agent_custid ? "ID: $agent_custid " : '').
+ ($ship_fax ? "Fax: $ship_fax " : '').
+ ' | | | '
+ )
+ : ''
+ %>
Terms: <%= $terms %>
<%= $po_line %>
@@ -107,6 +124,7 @@
' | Amount | '.
'
';
+ my $lastref = 0;
foreach my $line (
grep { ( scalar(@sections) > 1
? $section->{'description'} eq $_->{'section'}->{'description'}
@@ -115,8 +133,11 @@
@detail_items )
{
$OUT .=
- ''.
- ''. $line->{'ref'}. ' | '.
+ '
'.
+ ''.
+ ( $line->{'ref'} ne $lastref ? $line->{'ref'} : '' ). ' | '.
''. $line->{'description'}. ' | '.
( $unitprices
? ''. $line->{'unit_amount'}. ' | '.
@@ -127,6 +148,7 @@
''. $line->{'amount'}. ' | '.
'
'
;
+ $lastref = $line->{'ref'};
if ( @{$line->{'ext_description'} } ) {
$OUT .= ' | ' : '>';
@@ -148,7 +170,8 @@
$OUT .=
' |
'.
qq( | ).
- qq( colspan=3).
+ qq( | ' : '>' ).
$section->{'description'}. ' Total | '.
qq().
$section->{'subtotal'}. ' | '.