summaryrefslogtreecommitdiff
path: root/FS/FS
diff options
context:
space:
mode:
authorMark Wells <mark@freeside.biz>2016-09-22 15:48:16 -0700
committerMark Wells <mark@freeside.biz>2016-09-22 15:48:16 -0700
commit495da424492b18c3f4cdaa3fccec728b14435fde (patch)
tree82724efb6abcd1cb0875693b5c6cd2478ee93bf4 /FS/FS
parent44dcd4a1ff335a85a6babf0e007be57e6ec4f525 (diff)
on summary-format invoices, avoid duplicating the tax section, #72342
Diffstat (limited to 'FS/FS')
-rw-r--r--FS/FS/Template_Mixin.pm5
1 files changed, 2 insertions, 3 deletions
diff --git a/FS/FS/Template_Mixin.pm b/FS/FS/Template_Mixin.pm
index c8ddffd79..caa31f76b 100644
--- a/FS/FS/Template_Mixin.pm
+++ b/FS/FS/Template_Mixin.pm
@@ -1240,11 +1240,13 @@ sub print_generic {
if $DEBUG > 1;
# create a tax section if we don't yet have one
+ my @items_tax = $self->_items_tax;
my $tax_description = 'Taxes, Surcharges, and Fees';
my $tax_section =
List::Util::first { $_->{description} eq $tax_description } @sections;
if (!$tax_section) {
$tax_section = { 'description' => $tax_description };
+ push @sections, $tax_section if $multisection and @items_tax > 0;
}
$tax_section->{tax_section} = 1; # mark this section as containing taxes
# if this is an existing tax section, we're merging the tax items into it.
@@ -1259,9 +1261,6 @@ sub print_generic {
#$tax_section->{'summarized'} = ''; #why? $summarypage && !$tax_weight ? 'Y' : '';
#$tax_section->{'sort_weight'} = $tax_weight;
- my @items_tax = $self->_items_tax;
- push @sections, $tax_section if $multisection and @items_tax > 0;
-
foreach my $tax ( @items_tax ) {
$taxtotal += $tax->{'amount'};