[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
SF.net SVN: ledger-smb:[4871] trunk
- Subject: SF.net SVN: ledger-smb:[4871] trunk
- From: ..hidden..
- Date: Fri, 08 Jun 2012 08:32:15 +0000
Revision: 4871
http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4871&view=rev
Author: einhverfr
Date: 2012-06-08 08:32:15 +0000 (Fri, 08 Jun 2012)
Log Message:
-----------
Merging from branches/1.3
Modified Paths:
--------------
trunk/Changelog
trunk/sql/modules/test/Company.sql
trunk/sql/modules/test/Payment.sql
trunk/sql/modules/test/Session.sql
Property Changed:
----------------
trunk/
trunk/LedgerSMB/Scripts/account.pm
trunk/LedgerSMB/Scripts/admin.pm
trunk/LedgerSMB/Scripts/contact.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/sql/upgrade/1.2-1.3-manual.sql
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3:3711-4867
+ /branches/1.3:3711-4870
Modified: trunk/Changelog
===================================================================
--- trunk/Changelog 2012-06-08 07:46:16 UTC (rev 4870)
+++ trunk/Changelog 2012-06-08 08:32:15 UTC (rev 4871)
@@ -60,6 +60,8 @@
* Fixed error on taxable sales report (Chris T, 3531784 h/t Nigel T)
* Added missing localization calls to recon approval workflow (Chris T)
* Clarified recon approval workflow (Chris T)
+* Fixed error editing non-existent localized template (Chris T, 3531738)
+* Fixed show/hide logic on nav bar on Contacts screen (Chris T)
Changelog for 1.3.18
* Fixed missing template for CSV pricelists (Chris T)
Property changes on: trunk/LedgerSMB/Scripts/account.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/account.pm:3712-4867
/branches/1.3/scripts/account.pl:3711-4368
+ /branches/1.3/LedgerSMB/Scripts/account.pm:3712-4870
/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:3712-4867
/branches/1.3/scripts/admin.pl:3711-4678
+ /branches/1.3/LedgerSMB/Scripts/admin.pm:3712-4870
/branches/1.3/scripts/admin.pl:3711-4678
Property changes on: trunk/LedgerSMB/Scripts/contact.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/contact.pm:4783-4867
/branches/1.3/LedgerSMB/Scripts/customer.pm:3712-4782
/branches/1.3/scripts/customer.pl:4273-4287
+ /branches/1.3/LedgerSMB/Scripts/contact.pm:4783-4870
/branches/1.3/LedgerSMB/Scripts/customer.pm:3712-4782
/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-4867
/branches/1.3/scripts/employee.pl:3842-3843,4273-4287,4289-4310
+ /branches/1.3/LedgerSMB/Scripts/employee.pm:3712-4870
/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-4867
/branches/1.3/scripts/file.pl:3711-4859
+ /branches/1.3/LedgerSMB/Scripts/file.pm:3711-4870
/branches/1.3/scripts/file.pl:3711-4859
Property changes on: trunk/LedgerSMB/Scripts/journal.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/journal.pm:3712-4867
/branches/1.3/scripts/journal.pl:3711-4328
+ /branches/1.3/LedgerSMB/Scripts/journal.pm:3712-4870
/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:3712-4867
/branches/1.3/scripts/login.pl:3711-4192
+ /branches/1.3/LedgerSMB/Scripts/login.pm:3712-4870
/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:3712-4867
/branches/1.3/scripts/menu.pl:3711-4192,4273-4287
+ /branches/1.3/LedgerSMB/Scripts/menu.pm:3712-4870
/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:3712-4867
/branches/1.3/scripts/payment.pl:3711-4680
+ /branches/1.3/LedgerSMB/Scripts/payment.pm:3712-4870
/branches/1.3/scripts/payment.pl:3711-4680
Property changes on: trunk/LedgerSMB/Scripts/recon.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/recon.pm:3711-4867
/branches/1.3/scripts/recon.pl:4194-4271,4273-4287,4393-4438
+ /branches/1.3/LedgerSMB/Scripts/recon.pm:3711-4870
/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:3712-4867
/branches/1.3/scripts/setup.pl:3711-4550
+ /branches/1.3/LedgerSMB/Scripts/setup.pm:3712-4870
/branches/1.3/scripts/setup.pl:3711-4550
Property changes on: trunk/LedgerSMB/Scripts/taxform.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/taxform.pm:3712-4867
/branches/1.3/scripts/taxform.pl:3711-4192,4273-4287
+ /branches/1.3/LedgerSMB/Scripts/taxform.pm:3712-4870
/branches/1.3/scripts/taxform.pl:3711-4192,4273-4287
Modified: trunk/sql/modules/test/Company.sql
===================================================================
--- trunk/sql/modules/test/Company.sql 2012-06-08 07:46:16 UTC (rev 4870)
+++ trunk/sql/modules/test/Company.sql 2012-06-08 08:32:15 UTC (rev 4871)
@@ -11,7 +11,7 @@
SELECT 'Saving Credit Acct',
entity_credit_save( NULL , 1, currval('entity_id_seq')::int, 'TEST', 0, false,
0, 0, 0, 'test-123', NULL, NULL, NULL, 'USD', now()::date, now()::date,
- 0, -1000, NULL, NULL, NULL)
+ 0, -1000, NULL, NULL, NULL, NULL)
IS NOT NULL;
INSERT INTO test_result (test_name, success)
Modified: trunk/sql/modules/test/Payment.sql
===================================================================
--- trunk/sql/modules/test/Payment.sql 2012-06-08 07:46:16 UTC (rev 4870)
+++ trunk/sql/modules/test/Payment.sql 2012-06-08 08:32:15 UTC (rev 4871)
@@ -5,8 +5,8 @@
insert into users (entity_id, username, id)
values (-200, '_test1', -200);
-insert into session (session_id, users_id, token, last_used, transaction_id)
-values (-200, -200, md5(random()::text), now(), 0);
+insert into session (session_id, users_id, token, last_used)
+values (-200, -200, md5(random()::text), now());
INSERT INTO chart (accno, description, charttype, category, link)
VALUES ('00001', 'testing', 'A', 'L', 'AP');
@@ -15,8 +15,8 @@
INSERT INTO chart (accno, description, charttype, category, link)
VALUES ('00003', 'testing2', 'A', 'A', 'AP_paid');
-INSERT INTO session (users_id, last_used, token, transaction_id)
-values (currval('users_id_seq'), now(), md5('test2'), 2);
+INSERT INTO session (users_id, last_used, token)
+values (currval('users_id_seq'), now(), md5('test2'));
INSERT INTO test_result(test_name, success)
SELECT 'AP Batch created', (SELECT batch_create('test', 'test', 'ap', now()::date)) IS NOT NULL;
@@ -126,7 +126,7 @@
INSERT INTO test_result(test_name, success)
SELECT 'batch_description exists', count(batch_description) = 1
-FROM payment__search('_test_src1', NULL, NULL, -101, '00003', 1);
+FROM payment__search('_test_src1', NULL, NULL, -101, '00003', 1, 'USD');
SELECT * FROM TEST_RESULT;
Modified: trunk/sql/modules/test/Session.sql
===================================================================
--- trunk/sql/modules/test/Session.sql 2012-06-08 07:46:16 UTC (rev 4870)
+++ trunk/sql/modules/test/Session.sql 2012-06-08 08:32:15 UTC (rev 4871)
@@ -6,21 +6,21 @@
values ('timeout set',
(select count(*) from defaults where setting_key = 'timeout') = 1);
-INSERT INTO session (users_id, last_used, token, transaction_id)
+INSERT INTO session (users_id, last_used, token)
SELECT currval('users_id_seq'),
now() - coalesce((select value from defaults where setting_key = 'timeout')::interval,
'90 minutes'::interval) - '1 minute'::interval,
-md5('test2'), 2;
+md5('test2');
-INSERT INTO session (users_id, last_used, token, transaction_id)
+INSERT INTO session (users_id, last_used, token)
SELECT currval('users_id_seq'),
now() - coalesce((select value from defaults where setting_key = 'timeout')::interval,
'2 days'::interval),
-md5('test3'), 3;
+md5('test3');
-INSERT INTO session (users_id, last_used, token, transaction_id)
-SELECT currval('users_id_seq'), now(), md5('test1'), 1;
+INSERT INTO session (users_id, last_used, token)
+SELECT currval('users_id_seq'), now(), md5('test1');
INSERT INTO test_result (test_name, success)
SELECT 'records exist in transactions table', count(*) > 0 FROM transactions;
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-4867
/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-4870
/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.