X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fh_cust_svc.pm;h=7b565adde5285dc191f0cff9638e98c4eaabe0f4;hb=3cbdd85a96348a287623e3b97c937c7749e99392;hp=921be3ab92fd3cc48ea0fe8c0fbb116a4aff7e10;hpb=5e05724a635a22776f1b973f5d7e77989da4e048;p=freeside.git

diff --git a/FS/FS/h_cust_svc.pm b/FS/FS/h_cust_svc.pm
index 921be3ab9..7b565adde 100644
--- 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
 
-sub label {
+sub label      { shift->_label('svc_label',      @_); }
+sub label_long { shift->_label('svc_label_long', @_); }
+
+sub _label {
   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;
@@ -65,7 +71,7 @@ sub 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 ' . 
@@ -92,6 +98,7 @@ sub h_svc_x {
 
   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, },
@@ -111,8 +118,6 @@ sub h_svc_x {
 # _upgrade_data
 #
 # Used by FS::Upgrade to migrate to a new database.
-#
-#
 
 use FS::UID qw( driver_name dbh );