projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8239b04
)
fix new tax report w/FS::tax_rate_location->location_sql, RT#12332
author
ivan
<ivan>
Fri, 15 Apr 2011 23:15:52 +0000
(23:15 +0000)
committer
ivan
<ivan>
Fri, 15 Apr 2011 23:15:52 +0000
(23:15 +0000)
FS/FS/tax_rate.pm
patch
|
blob
|
history
httemplate/search/report_newtax.cgi
patch
|
blob
|
history
diff --git
a/FS/FS/tax_rate.pm
b/FS/FS/tax_rate.pm
index
76631d7
..
ea605fe
100644
(file)
--- 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 =
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";
$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
dca78c3
..
0961bbb
100755
(executable)
--- 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 =
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";
$sql = "SELECT SUM(cust_credit_bill_pkg.amount) ".
" $creditwhere AND cust_bill_pkg.pkgnum = 0";