X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fsvc_hardware.pm;h=c8bf02ffb3efe08ef9b27ece409fc85e1fed0fe9;hp=dbb8b68293560d063916882c9655169215d4a023;hb=3482a5ad0d9660aa994bb2be61aaa5ae61b1b28d;hpb=50ccf7c4c7a6416922c95eebea84b547d1235817

diff --git a/FS/FS/svc_hardware.pm b/FS/FS/svc_hardware.pm
index dbb8b6829..c8bf02ffb 100644
--- a/FS/FS/svc_hardware.pm
+++ b/FS/FS/svc_hardware.pm
@@ -134,15 +134,17 @@ sub search_sql {
 
 sub label {
   my $self = shift;
+  my $part_svc = $self->cust_svc->part_svc;
   my @label = ();
   if (my $type = $self->hardware_type) {
-    push @label, 'Type:' . $type->description;
+    push @label, ($part_svc->part_svc_column('typenum') || 'Type:').
+                 $type->description;
   }
   if (my $ser = $self->serial) {
-    push @label, 'Serial#' . $ser;
+    push @label, ($part_svc->part_svc_column('serial') || 'Serial#'). $ser;
   }
   if (my $mac = $self->display_hw_addr) {
-    push @label, 'MAC:'. $mac;
+    push @label, ($part_svc->part_svc_column('hw_addr') || 'MAC:'). $mac;
   }
   return join(', ', @label);
 }