X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=conf%2Finvoice_html;h=bd99899e0b7b5b686e82e6201e7970f46dfd4065;hb=a2df4ef9575be1ae2f1f5b9089f121316f796bac;hp=cd348274fd94f372fd369e2af926e0ec0fac863d;hpb=54a357b171aa44f9399b4c146acd2afd3b686075;p=freeside.git diff --git a/conf/invoice_html b/conf/invoice_html index cd348274f..bd99899e0 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,27 @@ unless ($section->{'summarized'}) { $OUT .= ' |
';
- my $sectionhead = $section->{'description'} || emt('Charges');
- $OUT .=
- ' '. substr($sectionhead,0,1).
+ $OUT .= ' ';
+ my $sectionhead;
+ if ( $section->{'location'} ) {
+ $sectionhead .= $section->{'location'}{'label_prefix'}. ': '
+ if length($section->{'location'}{'label_prefix'});
+ $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).
- ''.
- ' '.
- ' |
'. - ( $line->{'ref'} ne $lastref ? $line->{'ref'} : '' ). ' | '. - ''. $line->{'description'}. ' | '. - ( $unitprices - ? ''. $line->{'unit_amount'}. ' | '. - ''. $line->{'quantity'}. ' | ' - : '' - ). - - ''. $line->{'amount'}. ' | '; + my $class = 'invoice_desc_more'; + if ( $line->{'ref'} and $line->{'ref'} ne $lastref ) { + # then it's a new package (not a continuation) + $class = 'invoice_desc'; + } + $OUT .= '
'; + if ( $line->{'ref'} ne $lastref ) { + $OUT .= $line->{'ref'}; + } + $OUT .= ' | +'. $line->{'description'}. ' | '; + if ( $unitprices ) { + $OUT .= + ''. $line->{'unit_amount'}. ' | '. + ''. $line->{'quantity'}. ' | '; + } + $OUT .= ''. $line->{'amount'}. ' | '; } $OUT .= '