[freeside-commits] branch FREESIDE_2_3_BRANCH updated. 1a887c2d93bb897bf19362a4eff3cf41b834a617

[Ivan]

The branch, FREESIDE_2_3_BRANCH has been updated
       via  1a887c2d93bb897bf19362a4eff3cf41b834a617 (commit)
      from  741b6bf4e2532238860bc5f968bd24c6698d5c5f (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 1a887c2d93bb897bf19362a4eff3cf41b834a617
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sun Feb 17 16:26:50 2013 -0800

    fix istax line item search with tax-pkg_address on, RT#21459

diff --git a/httemplate/search/cust_bill_pkg.cgi b/httemplate/search/cust_bill_pkg.cgi
index df040ff..4308e24 100644
--- a/httemplate/search/cust_bill_pkg.cgi
+++ b/httemplate/search/cust_bill_pkg.cgi
@@ -650,8 +650,11 @@ if ( $cgi->param('nottax') ) {
 
   } elsif ( $conf->exists('tax-pkg_address') ) {
 
-    $join_pkg .= ' LEFT JOIN cust_bill_pkg_tax_location USING ( billpkgnum )
-                   LEFT JOIN cust_location              USING ( locationnum ) ';
+    $join_pkg .= '
+      LEFT JOIN cust_bill_pkg_tax_location USING ( billpkgnum )
+      LEFT JOIN cust_location ON cust_bill_pkg_tax_location.locationnum
+                                 = cust_location.locationnum
+    ';
 
     #quelle kludge, somewhat false laziness w/report_tax.cgi
     s/cust_pkg\.locationnum/cust_bill_pkg_tax_location.locationnum/g for @where;

-----------------------------------------------------------------------

Summary of changes:
 httemplate/search/cust_bill_pkg.cgi |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)