X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fmisc%2Flocation.cgi;h=fab61dd010885bdf541c898a621eb981dfa57826;hp=3c3a8554525bbddb0d4e3e77181d0ec1194de311;hb=3f2a7b01b59902faed5767d81e2959e131bdbdfd;hpb=20bddf47a41b6d064b3cfa4c41e55c157cf0c3de

diff --git a/httemplate/misc/location.cgi b/httemplate/misc/location.cgi
index 3c3a85545..fab61dd01 100644
--- a/httemplate/misc/location.cgi
+++ b/httemplate/misc/location.cgi
@@ -1,18 +1,32 @@
-<% objToJson(\%hash) %>
+<% encode_json(\%hash) %>\
 <%init>
 
 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 = ();
 %hash = map { $_ => $cust_location->$_() }
-            qw( address1 address2 city county state zip country )
+            ( FS::cust_main->location_fields,
+              qw( location_kind location_type location_number )
+            )
   if $cust_location;
 
 </%init>