[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
SF.net SVN: ledger-smb:[4491] trunk
- Subject: SF.net SVN: ledger-smb:[4491] trunk
- From: ..hidden..
- Date: Fri, 16 Mar 2012 23:58:11 +0000
Revision: 4491
http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4491&view=rev
Author: einhverfr
Date: 2012-03-16 23:58:11 +0000 (Fri, 16 Mar 2012)
Log Message:
-----------
merging from branches/1.3
Modified Paths:
--------------
trunk/Changelog
trunk/bin/am.pl
trunk/bin/rp.pl
trunk/lsmb-request.pl
trunk/sql/Pg-database.sql
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-4482
+ /branches/1.3:3711-4490
Modified: trunk/Changelog
===================================================================
--- trunk/Changelog 2012-03-16 23:50:21 UTC (rev 4490)
+++ trunk/Changelog 2012-03-16 23:58:11 UTC (rev 4491)
@@ -46,6 +46,8 @@
* Added default to country for initial setup (Chris T, bug 3496967)
* Added recon data to COA files for a few extra locales (Chris T bug 3505102)
* Clarified error message when contrib scripts not found (Chris T)
+* Corrected warnings for missin glog initalization (Andres B)
+* XAL and ODS buttons are now disabled if prereqs are missing (Erik H)
Andres B is Andres Basile
Property changes on: trunk/LedgerSMB/Scripts/account.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/account.pm:4369-4482
/branches/1.3/scripts/account.pl:3711-4368
+ /branches/1.3/LedgerSMB/Scripts/account.pm:4369-4490
/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-4482
/branches/1.3/scripts/admin.pl:3711-3903,4273-4287
+ /branches/1.3/LedgerSMB/Scripts/admin.pm:3901-4490
/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-4482
/branches/1.3/scripts/customer.pl:4273-4287
+ /branches/1.3/LedgerSMB/Scripts/customer.pm:4288-4490
/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-4482
/branches/1.3/scripts/employee.pl:3842-3843,4273-4287,4289-4310
+ /branches/1.3/LedgerSMB/Scripts/employee.pm:3712-4490
/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-4482
/branches/1.3/scripts/file.pl:3711-4138
+ /branches/1.3/LedgerSMB/Scripts/file.pm:3711-4490
/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-4482
/branches/1.3/scripts/journal.pl:3711-4328
+ /branches/1.3/LedgerSMB/Scripts/journal.pm:4288-4490
/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-4482
/branches/1.3/scripts/login.pl:3711-4192
+ /branches/1.3/LedgerSMB/Scripts/login.pm:4193-4490
/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-4482
/branches/1.3/scripts/menu.pl:3711-4192,4273-4287
+ /branches/1.3/LedgerSMB/Scripts/menu.pm:4155-4490
/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-4482
/branches/1.3/scripts/payment.pl:3711-4310
+ /branches/1.3/LedgerSMB/Scripts/payment.pm:4010-4490
/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-4482
/branches/1.3/scripts/recon.pl:4194-4271,4273-4287,4393-4438
+ /branches/1.3/LedgerSMB/Scripts/recon.pm:3711-4490
/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-4482
/branches/1.3/scripts/setup.pl:3711-4474
+ /branches/1.3/LedgerSMB/Scripts/setup.pm:3937-4490
/branches/1.3/scripts/setup.pl:3711-4474
Property changes on: trunk/LedgerSMB/Scripts/taxform.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/taxform.pm:4193-4482
/branches/1.3/scripts/taxform.pl:3711-4192,4273-4287
+ /branches/1.3/LedgerSMB/Scripts/taxform.pm:4193-4490
/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-4482
/branches/1.3/scripts/vendor.pl:4273-4287
+ /branches/1.3/LedgerSMB/Scripts/vendor.pm:4288-4490
/branches/1.3/scripts/vendor.pl:4273-4287
Modified: trunk/bin/am.pl
===================================================================
--- trunk/bin/am.pl 2012-03-16 23:50:21 UTC (rev 4490)
+++ trunk/bin/am.pl 2012-03-16 23:58:11 UTC (rev 4491)
@@ -256,6 +256,11 @@
push @rows, \%column_data;
}
+ my %can_load;
+ $can_load{CSV} = 1;
+ $can_load{XLS} = ! eval { require Excel::Template::Plus };
+ $can_load{ODS} = ! eval { require OpenOffice::OODoc };
+
my @buttons;
for my $type (qw(CSV XLS ODS)) {
push @buttons, {
@@ -264,6 +269,7 @@
text => $locale->text("[_1] Report", $type),
type => 'submit',
class => 'submit',
+ disabled => $can_load{$type} ? "" : "disabled",
};
}
my %hiddens = (
Modified: trunk/bin/rp.pl
===================================================================
--- trunk/bin/rp.pl 2012-03-16 23:50:21 UTC (rev 4490)
+++ trunk/bin/rp.pl 2012-03-16 23:58:11 UTC (rev 4491)
@@ -854,6 +854,12 @@
$column_data{debit} = $totaldebit;
$column_data{credit} = $totalcredit;
+
+ my %can_load;
+ $can_load{CSV} = 1;
+ $can_load{XLS} = ! eval { require Excel::Template::Plus };
+ $can_load{ODS} = ! eval { require OpenOffice::OODoc };
+
my @buttons;
for my $type (qw(CSV XLS ODS)) {
push @buttons, {
@@ -862,6 +868,7 @@
text => $locale->text("[_1] Report", $type),
type => 'submit',
class => 'submit',
+ disabled => $can_load{$type} ? "" : "disabled",
};
}
my $format;
@@ -1265,6 +1272,11 @@
## &menubar;
## }
+ my %can_load;
+ $can_load{CSV} = 1;
+ $can_load{XLS} = ! eval { require Excel::Template::Plus };
+ $can_load{ODS} = ! eval { require OpenOffice::OODoc };
+
for my $type (qw(CSV XLS ODS)) {
push @buttons, {
name => 'action',
@@ -1272,6 +1284,7 @@
text => $locale->text("[_1] Report", $type),
type => 'submit',
class => 'submit',
+ disabled => $can_load{$type} ? "" : "disabled",
};
}
my $format;
Modified: trunk/lsmb-request.pl
===================================================================
--- trunk/lsmb-request.pl 2012-03-16 23:50:21 UTC (rev 4490)
+++ trunk/lsmb-request.pl 2012-03-16 23:58:11 UTC (rev 4491)
@@ -40,7 +40,7 @@
LedgerSMB::App_State->zero();
my $logger = Log::Log4perl->get_logger('LedgerSMB::Handler');
-
+Log::Log4perl::init(\$LedgerSMB::Sysconfig::log4perl_config);
$logger->debug("Begin");
# for custom preprocessing logic
Modified: trunk/sql/Pg-database.sql
===================================================================
--- trunk/sql/Pg-database.sql 2012-03-16 23:50:21 UTC (rev 4490)
+++ trunk/sql/Pg-database.sql 2012-03-16 23:58:11 UTC (rev 4491)
@@ -168,6 +168,7 @@
--TABLE language moved here because of later references
INSERT INTO language (code, description)
VALUES ('ar_EG', 'Arabic (Egypt)'),
+ ('es_AR', 'Spanish (Argentina)'),
('bg', 'Bulgarian'),
('ca', 'Catalan'),
('cs', 'Czech'),
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-4482
/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-4490
/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.