projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.freeside.biz:/home/git/freeside
[freeside.git]
/
FS
/
FS
/
svc_Common.pm
diff --git
a/FS/FS/svc_Common.pm
b/FS/FS/svc_Common.pm
index
4a2d617
..
8199ba1
100644
(file)
--- 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 {
=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 : '';
my $self = shift;
my $old = @_ ? shift : '';
@@
-1381,7
+1384,7
@@
sub search {
#custnum
if ( $params->{'custnum'} =~ /^(\d+)$/ && $1 ) {
#custnum
if ( $params->{'custnum'} =~ /^(\d+)$/ && $1 ) {
- push @where, "custnum = $1";
+ push @where, "cust
_pkg.cust
num = $1";
}
#customer status
}
#customer status