.allcaps { text-transform:uppercase; font-size: 12pt }
</STYLE>
-<table class="invoice" bgcolor="#ffffff" WIDTH=625 CELLSPACING=8><tr><td>
+<table class="invoice" bgcolor="#ffffff" WIDTH=625 CELLSPACING=8 STYLE="border:1px solid #000000"><tr><td>
<table class="invoice_header" width="100%">
<tr>
$OUT .= '<p class="allcaps"><b>';
my $sectionhead;
if ( $section->{'location'} ) {
- $sectionhead .= $section->{'location'}{'label_prefix'}. ': '.
+ $sectionhead .= $section->{'location'}{'label_prefix'}. ': '
if length($section->{'location'}{'label_prefix'});
$sectionhead = $section->{'location'}{'address1'};
$sectionhead .= ', '.$section->{'location'}{'address2'}
$OUT .= $header;
$columncount = scalar(my @array = split /<\/th><th/i, $header);
} else {
- $OUT .= '<th align="center">' . emt('Ref') . '</th>'.
+ $OUT .= '<th align="center"></th>'.
'<th align="left">' . emt('Description') . '</th>'.
( $unitprices
? '<th align="right">' . emt('Unit Price') . '</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="right">'. $line->{'unit_amount'}. '</td>'.
- '<td align="right">'. $line->{'quantity'}. '</td>'
- : ''
- ).
-
- '<td align="right">'. $line->{'amount'}. '</td>';
+ my $class = 'invoice_desc_more';
+ if ( ($line->{'ref'} || 0) ne $lastref ) {
+ # then it's a new package (not a continuation)
+ $class = 'invoice_desc';
+ }
+ $OUT .= '<tr class="'.$class.'">
+ <td align="center">';
+ $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'};
+ $lastref = $line->{'ref'} || 0;
if ( @{$line->{'ext_description'} } ) {
unless ( $section->{description_generator} ) {
$OUT .= '<tr class="invoice_extdesc"><td></td><td';