diff options
| author | ivan <ivan> | 2011-04-15 23:33:50 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2011-04-15 23:33:50 +0000 |
| commit | 69b7b85a2f35062008efe5fc73e7769eef92ab11 (patch) | |
| tree | a9293c6470e9139f96daab4ac232ff49e3069110 | |
| parent | 5ce7e6b73c3fc869e90dece88557ff3951c9d52b (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 ea605fe83..8185d99d3 100644 --- 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 0961bbb4c..5b8604b1d 100755 --- 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 ); |