Further fixes to Recon and Admin. In testing.

git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@2296 4979c152-3d1c-0410-bac9-87ea11338e46

1 files changed, 10 insertions, 3 deletions

diff --git a/LedgerSMB/Admin.pm b/LedgerSMB/Admin.pm
index 34acecb3..98a466bf 100644
--- a/LedgerSMB/Admin.pm
+++ b/LedgerSMB/Admin.pm
@@ -180,9 +180,16 @@ sub get_entire_user {
     
     my $self = shift @_;
     my $id = shift @_;
-    my $user = LedgerSMB::DBObject::User->new(base=>$self,copy=>'all');
-    $user->get($id);
-    
+    my $user = {};
+    my $u = LedgerSMB::DBObject::User->new(base=>$self,copy=>'all');
+    $user->{user} = $u->get($id);
+    $user->{pref} = $u->preferences($id);
+    $user->{employee} = $u->employee($user->{user}->{entity_id});
+    $user->{person} = $u->person($user->{user}->{entity_id});
+    $user->{entity} = $u->entity($id);
+    $user->{roles} = $u->roles($id);
+    
+    return $user;
 }
 
 sub get_roles {