X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fsvc_hardware.pm;h=62556ba6a6144040e71ac4b059dbebe08e3ed174;hp=67eca8f9e67381a8294c551c4679df1a75b5bb1a;hb=53c235fd67a9ab0022bc8ea0cc35b5a4d02d2e11;hpb=aacc031f9766621bb5addffeab0fbd334607a265

diff --git a/FS/FS/svc_hardware.pm b/FS/FS/svc_hardware.pm
index 67eca8f9e..62556ba6a 100644
--- a/FS/FS/svc_hardware.pm
+++ b/FS/FS/svc_hardware.pm
@@ -138,14 +138,19 @@ sub label {
   my $part_svc = $self->cust_svc->part_svc;
   my @label = ();
   if (my $type = $self->hardware_type) {
-    push @label, ($part_svc->part_svc_column('typenum') || 'Type:').
+    my $typenum_label = $part_svc->part_svc_column('typenum');
+    push @label, ( $typenum_label && $typenum_label->columnlabel || 'Type:' ).
                  $type->description;
   }
   if (my $ser = $self->serial) {
-    push @label, ($part_svc->part_svc_column('serial') || 'Serial#'). $ser;
+    my $serial_label = $part_svc->part_svc_column('serial');
+    push @label, ( $serial_label && $serial_label->columnlabel || 'Serial#' ).
+                 $ser;
   }
   if (my $mac = $self->display_hw_addr) {
-    push @label, ($part_svc->part_svc_column('hw_addr') || 'MAC:'). $mac;
+    my $hw_addr_label = $part_svc->part_svc_column('hw_addr');
+    push @label, ( $hw_addr_label && $hw_addr_label->columnlabel || 'MAC:').
+    $mac;
   }
   return join(', ', @label);
 }