respect part_svc labels in svc_hardware & svc_cable short service labels, RT#73405

[freeside.git] / FS / FS / svc_cable.pm

diff --git a/FS/FS/svc_cable.pm b/FS/FS/svc_cable.pm
index 50859da..9e818e1 100644 (file)
--- a/FS/FS/svc_cable.pm
+++ b/FS/FS/svc_cable.pm
@@ -126,9 +126,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);
 }