From: ivan <ivan>
Date: Sat, 5 Jun 2010 20:18:47 +0000 (+0000)
Subject: should really fix the cust_main_note upgrade bullshit, RT#8580
X-Git-Tag: root_of_svc_elec_features~202
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=627408df58ee7efff68e8cb08e0deba5a677d8a9

should really fix the cust_main_note upgrade bullshit, RT#8580
---

diff --git a/FS/FS/otaker_Mixin.pm b/FS/FS/otaker_Mixin.pm
index ca170186b..c8479cd77 100644
--- a/FS/FS/otaker_Mixin.pm
+++ b/FS/FS/otaker_Mixin.pm
@@ -11,8 +11,11 @@ sub otaker {
     my $otaker = shift;
     my $access_user = qsearchs('access_user', { 'username' => $otaker } );
     if ( !$access_user && $otaker =~ /^(.+), (.+)$/ ) { #same as below..
-      $otaker = lc($2.$1);
-      $access_user = qsearchs('access_user', { 'username' => $otaker } );
+      my($lastname, $firstname) = ($1, $2);
+      $otaker = lc($firstname.$lastname);
+      $access_user =  qsearchs('access_user', { 'first' => $firstname, 
+                                                'last'  => $lastname  } )
+                   || qsearchs('access_user', { 'username' => $otaker } );
     }
     croak "can't set otaker: $otaker not found!" unless $access_user; #confess?
     $self->usernum( $access_user->usernum );