[freeside-commits] branch master updated. c7ad63f42570c80ba01e00326e62a8ef66ba86c3

[Mark Wells]

The branch, master has been updated
       via  c7ad63f42570c80ba01e00326e62a8ef66ba86c3 (commit)
      from  cfcc4c14a40c84d1603c707066e7644aefef5690 (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 c7ad63f42570c80ba01e00326e62a8ef66ba86c3
Author: Mark Wells <mark at freeside.biz>
Date:   Mon May 7 12:45:22 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 1cca10b..27c25da 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 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(-)