diff options
| author | Mark Wells <mark@freeside.biz> | 2012-05-07 12:44:11 -0700 |
|---|---|---|
| committer | Mark Wells <mark@freeside.biz> | 2012-05-07 12:44:11 -0700 |
| commit | 01d9085c7db7c3c96c3a8ef9ebe049b4a3bbbb18 (patch) | |
| tree | e2125b28acd8b72de65f26492d83be023b80be59 | |
| parent | a7ec3dcd42e7f15b2bce2abfb5dc9ea07c964cd4 (diff) | |
fix tax calculation based on ship address, from #17051
| -rw-r--r-- | FS/FS/cust_pkg.pm | 2 | ||||
| -rwxr-xr-x | httemplate/search/report_tax.cgi | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm index 9d81c67b3..64736ba50 100644 --- a/FS/FS/cust_pkg.pm +++ b/FS/FS/cust_pkg.pm @@ -3612,7 +3612,7 @@ sub _location_sql_where { # ( $table.${prefix}city = ? $or_empty_city $ornull ) " - ( $table.${prefix}district = ? OR ? = '' OR CAST(? AS text) IS NULL ) + ( $table.district = ? OR ? = '' OR CAST(? AS text) IS NULL ) AND ( $table.${prefix}city = ? OR ? = '' OR CAST(? AS text) IS NULL ) AND ( $table.${prefix}county = ? $or_empty_county $ornull ) AND ( $table.${prefix}state = ? $or_empty_state $ornull ) diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi index bfbc5fe5a..248f6c5e4 100755 --- a/httemplate/search/report_tax.cgi +++ b/httemplate/search/report_tax.cgi @@ -275,7 +275,7 @@ sub gotcust { my $table = shift; my $prefix = @_ ? shift : ''; " - ( $table.${prefix}district = cust_main_county.district + ( $table.district = cust_main_county.district OR cust_main_county.district = '' OR cust_main_county.district IS NULL ) AND ( $table.${prefix}city = cust_main_county.city |