[freeside-commits] branch FREESIDE_4_BRANCH updated. adc262be7fc31d50a06a6ef11e5d1767dbf94bb4

[Ivan Kohler]

The branch, FREESIDE_4_BRANCH has been updated
       via  adc262be7fc31d50a06a6ef11e5d1767dbf94bb4 (commit)
      from  256a21d5c84739f0f5d3456a38a08d04f1f8a5fd (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 adc262be7fc31d50a06a6ef11e5d1767dbf94bb4
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Aug 1 13:32:33 2018 -0700

    fix search failures, RT#77532

diff --git a/FS/FS/cust_main/Search.pm b/FS/FS/cust_main/Search.pm
index 2ec87cd14..e0ca450e1 100644
--- a/FS/FS/cust_main/Search.pm
+++ b/FS/FS/cust_main/Search.pm
@@ -95,6 +95,7 @@ sub smart_search {
 
     #cust_main phone numbers and contact phone number
     push @cust_main, qsearch( {
+      'select'  => 'cust_main.*',
       'table'   => 'cust_main',
       'hashref' => { %options },
       'extra_sql' => ( scalar(keys %options) ? ' AND ' : ' WHERE ' ).
@@ -131,6 +132,7 @@ sub smart_search {
   if ( $search =~ /@/ ) { #email address from cust_main_invoice and contact_email
 
     push @cust_main, qsearch( {
+      'select'  => 'cust_main.*',
       'table'   => 'cust_main',
       'hashref' => { %options },
       'extra_sql' => ( scalar(keys %options) ? ' AND ' : ' WHERE ' ).
@@ -282,7 +284,7 @@ sub smart_search {
       #cust_main and contacts
       push @cust_main, qsearch( {
         'table'     => 'cust_main',
-        'select'    => 'cust_main.*, cust_contact.*, contact.contactnum, contact.last as contact_last, contact.first as contact_first, contact.title',
+        'select'    => 'cust_main.*',
         'hashref'   => { %options },
         'extra_sql' => "$sql AND $agentnums_sql", #agent virtualization
         'addl_from' => ' left join cust_contact on cust_main.custnum = cust_contact.custnum left join contact using (contactnum) ',
@@ -314,7 +316,7 @@ sub smart_search {
 
     push @cust_main, qsearch( {
       'table'     => 'cust_main',
-      'select'    => 'cust_main.*, cust_contact.*, contact.contactnum, contact.last as contact_last, contact.first as contact_first, contact.title',
+      'select'    => 'cust_main.*',
       'hashref'   => { %options },
       'extra_sql' => "$sql AND $agentnums_sql", #agent virtualization
       'addl_from' => 'left join cust_contact on cust_main.custnum = cust_contact.custnum left join contact using (contactnum) ',

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

Summary of changes:
 FS/FS/cust_main/Search.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)