projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.freeside.biz:/home/git/freeside
[freeside.git]
/
FS
/
FS
/
h_cust_svc.pm
diff --git
a/FS/FS/h_cust_svc.pm
b/FS/FS/h_cust_svc.pm
index
921be3a
..
7b565ad
100644
(file)
--- a/
FS/FS/h_cust_svc.pm
+++ b/
FS/FS/h_cust_svc.pm
@@
-52,9
+52,15
@@
If a service is found, returns a list consisting of:
=cut
=cut
-sub label {
+sub label { shift->_label('svc_label', @_); }
+sub label_long { shift->_label('svc_label_long', @_); }
+
+sub _label {
my $self = shift;
my $self = shift;
- carp "FS::h_cust_svc::label called on $self" if $DEBUG;
+ my $method = shift;
+
+ #carp "FS::h_cust_svc::_label called on $self" if $DEBUG;
+ warn "FS::h_cust_svc::_label called on $self for $method" if $DEBUG;
my $svc_x = $self->h_svc_x(@_);
return () unless $svc_x;
my $part_svc = $self->part_svc;
my $svc_x = $self->h_svc_x(@_);
return () unless $svc_x;
my $part_svc = $self->part_svc;
@@
-65,7
+71,7
@@
sub label {
}
my @label;
}
my @label;
- eval { @label = $self->
_svc_label
($svc_x, @_); };
+ eval { @label = $self->
$method
($svc_x, @_); };
if ($@) {
carp 'while resolving history record for svcdb/svcnum ' .
if ($@) {
carp 'while resolving history record for svcdb/svcnum ' .
@@
-92,6
+98,7
@@
sub h_svc_x {
warn "requiring FS/h_$svcdb.pm" if $DEBUG;
require "FS/h_$svcdb.pm";
warn "requiring FS/h_$svcdb.pm" if $DEBUG;
require "FS/h_$svcdb.pm";
+ local($FS::Record::qsearch_qualify_columns) = 0;
my $svc_x = qsearchs(
"h_$svcdb",
{ 'svcnum' => $self->svcnum, },
my $svc_x = qsearchs(
"h_$svcdb",
{ 'svcnum' => $self->svcnum, },
@@
-111,8
+118,6
@@
sub h_svc_x {
# _upgrade_data
#
# Used by FS::Upgrade to migrate to a new database.
# _upgrade_data
#
# Used by FS::Upgrade to migrate to a new database.
-#
-#
use FS::UID qw( driver_name dbh );
use FS::UID qw( driver_name dbh );