[freeside-commits] branch FREESIDE_3_BRANCH updated. 8a796c9b7e9f69c154bf71c90796fa40d89e5527

[Mark Wells]

The branch, FREESIDE_3_BRANCH has been updated
       via  8a796c9b7e9f69c154bf71c90796fa40d89e5527 (commit)
      from  d4a8a4dde783d8b106e6ad423655bb5d48232960 (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 8a796c9b7e9f69c154bf71c90796fa40d89e5527
Author: Mark Wells <mark at freeside.biz>
Date:   Wed Jun 19 10:24:28 2013 -0700

    make service search by svcdb return the same field set as smart search, #23621, #22385, etc.

diff --git a/httemplate/search/cust_svc.html b/httemplate/search/cust_svc.html
index 8f10a94..3b77043 100644
--- a/httemplate/search/cust_svc.html
+++ b/httemplate/search/cust_svc.html
@@ -96,8 +96,7 @@ if ( length( $cgi->param('search_svc') ) ) {
   my $extra_sql = ' WHERE '. join(' AND ', @extra_sql );
 
   $sql_query = {
-    #'select'     => 'svcnum',
-    'select'     => 'cust_svc.*',
+    'select'     => 'cust_svc.*, part_svc.*',
     'table'      => 'cust_svc',
     'addl_from'  => $addl_from,
     'hashref'    => {},
@@ -106,9 +105,10 @@ if ( length( $cgi->param('search_svc') ) ) {
 
 }
 
+# at this point the query must provide all fields from 
+# cust_svc and part_svc, and must include join_cust_main.
 $sql_query->{'select'} = join(', ',
                                     $sql_query->{'select'},
-                                    #'part_svc.*',
                                     'cust_main.custnum',
                                     FS::UI::Web::cust_sql_fields(),
                              );

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

Summary of changes:
 httemplate/search/cust_svc.html |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)