Merge branch 'patch-18' of https://github.com/gjones2/Freeside

[freeside.git] / httemplate / search / cust_svc.html

diff --git a/httemplate/search/cust_svc.html b/httemplate/search/cust_svc.html
index 585431e..e2a83b7 100644 (file)
--- a/httemplate/search/cust_svc.html
+++ b/httemplate/search/cust_svc.html
@@ -13,7 +13,10 @@
                                 sub { 
                                   #$_[0]->svc. ': '. $_[0]->label;
                                   my($label, $value, $svcdb) = $_[0]->label;
-                                  "$label: $value";
+                                   my $id = $_[0]->agent_svcid
+                                              ? $_[0]->agent_svcid.': '
+                                              : '';
+                                  "$label: $id$value";
                                 },
                                 # package?
                                 \&FS::UI::Web::cust_fields,
@@ -59,7 +62,7 @@ if ( length( $cgi->param('search_svc') ) ) {
 
   my $addl_from = ' LEFT JOIN part_svc  USING ( svcpart ) '.
                   ' LEFT JOIN cust_pkg  USING ( pkgnum  ) '.
-                  ' LEFT JOIN cust_main USING ( custnum ) ';
+                  FS::UI::Web::join_cust_main('cust_pkg', 'cust_pkg');
 
   my @extra_sql = ();