From: ivan <ivan>
Date: Sun, 2 Nov 2008 19:40:37 +0000 (+0000)
Subject: (and fix the total too) fix overreporting of tax invoiced when using & reporting... 
X-Git-Tag: freeside_1_7_4rc1~151
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=78eaeff1d9e82316295ab54592d681d2f49b3819;p=freeside.git

(and fix the total too) fix overreporting of tax invoiced when using & reporting with taxclasses, RT#4131
---

diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi
index 3316ee472..62a3645db 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;
   }
 
 }