X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fsvc_broadband.pm;h=d05ae72d08748afc82ed9eb57052f82605140e47;hb=103dfde149eec5034696d073253255f508a1be78;hp=bd7bf9b132f174c77242156858889732032a7884;hpb=25efd7207d9ea9be4bea1093917c0d8dc4b1e87a;p=freeside.git diff --git a/FS/FS/svc_broadband.pm b/FS/FS/svc_broadband.pm index bd7bf9b13..d05ae72d0 100755 --- a/FS/FS/svc_broadband.pm +++ b/FS/FS/svc_broadband.pm @@ -96,6 +96,8 @@ points to. You can ask the object for a copy with the I method. =cut sub table_info { + my $conf = new FS::Conf; + my $ip_addr_required = $conf->exists('svc_broadband-allow_null_ip_addr') ? '' : '1'; { 'name' => 'Wireless broadband', 'name_plural' => 'Wireless broadband services', @@ -117,7 +119,10 @@ sub table_info { 'type' => 'fcc_477_speed', 'def_info' => 'both upload and download speed must be set to FCC 477 information if using that modifier', }, - 'ip_addr' => 'IP address', + 'ip_addr' => { + 'label' => 'IP address', + 'required' => $ip_addr_required, + }, 'blocknum' => { 'label' => 'Address block', 'type' => 'select', @@ -156,8 +161,8 @@ sub table_info { disable_inventory => 1, }, 'serviceid' => 'Torrus serviceid', #but is should be hidden - 'speed_test_up' => 'Speed test download (Kbps)', - 'speed_test_down' => 'Speed test upload (Kbps)', + 'speed_test_up' => { 'label' => 'Speed test upload (Kbps)' }, + 'speed_test_down' => { 'label' => 'Speed test download (Kbps)' }, 'speed_test_latency' => 'Speed test latency (ms)', }, }; @@ -364,6 +369,8 @@ sub check { || $self->ut_textn('description') || $self->ut_numbern('speed_up') || $self->ut_numbern('speed_down') + || $self->ut_numbern('speed_test_up') + || $self->ut_numbern('speed_test_down') || $self->ut_ipn('ip_addr') || $self->ut_hexn('mac_addr') || $self->ut_hexn('auth_key')