[freeside-commits] freeside/FS/FS tax_rate.pm,1.43.4.5,1.43.4.6

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv17940/FS/FS

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	tax_rate.pm 
Log Message:
fix new tax report w/FS::tax_rate_location->location_sql, RT#12332

Index: tax_rate.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/tax_rate.pm,v
retrieving revision 1.43.4.5
retrieving revision 1.43.4.6
diff -u -w -d -r1.43.4.5 -r1.43.4.6
--- tax_rate.pm	15 Apr 2011 22:34:26 -0000	1.43.4.5
+++ tax_rate.pm	15 Apr 2011 22:52:30 -0000	1.43.4.6
@@ -1892,23 +1892,26 @@
       $taxes{$label}->{'url_param'} =
         join(';', map { "$_=". uri_escape($t->$_) } @params);
 
-      my $taxwhere = "FROM cust_bill_pkg $addl_from $where AND payby != 'COMP' ".
+      my $payby_itemdesc_loc = 
+        "    payby != 'COMP' ".
+        "AND itemdesc = ? OR ? = '' AND itemdesc IS NULL ".
        "AND ". FS::tax_rate_location->location_sql( map { $_ => $t->$_ }
                                                         @taxparams
                                                   );
 
+      my $taxwhere =
+        "FROM cust_bill_pkg $addl_from $where AND $payby_itemdesc_loc";
+
       my $sql = "SELECT SUM(amount) $taxwhere AND cust_bill_pkg.pkgnum = 0";
 
       my $x = &{$scalar_sql}($t, [], $sql );
       $tax += $x;
       $taxes{$label}->{'tax'} += $x;
 
-      my $creditfrom = " JOIN cust_credit_bill_pkg USING (billpkgnum,billpkgtaxratelocationnum) ";
-      my $creditwhere = "FROM cust_bill_pkg $addl_from $creditfrom $where ".
-        "AND payby != 'COMP' ".
-        "AND ". FS::tax_rate_location->location_sql( map { $_ => $t->$_ }
-                                                         @taxparams
-                                                   );
+      my $creditfrom =
+       "JOIN cust_credit_bill_pkg USING (billpkgnum,billpkgtaxratelocationnum)";
+      my $creditwhere =
+        "FROM cust_bill_pkg $addl_from $creditfrom $where $payby_itemdesc_loc";
 
       $sql = "SELECT SUM(cust_credit_bill_pkg.amount) ".
              " $creditwhere AND cust_bill_pkg.pkgnum = 0";