projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
possibly fix intermittent "could not receive data from server: Bad file
[freeside.git]
/
FS
/
FS
/
cust_svc.pm
diff --git
a/FS/FS/cust_svc.pm
b/FS/FS/cust_svc.pm
index
1fd8406
..
2ec8f12
100644
(file)
--- a/
FS/FS/cust_svc.pm
+++ b/
FS/FS/cust_svc.pm
@@
-344,6
+344,18
@@
sub check {
$self->SUPER::check;
}
$self->SUPER::check;
}
+=item display_svcnum
+
+Returns the displayed service number for this service: agent_svcid if it has a
+value, svcnum otherwise
+
+=cut
+
+sub display_svcnum {
+ my $self = shift;
+ $self->agent_svcid || $self->svcnum;
+}
+
=item part_svc
Returns the definition for this service, as a FS::part_svc object (see
=item part_svc
Returns the definition for this service, as a FS::part_svc object (see
@@
-449,12
+461,9
@@
sub svc_label_long { shift->_svc_label('label_long', @_); }
sub _svc_label {
my( $self, $method, $svc_x ) = ( shift, shift, shift );
sub _svc_label {
my( $self, $method, $svc_x ) = ( shift, shift, shift );
- my $identifier = $svc_x->$method(@_);
- $identifier = '['.$self->agent_svcid.']'. $identifier if $self->agent_svcid;
-
(
$self->part_svc->svc,
(
$self->part_svc->svc,
- $
identifier
,
+ $
svc_x->$method(@_)
,
$self->part_svc->svcdb,
$self->svcnum
);
$self->part_svc->svcdb,
$self->svcnum
);