Final changes before release changes for -rc5: 2 errors corrected in OE.pm and /tools/cli moved to new User constructor

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

1 files changed, 5 insertions, 3 deletions

diff --git a/bin/pe.pl b/bin/pe.pl
index 62450bb3..57aa4bdb 100755
--- a/bin/pe.pl
+++ b/bin/pe.pl
@@ -2524,12 +2524,15 @@ sub generate_sales_orders {
   for (keys %{ $form->{order} }) {
     
     for (qw(type vc defaultcurrency login)) { $order->{$_} = $form->{$_} }
+    for (qw(currency)) { $order->{$_} = $form->{$_} }
     for (split / /, $form->{taxaccounts}) { $order->{"${_}_rate"} = $form->{"${_}_rate"} }
 
     $i = 0;
     $order->{"$order->{vc}_id"} = $_;
 
     AA->get_name(\%myconfig, \%$order);
+    PE->timecard_get_currency(\%$order);
+
 
     foreach $ref (@ {$form->{order}{$_} }) {
       $i++;
@@ -2543,16 +2546,15 @@ sub generate_sales_orders {
     }
     $order->{rowcount} = $i;
     
-    for (qw(currency)) { $order->{$_} = $form->{$_} }
 
     $order->{ordnumber} = $order->update_defaults(\%myconfig, 'sonumber');
     $order->{transdate} = $order->current_date(\%myconfig);
     $order->{reqdate} = $order->{transdate};
     
     for (qw(intnotes employee employee_id)) { delete $order->{$_} }
-    PE->timecard_get_currency(\%$order);
     
-
+    $order->debug;
+    $order->error();
     if (OE->save(\%myconfig, \%$order)) {
       if (! PE->allocate_projectitems(\%myconfig, \%$order)) {
 	OE->delete(\%myconfig, \%$order, ${LedgerSMB::Sysconfig::spool});