[freeside-commits] freeside/FS/FS tax_rate.pm,1.43.4.8,1.43.4.9

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv19671/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.8
retrieving revision 1.43.4.9
diff -u -w -d -r1.43.4.8 -r1.43.4.9
--- tax_rate.pm	15 Apr 2011 23:02:22 -0000	1.43.4.8
+++ tax_rate.pm	15 Apr 2011 23:15:54 -0000	1.43.4.9
@@ -1911,7 +1911,7 @@
       my $creditfrom =
        "JOIN cust_credit_bill_pkg USING (billpkgnum,billpkgtaxratelocationnum)";
       my $creditwhere =
-        "FROM cust_bill_pkg $addl_from $creditfrom $where $payby_itemdesc_loc";
+        "FROM cust_bill_pkg $addl_from $creditfrom $where AND $payby_itemdesc_loc";
 
       $sql = "SELECT SUM(cust_credit_bill_pkg.amount) ".
              " $creditwhere AND cust_bill_pkg.pkgnum = 0";