[freeside-commits] freeside/httemplate/search cust_bill_pkg.cgi, 1.11, 1.12

[Ivan,,,]

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

Modified Files:
	cust_bill_pkg.cgi 
Log Message:
fix line-item reports on taxclass-less regions

Index: cust_bill_pkg.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_bill_pkg.cgi,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- cust_bill_pkg.cgi	8 Jul 2008 02:01:41 -0000	1.11
+++ cust_bill_pkg.cgi	8 Jul 2008 02:19:56 -0000	1.12
@@ -123,8 +123,17 @@
     if $cgi->param('taxclass');
 
   if ( $cgi->param('taxclassNULL') ) {
-    my $same_sql = $r->sql_taxclass_sameregion;
+
+    my %hash = ( 'country' => scalar($cgi->param('country')) );
+    foreach (qw( state county )) {
+      $hash{$_} = scalar($cgi->param($_)) if $cgi->param($_);
+    }
+    my $cust_main_county = qsearchs('cust_main_county', \%hash);
+    die "unknown base region for empty taxclass" unless $cust_main_county;
+
+    my $same_sql = $cust_main_county->sql_taxclass_sameregion;
     push @where, $same_sql if $same_sql;
+
   }
 
 }