X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fh_cust_svc.pm;h=718f2c7edb7052b9ca274e0b609eafa1bc9af059;hb=699f1de4842d7939d13ddd37b6b2756b36665189;hp=0cbac4a18749d68f45cd77ef71d00bd6a5889839;hpb=29c80b06fd677d43ff94d4503bb577107c71882e;p=freeside.git

diff --git a/FS/FS/h_cust_svc.pm b/FS/FS/h_cust_svc.pm
index 0cbac4a18..718f2c7ed 100644
--- a/FS/FS/h_cust_svc.pm
+++ b/FS/FS/h_cust_svc.pm
@@ -73,16 +73,21 @@ cancelled before START_TIMESTAMP.
 sub h_svc_x {
   my $self = shift;
   my $svcdb = $self->part_svc->svcdb;
-  #if ( $svcdb eq 'svc_acct' && $self->{'_svc_acct'} ) {
-  #  $self->{'_svc_acct'};
-  #} else {
-    warn "requiring FS/h_$svcdb.pm" if $DEBUG;
-    require "FS/h_$svcdb.pm";
-    qsearchs( "h_$svcdb",
-              { 'svcnum'       => $self->svcnum, },
-              "FS::h_$svcdb"->sql_h_searchs(@_),
-            );
-  #}
+
+  warn "requiring FS/h_$svcdb.pm" if $DEBUG;
+  require "FS/h_$svcdb.pm";
+  my $svc_x = qsearchs(
+    "h_$svcdb",
+    { 'svcnum' => $self->svcnum, },
+    "FS::h_$svcdb"->sql_h_searchs(@_),
+  ) || $self->SUPER::svc_x
+    or die "no history ${svcdb}.svcnum for cust_svc.svcnum ". $self->svcnum;
+
+  carp "Using $svcdb in place of missing h_${svcdb} record."
+   if ($svc_x->isa('FS::' . $svcdb) and $DEBUG);
+
+  return $svc_x;
+
 }
 
 =back