[freeside-commits] branch FREESIDE_2_3_BRANCH updated. 01d9085c7db7c3c96c3a8ef9ebe049b4a3bbbb18
Mark Wells
mark at 420.am
Mon May 7 12:45:45 PDT 2012
The branch, FREESIDE_2_3_BRANCH has been updated
via 01d9085c7db7c3c96c3a8ef9ebe049b4a3bbbb18 (commit)
from a7ec3dcd42e7f15b2bce2abfb5dc9ea07c964cd4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 01d9085c7db7c3c96c3a8ef9ebe049b4a3bbbb18
Author: Mark Wells <mark at freeside.biz>
Date: Mon May 7 12:44:11 2012 -0700
fix tax calculation based on ship address, from #17051
diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 9d81c67..64736ba 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 bfbc5fe..248f6c5 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
-----------------------------------------------------------------------
Summary of changes:
FS/FS/cust_pkg.pm | 2 +-
httemplate/search/report_tax.cgi | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
More information about the freeside-commits
mailing list