projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e723123
)
stop new IP address assignment code from tripping over ancient svc_acct.slipip values...
author
Mark Wells
<mark@freeside.biz>
Thu, 10 Apr 2014 22:19:42 +0000
(15:19 -0700)
committer
Mark Wells
<mark@freeside.biz>
Thu, 10 Apr 2014 22:19:42 +0000
(15:19 -0700)
FS/FS/svc_IP_Mixin.pm
patch
|
blob
|
history
diff --git
a/FS/FS/svc_IP_Mixin.pm
b/FS/FS/svc_IP_Mixin.pm
index
ff7c2f5
..
5b06082
100644
(file)
--- a/
FS/FS/svc_IP_Mixin.pm
+++ b/
FS/FS/svc_IP_Mixin.pm
@@
-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 {