[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
SF.net SVN: ledger-smb:[4546] trunk
- Subject: SF.net SVN: ledger-smb:[4546] trunk
- From: ..hidden..
- Date: Sat, 24 Mar 2012 08:25:14 +0000
Revision: 4546
http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4546&view=rev
Author: einhverfr
Date: 2012-03-24 08:25:13 +0000 (Sat, 24 Mar 2012)
Log Message:
-----------
Merging from branches/1.3
Modified Paths:
--------------
trunk/Changelog
trunk/LedgerSMB/Database.pm
trunk/bin/aa.pl
trunk/bin/ir.pl
trunk/bin/is.pl
Property Changed:
----------------
trunk/
trunk/LedgerSMB/Scripts/account.pm
trunk/LedgerSMB/Scripts/admin.pm
trunk/LedgerSMB/Scripts/customer.pm
trunk/LedgerSMB/Scripts/employee.pm
trunk/LedgerSMB/Scripts/file.pm
trunk/LedgerSMB/Scripts/journal.pm
trunk/LedgerSMB/Scripts/login.pm
trunk/LedgerSMB/Scripts/menu.pm
trunk/LedgerSMB/Scripts/payment.pm
trunk/LedgerSMB/Scripts/recon.pm
trunk/LedgerSMB/Scripts/setup.pm
trunk/LedgerSMB/Scripts/taxform.pm
trunk/LedgerSMB/Scripts/vendor.pm
trunk/sql/upgrade/1.2-1.3-manual.sql
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3:3711-4541
+ /branches/1.3:3711-4545
Modified: trunk/Changelog
===================================================================
--- trunk/Changelog 2012-03-24 08:14:20 UTC (rev 4545)
+++ trunk/Changelog 2012-03-24 08:25:13 UTC (rev 4546)
@@ -51,6 +51,9 @@
* Experimental support for migrating from SQL-Ledger via Setup.pl (Chris T)
* Fixed POD issues with lsmb-request.pl (h/t Robert C) (Chris T item 3472648)
* Fixed means of adding parts/editing pricelist missing (Chris T, bug 3442163)
+* Fixed unknown db detected as SQL-Ledger (Chris T, bug 3510039)
+* Fixed pos ignores pd_proto and always connects tcp (Chris T, bug 3458112)
+* Error now displayed when currencies are not defined (Chris T, bug 3509555)
Andres B is Andres Basile
Modified: trunk/LedgerSMB/Database.pm
===================================================================
--- trunk/LedgerSMB/Database.pm 2012-03-24 08:14:20 UTC (rev 4545)
+++ trunk/LedgerSMB/Database.pm 2012-03-24 08:25:13 UTC (rev 4546)
@@ -311,7 +311,7 @@
my $rv=$sth->execute();
if(defined($rv))
{
- if (my ($ref) = $sth->fetchrow_hashref('NAME_lc')){
+ if (my $ref = $sth->fetchrow_hashref('NAME_lc')){
if ($ref->{version}){
$retval->{appname} = 'ledgersmb';
$retval->{version} = 'legacy';
@@ -324,7 +324,7 @@
# LedgerSMB 1.2 and above
$sth = $dbh->prepare('SELECT value FROM defaults WHERE setting_key = ?');
$sth->execute('version');
- if (my ($ref) = $sth->fetchrow_hashref('NAME_lc')){
+ if (my $ref = $sth->fetchrow_hashref('NAME_lc')){
$retval->{full_version} = $ref->{value};
$retval->{appname} = 'ledgersmb';
if ($ref->{value} eq '1.2.0') {
@@ -342,12 +342,15 @@
# SQL-Ledger 2.7-2.8 (fldname, fldvalue)
$sth = $dbh->prepare('SELECT fldvalue FROM defaults WHERE fldname = ?');
$sth->execute('version');
- if (my ($ref) = $sth->fetchrow_hashref('NAME_lc')){
+ if (my $ref = $sth->fetchrow_hashref('NAME_lc')){
$retval->{appname} = 'sql-ledger';
$retval->{full_version} = $ref->{fldname};
$retval->{version} = $ref->{fldname};
$retval->{version} =~ s/(\d+\.\d+).*/$1/g;
- }
+ } else {
+ $retval->{appname} = 'unknown';
+ $retval->{exists} = 'exists';
+ }
$dbh->rollback;
}
#$logger->debug("DBI->disconnect dbh=$dbh");
Property changes on: trunk/LedgerSMB/Scripts/account.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/account.pm:4369-4541
/branches/1.3/scripts/account.pl:3711-4368
+ /branches/1.3/LedgerSMB/Scripts/account.pm:4369-4545
/branches/1.3/scripts/account.pl:3711-4368
Property changes on: trunk/LedgerSMB/Scripts/admin.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/admin.pm:3901-4541
/branches/1.3/scripts/admin.pl:3711-3903,4273-4287
+ /branches/1.3/LedgerSMB/Scripts/admin.pm:3901-4545
/branches/1.3/scripts/admin.pl:3711-3903,4273-4287
Property changes on: trunk/LedgerSMB/Scripts/customer.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/customer.pm:4288-4541
/branches/1.3/scripts/customer.pl:4273-4287
+ /branches/1.3/LedgerSMB/Scripts/customer.pm:4288-4545
/branches/1.3/scripts/customer.pl:4273-4287
Property changes on: trunk/LedgerSMB/Scripts/employee.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/employee.pm:3712-4541
/branches/1.3/scripts/employee.pl:3842-3843,4273-4287,4289-4310
+ /branches/1.3/LedgerSMB/Scripts/employee.pm:3712-4545
/branches/1.3/scripts/employee.pl:3842-3843,4273-4287,4289-4310
Property changes on: trunk/LedgerSMB/Scripts/file.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/file.pm:3711-4541
/branches/1.3/scripts/file.pl:3711-4138
+ /branches/1.3/LedgerSMB/Scripts/file.pm:3711-4545
/branches/1.3/scripts/file.pl:3711-4138
Property changes on: trunk/LedgerSMB/Scripts/journal.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/journal.pm:4288-4541
/branches/1.3/scripts/journal.pl:3711-4328
+ /branches/1.3/LedgerSMB/Scripts/journal.pm:4288-4545
/branches/1.3/scripts/journal.pl:3711-4328
Property changes on: trunk/LedgerSMB/Scripts/login.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/login.pm:4193-4541
/branches/1.3/scripts/login.pl:3711-4192
+ /branches/1.3/LedgerSMB/Scripts/login.pm:4193-4545
/branches/1.3/scripts/login.pl:3711-4192
Property changes on: trunk/LedgerSMB/Scripts/menu.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/menu.pm:4155-4541
/branches/1.3/scripts/menu.pl:3711-4192,4273-4287
+ /branches/1.3/LedgerSMB/Scripts/menu.pm:4155-4545
/branches/1.3/scripts/menu.pl:3711-4192,4273-4287
Property changes on: trunk/LedgerSMB/Scripts/payment.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/payment.pm:4010-4541
/branches/1.3/scripts/payment.pl:3711-4310
+ /branches/1.3/LedgerSMB/Scripts/payment.pm:4010-4545
/branches/1.3/scripts/payment.pl:3711-4310
Property changes on: trunk/LedgerSMB/Scripts/recon.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/recon.pm:3711-4541
/branches/1.3/scripts/recon.pl:4194-4271,4273-4287,4393-4438
+ /branches/1.3/LedgerSMB/Scripts/recon.pm:3711-4545
/branches/1.3/scripts/recon.pl:4194-4271,4273-4287,4393-4438
Property changes on: trunk/LedgerSMB/Scripts/setup.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/setup.pm:3937-4541
/branches/1.3/scripts/setup.pl:3711-4525
+ /branches/1.3/LedgerSMB/Scripts/setup.pm:3937-4545
/branches/1.3/scripts/setup.pl:3711-4525
Property changes on: trunk/LedgerSMB/Scripts/taxform.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/taxform.pm:4193-4541
/branches/1.3/scripts/taxform.pl:3711-4192,4273-4287
+ /branches/1.3/LedgerSMB/Scripts/taxform.pm:4193-4545
/branches/1.3/scripts/taxform.pl:3711-4192,4273-4287
Property changes on: trunk/LedgerSMB/Scripts/vendor.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/vendor.pm:4288-4541
/branches/1.3/scripts/vendor.pl:4273-4287
+ /branches/1.3/LedgerSMB/Scripts/vendor.pm:4288-4545
/branches/1.3/scripts/vendor.pl:4273-4287
Modified: trunk/bin/aa.pl
===================================================================
--- trunk/bin/aa.pl 2012-03-24 08:14:20 UTC (rev 4545)
+++ trunk/bin/aa.pl 2012-03-24 08:25:13 UTC (rev 4546)
@@ -193,6 +193,11 @@
qq|<option value="transaction">| . $locale->text('Transaction');
# currencies
+ if (!$form->{currencies}){
+ $form->error($locale->text(
+ 'No currencies defined. Please set these up under System/Defaults.'
+ ));
+ }
@curr = split /:/, $form->{currencies};
$form->{defaultcurrency} = $curr[0];
chomp $form->{defaultcurrency};
Modified: trunk/bin/ir.pl
===================================================================
--- trunk/bin/ir.pl 2012-03-24 08:14:20 UTC (rev 4545)
+++ trunk/bin/ir.pl 2012-03-24 08:25:13 UTC (rev 4546)
@@ -114,6 +114,11 @@
job => 1 );
# currencies
+ if (!$form->{currencies}){
+ $form->error($locale->text(
+ 'No currencies defined. Please set these up under System/Defaults.'
+ ));
+ }
@curr = split /:/, $form->{currencies};
$form->{defaultcurrency} = $curr[0];
chomp $form->{defaultcurrency};
Modified: trunk/bin/is.pl
===================================================================
--- trunk/bin/is.pl 2012-03-24 08:14:20 UTC (rev 4545)
+++ trunk/bin/is.pl 2012-03-24 08:25:13 UTC (rev 4546)
@@ -121,6 +121,11 @@
job => 1 );
# currencies
+ if (!$form->{currencies}){
+ $form->error($locale->text(
+ 'No currencies defined. Please set these up under System/Defaults.'
+ ));
+ }
@curr = split /:/, $form->{currencies};
$form->{defaultcurrency} = $curr[0];
chomp $form->{defaultcurrency};
Property changes on: trunk/sql/upgrade/1.2-1.3-manual.sql
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/sql/upgrade/1.2-1.3-manual.sql:3712-4541
/branches/1.3/sql/upgrade/1.2-1.3.sql:3711-3851
/trunk/sql/upgrade/1.2-1.3.sql:858-3710
+ /branches/1.3/sql/upgrade/1.2-1.3-manual.sql:3712-4545
/branches/1.3/sql/upgrade/1.2-1.3.sql:3711-3851
/trunk/sql/upgrade/1.2-1.3.sql:858-3710
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.