From: Ivan Kohler <ivan@freeside.biz>
Date: Thu, 4 Feb 2016 19:29:22 +0000 (-0800)
Subject: fix customer search, RT#40212, RT#40205, fallout from RT#20173
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=affba4b02a38999423f4189a40862a4c6549552a

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 d2a797c57..9f4963d55 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