X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fotaker_Mixin.pm;h=8d9c8824f54b4b96bc3e95c082f868496a4ee9c7;hp=4aa47c38d82d85384a94c518524851f92f5e1eb4;hb=90393980e5f2859ee1e186fa461f48f5129e803e;hpb=dcfabb6fcf75a5a43e0d00eb4e25db61ea155f89

diff --git a/FS/FS/otaker_Mixin.pm b/FS/FS/otaker_Mixin.pm
index 4aa47c38d..8d9c8824f 100644
--- a/FS/FS/otaker_Mixin.pm
+++ b/FS/FS/otaker_Mixin.pm
@@ -13,6 +13,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 } );
@@ -40,11 +41,13 @@ sub _upgrade_otaker {
   my $class = shift;
   my $table = $class->table;
 
+  my $limit = ( $table eq 'cust_attachment' ? 10 : 1000 );
+
   while ( 1 ) {
     my @records = qsearch({
                     'table'     => $table,
                     'hashref'   => {},
-                    'extra_sql' => 'WHERE otaker IS NOT NULL LIMIT 1000',
+                    'extra_sql' => "WHERE otaker IS NOT NULL LIMIT $limit",
                   });
     last unless @records;
 
@@ -56,6 +59,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,