X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fsvc_dsl.pm;h=570476005222b1a9d78e2a1b781e000e07805258;hb=52a824f9b11ca266be10c76894eaf6607344c8d0;hp=b02e74fa7285192c7edb1114a63e4bf3b0341337;hpb=2543cd5e16887a7976649e8f23818b64f397d2a6;p=freeside.git

diff --git a/FS/FS/svc_dsl.pm b/FS/FS/svc_dsl.pm
index b02e74fa7..570476005 100644
--- a/FS/FS/svc_dsl.pm
+++ b/FS/FS/svc_dsl.pm
@@ -1,14 +1,14 @@
 package FS::svc_dsl;
+use base qw(FS::svc_Common);
 
 use strict;
-use vars qw( @ISA $conf $DEBUG $me );
+use vars qw( $conf $DEBUG $me );
+use FS::UID;
 use FS::Record qw( qsearch qsearchs );
 use FS::svc_Common;
-use FS::dsl_device;
 use FS::dsl_note;
 use FS::qual;
 
-@ISA = qw( FS::svc_Common );
 $DEBUG = 0;
 $me = '[FS::svc_dsl]';
 
@@ -137,6 +137,7 @@ sub table_info {
         'sorts' => [ 'phonenum' ],
         'display_weight' => 55,
         'cancel_weight' => 75,
+        'ip_field' => 'staticips',
         'fields' => {
             'pushed'                => { label => 'Pushed', 
                                          type  => 'disabled' },
@@ -279,6 +280,15 @@ sub check {
   $self->SUPER::check;
 }
 
+=item gateway_access_or_phonenum
+
+=cut
+
+sub gateway_access_or_phonenum {
+  my $self = shift;
+  $self->gateway_access_number || $self->phonenum;
+}
+
 =item dsl_device
 
 Returns the MAC addresses associated with this DSL service, as FS::dsl_device
@@ -286,11 +296,6 @@ objects.
 
 =cut
 
-sub dsl_device {
-  my $self = shift;
-  qsearch('dsl_device', { 'svcnum' => $self->svcnum });
-}
-
 sub predelete_hook_first {
     my $self = shift;
     my @exports = $self->part_svc->part_export_dsl_pull;