From de602da29b21203c4526a391c50d27cbf2e92fec Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 2 Nov 2008 19:40:35 +0000
Subject: [PATCH] (and fix the total too) fix overreporting of tax invoiced
 when using & reporting with taxclasses, RT#4131

---
 httemplate/search/report_tax.cgi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi
index 155993fea..7585caa15 100755
--- a/httemplate/search/report_tax.cgi
+++ b/httemplate/search/report_tax.cgi
@@ -477,7 +477,7 @@ foreach my $r ( qsearch(\%qsearch) ) {
 
   my $x = &{$_taxamount_sub}($r);
 
-  $tax += $x;
+  $tax += $x unless $cgi->param('show_taxclasses');
   $regions{$label}->{'tax'} += $x;
 
 }
@@ -495,6 +495,7 @@ if ( $cgi->param('show_taxclasses') ) {
     $base_regions{$base_label}->{'url_param'} =
       join(';', map "$_=".$r->$_(), qw( county state country ) );
     $base_regions{$base_label}->{'tax'} += $x;
+    $tax += $x;
   }
 
 }
-- 
2.11.0