stop new IP address assignment code from tripping over ancient svc_acct.slipip values...
authorMark Wells <mark@freeside.biz>
Thu, 10 Apr 2014 22:20:47 +0000 (15:20 -0700)
committerMark Wells <mark@freeside.biz>
Thu, 10 Apr 2014 22:20:47 +0000 (15:20 -0700)
FS/FS/svc_IP_Mixin.pm

index ff7c2f5..5b06082 100644 (file)
@@ -96,7 +96,12 @@ sub _used_addresses {
   my %hash = ( $ip_field => { op => '!=', value => '' } );
   #$hash{'blocknum'} = $block->blocknum if $block;
   $hash{'svcnum'} = { op => '!=', value => $exclude->svcnum } if ref $exclude;
-  map { $_->NetAddr->addr } qsearch($class->table, \%hash);
+  map { my $na = $_->NetAddr; $na ? $na->addr : () }
+    qsearch({
+        table     => $class->table,
+        hashref   => \%hash,
+        extra_sql => " AND $ip_field != '0e0'",
+    });
 }
 
 sub _is_used {