diff options
| author | Mark Wells <mark@freeside.biz> | 2015-02-04 21:12:56 -0800 |
|---|---|---|
| committer | Mark Wells <mark@freeside.biz> | 2015-02-04 21:12:56 -0800 |
| commit | 60f71e8b94fcd4403ad59c0508de59f90eb6edc5 (patch) | |
| tree | b1e630a9e47b402faa322f845332daf98492560e /conf | |
| parent | 745e36b35b36607f450d16944469f52e362bf934 (diff) | |
allow fees to be grouped with taxes on the invoice, #32223
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/invoice_html | 7 | ||||
| -rw-r--r-- | conf/invoice_latex | 6 |
2 files changed, 5 insertions, 8 deletions
diff --git a/conf/invoice_html b/conf/invoice_html index e9b0bdf95..06ee77588 100644 --- a/conf/invoice_html +++ b/conf/invoice_html @@ -166,15 +166,12 @@ &{$section->{description_generator}}($line); } else { my $class = 'invoice_desc_more'; - if ( $line->{'ref'} and $line->{'ref'} ne $lastref ) { + 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">'; - #if ( $line->{'ref'} ne $lastref ) { - # $OUT .= $line->{'ref'}; - #} $OUT .= '</td> <td align="left">'. $line->{'description'}. '</td>'; if ( $unitprices ) { @@ -185,7 +182,7 @@ $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'; diff --git a/conf/invoice_latex b/conf/invoice_latex index 822afcbdd..40ec70313 100644 --- a/conf/invoice_latex +++ b/conf/invoice_latex @@ -327,12 +327,12 @@ # Don't break-up small packages.
my $rowbreak = @$ext_description < 5 ? '*' : '';
- $OUT .= "\\hline\n" if ($line->{'ref'} && $line->{'ref'} ne $lastref);
+ $OUT .= "\\hline\n" if (($line->{'ref'} || 0) ne $lastref);
if ($section->{description_generator}) {
$OUT .= &{$section->{description_generator}}($line);
} else {
$OUT .= '\FSdesc'.
- '{}'. #'{' . ( $line->{'ref'} ne $lastref ? $line->{'ref'} : '' ) . '}'.
+ '{}'.
'{' . $line->{'description'} . '}' ;
if ( $unitprices and length($line->{'unit_amount'}) ) {
# then show the unit amount and quantity
@@ -345,7 +345,7 @@ }
$OUT .= '{\\dollar' . $line->{'amount'} . "}${rowbreak}\n";
}
- $lastref = $line->{'ref'};
+ $lastref = $line->{'ref'} || 0;
foreach my $ext_desc (@$ext_description) {
if ($section->{extended_description_generator}) {
|