X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fsvc_fiber.pm;h=1428daa1d322976f344823d2a9d554de45a53e74;hb=b8a0fbd814bd8e1ba3a8b8c58c5f162af8dc9f00;hp=4515d013fa0ebc4a2c90dde4d6c9f3b2e4caf119;hpb=0fc158f576b404002225284b5dfc1634502f7569;p=freeside.git

diff --git a/FS/FS/svc_fiber.pm b/FS/FS/svc_fiber.pm
index 4515d013f..1428daa1d 100644
--- a/FS/FS/svc_fiber.pm
+++ b/FS/FS/svc_fiber.pm
@@ -108,6 +108,13 @@ sub table_info {
                           'disable_inventory' => 1,
                           'disable_select'    => 1,
                          },
+      # ODN circuit
+      'circuit_id'    => {
+                          'label' => 'ODN circuit',
+                          'type'  => 'input-fiber_circuit',
+                          'disable_inventory' => 1,
+                          'disable_select'    => 1,
+                         },
       # ONT stuff
       'ont_id'        => {
                           'label' => 'ONT #',
@@ -180,14 +187,14 @@ sub search_sql {
 
 =item label
 
-Returns a description of this fiber service containing the OLT name and
-port location, and the ONT serial number.
+Returns a description of this fiber service containing the ONT serial number
+and the OLT name and port location.
 
 =cut
 
 sub label {
   my $self = shift;
-  $self->ont_serial . ' @ ' . $self->fiber_olt->oltname . ' ' .
+  $self->ont_serial . ' @ ' . $self->fiber_olt->description . ' ' .
   join('-', $self->shelf, $self->card, $self->olt_port);
 }
 
@@ -247,13 +254,15 @@ sub check {
     || $self->ut_alphan('ont_serial')
     || $self->ut_alphan('ont_port')
     || $self->ut_numbern('vlan')
-    || $self->ut_snumbern('signal')
+    || $self->ut_sfloatn('signal')
     || $self->ut_numbern('speed_up')
     || $self->ut_numbern('speed_down')
     || $self->ut_textn('ont_install')
   ;
   return $error if $error;
 
+  $self->set('signal', sprintf('%.2f', $self->get('signal')));
+
   $self->SUPER::check;
 }