[freeside-commits] branch FREESIDE_3_BRANCH updated. 9a14161203e3fb6f4733d3554d66dcdc1486fe23

[Ivan]

The branch, FREESIDE_3_BRANCH has been updated
       via  9a14161203e3fb6f4733d3554d66dcdc1486fe23 (commit)
      from  4c6648c06d62df50aeb39baf81552ecde0a5f6ba (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 9a14161203e3fb6f4733d3554d66dcdc1486fe23
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Feb 2 22:10:33 2015 -0800

    fix prospect contact search

diff --git a/httemplate/search/contact.html b/httemplate/search/contact.html
index 1933493..6503078 100644
--- a/httemplate/search/contact.html
+++ b/httemplate/search/contact.html
@@ -34,18 +34,19 @@ if ( $cgi->param('selfservice_access') eq 'Y' ) {
 my $extra_sql = '';
 if ( $cgi->param('link') ) {
 
-  my $coalesce = ', COALESCE( cust_main.company,';
   my $as       = ') AS prospect_or_customer';
 
   if ( $cgi->param('link') eq 'cust_main' ) {
     push @header, 'Customer';
-    $select .= "$coalesce cust_main.first||' '||cust_main.last $as";
+    $select .=
+      ", COALESCE( cust_main.company, cust_main.first||' '||cust_main.last $as";
     $addl_from = ' LEFT JOIN cust_main USING ( custnum )';
     $extra_sql = ' custnum IS NOT NULL ';
     $company_link  = [ $p.'view/cust_main.cgi?', 'custnum' ];
   } elsif ( $cgi->param('link') eq 'prospect_main' ) {
     push @header, 'Prospect';
-    $select .= "$coalesce contact.first||'  '||contact.last $as";
+    $select .=
+     ", COALESCE( prospect_main.company, contact.first||'  '||contact.last $as";
     $addl_from = ' LEFT JOIN prospect_main USING ( prospectnum )';
     $extra_sql = ' prospectnum IS NOT NULL ';
     $company_link  = [ $p.'view/prospect_main.html?', 'prospectnum' ];

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

Summary of changes:
 httemplate/search/contact.html |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)