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

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

diff --git a/FS/FS/svc_hardware.pm b/FS/FS/svc_hardware.pm
index dc9ac59..c8bf02f 100644 (file)
--- a/FS/FS/svc_hardware.pm
+++ b/FS/FS/svc_hardware.pm
@@ -75,6 +75,7 @@ sub table_info {
     'name_plural'    => 'Hardware',
     'display_weight' => 59,
     'cancel_weight'  => 86,
+    'manual_require' => 1,
     'fields' => {
       'svcnum'    => { label => 'Service' },
       'typenum'   => { label => 'Device type',
@@ -83,6 +84,7 @@ sub table_info {
                        disable_fixed     => 1,
                        disable_default   => 1,
                        disable_inventory => 1,
+                       required => 1,
                      },
       'serial'    => { label => 'Serial number', %opts },
       'hw_addr'   => { label => 'Hardware address', %opts },
@@ -132,7 +134,19 @@ sub search_sql {
 
 sub label {
   my $self = shift;
-  $self->serial || $self->display_hw_addr;
+  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:').
+                 $type->description;
+  }
+  if (my $ser = $self->serial) {
+    push @label, ($part_svc->part_svc_column('serial') || 'Serial#'). $ser;
+  }
+  if (my $mac = $self->display_hw_addr) {
+    push @label, ($part_svc->part_svc_column('hw_addr') || 'MAC:'). $mac;
+  }
+  return join(', ', @label);
 }
 
 =item insert