From: ivan <ivan>
Date: Sat, 13 Nov 2004 05:32:32 +0000 (+0000)
Subject: fix problem with dup checking manifesting as Argument isn't numeric errors
X-Git-Tag: BEFORE_FINAL_MASONIZE~863
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=733fced5b6b59492604bb1097f68f7c8fa9a282e

fix problem with dup checking manifesting as Argument isn't numeric errors
---

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 58442c956..f5f3978a8 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -863,12 +863,12 @@ sub _check_duplicate {
 
   my $global_unique = $conf->config('global_unique-username');
 
-  my @dup_user = grep { $svcpart != $_->svcpart }
+  my @dup_user = grep { !$_->svcnum || $_->svcnum != $self->svcnum }
                  qsearch( 'svc_acct', { 'username' => $self->username } );
   return gettext('username_in_use')
     if $global_unique eq 'username' && @dup_user;
 
-  my @dup_userdomain = grep { $svcpart != $_->svcpart }
+  my @dup_userdomain = grep { !$_->svcnum || $_->svcnum != $self->svcnum }
                        qsearch( 'svc_acct', { 'username' => $self->username,
                                               'domsvc'   => $self->domsvc } );
   return gettext('username_in_use')