diff options
| author | ivan <ivan> | 2011-04-15 23:15:52 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2011-04-15 23:15:52 +0000 |
| commit | 67c32759b3f821277033c2abcb8e5a13877a2ac7 (patch) | |
| tree | dcb057cdd91f53241b0770122c2ef32129ccb99a | |
| parent | 8239b044a13759ff4df2e0cebcec54f0d2751f35 (diff) | |
fix new tax report w/FS::tax_rate_location->location_sql, RT#12332
| -rw-r--r-- | FS/FS/tax_rate.pm | 2 | ||||
| -rwxr-xr-x | httemplate/search/report_newtax.cgi | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/FS/FS/tax_rate.pm b/FS/FS/tax_rate.pm index 76631d7a6..ea605fe83 100644 --- a/FS/FS/tax_rate.pm +++ b/FS/FS/tax_rate.pm @@ -1911,7 +1911,7 @@ sub generate_liability_report { 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"; diff --git a/httemplate/search/report_newtax.cgi b/httemplate/search/report_newtax.cgi index dca78c35b..0961bbb4c 100755 --- a/httemplate/search/report_newtax.cgi +++ b/httemplate/search/report_newtax.cgi @@ -138,7 +138,7 @@ foreach my $t (qsearch({ table => 'cust_bill_pkg', 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"; |