[freeside-commits] branch FREESIDE_4_BRANCH updated. 6894828ab5a66e53ad6945cc14e6cd9f9c3b67f7

[Mark Wells]

The branch, FREESIDE_4_BRANCH has been updated
       via  6894828ab5a66e53ad6945cc14e6cd9f9c3b67f7 (commit)
      from  f618014107741d159fb257f1a6726a92cb046dfb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6894828ab5a66e53ad6945cc14e6cd9f9c3b67f7
Author: Mark Wells <mark at freeside.biz>
Date:   Thu Sep 22 15:48:16 2016 -0700

    on summary-format invoices, avoid duplicating the tax section, #72342

diff --git a/FS/FS/Template_Mixin.pm b/FS/FS/Template_Mixin.pm
index c8ddffd..caa31f7 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'};

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/Template_Mixin.pm |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)