summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wells <mark@freeside.biz>2015-07-29 16:32:07 -0700
committerMark Wells <mark@freeside.biz>2015-07-29 16:32:29 -0700
commit0bd27f99741ac96812a9a86713d506f59ea1c2e8 (patch)
treead93a74518b779363cdd94aacff6d5b0b623358a
parent4d6e432a463f155a8043286b6784275538ccf441 (diff)
fix display of tax section on summary invoices, #37417, from #32223
-rw-r--r--FS/FS/Template_Mixin.pm7
1 files changed, 6 insertions, 1 deletions
diff --git a/FS/FS/Template_Mixin.pm b/FS/FS/Template_Mixin.pm
index 0d7c1f159..6d272dd42 100644
--- a/FS/FS/Template_Mixin.pm
+++ b/FS/FS/Template_Mixin.pm
@@ -1277,11 +1277,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 ) {
@@ -2492,7 +2498,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 ) {