.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 }
</STYLE>
<table class="invoice" bgcolor="#ffffff" WIDTH=625 CELLSPACING=8><tr><td>
unless ($section->{'summarized'}) {
$OUT .= '</table>' if ( $notfirst || $section->{'pretotal'} && !$summary );
$OUT .= '<table><tr><td>';
- my $sectionhead = $section->{'description'} || emt('Charges');
- $OUT .=
- '<p class="allcaps"><b><font size="+1">'. substr($sectionhead,0,1).
+ $OUT .= '<p class="allcaps"><b>';
+ 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 .= '<font size="+1">'. substr($sectionhead,0,1).
'</font><font size="+0">'. substr($sectionhead,1).
- '</font></b>'.
- '<p>'.
- '</td></tr></table>';
+
+ '</font>';
+ }
+ $OUT .= '</b></p></td></tr></table>';
$OUT .=
'<table class="invoice_longtable" CELLSPACING=0 WIDTH="100%">'.
$OUT .= '<th align="center">' . emt('Ref') . '</th>'.
'<th align="left">' . emt('Description') . '</th>'.
( $unitprices
- ? '<th align="left">' . emt('Unit Price') . '</th>'.
- '<th align="left">' . emt('Quantity') . '</th>'
+ ? '<th align="right">' . emt('Unit Price') . '</th>'.
+ '<th align="right">' . emt('Quantity') . '</th>'
: '' ).
'<th align="right">' . emt('Amount') . '</th>';
}
) }
@detail_items )
{
- $OUT .=
- '<tr class="invoice_desc';
if ( $section->{description_generator} ) {
- $OUT .= &{$section->{description_generator}}($line);
+ $OUT .= '<tr class="invoice_desc' .
+ &{$section->{description_generator}}($line);
} else {
- $OUT .= ( ($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="left">'. $line->{'quantity'}. '</td>'
- : ''
- ).
-
- '<td align="right">'. $line->{'amount'}. '</td>';
+ 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 .= '<tr class="'.$class.'">
+ <td align="center">';
+ if ( $line->{'ref'} ne $lastref ) {
+ $OUT .= $line->{'ref'};
+ }
+ $OUT .= '</td>
+ <td align="left">'. $line->{'description'}. '</td>';
+ if ( $unitprices ) {
+ $OUT .=
+ '<td align="right">'. $line->{'unit_amount'}. '</td>'.
+ '<td align="right">'. $line->{'quantity'}. '</td>';
+ }
+ $OUT .= '<td align="right">'. $line->{'amount'}. '</td>';
}
$OUT .= '</tr>';
$lastref = $line->{'ref'};