From: Mitch Jackson <mitch@freeside.biz>
Date: Sun, 15 Apr 2018 00:35:12 +0000 (-0500)
Subject: RT# 42357,78190 Fix Fees appearing twice within sectioned invoices
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=5828f9ef8d7c9e424423ba2063840060d2da8b6e;p=freeside.git

RT# 42357,78190 Fix Fees appearing twice within sectioned invoices
---

diff --git a/FS/FS/Template_Mixin.pm b/FS/FS/Template_Mixin.pm
index 4f5501d15..7ea22b55d 100644
--- a/FS/FS/Template_Mixin.pm
+++ b/FS/FS/Template_Mixin.pm
@@ -1216,6 +1216,17 @@ sub print_generic {
     foreach my $line_item ( $self->_items_pkg(%options),
                             $self->_items_fee(%options) ) {
 
+      # When bill is sectioned by location, fees may be displayed within the
+      # appropriate location section.  Suppress this fee from the taxes/fees
+      # end section, so it doesn't appear to be charged twice and make the
+      # subtotals seem incorrect
+      next
+        if $line_item->{locationnum}
+        && ref $options{section}
+        && !exists $options{section}->{locationnum}
+        && $self->has_sections
+        && $conf->config($tc.'sections_method') eq 'location';
+
       warn "$me     adding line item ".
            join(', ', map "$_=>".$line_item->{$_}, keys %$line_item). "\n"
         if $DEBUG > 1;