X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fsvc_acct.pm;h=2bbbdcbb740def3d9d55704707395a47e2742bbb;hb=e9af247503b619f0c61a3ba14481bc76752bdd8b;hp=9186e81074afbaa92b2d9ae439f6fc4e0009a7b4;hpb=a930f5bc47c9c2de989074f1570beaa8f116bd22;p=freeside.git

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 9186e8107..2bbbdcbb7 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -289,7 +289,7 @@ sub insert {
 
   my $part_svc = qsearchs( 'part_svc', { 'svcpart' => $self->svcpart } );
   return "Unknown svcpart" unless $part_svc;
-  return "uid in use"
+  return "uid ". $self->uid. " in use"
     if $part_svc->part_svc_column('uid')->columnflag ne 'F'
       && qsearchs( 'svc_acct', { 'uid' => $self->uid } )
       && $self->username !~ /^(hyla)?fax$/
@@ -505,12 +505,6 @@ sub replace {
   local $FS::UID::AutoCommit = 0;
   my $dbh = dbh;
 
-  $error = $new->SUPER::replace($old);
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error if $error;
-  }
-
   $old->usergroup( [ $old->radius_groups ] );
   if ( $new->usergroup ) {
     #(sorta) false laziness with FS::part_export::sqlradius::_export_replace
@@ -545,6 +539,12 @@ sub replace {
 
   }
 
+  $error = $new->SUPER::replace($old);
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error if $error;
+  }
+
   #false laziness with sub insert (and cust_main)
   my $queue = new FS::queue {
     'svcnum' => $new->svcnum,
@@ -787,7 +787,7 @@ sub check {
     $recref->{_password} = '!!';
   } else {
     #return "Illegal password";
-    return gettext('illegal_password'). "$passwordmin-$passwordmax".
+    return gettext('illegal_password'). " $passwordmin-$passwordmax ".
            FS::Msgcat::_gettext('illegal_password_characters').
            ": ". $recref->{_password};
   }
@@ -931,8 +931,14 @@ Returns all RADIUS groups for this account (see L<FS::radius_usergroup>).
 
 sub radius_groups {
   my $self = shift;
-  map { $_->groupname }
-    qsearch('radius_usergroup', { 'svcnum' => $self->svcnum } );
+  if ( $self->usergroup ) {
+    #when provisioning records, export callback runs in svc_Common.pm before
+    #radius_usergroup records can be inserted...
+    @{$self->usergroup};
+  } else {
+    map { $_->groupname }
+      qsearch('radius_usergroup', { 'svcnum' => $self->svcnum } );
+  }
 }
 
 =back