diff options
| author | Mark Wells <mark@freeside.biz> | 2012-05-07 12:45:22 -0700 |
|---|---|---|
| committer | Mark Wells <mark@freeside.biz> | 2012-05-07 12:45:22 -0700 |
| commit | c7ad63f42570c80ba01e00326e62a8ef66ba86c3 (patch) | |
| tree | 9c2e486064d53b37e297e1f33f905cd07dc70b1e | |
| parent | cfcc4c14a40c84d1603c707066e7644aefef5690 (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 1cca10bc4..27c25daa9 100644 --- a/FS/FS/cust_pkg.pm +++ b/FS/FS/cust_pkg.pm @@ -3682,7 +3682,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 |