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

1 files changed, 9 insertions, 1 deletions

diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi
index 7585caa15..21b42e370 100755
--- a/httemplate/search/report_tax.cgi
+++ b/httemplate/search/report_tax.cgi
@@ -492,8 +492,16 @@ if ( $cgi->param('show_taxclasses') ) {
 
     my $base_label = getlabel($r, 'no_taxclass'=>1 );
     $base_regions{$base_label}->{'label'} = $base_label;
+
     $base_regions{$base_label}->{'url_param'} =
-      join(';', map "$_=".$r->$_(), qw( county state country ) );
+      join(';', map "$_=".$r->$_(), qw( county state country ) ); #taxname???
+
+    if ( $r->taxclass ) {
+      $base_regions{$base_label}->{'url_param'} .= ';taxclass='. $r->taxclass;
+    } else {
+      $base_regions{$base_label}->{'url_param'} .= ';taxclassNULL=1'
+    }
+
     $base_regions{$base_label}->{'tax'} += $x;
     $tax += $x;
   }