X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fsvc_cable.pm;h=daaf680c59150a5409f5484b079e40ad773b88f7;hb=121510b6337b7f75f25d583730a65f3fc63bbfbe;hp=50859dabc7c1d3b2457dbd9abf21d22996dfba3b;hpb=3482a5ad0d9660aa994bb2be61aaa5ae61b1b28d;p=freeside.git

diff --git a/FS/FS/svc_cable.pm b/FS/FS/svc_cable.pm
index 50859dabc..daaf680c5 100644
--- a/FS/FS/svc_cable.pm
+++ b/FS/FS/svc_cable.pm
@@ -36,6 +36,26 @@ from FS::Record.  The following fields are currently supported:
 
 primary key
 
+=item providernum
+
+Provider (see L<FS::cable_provider>)
+
+=item ordernum
+
+Provider order number
+
+=item modelnum
+
+Cable device model (see L<FS::cable_model>)
+
+=item serialnum
+
+Cable device serial number
+
+=item mac_addr
+
+Cable device MAC address
+
 =back
 
 =head1 METHODS
@@ -126,9 +146,12 @@ sub label {
   my @label = ();
   push @label, 'MAC:'. $self->mac_addr_pretty
     if $self->mac_addr;
-  push @label, ($part_svc->part_svc_column('serialnum') || 'Serial#').
-               $self->serialnum
-    if $self->serialnum;
+  if ( $self->serialnum ) {
+    my $serialnum_label = $part_svc->part_svc_column('serialnum');
+    push @label,
+      ($serialnum_label && $serialnum_label->columnlabel || 'Serial#').
+      $self->serialnum;
+  }
   return join(', ', @label);
 }
 
@@ -186,7 +209,7 @@ sub _check_duplicate {
 
   if ( $self->serialnum ) {
     my @dup_serial;
-    @dup_serial = $self->find_duplicates('global', 'serialnum');
+    @dup_serial = $self->find_duplicates('global', 'modelnum', 'serialnum');
     if ( @dup_serial ) {
       return "Serial number in use (svcnum ".$dup_serial[0]->svcnum.")";
     }