X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=FS%2FFS%2Fsvc_broadband.pm;h=576684c565455abd93dcd66ed5af110ab2900f3d;hb=60bc613d68c07840f5c31c4299ffcf8a235f9da7;hp=2b794aa4b781f176f2c82d2a6042f283bf79f3bc;hpb=0259db6a5f67fa8837c18bbaed3e424cccf7a3e0;p=freeside.git

diff --git a/FS/FS/svc_broadband.pm b/FS/FS/svc_broadband.pm
index 2b794aa4b..576684c56 100755
--- a/FS/FS/svc_broadband.pm
+++ b/FS/FS/svc_broadband.pm
@@ -168,7 +168,7 @@ sub search {
   
   #agentnum
   if ( $params->{'agentnum'} =~ /^(\d+)$/ and $1 ) {
-    push @where, "agentnum = $1";
+    push @where, "cust_main.agentnum = $1";
   }
   push @where, $FS::CurrentUser::CurrentUser->agentnums_sql(
     'null_right' => 'View/link unlinked services',
@@ -334,6 +334,10 @@ sub check {
 
   return $x unless ref($x);
 
+  my $nw_coords = $conf->exists('svc_broadband-require-nw-coordinates');
+  my $lat_lower = $nw_coords ? 1 : -90;
+  my $lon_upper = $nw_coords ? -1 : 180;
+
   my $error =
     $self->ut_numbern('svcnum')
     || $self->ut_numbern('blocknum')
@@ -343,8 +347,8 @@ sub check {
     || $self->ut_ipn('ip_addr')
     || $self->ut_hexn('mac_addr')
     || $self->ut_hexn('auth_key')
-    || $self->ut_coordn('latitude', -90, 90)
-    || $self->ut_coordn('longitude', -180, 180)
+    || $self->ut_coordn('latitude', $lat_lower, 90)
+    || $self->ut_coordn('longitude', -180, $lon_upper)
     || $self->ut_sfloatn('altitude')
     || $self->ut_textn('vlan_profile')
     || $self->ut_textn('plan_id')