X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=conf%2Finvoice_html;h=35de6cf09cd1dc213664c761c1539a75967ce664;hb=313a3715952e448b9efda129597e83df514be4ec;hp=1d53683ad67011f5d63194c20f9290cf38e146e5;hpb=62b12e8b09608b7081ffd596be899fafb5c2403f;p=freeside.git diff --git a/conf/invoice_html b/conf/invoice_html index 1d53683ad..35de6cf09 100644 --- a/conf/invoice_html +++ b/conf/invoice_html @@ -11,7 +11,7 @@ .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 } -.allcaps { text-transform:uppercase } +.allcaps { text-transform:uppercase; font-size: 12pt }
@@ -112,13 +112,25 @@ unless ($section->{'summarized'}) { $OUT .= ' |
';
- my $sectionhead = $section->{'description'} || emt('Charges');
- $OUT .=
- ' '. substr($sectionhead,0,1).
+ $OUT .= ' ';
+ my $sectionhead;
+ if ( $section->{'location'} ) {
+ $sectionhead = $section->{'location'}{'address1'};
+ $sectionhead .= ', '.$section->{'location'}{'address2'}
+ if length($section->{'location'}{'address2'});
+ $sectionhead .= ', ' .
+ $section->{'location'}{'city'} . ', ' .
+ $section->{'location'}{'state'} . ' ' .
+ $section->{'location'}{'zip'};
+ $OUT .= $sectionhead;
+ } else {
+ $sectionhead = $section->{'description'} || emt('Charges');
+ $OUT .= ''. substr($sectionhead,0,1).
''. substr($sectionhead,1).
- ''.
- ' '.
- ' |
' . emt('Ref') . ' | '. '' . emt('Description') . ' | '. ( $unitprices - ? '' . emt('Unit Price') . ' | '. - '' . emt('Quantity') . ' | ' + ? '' . emt('Unit Price') . ' | '. + '' . emt('Quantity') . ' | ' : '' ). '' . emt('Amount') . ' | '; } @@ -158,8 +170,8 @@ ( $line->{'ref'} ne $lastref ? $line->{'ref'} : '' ). ''. ''. $line->{'description'}. ' | '. ( $unitprices - ? ''. $line->{'unit_amount'}. ' | '. - ''. $line->{'quantity'}. ' | ' + ? ''. $line->{'unit_amount'}. ' | '. + ''. $line->{'quantity'}. ' | ' : '' ). @@ -191,7 +203,7 @@ } - if ($section->{'description'} || $multisection) { + if ($section->{'description'} || $multisection and !$section->{no_subtotal}) { my $style = 'border-top: 3px solid #000000;'. 'border-bottom: 3px solid #000000;'; $OUT .=
---|