From: Mark Wells <mark@freeside.biz>
Date: Wed, 15 Oct 2014 22:34:20 +0000 (-0700)
Subject: don't try to assign inventory during an upgrade, #30900
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=a21bd79010b9a3a5e1f9e19dca673dcb38f35334

don't try to assign inventory during an upgrade, #30900
---

diff --git a/FS/FS/svc_Common.pm b/FS/FS/svc_Common.pm
index 4a2d61786..e4591720d 100644
--- a/FS/FS/svc_Common.pm
+++ b/FS/FS/svc_Common.pm
@@ -804,6 +804,9 @@ If there is an error, returns the error, otherwise returns false.
 =cut
 
 sub set_auto_inventory {
+  # don't try to do this during an upgrade
+  return '' if $FS::CurrentUser::upgrade_hack;
+
   my $self = shift;
   my $old = @_ ? shift : '';