[freeside-commits] freeside/httemplate/search report_tax.cgi, 1.34.2.8, 1.34.2.9

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/search
In directory wavetail.420.am:/tmp/cvs-serv15072

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	report_tax.cgi 
Log Message:
(and fix the total too) fix overreporting of tax invoiced when using & reporting with taxclasses, RT#4131

Index: report_tax.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/report_tax.cgi,v
retrieving revision 1.34.2.8
retrieving revision 1.34.2.9
diff -u -d -r1.34.2.8 -r1.34.2.9
--- report_tax.cgi	2 Nov 2008 19:26:50 -0000	1.34.2.8
+++ report_tax.cgi	2 Nov 2008 19:40:37 -0000	1.34.2.9
@@ -477,7 +477,7 @@
 
   my $x = &{$_taxamount_sub}($r);
 
-  $tax += $x;
+  $tax += $x unless $cgi->param('show_taxclasses');
   $regions{$label}->{'tax'} += $x;
 
 }
@@ -495,6 +495,7 @@
     $base_regions{$base_label}->{'url_param'} =
       join(';', map "$_=".$r->$_(), qw( county state country ) );
     $base_regions{$base_label}->{'tax'} += $x;
+    $tax += $x;
   }
 
 }