diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2014-10-19 12:19:08 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2014-10-19 12:19:08 -0700 |
| commit | c9994d080422aec5188ee08851a493ce1794c3b7 (patch) | |
| tree | b606a51961c66cc687c5386b9b3c5dc8547d65c9 /FS/FS/svc_Common.pm | |
| parent | 9ef031dc275339f9f2527ff70eca21739a99eb32 (diff) | |
| parent | 6205135803080b92127d4b1b52b4d4729d08a09f (diff) | |
Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE_3_BRANCH
Diffstat (limited to 'FS/FS/svc_Common.pm')
| -rw-r--r-- | FS/FS/svc_Common.pm | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/FS/FS/svc_Common.pm b/FS/FS/svc_Common.pm index 659255eaa..9c2592213 100644 --- a/FS/FS/svc_Common.pm +++ b/FS/FS/svc_Common.pm @@ -807,6 +807,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 : ''; |