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

5 files changed, 24 insertions, 15 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
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});
diff --git a/dists/source/build.sh b/dists/source/build.sh
index 9a7c5f94..ac9036fa 100644
--- a/dists/source/build.sh
+++ b/dists/source/build.sh
@@ -2,6 +2,13 @@
 
 # Simple script to prepare for release
 
+if test -n "$1" # Arguments are presented.  set up argument list and related
+then
+   $pgdoc = "postgresql_autodoc -U $1 -d $2"
+else
+   $pgdoc = "true";
+fi
+
 version="1.2.0rc4";
 build_d="../release";
 
@@ -26,5 +33,7 @@ pwd
 find -name '*.svn' -exec rm -rf '{}' ';'
 rm ledger-smb.conf
 rm ledgersmb.conf
-cd ..
+cd doc/database
+$pg_doc
+cd ../../..
 tar -zcvf ledger-smb-$version.tar.gz ledger-smb
diff --git a/ledgersmb.conf b/ledgersmb.conf
index 6427cce6..6d5b2cef 100644
--- a/ledgersmb.conf
+++ b/ledgersmb.conf
@@ -13,8 +13,9 @@ PATH: /usr/local/pgsql/bin
 #
 [globaldb]
 ##uncomment below and set to correct values
-DBname: lsmb13
-DBhost: localhost
-DBport: 5432
-DBUserName: postgres
-DBPassword:
+DBConnect: dbi:Pg:dbname=metatron_ledger;host=localhost;port=5432
+DBname       = metatron_ledger
+DBhost       = localhost
+DBport       = 5432
+DBUserName   = ledgersmb
+DBPassword: test 
diff --git a/utils/cli/ledgersmb_cli.pl b/utils/cli/ledgersmb_cli.pl
index a8fbaa98..67a1b8f4 100644
--- a/utils/cli/ledgersmb_cli.pl
+++ b/utils/cli/ledgersmb_cli.pl
@@ -152,8 +152,7 @@ sub if_handler {
 }
 
 sub login {
-	$myconfig = new LedgerSMB::User 
-		"${LedgerSMB::Sysconfig::memberfile}", "$form->{login}";
+	$myconfig = new LedgerSMB::User("$form->{login}");
 	$form->db_init($myconfig);
 }