[freeside-commits] freeside/httemplate/search report_newtax.cgi, 1.3.4.7, 1.3.4.8

[Ivan,,,]

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

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

Index: report_newtax.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/report_newtax.cgi,v
retrieving revision 1.3.4.7
retrieving revision 1.3.4.8
diff -u -w -d -r1.3.4.7 -r1.3.4.8
--- report_newtax.cgi	15 Apr 2011 23:02:22 -0000	1.3.4.7
+++ report_newtax.cgi	15 Apr 2011 23:15:54 -0000	1.3.4.8
@@ -138,7 +138,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";