projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
67c3275
)
fix new tax report w/FS::tax_rate_location->location_sql, RT#12332
author
ivan
<ivan>
Fri, 15 Apr 2011 23:33:48 +0000
(23:33 +0000)
committer
ivan
<ivan>
Fri, 15 Apr 2011 23:33:48 +0000
(23:33 +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
ea605fe
..
8185d99
100644
(file)
--- a/
FS/FS/tax_rate.pm
+++ b/
FS/FS/tax_rate.pm
@@
-1894,7
+1894,7
@@
sub generate_liability_report {
my $payby_itemdesc_loc =
" payby != 'COMP' ".
- "AND
itemdesc = ? OR ? = '' AND itemdesc IS NULL
".
+ "AND
( itemdesc = ? OR ? = '' AND itemdesc IS NULL )
".
"AND ". FS::tax_rate_location->location_sql( map { $_ => $t->$_ }
@taxparams
);
diff --git
a/httemplate/search/report_newtax.cgi
b/httemplate/search/report_newtax.cgi
index
0961bbb
..
5b8604b
100755
(executable)
--- a/
httemplate/search/report_newtax.cgi
+++ b/
httemplate/search/report_newtax.cgi
@@
-121,7
+121,7
@@
foreach my $t (qsearch({ table => 'cust_bill_pkg',
my $payby_itemdesc_loc =
" payby != 'COMP' ".
- "AND
itemdesc = ? OR ? = '' AND itemdesc IS NULL
".
+ "AND
( itemdesc = ? OR ? = '' AND itemdesc IS NULL )
".
"AND ". FS::tax_rate_location->location_sql( map { $_ => $t->$_ }
@taxparams
);