From 87d12c1c5a7fecadad5edbe4622cf1e02837cc05 Mon Sep 17 00:00:00 2001 From: tspc Date: Tue, 15 Jun 2010 03:12:40 +0000 Subject: [PATCH] Merge Revisions 12577,12578,12579,12580,12581 from /release to /trunk r12577 Run sequence check before release r12578 Steps to release - change sources to point new version r12579 Steps to release -> Create migration scripts to update version information in ad_system table r12580 Steps to release -> Create migration scripts to update version information in ad_system table r12581 Steps to release -> Change and compile new Launch4j Regards, Tony --- base/src/org/compiere/Adempiere.java | 10 +- launch/Adempiere.xml | 12 +- launch/Release/Adempiere.exe | Bin 31232 -> 31232 bytes .../354a-trunk/oracle/736_SequenceCheck.sql | 145 ++++++++++++++++++ migration/354a-trunk/oracle/737_Version.sql | 18 +++ .../postgresql/736_SequenceCheck.sql | 145 ++++++++++++++++++ .../354a-trunk/postgresql/737_Version.sql | 18 +++ serverRoot/src/web/adempiere.html | 2 +- serverRoot/src/web/adempiere.jnlp | 6 +- utils/adempiereDirectTemplate.jnlp | 6 +- utils_dev/build.properties | 2 +- 11 files changed, 345 insertions(+), 19 deletions(-) create mode 100644 migration/354a-trunk/oracle/736_SequenceCheck.sql create mode 100644 migration/354a-trunk/oracle/737_Version.sql create mode 100644 migration/354a-trunk/postgresql/736_SequenceCheck.sql create mode 100644 migration/354a-trunk/postgresql/737_Version.sql diff --git a/base/src/org/compiere/Adempiere.java b/base/src/org/compiere/Adempiere.java index e573779197..57a6589c5f 100644 --- a/base/src/org/compiere/Adempiere.java +++ b/base/src/org/compiere/Adempiere.java @@ -59,12 +59,12 @@ public final class Adempiere static public final String ID = "$Id: Adempiere.java,v 1.8 2006/08/11 02:58:14 jjanke Exp $"; /** Main Version String */ // Conventions for naming second number is even for stable, and odd for unstable - // the releases will have a suffix (a) for alpha - (b) for beta - (t) for trunk - and (s) for stable - static public String MAIN_VERSION = "Release 3.5.4a"; + // the releases will have a suffix (a) for alpha - (b) for beta - (t) for trunk - (s) for stable - and (LTS) for long term support + static public String MAIN_VERSION = "Release 3.6.0LTS"; /** Detail Version as date Used for Client/Server */ - static public String DATE_VERSION = "2009-09-15"; + static public String DATE_VERSION = "2010-06-14"; /** Database Version as date Compared with AD_System */ - static public String DB_VERSION = "2009-09-15"; + static public String DB_VERSION = "2010-06-14"; /** Product Name */ static public final String NAME = "ADempiere\u00AE"; @@ -86,7 +86,7 @@ public final class Adempiere /** Subtitle */ static public final String SUB_TITLE = "Smart Suite ERP,CRM and SCM"; static public final String ADEMPIERE_R = "ADempiere\u00AE"; - static public final String COPYRIGHT = "\u00A9 1999-2009 ADempiere\u00AE"; + static public final String COPYRIGHT = "\u00A9 1999-2010 ADempiere\u00AE"; static private String s_ImplementationVersion = null; static private String s_ImplementationVendor = null; diff --git a/launch/Adempiere.xml b/launch/Adempiere.xml index dcd97c8b97..de40a24dea 100644 --- a/launch/Adempiere.xml +++ b/launch/Adempiere.xml @@ -23,19 +23,19 @@ - 1.5.0 + 1.6.0 preferJre 48 512 - 3.5.4.0 - Release 3.5.4a - Adempiere ERP & CRM 3.5.4a + 3.6.0.0 + Release 3.6.0LTS + Adempiere ERP & CRM 3.6.0LTS Adempiere - 3.5.4.0 - Release 3.5.4a + 3.6.0.0 + Release 3.6.0LTS Adempier ERP & CRM Adempiere Bazaar Adempiere diff --git a/launch/Release/Adempiere.exe b/launch/Release/Adempiere.exe index e4d98d2435a81994f5c0bcd8e37f598dd15bad46..dc410df1109bb0af8d3b30086eae13eb276d27af 100644 GIT binary patch delta 539 zcmZqp!r1VIaY6@6z;ZF4i9J5dE4&#e-Zo^4k(^w}lr_16@d9JaW>2Qwv0w$0ITCba zKq?u)fRTX_NP93aG=R7u@yP)RA`q1s2{kAx8CVz?7BGR-K~zpk6v2=`fFwWJ0E>bL z$O;m$C}3bl*f4nl76l5(3JzdV;DD^)0~Q4d$O;saP<;Uo4<_XBz@nf6Nx|lZBoRg? z4(83%lD7yjnr-$j;ba1GCx?~k>9Rq61EV2c1CcD?fJg8d7}6$hEK_E5ntZh^nmLI< ycCvAKps*Q(9)kgc4?_q;Fj%P*gW%-J<%Zly;*(F8|7CUqil449MG2Qwu`G2!1(P`v zbYwsb1~6b`UyBvfC3!-EMqJg_LJKvJ-|AxVUh z=?~N9X~|mz7)>{OmvAxxxs$`n^mJLlzF}d2(GahJNEUFwBlrvqQIj{8DKnZ)zFHQ| z9LFF%*|t.TableName) +; + +-- Jun 14, 2010 4:19:35 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=59231,Updated=TO_DATE('2010-06-14 16:19:35','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=3 +; + +-- Jun 14, 2010 4:19:35 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=54159,Updated=TO_DATE('2010-06-14 16:19:35','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=188 +; + +-- Jun 14, 2010 4:19:35 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=58883,Updated=TO_DATE('2010-06-14 16:19:35','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=4 +; + +-- Jun 14, 2010 4:19:36 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=50017,Updated=TO_DATE('2010-06-14 16:19:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=6 +; + +-- Jun 14, 2010 4:19:36 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=53265,Updated=TO_DATE('2010-06-14 16:19:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=7 +; + +-- Jun 14, 2010 4:19:36 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=523854,Updated=TO_DATE('2010-06-14 16:19:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=9 +; + +-- Jun 14, 2010 4:19:36 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=53201,Updated=TO_DATE('2010-06-14 16:19:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=199 +; + +-- Jun 14, 2010 4:19:36 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=53408,Updated=TO_DATE('2010-06-14 16:19:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=200 +; + +-- Jun 14, 2010 4:19:36 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=53355,Updated=TO_DATE('2010-06-14 16:19:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=14 +; + +-- Jun 14, 2010 4:19:36 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=53584,Updated=TO_DATE('2010-06-14 16:19:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=11 +; + +-- Jun 14, 2010 4:19:36 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=50006,Updated=TO_DATE('2010-06-14 16:19:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=53355 +; + +-- Jun 14, 2010 4:19:36 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=53032,Updated=TO_DATE('2010-06-14 16:19:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=298 +; + +-- Jun 14, 2010 4:19:36 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=53378,Updated=TO_DATE('2010-06-14 16:19:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=16 +; + +-- Jun 14, 2010 4:19:36 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=50044,Updated=TO_DATE('2010-06-14 16:19:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=50009 +; + +-- Jun 14, 2010 4:19:36 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=53308,Updated=TO_DATE('2010-06-14 16:19:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=19 +; + +-- Jun 14, 2010 4:19:36 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=53261,Updated=TO_DATE('2010-06-14 16:19:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=21 +; + +-- Jun 14, 2010 4:19:37 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=52085,Updated=TO_DATE('2010-06-14 16:19:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=26 +; + +-- Jun 14, 2010 4:19:37 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=50099,Updated=TO_DATE('2010-06-14 16:19:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=32 +; + +-- Jun 14, 2010 4:19:37 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=50076,Updated=TO_DATE('2010-06-14 16:19:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=33 +; + +-- Jun 14, 2010 4:19:37 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=53110,Updated=TO_DATE('2010-06-14 16:19:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=27 +; + +-- Jun 14, 2010 4:19:37 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=50006,Updated=TO_DATE('2010-06-14 16:19:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=57 +; + +-- Jun 14, 2010 4:19:37 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=50018,Updated=TO_DATE('2010-06-14 16:19:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=59 +; + +-- Jun 14, 2010 4:19:38 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=50048,Updated=TO_DATE('2010-06-14 16:19:38','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=43 +; + +-- Jun 14, 2010 4:19:38 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=51236,Updated=TO_DATE('2010-06-14 16:19:38','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=136 +; + +-- Jun 14, 2010 4:19:38 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=50018,Updated=TO_DATE('2010-06-14 16:19:38','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=62 +; + +-- Jun 14, 2010 4:19:38 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=50014,Updated=TO_DATE('2010-06-14 16:19:38','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=191 +; + +-- Jun 14, 2010 4:19:38 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=50004,Updated=TO_DATE('2010-06-14 16:19:38','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=65 +; + +-- Jun 14, 2010 4:19:42 PM COT +-- Preparing release 3.6.0LTS +INSERT INTO AD_Sequence (AD_Client_ID,AD_Org_ID,AD_Sequence_ID,Created,CreatedBy,CurrentNext,CurrentNextSys,Description,IncrementNo,IsActive,IsAudited,IsAutoSequence,IsTableID,Name,StartNewYear,StartNo,Updated,UpdatedBy) VALUES (11,0,53379,TO_DATE('2010-06-14 16:19:41','YYYY-MM-DD HH24:MI:SS'),100,1000000,50000,'DocumentNo/Value for Table C_OrderSource',1,'Y','N','Y','N','DocumentNo_C_OrderSource','N',1000000,TO_DATE('2010-06-14 16:19:41','YYYY-MM-DD HH24:MI:SS'),100) +; + diff --git a/migration/354a-trunk/oracle/737_Version.sql b/migration/354a-trunk/oracle/737_Version.sql new file mode 100644 index 0000000000..b0d539347e --- /dev/null +++ b/migration/354a-trunk/oracle/737_Version.sql @@ -0,0 +1,18 @@ +-- Jun 14, 2010 4:46:33 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Column SET FieldLength=10,Updated=TO_DATE('2010-06-14 16:46:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=9328 +; + +-- Jun 14, 2010 4:46:36 PM COT +-- Preparing release 3.6.0LTS +ALTER TABLE AD_System MODIFY ReleaseNo NVARCHAR2(10) DEFAULT NULL +; + +-- Jun 14, 2010 4:46:37 PM COT +-- Preparing release 3.6.0LTS +ALTER TABLE AD_System MODIFY ReleaseNo NULL +; + +UPDATE AD_SYSTEM + SET releaseno = '3.6.0LTS', VERSION = '2010-06-14' + WHERE ad_system_id = 0 AND ad_client_id = 0; diff --git a/migration/354a-trunk/postgresql/736_SequenceCheck.sql b/migration/354a-trunk/postgresql/736_SequenceCheck.sql new file mode 100644 index 0000000000..890c847e5a --- /dev/null +++ b/migration/354a-trunk/postgresql/736_SequenceCheck.sql @@ -0,0 +1,145 @@ +-- Jun 14, 2010 4:19:35 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET Name = (SELECT TableName FROM AD_Table t WHERE t.IsView='N' AND UPPER(AD_Sequence.Name)=UPPER(t.TableName)) WHERE AD_Sequence.IsTableID='Y' AND EXISTS (SELECT * FROM AD_Table t WHERE t.IsActive='Y' AND t.IsView='N' AND UPPER(AD_Sequence.Name)=UPPER(t.TableName) AND AD_Sequence.Name<>t.TableName) +; + +-- Jun 14, 2010 4:19:35 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=59231,Updated=TO_TIMESTAMP('2010-06-14 16:19:35','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=3 +; + +-- Jun 14, 2010 4:19:35 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=54159,Updated=TO_TIMESTAMP('2010-06-14 16:19:35','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=188 +; + +-- Jun 14, 2010 4:19:35 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=58883,Updated=TO_TIMESTAMP('2010-06-14 16:19:35','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=4 +; + +-- Jun 14, 2010 4:19:36 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=50017,Updated=TO_TIMESTAMP('2010-06-14 16:19:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=6 +; + +-- Jun 14, 2010 4:19:36 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=53265,Updated=TO_TIMESTAMP('2010-06-14 16:19:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=7 +; + +-- Jun 14, 2010 4:19:36 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=523854,Updated=TO_TIMESTAMP('2010-06-14 16:19:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=9 +; + +-- Jun 14, 2010 4:19:36 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=53201,Updated=TO_TIMESTAMP('2010-06-14 16:19:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=199 +; + +-- Jun 14, 2010 4:19:36 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=53408,Updated=TO_TIMESTAMP('2010-06-14 16:19:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=200 +; + +-- Jun 14, 2010 4:19:36 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=53355,Updated=TO_TIMESTAMP('2010-06-14 16:19:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=14 +; + +-- Jun 14, 2010 4:19:36 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=53584,Updated=TO_TIMESTAMP('2010-06-14 16:19:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=11 +; + +-- Jun 14, 2010 4:19:36 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=50006,Updated=TO_TIMESTAMP('2010-06-14 16:19:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=53355 +; + +-- Jun 14, 2010 4:19:36 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=53032,Updated=TO_TIMESTAMP('2010-06-14 16:19:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=298 +; + +-- Jun 14, 2010 4:19:36 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=53378,Updated=TO_TIMESTAMP('2010-06-14 16:19:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=16 +; + +-- Jun 14, 2010 4:19:36 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=50044,Updated=TO_TIMESTAMP('2010-06-14 16:19:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=50009 +; + +-- Jun 14, 2010 4:19:36 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=53308,Updated=TO_TIMESTAMP('2010-06-14 16:19:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=19 +; + +-- Jun 14, 2010 4:19:36 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=53261,Updated=TO_TIMESTAMP('2010-06-14 16:19:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=21 +; + +-- Jun 14, 2010 4:19:37 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=52085,Updated=TO_TIMESTAMP('2010-06-14 16:19:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=26 +; + +-- Jun 14, 2010 4:19:37 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=50099,Updated=TO_TIMESTAMP('2010-06-14 16:19:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=32 +; + +-- Jun 14, 2010 4:19:37 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=50076,Updated=TO_TIMESTAMP('2010-06-14 16:19:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=33 +; + +-- Jun 14, 2010 4:19:37 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=53110,Updated=TO_TIMESTAMP('2010-06-14 16:19:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=27 +; + +-- Jun 14, 2010 4:19:37 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=50006,Updated=TO_TIMESTAMP('2010-06-14 16:19:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=57 +; + +-- Jun 14, 2010 4:19:37 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=50018,Updated=TO_TIMESTAMP('2010-06-14 16:19:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=59 +; + +-- Jun 14, 2010 4:19:38 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=50048,Updated=TO_TIMESTAMP('2010-06-14 16:19:38','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=43 +; + +-- Jun 14, 2010 4:19:38 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=51236,Updated=TO_TIMESTAMP('2010-06-14 16:19:38','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=136 +; + +-- Jun 14, 2010 4:19:38 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=50018,Updated=TO_TIMESTAMP('2010-06-14 16:19:38','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=62 +; + +-- Jun 14, 2010 4:19:38 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=50014,Updated=TO_TIMESTAMP('2010-06-14 16:19:38','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=191 +; + +-- Jun 14, 2010 4:19:39 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Sequence SET CurrentNextSys=50004,Updated=TO_TIMESTAMP('2010-06-14 16:19:38','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=65 +; + +-- Jun 14, 2010 4:19:42 PM COT +-- Preparing release 3.6.0LTS +INSERT INTO AD_Sequence (AD_Client_ID,AD_Org_ID,AD_Sequence_ID,Created,CreatedBy,CurrentNext,CurrentNextSys,Description,IncrementNo,IsActive,IsAudited,IsAutoSequence,IsTableID,Name,StartNewYear,StartNo,Updated,UpdatedBy) VALUES (11,0,53379,TO_TIMESTAMP('2010-06-14 16:19:41','YYYY-MM-DD HH24:MI:SS'),100,1000000,50000,'DocumentNo/Value for Table C_OrderSource',1,'Y','N','Y','N','DocumentNo_C_OrderSource','N',1000000,TO_TIMESTAMP('2010-06-14 16:19:41','YYYY-MM-DD HH24:MI:SS'),100) +; + diff --git a/migration/354a-trunk/postgresql/737_Version.sql b/migration/354a-trunk/postgresql/737_Version.sql new file mode 100644 index 0000000000..e2da2a826b --- /dev/null +++ b/migration/354a-trunk/postgresql/737_Version.sql @@ -0,0 +1,18 @@ +-- Jun 14, 2010 4:46:33 PM COT +-- Preparing release 3.6.0LTS +UPDATE AD_Column SET FieldLength=10,Updated=TO_TIMESTAMP('2010-06-14 16:46:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=9328 +; + +-- Jun 14, 2010 4:46:36 PM COT +-- Preparing release 3.6.0LTS +INSERT INTO t_alter_column values('ad_system','ReleaseNo','VARCHAR(10)',null,'NULL') +; + +-- Jun 14, 2010 4:46:37 PM COT +-- Preparing release 3.6.0LTS +INSERT INTO t_alter_column values('ad_system','ReleaseNo',null,'NULL',null) +; + +UPDATE AD_SYSTEM + SET releaseno = '3.6.0LTS', VERSION = '2010-06-14' + WHERE ad_system_id = 0 AND ad_client_id = 0; diff --git a/serverRoot/src/web/adempiere.html b/serverRoot/src/web/adempiere.html index 1ed84cb97a..e5bf4cbfd4 100644 --- a/serverRoot/src/web/adempiere.html +++ b/serverRoot/src/web/adempiere.html @@ -96,7 +96,7 @@ End If - Welcome to the ADempiere 3.5.4a Home Page!
+ Welcome to the ADempiere 3.6.0LTS Home Page!
 diff --git a/serverRoot/src/web/adempiere.jnlp b/serverRoot/src/web/adempiere.jnlp index 6700c46970..3d00ab2ba2 100644 --- a/serverRoot/src/web/adempiere.jnlp +++ b/serverRoot/src/web/adempiere.jnlp @@ -1,9 +1,9 @@ - - Adempiere Client 3.5.4a $$context + Adempiere Client 3.6.0LTS $$context ADempiere, Inc. @@ -14,7 +14,7 @@ - + diff --git a/utils/adempiereDirectTemplate.jnlp b/utils/adempiereDirectTemplate.jnlp index 8c5dcf9295..dcf8fd6bd2 100644 --- a/utils/adempiereDirectTemplate.jnlp +++ b/utils/adempiereDirectTemplate.jnlp @@ -1,9 +1,9 @@ - - Adempiere Client 3.5.4a @ADEMPIERE_APPS_SERVER@ Direct + Adempiere Client 3.6.0LTS @ADEMPIERE_APPS_SERVER@ Direct ADempiere, Inc. Adempiere ERP+CRM (local) - Smart Business Solution for Distribution and Service - globally @@ -13,7 +13,7 @@ - + diff --git a/utils_dev/build.properties b/utils_dev/build.properties index 5ca0f646be..86d6720098 100644 --- a/utils_dev/build.properties +++ b/utils_dev/build.properties @@ -3,7 +3,7 @@ env.ADEMPIERE_ROOT=${env.ADEMPIERE_SOURCE}/adempiere env.ADEMPIERE_HOME=${env.ADEMPIERE_ROOT}/Adempiere env.ADEMPIERE_INSTALL=${env.ADEMPIERE_SOURCE}/adempiere/install env.ADEMPIERE_VERSION=ADempiere -env.ADEMPIERE_VERSION_FILE=354a +env.ADEMPIERE_VERSION_FILE=360LTS env.ADEMPIERE_VENDOR=ADempiere env.ENCODING=UTF-8 env.XDOCLET_HOME=${env.ADEMPIERE_SOURCE}/tools