X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fotaker_Mixin.pm;h=6e465f06a6a47a694ea39b8310144d9c6e3e8c7c;hb=a0e00fa0547e99893c735ab3dbdacdb2bb054f5a;hp=0da9aeedbf28d0f714e2644dfff1482c1d674d14;hpb=24e81f4d632ebb4af2d8a68e64352c37052781b5;p=freeside.git

diff --git a/FS/FS/otaker_Mixin.pm b/FS/FS/otaker_Mixin.pm
index 0da9aeedb..6e465f06a 100644
--- a/FS/FS/otaker_Mixin.pm
+++ b/FS/FS/otaker_Mixin.pm
@@ -4,6 +4,7 @@ use strict;
 use Carp qw( croak ); #confess );
 use FS::Record qw( qsearch qsearchs );
 use FS::access_user;
+use FS::UID qw( dbh );
 
 sub otaker {
   my $self = shift;
@@ -13,6 +14,7 @@ sub otaker {
     if ( !$access_user && $otaker =~ /^(.+), (.+)$/ ) { #same as below..
       my($lastname, $firstname) = ($1, $2);
       $otaker = lc($firstname.$lastname);
+      $otaker =~ s/ //g;
       $access_user =  qsearchs('access_user', { 'first' => $firstname, 
                                                 'last'  => $lastname  } )
                    || qsearchs('access_user', { 'username' => $otaker } );
@@ -31,11 +33,6 @@ sub otaker {
   }
 }
 
-sub access_user {
-  my $self = shift;
-  qsearchs('access_user', { 'usernum' => $self->usernum } );
-}
-
 sub _upgrade_otaker {
   my $class = shift;
   my $table = $class->table;
@@ -58,6 +55,7 @@ sub _upgrade_otaker {
         if ( $username =~ /^(.+), (.+)$/ ) {
           ($lastname, $firstname) = ($1, $2);
           $username = lc($firstname.$lastname);
+          $username =~ s/ //g;
         }
         my $access_user = new FS::access_user {
           'username'  => $username,
@@ -74,6 +72,11 @@ sub _upgrade_otaker {
       my $error = $record->replace;
       die $error if $error;
     }
+        
+    if ( $table eq 'cust_attachment' ) {
+	warn "  committing (cust_attachment) \n";
+	dbh->commit or die dbh->errstr;
+    }
 
   }