From c473d0d1a9085887c1fa8eaf9fcd8888bc23cef4 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Tue, 10 Jun 2008 01:24:11 +0000 Subject: [PATCH] Fix [ 1989305 ] Missing GL Journal Batch in GardenWorld --- base/src/org/compiere/model/MDocType.java | 2 +- .../200_BF1989305_createGWJournalBatch.sql | 17 +++++++++++++++++ .../200_BF1989305_createGWJournalBatch.sql | 17 +++++++++++++++++ 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 migration/351a-trunk/200_BF1989305_createGWJournalBatch.sql create mode 100644 migration/351a-trunk/postgresql/200_BF1989305_createGWJournalBatch.sql diff --git a/base/src/org/compiere/model/MDocType.java b/base/src/org/compiere/model/MDocType.java index e1b97e006c..accaddb2d6 100644 --- a/base/src/org/compiere/model/MDocType.java +++ b/base/src/org/compiere/model/MDocType.java @@ -45,7 +45,7 @@ public class MDocType extends X_C_DocType static public MDocType[] getOfDocBaseType (Properties ctx, String DocBaseType) { ArrayList list = new ArrayList(); - String sql = "SELECT * FROM C_DocType WHERE AD_Client_ID=? AND DocBaseType=?"; + String sql = "SELECT * FROM C_DocType WHERE AD_Client_ID=? AND DocBaseType=? ORDER BY IsDefault DESC, C_DocType_ID"; PreparedStatement pstmt = null; try { diff --git a/migration/351a-trunk/200_BF1989305_createGWJournalBatch.sql b/migration/351a-trunk/200_BF1989305_createGWJournalBatch.sql new file mode 100644 index 0000000000..7e4c6a53d1 --- /dev/null +++ b/migration/351a-trunk/200_BF1989305_createGWJournalBatch.sql @@ -0,0 +1,17 @@ +-- Jun 9, 2008 8:18:13 PM COT +-- [ 1989305 ] Missing GL Journal Batch in GardenWorld +INSERT INTO AD_Sequence (UpdatedBy,IsAutoSequence,AD_Org_ID,AD_Sequence_ID,Updated,CurrentNext,IsTableID,Created,StartNewYear,IsAudited,IncrementNo,AD_Client_ID,StartNo,Name,CurrentNextSys,CreatedBy,IsActive) VALUES (100,'Y',0,53162,TO_DATE('2008-06-09 20:18:12','YYYY-MM-DD HH24:MI:SS'),100,'N',TO_DATE('2008-06-09 20:18:12','YYYY-MM-DD HH24:MI:SS'),'N','N',1,11,1000,'GL Journal Batch',1002,100,'Y') +; + +-- Jun 9, 2008 8:18:33 PM COT +INSERT INTO C_DocType (IsSOTrx,UpdatedBy,IsDocNoControlled,AD_Org_ID,DocNoSequence_ID,Updated,DocumentCopies,HasCharges,C_DocType_ID,Created,IsDefault,GL_Category_ID,PrintName,AD_Client_ID,HasProforma,Name,CreatedBy,IsShipConfirm,IsPickQAConfirm,DocBaseType,IsDefaultCounterDoc,IsActive,IsSplitWhenDifference,IsCreateCounter,IsInTransit,IsOverwriteDateOnComplete,IsOverwriteSeqOnComplete,IsIndexed) VALUES ('N',100,'Y',0,53162,TO_DATE('2008-06-09 20:18:32','YYYY-MM-DD HH24:MI:SS'),0,'N',50001,TO_DATE('2008-06-09 20:18:32','YYYY-MM-DD HH24:MI:SS'),'N',108,'Journal Batch',11,'N','GL Journal Batch',100,'N','N','GLJ','N','Y','N','Y','N','N','N','Y') +; + +-- Jun 9, 2008 8:18:34 PM COT +INSERT INTO C_DocType_Trl (AD_Language,C_DocType_ID, DocumentNote,PrintName,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.C_DocType_ID, t.DocumentNote,t.PrintName,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, C_DocType t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.C_DocType_ID=50001 AND EXISTS (SELECT * FROM C_DocType_Trl tt WHERE tt.AD_Language!=l.AD_Language OR tt.C_DocType_ID!=t.C_DocType_ID) +; + +-- Jun 9, 2008 8:18:34 PM COT +INSERT INTO AD_Document_Action_Access (AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_DocType_ID , AD_Ref_List_ID, AD_Role_ID) (SELECT 11,0,'Y', SysDate,100, SysDate,100, doctype.C_DocType_ID, action.AD_Ref_List_ID, rol.AD_Role_ID FROM AD_Client client INNER JOIN C_DocType doctype ON (doctype.AD_Client_ID=client.AD_Client_ID) INNER JOIN AD_Ref_List action ON (action.AD_Reference_ID=135) INNER JOIN AD_Role rol ON (rol.AD_Client_ID=client.AD_Client_ID) WHERE client.AD_Client_ID=11 AND doctype.C_DocType_ID=50001 AND rol.IsManual='N') +; + diff --git a/migration/351a-trunk/postgresql/200_BF1989305_createGWJournalBatch.sql b/migration/351a-trunk/postgresql/200_BF1989305_createGWJournalBatch.sql new file mode 100644 index 0000000000..abf55aff0c --- /dev/null +++ b/migration/351a-trunk/postgresql/200_BF1989305_createGWJournalBatch.sql @@ -0,0 +1,17 @@ +-- Jun 9, 2008 8:18:14 PM COT +-- [ 1989305 ] Missing GL Journal Batch in GardenWorld +INSERT INTO AD_Sequence (UpdatedBy,IsAutoSequence,AD_Org_ID,AD_Sequence_ID,Updated,CurrentNext,IsTableID,Created,StartNewYear,IsAudited,IncrementNo,AD_Client_ID,StartNo,Name,CurrentNextSys,CreatedBy,IsActive) VALUES (100,'Y',0,53162,TO_TIMESTAMP('2008-06-09 20:18:12','YYYY-MM-DD HH24:MI:SS'),100,'N',TO_TIMESTAMP('2008-06-09 20:18:12','YYYY-MM-DD HH24:MI:SS'),'N','N',1,11,1000,'GL Journal Batch',1002,100,'Y') +; + +-- Jun 9, 2008 8:18:33 PM COT +INSERT INTO C_DocType (IsSOTrx,UpdatedBy,IsDocNoControlled,AD_Org_ID,DocNoSequence_ID,Updated,DocumentCopies,HasCharges,C_DocType_ID,Created,IsDefault,GL_Category_ID,PrintName,AD_Client_ID,HasProforma,Name,CreatedBy,IsShipConfirm,IsPickQAConfirm,DocBaseType,IsDefaultCounterDoc,IsActive,IsSplitWhenDifference,IsCreateCounter,IsInTransit,IsOverwriteDateOnComplete,IsOverwriteSeqOnComplete,IsIndexed) VALUES ('N',100,'Y',0,53162,TO_TIMESTAMP('2008-06-09 20:18:32','YYYY-MM-DD HH24:MI:SS'),0,'N',50001,TO_TIMESTAMP('2008-06-09 20:18:32','YYYY-MM-DD HH24:MI:SS'),'N',108,'Journal Batch',11,'N','GL Journal Batch',100,'N','N','GLJ','N','Y','N','Y','N','N','N','Y') +; + +-- Jun 9, 2008 8:18:34 PM COT +INSERT INTO C_DocType_Trl (AD_Language,C_DocType_ID, DocumentNote,PrintName,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.C_DocType_ID, t.DocumentNote,t.PrintName,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, C_DocType t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.C_DocType_ID=50001 AND EXISTS (SELECT * FROM C_DocType_Trl tt WHERE tt.AD_Language!=l.AD_Language OR tt.C_DocType_ID!=t.C_DocType_ID) +; + +-- Jun 9, 2008 8:18:34 PM COT +INSERT INTO AD_Document_Action_Access (AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_DocType_ID , AD_Ref_List_ID, AD_Role_ID) (SELECT 11,0,'Y', CURRENT_TIMESTAMP,100, CURRENT_TIMESTAMP,100, doctype.C_DocType_ID, "action".AD_Ref_List_ID, rol.AD_Role_ID FROM AD_Client client INNER JOIN C_DocType doctype ON (doctype.AD_Client_ID=client.AD_Client_ID) INNER JOIN AD_Ref_List "action" ON ("action".AD_Reference_ID=135) INNER JOIN AD_Role rol ON (rol.AD_Client_ID=client.AD_Client_ID) WHERE client.AD_Client_ID=11 AND doctype.C_DocType_ID=50001 AND rol.IsManual='N') +; +