[freeside-commits] branch FREESIDE_4_BRANCH updated. 7a4a4dc69ac7f2b97e477568ebce10b861461d8c

[Ivan]

The branch, FREESIDE_4_BRANCH has been updated
       via  7a4a4dc69ac7f2b97e477568ebce10b861461d8c (commit)
      from  63a5cebd18a9f21c66a7ed93a8dc888c595f85a4 (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 7a4a4dc69ac7f2b97e477568ebce10b861461d8c
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Feb 4 11:29:26 2016 -0800

    fix customer search, RT#40212, RT#40205, fallout from RT#20173

diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index d2a797c..9f4963d 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -498,8 +498,13 @@ my $pkgs_method = $conf->exists('hidecancelledpackages')
                     : 'all_pkgs';
 
 #false laziness w/httemplate/view/cust_main/packages.html
-my $select = '*, setup_option.optionvalue AS _opt_setup_fee, '.
-                'recur_option.optionvalue AS _opt_recur_fee',
+my $select = join(',',
+               'cust_pkg.*',
+               'part_pkg.*',
+               'setup_option.optionvalue AS _opt_setup_fee',
+               'recur_option.optionvalue AS _opt_recur_fee',
+             );
+
 my $addl_from = qq{
     LEFT JOIN part_pkg USING ( pkgpart )
     LEFT JOIN part_pkg_option AS setup_option

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

Summary of changes:
 httemplate/search/cust_main.cgi |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)