From: khoff <khoff>
Date: Tue, 2 Aug 2005 19:17:09 +0000 (+0000)
Subject: Only complain, not die, if we can't find a svc_x record for an h_cust_svc record.
X-Git-Tag: SQL_LEDGER_2_4_4~1^2~201
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=f9520d436146a4f5f75c104f887f020fa778e509;p=freeside.git

Only complain, not die, if we can't find a svc_x record for an h_cust_svc record.
---

diff --git a/FS/FS/h_cust_svc.pm b/FS/FS/h_cust_svc.pm
index 718f2c7ed..af0bf6064 100644
--- a/FS/FS/h_cust_svc.pm
+++ b/FS/FS/h_cust_svc.pm
@@ -80,13 +80,15 @@ sub h_svc_x {
     "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;
+  ) || $self->SUPER::svc_x;
 
-  carp "Using $svcdb in place of missing h_${svcdb} record."
-   if ($svc_x->isa('FS::' . $svcdb) and $DEBUG);
-
-  return $svc_x;
+  if ($svc_x) {
+    carp "Using $svcdb in place of missing h_${svcdb} record."
+      if ($svc_x->isa('FS::' . $svcdb) and $DEBUG);
+    return $svc_x;
+  } else {
+    return '';
+  }
 
 }