X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fmisc%2Flocation.cgi;h=82ad636c404a0c568fd19b330a05be7b3014f7c9;hp=419c59f2e0d1863222113f8919dfaacff5dd3e19;hb=03ceab71dad1e5eb366865d304e5e459cc905ce4;hpb=5950a980cef4968ac59ca8041d2204e6d98e7a3d

diff --git a/httemplate/misc/location.cgi b/httemplate/misc/location.cgi
index 419c59f2e..82ad636c4 100644
--- a/httemplate/misc/location.cgi
+++ b/httemplate/misc/location.cgi
@@ -3,12 +3,23 @@
 
 my $locationnum = $cgi->param('arg');
 
+my $curuser = $FS::CurrentUser::CurrentUser;
+
 my $cust_location = qsearchs({
   'select'    => 'cust_location.*',
   'table'     => 'cust_location',
   'hashref'   => { 'locationnum' => $locationnum },
-  'addl_from' => 'LEFT JOIN cust_main USING ( custnum )',
-  'extra_sql' => ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql,
+  'addl_from' => ' LEFT JOIN cust_main     USING ( custnum     ) ',
+                 ' LEFT JOIN prospect_main USING ( prospectnum ) ',
+  'extra_sql' => ' AND ( '.
+                       ' ( custnum IS NOT NULL AND '.
+                           $curuser->agentnums_sql( table=>'cust_main' ).
+                       ' ) '.
+                       ' OR '.
+                       ' ( prospectnum IS NOT NULL AND '.
+                           $curuser->agentnums_sql( table=>'prospect_main' ).
+                       ' ) '.
+                     ' )',
 });
 
 my %hash = ();