diff options
| author | Mark Wells <mark@freeside.biz> | 2015-07-29 16:32:07 -0700 |
|---|---|---|
| committer | Mark Wells <mark@freeside.biz> | 2015-07-29 16:35:28 -0700 |
| commit | 64c053d9fa8e7223620a7079d2134a4dd7a80037 (patch) | |
| tree | 5bc2159c6e1ac4e07b61384887e94f65a598c72f | |
| parent | 380e6cb3c33bee60539a212ad0461d1f398431c3 (diff) | |
fix display of tax section on summary invoices, #37417, from #32223
| -rw-r--r-- | FS/FS/Template_Mixin.pm | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/FS/FS/Template_Mixin.pm b/FS/FS/Template_Mixin.pm index 37dcf2a5e..757701aa8 100644 --- a/FS/FS/Template_Mixin.pm +++ b/FS/FS/Template_Mixin.pm @@ -1278,11 +1278,17 @@ sub print_generic { if ( $multisection ) { if ( $taxtotal > 0 ) { + # there are taxes, so prepare the section to be displayed. + # $taxtotal already includes any line items that were already in the + # section (fees, taxes that are charged as packages for some reason). + # also set 'summarized' to false so that this isn't a summary-only + # section. $tax_section->{'subtotal'} = $other_money_char. sprintf('%.2f', $taxtotal); $tax_section->{'pretotal'} = 'New charges sub-total '. $total->{'total_amount'}; $tax_section->{'description'} = $self->mt($tax_description); + $tax_section->{'summarized'} = ''; # append it if it's not already there if ( !grep $tax_section, @sections ) { @@ -2496,7 +2502,6 @@ sub _items_sections { foreach my $sectionname (keys %{ $s->{$locationnum} }) { my $section = { 'subtotal' => $s->{$locationnum}{$sectionname}, - 'post_total' => $post_total, 'sort_weight' => 0, }; if ( $locationnum ) { |