projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
dbb8b68
..
c8bf02f
100644
(file)
--- a/
FS/FS/svc_hardware.pm
+++ b/
FS/FS/svc_hardware.pm
@@
-134,15
+134,17
@@
sub search_sql {
sub label {
my $self = shift;
sub label {
my $self = shift;
+ my $part_svc = $self->cust_svc->part_svc;
my @label = ();
if (my $type = $self->hardware_type) {
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) {
}
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) {
}
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);
}
}
return join(', ', @label);
}