[freeside-commits] freeside/httemplate/search cust_bill_pkg.cgi, 1.46, 1.47

[Ivan,,,]

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

Modified Files:
	cust_bill_pkg.cgi 
Log Message:
fix "tax invoiced" links on tax report for the taxclass + not taxclass in same region case, RT#15469

Index: cust_bill_pkg.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_bill_pkg.cgi,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -w -d -r1.46 -r1.47
--- cust_bill_pkg.cgi	21 Jul 2011 23:33:09 -0000	1.46
+++ cust_bill_pkg.cgi	16 Dec 2011 04:48:05 -0000	1.47
@@ -300,8 +300,11 @@
     #warn "neither nottax nor istax parameters specified";
   }
 
-  if ( $cgi->param('taxclassNULL') ) {
-
+  if ( $cgi->param('taxclassNULL')
+       && ! $cgi->param('istax')  #no part_pkg.taxclass in this case
+                                  #(see comment above?)
+     )
+  {
     my %hash = ( 'country' => scalar($cgi->param('country')) );
     foreach (qw( state county )) {
       $hash{$_} = scalar($cgi->param($_)) if $cgi->param($_);