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, 2 insertions, 4 deletions

diff --git a/LedgerSMB/OE.pm b/LedgerSMB/OE.pm
index b5bbc6a4..6fd5aeca 100755
--- a/LedgerSMB/OE.pm
+++ b/LedgerSMB/OE.pm
@@ -2546,7 +2546,7 @@ sub consolidate_orders {
 				$amount += $ref->{amount};
 				$netamount += $ref->{netamount};
 
-				$id = $dbh->quore($id);
+				$id = $dbh->quote($id);
 				foreach $item 
 					(@{ $oe{orderitems}{$curr}{$id} }) {
 
@@ -2605,9 +2605,7 @@ sub consolidate_orders {
 					department_id = $department_id
 				WHERE id = $id|;
 			$sth = $dbh->prepare($query);
-			$sth->execute (
-				$department_id, $id
-				) || $form->dberror($query);
+			$sth->execute () || $form->dberror($query);
 	  
 
 			# add items