[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
SF.net SVN: ledger-smb: [986] branches/1.2
- Subject: SF.net SVN: ledger-smb: [986] branches/1.2
- From: ..hidden..
- Date: Thu, 22 Mar 2007 15:20:46 -0700
Revision: 986
http://svn.sourceforge.net/ledger-smb/?rev=986&view=rev
Author: einhverfr
Date: 2007-03-22 15:20:45 -0700 (Thu, 22 Mar 2007)
Log Message:
-----------
Final changes before release changes for -rc5: 2 errors corrected in OE.pm and /tools/cli moved to new User constructor
Modified Paths:
--------------
branches/1.2/LedgerSMB/OE.pm
branches/1.2/bin/pe.pl
branches/1.2/dists/source/build.sh
branches/1.2/ledgersmb.conf
branches/1.2/utils/cli/ledgersmb_cli.pl
Modified: branches/1.2/LedgerSMB/OE.pm
===================================================================
--- branches/1.2/LedgerSMB/OE.pm 2007-03-22 22:04:44 UTC (rev 985)
+++ branches/1.2/LedgerSMB/OE.pm 2007-03-22 22:20:45 UTC (rev 986)
@@ -2546,7 +2546,7 @@
$amount += $ref->{amount};
$netamount += $ref->{netamount};
- $id = $dbh->quore($id);
+ $id = $dbh->quote($id);
foreach $item
(@{ $oe{orderitems}{$curr}{$id} }) {
@@ -2605,9 +2605,7 @@
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
Modified: branches/1.2/bin/pe.pl
===================================================================
--- branches/1.2/bin/pe.pl 2007-03-22 22:04:44 UTC (rev 985)
+++ branches/1.2/bin/pe.pl 2007-03-22 22:20:45 UTC (rev 986)
@@ -2524,13 +2524,16 @@
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 @@
}
$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});
Modified: branches/1.2/dists/source/build.sh
===================================================================
--- branches/1.2/dists/source/build.sh 2007-03-22 22:04:44 UTC (rev 985)
+++ branches/1.2/dists/source/build.sh 2007-03-22 22:20:45 UTC (rev 986)
@@ -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 @@
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
Modified: branches/1.2/ledgersmb.conf
===================================================================
--- branches/1.2/ledgersmb.conf 2007-03-22 22:04:44 UTC (rev 985)
+++ branches/1.2/ledgersmb.conf 2007-03-22 22:20:45 UTC (rev 986)
@@ -13,8 +13,9 @@
#
[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
Modified: branches/1.2/utils/cli/ledgersmb_cli.pl
===================================================================
--- branches/1.2/utils/cli/ledgersmb_cli.pl 2007-03-22 22:04:44 UTC (rev 985)
+++ branches/1.2/utils/cli/ledgersmb_cli.pl 2007-03-22 22:20:45 UTC (rev 986)
@@ -152,8 +152,7 @@
}
sub login {
- $myconfig = new LedgerSMB::User
- "${LedgerSMB::Sysconfig::memberfile}", "$form->{login}";
+ $myconfig = new LedgerSMB::User("$form->{login}");
$form->db_init($myconfig);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.