projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT# 39340 - fixed skin_info caching issue
[freeside.git]
/
FS
/
FS
/
svc_hardware.pm
diff --git
a/FS/FS/svc_hardware.pm
b/FS/FS/svc_hardware.pm
index
c8bf02f
..
019a564
100644
(file)
--- a/
FS/FS/svc_hardware.pm
+++ b/
FS/FS/svc_hardware.pm
@@
-137,14
+137,19
@@
sub label {
my $part_svc = $self->cust_svc->part_svc;
my @label = ();
if (my $type = $self->hardware_type) {
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) {
$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) {
}
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);
}
}
return join(', ', @label);
}
@@
-240,6
+245,17
@@
sub display_hw_addr {
join(':', $self->hw_addr =~ /../g) : $self->hw_addr)
}
join(':', $self->hw_addr =~ /../g) : $self->hw_addr)
}
+sub _upgrade_data {
+
+ require FS::Misc::FixIPFormat;
+ FS::Misc::FixIPFormat::fix_bad_addresses_in_table(
+ 'svc_hardware', 'svcnum', 'ip_addr',
+ );
+
+ '';
+
+}
+
=back
=head1 SEE ALSO
=back
=head1 SEE ALSO
@@
-249,4
+265,3
@@
L<FS::Record>, L<FS::svc_Common>, schema.html from the base documentation.
=cut
1;
=cut
1;
-