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

[Ivan,,,]

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

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	report_tax.cgi 
Log Message:
(and fix the line-item links too, whew) 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.9
retrieving revision 1.34.2.10
diff -u -d -r1.34.2.9 -r1.34.2.10
--- report_tax.cgi	2 Nov 2008 19:40:37 -0000	1.34.2.9
+++ report_tax.cgi	2 Nov 2008 20:03:31 -0000	1.34.2.10
@@ -492,8 +492,16 @@
 
     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;
   }