midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-1353 Choose to display trees on master, detail or both tabs / based on patch from Nicolas Micoud (nmicoud)

This commit is contained in:
Carlos Ruiz 2014-01-25 13:56:48 -05:00
parent f26d5d6a94
commit 410a19b632
14 changed files with 544 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
db/ddlutils/oracle/views/AD_TAB_V.sql
View File

@ -6,7 +6,7 @@ CREATE OR REPLACE VIEW AD_TAB_V
AD_IMAGE_ID, TABLEVEL, WHERECLAUSE, ORDERBYCLAUSE, COMMITWARNING, AD_IMAGE_ID, TABLEVEL, WHERECLAUSE, ORDERBYCLAUSE, COMMITWARNING,
READONLYLOGIC, DISPLAYLOGIC, AD_COLUMN_ID, AD_PROCESS_ID, ISSORTTAB, READONLYLOGIC, DISPLAYLOGIC, AD_COLUMN_ID, AD_PROCESS_ID, ISSORTTAB,
ISINSERTRECORD, ISADVANCEDTAB, AD_COLUMNSORTORDER_ID, AD_COLUMNSORTYESNO_ID, ISINSERTRECORD, ISADVANCEDTAB, AD_COLUMNSORTORDER_ID, AD_COLUMNSORTYESNO_ID,
INCLUDED_TAB_ID, PARENT_COLUMN_ID, AD_Tab_UU, AD_Table_UU) INCLUDED_TAB_ID, PARENT_COLUMN_ID, AD_Tab_UU, AD_Table_UU, TREEDISPLAYEDON)
AS AS
SELECT t.AD_Tab_ID, t.AD_Window_ID, t.AD_Table_ID, t.Name, t.Description, SELECT t.AD_Tab_ID, t.AD_Window_ID, t.AD_Table_ID, t.Name, t.Description,
t.Help, t.SeqNo, t.IsSingleRow, t.HasTree, t.IsInfoTab, tbl.ReplicationType, t.Help, t.SeqNo, t.IsSingleRow, t.HasTree, t.IsInfoTab, tbl.ReplicationType,
@ -16,7 +16,7 @@ SELECT t.AD_Tab_ID, t.AD_Window_ID, t.AD_Table_ID, t.Name, t.Description,
t.WhereClause, t.OrderByClause, t.CommitWarning, t.ReadOnlyLogic, t.DisplayLogic, t.WhereClause, t.OrderByClause, t.CommitWarning, t.ReadOnlyLogic, t.DisplayLogic,
t.AD_Column_ID, t.AD_Process_ID, t.IsSortTab, t.IsInsertRecord, t.IsAdvancedTab, t.AD_Column_ID, t.AD_Process_ID, t.IsSortTab, t.IsInsertRecord, t.IsAdvancedTab,
t.AD_ColumnSortOrder_ID, t.AD_ColumnSortYesNo_ID, t.Included_Tab_ID, t.Parent_Column_ID, t.AD_ColumnSortOrder_ID, t.AD_ColumnSortYesNo_ID, t.Included_Tab_ID, t.Parent_Column_ID,
t.AD_Tab_UU, tbl.AD_Table_UU t.AD_Tab_UU, tbl.AD_Table_UU, t.TreeDisplayedOn
FROM AD_Tab t FROM AD_Tab t
INNER JOIN AD_Table tbl ON (t.AD_Table_ID = tbl.AD_Table_ID) INNER JOIN AD_Table tbl ON (t.AD_Table_ID = tbl.AD_Table_ID)
WHERE t.IsActive='Y' WHERE t.IsActive='Y'

4
db/ddlutils/oracle/views/AD_TAB_VT.sql
View File

@ -6,7 +6,7 @@ CREATE OR REPLACE VIEW AD_TAB_VT
ISREADONLY, AD_IMAGE_ID, TABLEVEL, WHERECLAUSE, ORDERBYCLAUSE, ISREADONLY, AD_IMAGE_ID, TABLEVEL, WHERECLAUSE, ORDERBYCLAUSE,
COMMITWARNING, READONLYLOGIC, DISPLAYLOGIC, AD_COLUMN_ID, AD_PROCESS_ID, COMMITWARNING, READONLYLOGIC, DISPLAYLOGIC, AD_COLUMN_ID, AD_PROCESS_ID,
ISSORTTAB, ISINSERTRECORD, ISADVANCEDTAB, AD_COLUMNSORTORDER_ID, AD_COLUMNSORTYESNO_ID, ISSORTTAB, ISINSERTRECORD, ISADVANCEDTAB, AD_COLUMNSORTORDER_ID, AD_COLUMNSORTYESNO_ID,
INCLUDED_TAB_ID, PARENT_COLUMN_ID, AD_Tab_UU, AD_Table_UU) INCLUDED_TAB_ID, PARENT_COLUMN_ID, AD_Tab_UU, AD_Table_UU, TREEDISPLAYEDON)
AS AS
SELECT trl.AD_Language, t.AD_Tab_ID, t.AD_Window_ID, t.AD_Table_ID, trl.Name, trl.Description, SELECT trl.AD_Language, t.AD_Tab_ID, t.AD_Window_ID, t.AD_Table_ID, trl.Name, trl.Description,
trl.Help, t.SeqNo, t.IsSingleRow, t.HasTree, t.IsInfoTab, tbl.ReplicationType, trl.Help, t.SeqNo, t.IsSingleRow, t.HasTree, t.IsInfoTab, tbl.ReplicationType,
@ -16,7 +16,7 @@ SELECT trl.AD_Language, t.AD_Tab_ID, t.AD_Window_ID, t.AD_Table_ID, trl.Name, tr
t.WhereClause, t.OrderByClause, trl.CommitWarning, t.ReadOnlyLogic, t.DisplayLogic, t.WhereClause, t.OrderByClause, trl.CommitWarning, t.ReadOnlyLogic, t.DisplayLogic,
t.AD_Column_ID, t.AD_Process_ID, t.IsSortTab, t.IsInsertRecord, t.IsAdvancedTab, t.AD_Column_ID, t.AD_Process_ID, t.IsSortTab, t.IsInsertRecord, t.IsAdvancedTab,
t.AD_ColumnSortOrder_ID, t.AD_ColumnSortYesNo_ID, t.Included_Tab_ID, t.Parent_Column_ID, t.AD_ColumnSortOrder_ID, t.AD_ColumnSortYesNo_ID, t.Included_Tab_ID, t.Parent_Column_ID,
t.AD_Tab_UU, tbl.AD_Table_UU t.AD_Tab_UU, tbl.AD_Table_UU, t.TreeDisplayedOn
FROM AD_Tab t FROM AD_Tab t
INNER JOIN AD_Table tbl ON (t.AD_Table_ID = tbl.AD_Table_ID) INNER JOIN AD_Table tbl ON (t.AD_Table_ID = tbl.AD_Table_ID)
INNER JOIN AD_Tab_Trl trl ON (t.AD_Tab_ID = trl.AD_Tab_ID) INNER JOIN AD_Tab_Trl trl ON (t.AD_Tab_ID = trl.AD_Tab_ID)

4
db/ddlutils/postgresql/views/AD_TAB_V.sql
View File

@ -6,7 +6,7 @@ CREATE OR REPLACE VIEW AD_TAB_V
AD_IMAGE_ID, TABLEVEL, WHERECLAUSE, ORDERBYCLAUSE, COMMITWARNING, AD_IMAGE_ID, TABLEVEL, WHERECLAUSE, ORDERBYCLAUSE, COMMITWARNING,
READONLYLOGIC, DISPLAYLOGIC, AD_COLUMN_ID, AD_PROCESS_ID, ISSORTTAB, READONLYLOGIC, DISPLAYLOGIC, AD_COLUMN_ID, AD_PROCESS_ID, ISSORTTAB,
ISINSERTRECORD, ISADVANCEDTAB, AD_COLUMNSORTORDER_ID, AD_COLUMNSORTYESNO_ID, ISINSERTRECORD, ISADVANCEDTAB, AD_COLUMNSORTORDER_ID, AD_COLUMNSORTYESNO_ID,
INCLUDED_TAB_ID, PARENT_COLUMN_ID, AD_Tab_UU, AD_Table_UU) INCLUDED_TAB_ID, PARENT_COLUMN_ID, AD_Tab_UU, AD_Table_UU, TREEDISPLAYEDON)
AS AS
SELECT t.AD_Tab_ID, t.AD_Window_ID, t.AD_Table_ID, t.Name, t.Description, SELECT t.AD_Tab_ID, t.AD_Window_ID, t.AD_Table_ID, t.Name, t.Description,
t.Help, t.SeqNo, t.IsSingleRow, t.HasTree, t.IsInfoTab, tbl.ReplicationType, t.Help, t.SeqNo, t.IsSingleRow, t.HasTree, t.IsInfoTab, tbl.ReplicationType,
@ -16,7 +16,7 @@ SELECT t.AD_Tab_ID, t.AD_Window_ID, t.AD_Table_ID, t.Name, t.Description,
t.WhereClause, t.OrderByClause, t.CommitWarning, t.ReadOnlyLogic, t.DisplayLogic, t.WhereClause, t.OrderByClause, t.CommitWarning, t.ReadOnlyLogic, t.DisplayLogic,
t.AD_Column_ID, t.AD_Process_ID, t.IsSortTab, t.IsInsertRecord, t.IsAdvancedTab, t.AD_Column_ID, t.AD_Process_ID, t.IsSortTab, t.IsInsertRecord, t.IsAdvancedTab,
t.AD_ColumnSortOrder_ID, t.AD_ColumnSortYesNo_ID, t.Included_Tab_ID, t.Parent_Column_ID, t.AD_ColumnSortOrder_ID, t.AD_ColumnSortYesNo_ID, t.Included_Tab_ID, t.Parent_Column_ID,
t.AD_Tab_UU, tbl.AD_Table_UU t.AD_Tab_UU, tbl.AD_Table_UU, t.TreeDisplayedOn
FROM AD_Tab t FROM AD_Tab t
INNER JOIN AD_Table tbl ON (t.AD_Table_ID = tbl.AD_Table_ID) INNER JOIN AD_Table tbl ON (t.AD_Table_ID = tbl.AD_Table_ID)
WHERE t.IsActive='Y' WHERE t.IsActive='Y'

4
db/ddlutils/postgresql/views/AD_TAB_VT.sql
View File

@ -6,7 +6,7 @@ CREATE OR REPLACE VIEW AD_TAB_VT
ISREADONLY, AD_IMAGE_ID, TABLEVEL, WHERECLAUSE, ORDERBYCLAUSE, ISREADONLY, AD_IMAGE_ID, TABLEVEL, WHERECLAUSE, ORDERBYCLAUSE,
COMMITWARNING, READONLYLOGIC, DISPLAYLOGIC, AD_COLUMN_ID, AD_PROCESS_ID, COMMITWARNING, READONLYLOGIC, DISPLAYLOGIC, AD_COLUMN_ID, AD_PROCESS_ID,
ISSORTTAB, ISINSERTRECORD, ISADVANCEDTAB, AD_COLUMNSORTORDER_ID, AD_COLUMNSORTYESNO_ID, ISSORTTAB, ISINSERTRECORD, ISADVANCEDTAB, AD_COLUMNSORTORDER_ID, AD_COLUMNSORTYESNO_ID,
INCLUDED_TAB_ID, PARENT_COLUMN_ID, AD_Tab_UU, AD_Table_UU) INCLUDED_TAB_ID, PARENT_COLUMN_ID, AD_Tab_UU, AD_Table_UU, TREEDISPLAYEDON)
AS AS
SELECT trl.AD_Language, t.AD_Tab_ID, t.AD_Window_ID, t.AD_Table_ID, trl.Name, trl.Description, SELECT trl.AD_Language, t.AD_Tab_ID, t.AD_Window_ID, t.AD_Table_ID, trl.Name, trl.Description,
trl.Help, t.SeqNo, t.IsSingleRow, t.HasTree, t.IsInfoTab, tbl.ReplicationType, trl.Help, t.SeqNo, t.IsSingleRow, t.HasTree, t.IsInfoTab, tbl.ReplicationType,
@ -16,7 +16,7 @@ SELECT trl.AD_Language, t.AD_Tab_ID, t.AD_Window_ID, t.AD_Table_ID, trl.Name, tr
t.WhereClause, t.OrderByClause, trl.CommitWarning, t.ReadOnlyLogic, t.DisplayLogic, t.WhereClause, t.OrderByClause, trl.CommitWarning, t.ReadOnlyLogic, t.DisplayLogic,
t.AD_Column_ID, t.AD_Process_ID, t.IsSortTab, t.IsInsertRecord, t.IsAdvancedTab, t.AD_Column_ID, t.AD_Process_ID, t.IsSortTab, t.IsInsertRecord, t.IsAdvancedTab,
t.AD_ColumnSortOrder_ID, t.AD_ColumnSortYesNo_ID, t.Included_Tab_ID, t.Parent_Column_ID, t.AD_ColumnSortOrder_ID, t.AD_ColumnSortYesNo_ID, t.Included_Tab_ID, t.Parent_Column_ID,
t.AD_Tab_UU, tbl.AD_Table_UU t.AD_Tab_UU, tbl.AD_Table_UU, t.TreeDisplayedOn
FROM AD_Tab t FROM AD_Tab t
INNER JOIN AD_Table tbl ON (t.AD_Table_ID = tbl.AD_Table_ID) INNER JOIN AD_Table tbl ON (t.AD_Table_ID = tbl.AD_Table_ID)
INNER JOIN AD_Tab_Trl trl ON (t.AD_Tab_ID = trl.AD_Tab_ID) INNER JOIN AD_Tab_Trl trl ON (t.AD_Tab_ID = trl.AD_Tab_ID)

219
migration/i2.0z/oracle/201401251332_IDEMPIERE-1353.sql Normal file
View File

@ -0,0 +1,219 @@
SET SQLBLANKLINES ON
SET DEFINE OFF
-- Sep 11, 2013 7:42:21 PM CEST
-- IDEMPIERE-1353 Choose to display trees on master, detail or both tabs
INSERT INTO AD_Element (AD_Client_ID,AD_Element_ID,AD_Element_UU,AD_Org_ID,ColumnName,Created,CreatedBy,Description,EntityType,IsActive,Name,PrintName,Updated,UpdatedBy) VALUES (0,202610,'eaf54818-43d8-4c85-a7cd-24892ad5740e',0,'TreeDisplayedOn',TO_DATE('2013-09-11 19:42:20','YYYY-MM-DD HH24:MI:SS'),100,'The tree can be displayed on master tab, detail tab or both','D','Y','Tree displayed','Tree displayed',TO_DATE('2013-09-11 19:42:20','YYYY-MM-DD HH24:MI:SS'),100)
;
-- Sep 11, 2013 7:43:03 PM CEST
-- IDEMPIERE-1353 Choose to display trees on master, detail or both tabs
INSERT INTO AD_Reference (AD_Client_ID,AD_Org_ID,AD_Reference_ID,AD_Reference_UU,Created,CreatedBy,EntityType,IsActive,IsOrderByValue,Name,Updated,UpdatedBy,ValidationType) VALUES (0,0,200074,'859b6bbe-8381-44d4-b3f6-374c17be1b53',TO_DATE('2013-09-11 19:43:02','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','N','TreeDisplayedOn',TO_DATE('2013-09-11 19:43:02','YYYY-MM-DD HH24:MI:SS'),100,'L')
;
-- Sep 11, 2013 7:43:14 PM CEST
-- IDEMPIERE-1353 Choose to display trees on master, detail or both tabs
INSERT INTO AD_Ref_List (AD_Client_ID,AD_Org_ID,AD_Ref_List_ID,AD_Ref_List_UU,AD_Reference_ID,Created,CreatedBy,EntityType,IsActive,Name,Updated,UpdatedBy,Value) VALUES (0,0,200158,'4b99f0aa-846d-459e-a361-8df1018ea08b',200074,TO_DATE('2013-09-11 19:43:13','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','Both',TO_DATE('2013-09-11 19:43:13','YYYY-MM-DD HH24:MI:SS'),100,'B')
;
-- Sep 11, 2013 7:43:22 PM CEST
-- IDEMPIERE-1353 Choose to display trees on master, detail or both tabs
INSERT INTO AD_Ref_List (AD_Client_ID,AD_Org_ID,AD_Ref_List_ID,AD_Ref_List_UU,AD_Reference_ID,Created,CreatedBy,EntityType,IsActive,Name,Updated,UpdatedBy,Value) VALUES (0,0,200159,'0a125aed-6b96-41c2-86c7-6b196830dbcc',200074,TO_DATE('2013-09-11 19:43:21','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','Detail Tab',TO_DATE('2013-09-11 19:43:21','YYYY-MM-DD HH24:MI:SS'),100,'D')
;
-- Sep 11, 2013 7:43:29 PM CEST
-- IDEMPIERE-1353 Choose to display trees on master, detail or both tabs
INSERT INTO AD_Ref_List (AD_Client_ID,AD_Org_ID,AD_Ref_List_ID,AD_Ref_List_UU,AD_Reference_ID,Created,CreatedBy,EntityType,IsActive,Name,Updated,UpdatedBy,Value) VALUES (0,0,200160,'8b216882-c0c4-47c1-a2a8-d75721082def',200074,TO_DATE('2013-09-11 19:43:28','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','Master Tab',TO_DATE('2013-09-11 19:43:28','YYYY-MM-DD HH24:MI:SS'),100,'M')
;
-- Sep 11, 2013 7:43:49 PM CEST
-- IDEMPIERE-1353 Choose to display trees on master, detail or both tabs
INSERT INTO AD_Column (AD_Client_ID,AD_Column_ID,AD_Column_UU,AD_Element_ID,AD_Org_ID,AD_Reference_ID,AD_Reference_Value_ID,AD_Table_ID,ColumnName,Created,CreatedBy,DefaultValue,Description,EntityType,FieldLength,IsActive,IsAllowCopy,IsAllowLogging,IsAlwaysUpdateable,IsAutocomplete,IsEncrypted,IsIdentifier,IsKey,IsMandatory,IsParent,IsSecure,IsSelectionColumn,IsSyncDatabase,IsToolbarButton,IsTranslated,IsUpdateable,Name,SeqNo,SeqNoSelection,Updated,UpdatedBy,Version) VALUES (0,210869,'6ee372e3-8199-4d45-b500-1f4f872bc6dd',202610,0,17,200074,106,'TreeDisplayedOn',TO_DATE('2013-09-11 19:43:49','YYYY-MM-DD HH24:MI:SS'),100,'B','The tree can be displayed on master tab, detail tab or both','D',1,'Y','Y','Y','N','N','N','N','N','Y','N','N','N','N','N','N','Y','Tree displayed',0,0,TO_DATE('2013-09-11 19:43:49','YYYY-MM-DD HH24:MI:SS'),100,0)
;
-- Sep 11, 2013 7:43:53 PM CEST
-- IDEMPIERE-1353 Choose to display trees on master, detail or both tabs
ALTER TABLE AD_Tab ADD TreeDisplayedOn CHAR(1) DEFAULT 'B' NOT NULL
;
-- Sep 11, 2013 7:45:06 PM CEST
-- IDEMPIERE-1353 Choose to display trees on master, detail or both tabs
INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Field_UU,AD_Org_ID,AD_Tab_ID,ColumnSpan,Created,CreatedBy,DisplayLength,EntityType,IsActive,IsCentrallyMaintained,IsDisplayed,IsDisplayedGrid,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,SeqNo,Updated,UpdatedBy) VALUES (0,60551,202514,'b2bf9bc2-5018-434f-bdab-c036ba3a19c3',0,105,2,TO_DATE('2013-09-11 19:45:06','YYYY-MM-DD HH24:MI:SS'),100,36,'D','Y','Y','N','N','N','N','N','N','N','AD_Window_UU',170,TO_DATE('2013-09-11 19:45:06','YYYY-MM-DD HH24:MI:SS'),100)
;
-- Sep 11, 2013 7:45:18 PM CEST
-- IDEMPIERE-1353 Choose to display trees on master, detail or both tabs
INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Field_UU,AD_Org_ID,AD_Tab_ID,ColumnSpan,Created,CreatedBy,Description,DisplayLength,EntityType,IsActive,IsCentrallyMaintained,IsDisplayed,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,SeqNo,Updated,UpdatedBy) VALUES (0,210869,202515,'f1b8cfef-debb-44af-aa67-4854b94e69dc',0,106,2,TO_DATE('2013-09-11 19:45:18','YYYY-MM-DD HH24:MI:SS'),100,'The tree can be displayed on master tab, detail tab or both',1,'D','Y','Y','Y','N','N','N','N','N','Tree displayed',340,TO_DATE('2013-09-11 19:45:18','YYYY-MM-DD HH24:MI:SS'),100)
;
-- Sep 11, 2013 7:46:09 PM CEST
-- IDEMPIERE-1353 Choose to display trees on master, detail or both tabs
UPDATE AD_Field SET DisplayLogic='@HasTree@=Y',Updated=TO_DATE('2013-09-11 19:46:09','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202515
;
-- Sep 11, 2013 7:46:16 PM CEST
-- IDEMPIERE-1353 Choose to display trees on master, detail or both tabs
UPDATE AD_Field SET SeqNo=320,IsDisplayed='Y' WHERE AD_Field_ID=202515
;
-- Sep 11, 2013 7:46:16 PM CEST
-- IDEMPIERE-1353 Choose to display trees on master, detail or both tabs
UPDATE AD_Field SET SeqNo=330,IsDisplayed='Y' WHERE AD_Field_ID=5131
;
-- Sep 11, 2013 7:46:16 PM CEST
-- IDEMPIERE-1353 Choose to display trees on master, detail or both tabs
UPDATE AD_Field SET SeqNo=340,IsDisplayed='Y' WHERE AD_Field_ID=3205
;
-- Sep 11, 2013 7:46:23 PM CEST
-- IDEMPIERE-1353 Choose to display trees on master, detail or both tabs
UPDATE AD_Field SET SeqNoGrid=300,IsDisplayedGrid='Y' WHERE AD_Field_ID=202515
;
-- Sep 11, 2013 7:46:23 PM CEST
-- IDEMPIERE-1353 Choose to display trees on master, detail or both tabs
UPDATE AD_Field SET SeqNoGrid=310,IsDisplayedGrid='Y' WHERE AD_Field_ID=5131
;
-- Sep 11, 2013 7:46:23 PM CEST
-- IDEMPIERE-1353 Choose to display trees on master, detail or both tabs
UPDATE AD_Field SET SeqNoGrid=320,IsDisplayedGrid='Y' WHERE AD_Field_ID=3205
;
CREATE OR REPLACE VIEW AD_TAB_V
(AD_TAB_ID, AD_WINDOW_ID, AD_TABLE_ID, NAME, DESCRIPTION,
HELP, SEQNO, ISSINGLEROW, HASTREE, ISINFOTAB,
REPLICATIONTYPE, TABLENAME, ACCESSLEVEL, ISSECURITYENABLED, ISDELETEABLE,
ISHIGHVOLUME, ISVIEW, HASASSOCIATION, ISTRANSLATIONTAB, ISREADONLY,
AD_IMAGE_ID, TABLEVEL, WHERECLAUSE, ORDERBYCLAUSE, COMMITWARNING,
READONLYLOGIC, DISPLAYLOGIC, AD_COLUMN_ID, AD_PROCESS_ID, ISSORTTAB,
ISINSERTRECORD, ISADVANCEDTAB, AD_COLUMNSORTORDER_ID, AD_COLUMNSORTYESNO_ID,
INCLUDED_TAB_ID, PARENT_COLUMN_ID, AD_Tab_UU, AD_Table_UU, TREEDISPLAYEDON)
AS
SELECT t.AD_Tab_ID, t.AD_Window_ID, t.AD_Table_ID, t.Name, t.Description,
t.Help, t.SeqNo, t.IsSingleRow, t.HasTree, t.IsInfoTab, tbl.ReplicationType,
tbl.TableName, tbl.AccessLevel, tbl.IsSecurityEnabled, tbl.IsDeleteable,
tbl.IsHighVolume, tbl.IsView, cast('N' as char) AS HasAssociation, -- compatibility
t.IsTranslationTab, t.IsReadOnly, t.AD_Image_ID, t.TabLevel,
t.WhereClause, t.OrderByClause, t.CommitWarning, t.ReadOnlyLogic, t.DisplayLogic,
t.AD_Column_ID, t.AD_Process_ID, t.IsSortTab, t.IsInsertRecord, t.IsAdvancedTab,
t.AD_ColumnSortOrder_ID, t.AD_ColumnSortYesNo_ID, t.Included_Tab_ID, t.Parent_Column_ID,
t.AD_Tab_UU, tbl.AD_Table_UU, t.TreeDisplayedOn
FROM AD_Tab t
INNER JOIN AD_Table tbl ON (t.AD_Table_ID = tbl.AD_Table_ID)
WHERE t.IsActive='Y'
AND tbl.IsActive='Y';
CREATE OR REPLACE VIEW AD_TAB_VT
(AD_LANGUAGE, AD_TAB_ID, AD_WINDOW_ID, AD_TABLE_ID, NAME,
DESCRIPTION, HELP, SEQNO, ISSINGLEROW, HASTREE,
ISINFOTAB, REPLICATIONTYPE, TABLENAME, ACCESSLEVEL, ISSECURITYENABLED,
ISDELETEABLE, ISHIGHVOLUME, ISVIEW, HASASSOCIATION, ISTRANSLATIONTAB,
ISREADONLY, AD_IMAGE_ID, TABLEVEL, WHERECLAUSE, ORDERBYCLAUSE,
COMMITWARNING, READONLYLOGIC, DISPLAYLOGIC, AD_COLUMN_ID, AD_PROCESS_ID,
ISSORTTAB, ISINSERTRECORD, ISADVANCEDTAB, AD_COLUMNSORTORDER_ID, AD_COLUMNSORTYESNO_ID,
INCLUDED_TAB_ID, PARENT_COLUMN_ID, AD_Tab_UU, AD_Table_UU, TREEDISPLAYEDON)
AS
SELECT trl.AD_Language, t.AD_Tab_ID, t.AD_Window_ID, t.AD_Table_ID, trl.Name, trl.Description,
trl.Help, t.SeqNo, t.IsSingleRow, t.HasTree, t.IsInfoTab, tbl.ReplicationType,
tbl.TableName, tbl.AccessLevel, tbl.IsSecurityEnabled, tbl.IsDeleteable,
tbl.IsHighVolume, tbl.IsView, cast('N' as char) AS HasAssociation, -- compatibility
t.IsTranslationTab, t.IsReadOnly, t.AD_Image_ID, t.TabLevel,
t.WhereClause, t.OrderByClause, trl.CommitWarning, t.ReadOnlyLogic, t.DisplayLogic,
t.AD_Column_ID, t.AD_Process_ID, t.IsSortTab, t.IsInsertRecord, t.IsAdvancedTab,
t.AD_ColumnSortOrder_ID, t.AD_ColumnSortYesNo_ID, t.Included_Tab_ID, t.Parent_Column_ID,
t.AD_Tab_UU, tbl.AD_Table_UU, t.TreeDisplayedOn
FROM AD_Tab t
INNER JOIN AD_Table tbl ON (t.AD_Table_ID = tbl.AD_Table_ID)
INNER JOIN AD_Tab_Trl trl ON (t.AD_Tab_ID = trl.AD_Tab_ID)
WHERE t.IsActive='Y'
AND tbl.IsActive='Y';
-- Jan 25, 2014 1:54:55 PM COT
-- IDEMPIERE-1353 Choose to display trees on master, detail or both tabs
UPDATE AD_Field SET SeqNo=70,Updated=TO_DATE('2014-01-25 13:54:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=131
;
-- Jan 25, 2014 1:54:55 PM COT
UPDATE AD_Field SET SeqNo=80,Updated=TO_DATE('2014-01-25 13:54:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5824
;
-- Jan 25, 2014 1:54:55 PM COT
UPDATE AD_Field SET SeqNo=90,Updated=TO_DATE('2014-01-25 13:54:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=123
;
-- Jan 25, 2014 1:54:55 PM COT
UPDATE AD_Field SET SeqNo=100,Updated=TO_DATE('2014-01-25 13:54:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5326
;
-- Jan 25, 2014 1:54:55 PM COT
UPDATE AD_Field SET SeqNo=110, ColumnSpan=1,Updated=TO_DATE('2014-01-25 13:54:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=124
;
-- Jan 25, 2014 1:54:55 PM COT
UPDATE AD_Field SET SeqNo=120, IsDisplayed='Y', XPosition=3, ColumnSpan=1,Updated=TO_DATE('2014-01-25 13:54:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=312
;
-- Jan 25, 2014 1:54:55 PM COT
UPDATE AD_Field SET SeqNo=130, IsDisplayed='Y', XPosition=4,Updated=TO_DATE('2014-01-25 13:54:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202515
;
-- Jan 25, 2014 1:54:55 PM COT
UPDATE AD_Field SET SeqNo=140, IsDisplayed='Y', XPosition=2, ColumnSpan=1,Updated=TO_DATE('2014-01-25 13:54:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11997
;
-- Jan 25, 2014 1:54:55 PM COT
UPDATE AD_Field SET SeqNo=150, IsDisplayed='Y', XPosition=3, ColumnSpan=1,Updated=TO_DATE('2014-01-25 13:54:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=927
;
-- Jan 25, 2014 1:54:55 PM COT
UPDATE AD_Field SET SeqNo=160, IsDisplayed='Y', XPosition=4, ColumnSpan=1,Updated=TO_DATE('2014-01-25 13:54:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5707
;
-- Jan 25, 2014 1:54:55 PM COT
UPDATE AD_Field SET SeqNo=170, ColumnSpan=1,Updated=TO_DATE('2014-01-25 13:54:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=928
;
-- Jan 25, 2014 1:54:55 PM COT
UPDATE AD_Field SET SeqNo=240, ColumnSpan=1,Updated=TO_DATE('2014-01-25 13:54:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=929
;
-- Jan 25, 2014 1:54:56 PM COT
UPDATE AD_Field SET SeqNo=250, IsDisplayed='Y', XPosition=4, ColumnSpan=1,Updated=TO_DATE('2014-01-25 13:54:56','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11998
;
-- Jan 25, 2014 1:54:56 PM COT
UPDATE AD_Field SET SeqNo=260, IsDisplayed='Y', XPosition=6, ColumnSpan=1,Updated=TO_DATE('2014-01-25 13:54:56','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=271
;
-- Jan 25, 2014 1:54:56 PM COT
UPDATE AD_Field SET SeqNo=270,Updated=TO_DATE('2014-01-25 13:54:56','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11266
;
-- Jan 25, 2014 1:54:56 PM COT
UPDATE AD_Field SET SeqNo=280,Updated=TO_DATE('2014-01-25 13:54:56','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=1548
;
-- Jan 25, 2014 1:54:56 PM COT
UPDATE AD_Field SET SeqNo=290,Updated=TO_DATE('2014-01-25 13:54:56','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=1550
;
-- Jan 25, 2014 1:54:56 PM COT
UPDATE AD_Field SET SeqNo=300,Updated=TO_DATE('2014-01-25 13:54:56','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=1549
;
-- Jan 25, 2014 1:54:56 PM COT
UPDATE AD_Field SET SeqNo=310,Updated=TO_DATE('2014-01-25 13:54:56','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4956
;
-- Jan 25, 2014 1:54:56 PM COT
UPDATE AD_Field SET SeqNo=320, IsDisplayed='Y', XPosition=4,Updated=TO_DATE('2014-01-25 13:54:56','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201811
;
SELECT register_migration_script('201401251332_IDEMPIERE-1353.sql') FROM dual
;

216
migration/i2.0z/postgresql/201401251332_IDEMPIERE-1353.sql Normal file
View File

@ -0,0 +1,216 @@
-- Sep 11, 2013 7:42:21 PM CEST
-- IDEMPIERE-1353 Choose to display trees on master, detail or both tabs
INSERT INTO AD_Element (AD_Client_ID,AD_Element_ID,AD_Element_UU,AD_Org_ID,ColumnName,Created,CreatedBy,Description,EntityType,IsActive,Name,PrintName,Updated,UpdatedBy) VALUES (0,202610,'eaf54818-43d8-4c85-a7cd-24892ad5740e',0,'TreeDisplayedOn',TO_TIMESTAMP('2013-09-11 19:42:20','YYYY-MM-DD HH24:MI:SS'),100,'The tree can be displayed on master tab, detail tab or both','D','Y','Tree displayed','Tree displayed',TO_TIMESTAMP('2013-09-11 19:42:20','YYYY-MM-DD HH24:MI:SS'),100)
;
-- Sep 11, 2013 7:43:03 PM CEST
-- IDEMPIERE-1353 Choose to display trees on master, detail or both tabs
INSERT INTO AD_Reference (AD_Client_ID,AD_Org_ID,AD_Reference_ID,AD_Reference_UU,Created,CreatedBy,EntityType,IsActive,IsOrderByValue,Name,Updated,UpdatedBy,ValidationType) VALUES (0,0,200074,'859b6bbe-8381-44d4-b3f6-374c17be1b53',TO_TIMESTAMP('2013-09-11 19:43:02','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','N','TreeDisplayedOn',TO_TIMESTAMP('2013-09-11 19:43:02','YYYY-MM-DD HH24:MI:SS'),100,'L')
;
-- Sep 11, 2013 7:43:14 PM CEST
-- IDEMPIERE-1353 Choose to display trees on master, detail or both tabs
INSERT INTO AD_Ref_List (AD_Client_ID,AD_Org_ID,AD_Ref_List_ID,AD_Ref_List_UU,AD_Reference_ID,Created,CreatedBy,EntityType,IsActive,Name,Updated,UpdatedBy,Value) VALUES (0,0,200158,'4b99f0aa-846d-459e-a361-8df1018ea08b',200074,TO_TIMESTAMP('2013-09-11 19:43:13','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','Both',TO_TIMESTAMP('2013-09-11 19:43:13','YYYY-MM-DD HH24:MI:SS'),100,'B')
;
-- Sep 11, 2013 7:43:22 PM CEST
-- IDEMPIERE-1353 Choose to display trees on master, detail or both tabs
INSERT INTO AD_Ref_List (AD_Client_ID,AD_Org_ID,AD_Ref_List_ID,AD_Ref_List_UU,AD_Reference_ID,Created,CreatedBy,EntityType,IsActive,Name,Updated,UpdatedBy,Value) VALUES (0,0,200159,'0a125aed-6b96-41c2-86c7-6b196830dbcc',200074,TO_TIMESTAMP('2013-09-11 19:43:21','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','Detail Tab',TO_TIMESTAMP('2013-09-11 19:43:21','YYYY-MM-DD HH24:MI:SS'),100,'D')
;
-- Sep 11, 2013 7:43:29 PM CEST
-- IDEMPIERE-1353 Choose to display trees on master, detail or both tabs
INSERT INTO AD_Ref_List (AD_Client_ID,AD_Org_ID,AD_Ref_List_ID,AD_Ref_List_UU,AD_Reference_ID,Created,CreatedBy,EntityType,IsActive,Name,Updated,UpdatedBy,Value) VALUES (0,0,200160,'8b216882-c0c4-47c1-a2a8-d75721082def',200074,TO_TIMESTAMP('2013-09-11 19:43:28','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','Master Tab',TO_TIMESTAMP('2013-09-11 19:43:28','YYYY-MM-DD HH24:MI:SS'),100,'M')
;
-- Sep 11, 2013 7:43:49 PM CEST
-- IDEMPIERE-1353 Choose to display trees on master, detail or both tabs
INSERT INTO AD_Column (AD_Client_ID,AD_Column_ID,AD_Column_UU,AD_Element_ID,AD_Org_ID,AD_Reference_ID,AD_Reference_Value_ID,AD_Table_ID,ColumnName,Created,CreatedBy,DefaultValue,Description,EntityType,FieldLength,IsActive,IsAllowCopy,IsAllowLogging,IsAlwaysUpdateable,IsAutocomplete,IsEncrypted,IsIdentifier,IsKey,IsMandatory,IsParent,IsSecure,IsSelectionColumn,IsSyncDatabase,IsToolbarButton,IsTranslated,IsUpdateable,Name,SeqNo,SeqNoSelection,Updated,UpdatedBy,Version) VALUES (0,210869,'6ee372e3-8199-4d45-b500-1f4f872bc6dd',202610,0,17,200074,106,'TreeDisplayedOn',TO_TIMESTAMP('2013-09-11 19:43:49','YYYY-MM-DD HH24:MI:SS'),100,'B','The tree can be displayed on master tab, detail tab or both','D',1,'Y','Y','Y','N','N','N','N','N','Y','N','N','N','N','N','N','Y','Tree displayed',0,0,TO_TIMESTAMP('2013-09-11 19:43:49','YYYY-MM-DD HH24:MI:SS'),100,0)
;
-- Sep 11, 2013 7:43:53 PM CEST
-- IDEMPIERE-1353 Choose to display trees on master, detail or both tabs
ALTER TABLE AD_Tab ADD COLUMN TreeDisplayedOn CHAR(1) DEFAULT 'B' NOT NULL
;
-- Sep 11, 2013 7:45:06 PM CEST
-- IDEMPIERE-1353 Choose to display trees on master, detail or both tabs
INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Field_UU,AD_Org_ID,AD_Tab_ID,ColumnSpan,Created,CreatedBy,DisplayLength,EntityType,IsActive,IsCentrallyMaintained,IsDisplayed,IsDisplayedGrid,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,SeqNo,Updated,UpdatedBy) VALUES (0,60551,202514,'b2bf9bc2-5018-434f-bdab-c036ba3a19c3',0,105,2,TO_TIMESTAMP('2013-09-11 19:45:06','YYYY-MM-DD HH24:MI:SS'),100,36,'D','Y','Y','N','N','N','N','N','N','N','AD_Window_UU',170,TO_TIMESTAMP('2013-09-11 19:45:06','YYYY-MM-DD HH24:MI:SS'),100)
;
-- Sep 11, 2013 7:45:18 PM CEST
-- IDEMPIERE-1353 Choose to display trees on master, detail or both tabs
INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Field_UU,AD_Org_ID,AD_Tab_ID,ColumnSpan,Created,CreatedBy,Description,DisplayLength,EntityType,IsActive,IsCentrallyMaintained,IsDisplayed,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,SeqNo,Updated,UpdatedBy) VALUES (0,210869,202515,'f1b8cfef-debb-44af-aa67-4854b94e69dc',0,106,2,TO_TIMESTAMP('2013-09-11 19:45:18','YYYY-MM-DD HH24:MI:SS'),100,'The tree can be displayed on master tab, detail tab or both',1,'D','Y','Y','Y','N','N','N','N','N','Tree displayed',340,TO_TIMESTAMP('2013-09-11 19:45:18','YYYY-MM-DD HH24:MI:SS'),100)
;
-- Sep 11, 2013 7:46:09 PM CEST
-- IDEMPIERE-1353 Choose to display trees on master, detail or both tabs
UPDATE AD_Field SET DisplayLogic='@HasTree@=Y',Updated=TO_TIMESTAMP('2013-09-11 19:46:09','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202515
;
-- Sep 11, 2013 7:46:16 PM CEST
-- IDEMPIERE-1353 Choose to display trees on master, detail or both tabs
UPDATE AD_Field SET SeqNo=320,IsDisplayed='Y' WHERE AD_Field_ID=202515
;
-- Sep 11, 2013 7:46:16 PM CEST
-- IDEMPIERE-1353 Choose to display trees on master, detail or both tabs
UPDATE AD_Field SET SeqNo=330,IsDisplayed='Y' WHERE AD_Field_ID=5131
;
-- Sep 11, 2013 7:46:16 PM CEST
-- IDEMPIERE-1353 Choose to display trees on master, detail or both tabs
UPDATE AD_Field SET SeqNo=340,IsDisplayed='Y' WHERE AD_Field_ID=3205
;
-- Sep 11, 2013 7:46:23 PM CEST
-- IDEMPIERE-1353 Choose to display trees on master, detail or both tabs
UPDATE AD_Field SET SeqNoGrid=300,IsDisplayedGrid='Y' WHERE AD_Field_ID=202515
;
-- Sep 11, 2013 7:46:23 PM CEST
-- IDEMPIERE-1353 Choose to display trees on master, detail or both tabs
UPDATE AD_Field SET SeqNoGrid=310,IsDisplayedGrid='Y' WHERE AD_Field_ID=5131
;
-- Sep 11, 2013 7:46:23 PM CEST
-- IDEMPIERE-1353 Choose to display trees on master, detail or both tabs
UPDATE AD_Field SET SeqNoGrid=320,IsDisplayedGrid='Y' WHERE AD_Field_ID=3205
;
CREATE OR REPLACE VIEW AD_TAB_V
(AD_TAB_ID, AD_WINDOW_ID, AD_TABLE_ID, NAME, DESCRIPTION,
HELP, SEQNO, ISSINGLEROW, HASTREE, ISINFOTAB,
REPLICATIONTYPE, TABLENAME, ACCESSLEVEL, ISSECURITYENABLED, ISDELETEABLE,
ISHIGHVOLUME, ISVIEW, HASASSOCIATION, ISTRANSLATIONTAB, ISREADONLY,
AD_IMAGE_ID, TABLEVEL, WHERECLAUSE, ORDERBYCLAUSE, COMMITWARNING,
READONLYLOGIC, DISPLAYLOGIC, AD_COLUMN_ID, AD_PROCESS_ID, ISSORTTAB,
ISINSERTRECORD, ISADVANCEDTAB, AD_COLUMNSORTORDER_ID, AD_COLUMNSORTYESNO_ID,
INCLUDED_TAB_ID, PARENT_COLUMN_ID, AD_Tab_UU, AD_Table_UU, TREEDISPLAYEDON)
AS
SELECT t.AD_Tab_ID, t.AD_Window_ID, t.AD_Table_ID, t.Name, t.Description,
t.Help, t.SeqNo, t.IsSingleRow, t.HasTree, t.IsInfoTab, tbl.ReplicationType,
tbl.TableName, tbl.AccessLevel, tbl.IsSecurityEnabled, tbl.IsDeleteable,
tbl.IsHighVolume, tbl.IsView, cast('N' as char) AS HasAssociation, -- compatibility
t.IsTranslationTab, t.IsReadOnly, t.AD_Image_ID, t.TabLevel,
t.WhereClause, t.OrderByClause, t.CommitWarning, t.ReadOnlyLogic, t.DisplayLogic,
t.AD_Column_ID, t.AD_Process_ID, t.IsSortTab, t.IsInsertRecord, t.IsAdvancedTab,
t.AD_ColumnSortOrder_ID, t.AD_ColumnSortYesNo_ID, t.Included_Tab_ID, t.Parent_Column_ID,
t.AD_Tab_UU, tbl.AD_Table_UU, t.TreeDisplayedOn
FROM AD_Tab t
INNER JOIN AD_Table tbl ON (t.AD_Table_ID = tbl.AD_Table_ID)
WHERE t.IsActive='Y'
AND tbl.IsActive='Y';
CREATE OR REPLACE VIEW AD_TAB_VT
(AD_LANGUAGE, AD_TAB_ID, AD_WINDOW_ID, AD_TABLE_ID, NAME,
DESCRIPTION, HELP, SEQNO, ISSINGLEROW, HASTREE,
ISINFOTAB, REPLICATIONTYPE, TABLENAME, ACCESSLEVEL, ISSECURITYENABLED,
ISDELETEABLE, ISHIGHVOLUME, ISVIEW, HASASSOCIATION, ISTRANSLATIONTAB,
ISREADONLY, AD_IMAGE_ID, TABLEVEL, WHERECLAUSE, ORDERBYCLAUSE,
COMMITWARNING, READONLYLOGIC, DISPLAYLOGIC, AD_COLUMN_ID, AD_PROCESS_ID,
ISSORTTAB, ISINSERTRECORD, ISADVANCEDTAB, AD_COLUMNSORTORDER_ID, AD_COLUMNSORTYESNO_ID,
INCLUDED_TAB_ID, PARENT_COLUMN_ID, AD_Tab_UU, AD_Table_UU, TREEDISPLAYEDON)
AS
SELECT trl.AD_Language, t.AD_Tab_ID, t.AD_Window_ID, t.AD_Table_ID, trl.Name, trl.Description,
trl.Help, t.SeqNo, t.IsSingleRow, t.HasTree, t.IsInfoTab, tbl.ReplicationType,
tbl.TableName, tbl.AccessLevel, tbl.IsSecurityEnabled, tbl.IsDeleteable,
tbl.IsHighVolume, tbl.IsView, cast('N' as char) AS HasAssociation, -- compatibility
t.IsTranslationTab, t.IsReadOnly, t.AD_Image_ID, t.TabLevel,
t.WhereClause, t.OrderByClause, trl.CommitWarning, t.ReadOnlyLogic, t.DisplayLogic,
t.AD_Column_ID, t.AD_Process_ID, t.IsSortTab, t.IsInsertRecord, t.IsAdvancedTab,
t.AD_ColumnSortOrder_ID, t.AD_ColumnSortYesNo_ID, t.Included_Tab_ID, t.Parent_Column_ID,
t.AD_Tab_UU, tbl.AD_Table_UU, t.TreeDisplayedOn
FROM AD_Tab t
INNER JOIN AD_Table tbl ON (t.AD_Table_ID = tbl.AD_Table_ID)
INNER JOIN AD_Tab_Trl trl ON (t.AD_Tab_ID = trl.AD_Tab_ID)
WHERE t.IsActive='Y'
AND tbl.IsActive='Y';
-- Jan 25, 2014 1:54:55 PM COT
-- IDEMPIERE-1353 Choose to display trees on master, detail or both tabs
UPDATE AD_Field SET SeqNo=70,Updated=TO_TIMESTAMP('2014-01-25 13:54:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=131
;
-- Jan 25, 2014 1:54:55 PM COT
UPDATE AD_Field SET SeqNo=80,Updated=TO_TIMESTAMP('2014-01-25 13:54:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5824
;
-- Jan 25, 2014 1:54:55 PM COT
UPDATE AD_Field SET SeqNo=90,Updated=TO_TIMESTAMP('2014-01-25 13:54:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=123
;
-- Jan 25, 2014 1:54:55 PM COT
UPDATE AD_Field SET SeqNo=100,Updated=TO_TIMESTAMP('2014-01-25 13:54:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5326
;
-- Jan 25, 2014 1:54:55 PM COT
UPDATE AD_Field SET SeqNo=110, ColumnSpan=1,Updated=TO_TIMESTAMP('2014-01-25 13:54:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=124
;
-- Jan 25, 2014 1:54:55 PM COT
UPDATE AD_Field SET SeqNo=120, IsDisplayed='Y', XPosition=3, ColumnSpan=1,Updated=TO_TIMESTAMP('2014-01-25 13:54:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=312
;
-- Jan 25, 2014 1:54:55 PM COT
UPDATE AD_Field SET SeqNo=130, IsDisplayed='Y', XPosition=4,Updated=TO_TIMESTAMP('2014-01-25 13:54:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202515
;
-- Jan 25, 2014 1:54:55 PM COT
UPDATE AD_Field SET SeqNo=140, IsDisplayed='Y', XPosition=2, ColumnSpan=1,Updated=TO_TIMESTAMP('2014-01-25 13:54:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11997
;
-- Jan 25, 2014 1:54:55 PM COT
UPDATE AD_Field SET SeqNo=150, IsDisplayed='Y', XPosition=3, ColumnSpan=1,Updated=TO_TIMESTAMP('2014-01-25 13:54:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=927
;
-- Jan 25, 2014 1:54:55 PM COT
UPDATE AD_Field SET SeqNo=160, IsDisplayed='Y', XPosition=4, ColumnSpan=1,Updated=TO_TIMESTAMP('2014-01-25 13:54:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5707
;
-- Jan 25, 2014 1:54:55 PM COT
UPDATE AD_Field SET SeqNo=170, ColumnSpan=1,Updated=TO_TIMESTAMP('2014-01-25 13:54:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=928
;
-- Jan 25, 2014 1:54:55 PM COT
UPDATE AD_Field SET SeqNo=240, ColumnSpan=1,Updated=TO_TIMESTAMP('2014-01-25 13:54:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=929
;
-- Jan 25, 2014 1:54:56 PM COT
UPDATE AD_Field SET SeqNo=250, IsDisplayed='Y', XPosition=4, ColumnSpan=1,Updated=TO_TIMESTAMP('2014-01-25 13:54:56','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11998
;
-- Jan 25, 2014 1:54:56 PM COT
UPDATE AD_Field SET SeqNo=260, IsDisplayed='Y', XPosition=6, ColumnSpan=1,Updated=TO_TIMESTAMP('2014-01-25 13:54:56','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=271
;
-- Jan 25, 2014 1:54:56 PM COT
UPDATE AD_Field SET SeqNo=270,Updated=TO_TIMESTAMP('2014-01-25 13:54:56','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11266
;
-- Jan 25, 2014 1:54:56 PM COT
UPDATE AD_Field SET SeqNo=280,Updated=TO_TIMESTAMP('2014-01-25 13:54:56','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=1548
;
-- Jan 25, 2014 1:54:56 PM COT
UPDATE AD_Field SET SeqNo=290,Updated=TO_TIMESTAMP('2014-01-25 13:54:56','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=1550
;
-- Jan 25, 2014 1:54:56 PM COT
UPDATE AD_Field SET SeqNo=300,Updated=TO_TIMESTAMP('2014-01-25 13:54:56','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=1549
;
-- Jan 25, 2014 1:54:56 PM COT
UPDATE AD_Field SET SeqNo=310,Updated=TO_TIMESTAMP('2014-01-25 13:54:56','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4956
;
-- Jan 25, 2014 1:54:56 PM COT
UPDATE AD_Field SET SeqNo=320, IsDisplayed='Y', XPosition=4,Updated=TO_TIMESTAMP('2014-01-25 13:54:56','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201811
;
SELECT register_migration_script('201401251332_IDEMPIERE-1353.sql') FROM dual
;

11
org.adempiere.base/src/org/compiere/model/GridTab.java
View File

@ -112,7 +112,7 @@ public class GridTab implements DataStatusListener, Evaluatee, Serializable
/** /**
* *
*/ */
private static final long serialVersionUID = 3747471319239796736L; private static final long serialVersionUID = 1583164211079643636L;
public static final String DEFAULT_STATUS_MESSAGE = "NavigateOrUpdate"; public static final String DEFAULT_STATUS_MESSAGE = "NavigateOrUpdate";
@ -1665,6 +1665,15 @@ public class GridTab implements DataStatusListener, Evaluatee, Serializable
return m_vo.HasTree; return m_vo.HasTree;
} // isTreeTab } // isTreeTab
/**
* Where the tree should be shown
* @return master, detail or both
*/
public String getTreeDisplayedOn()
{
return m_vo.TreeDisplayedOn;
} // getTreeDisplayedOn
/** /**
* Get Tab ID * Get Tab ID
* @return Tab ID * @return Tab ID

7
org.adempiere.base/src/org/compiere/model/GridTabVO.java
View File

@ -41,7 +41,7 @@ public class GridTabVO implements Evaluatee, Serializable
/** /**
* *
*/ */
private static final long serialVersionUID = -5120775523212893253L; private static final long serialVersionUID = -7973388282943436222L;
/************************************************************************** /**************************************************************************
* Create MTab VO * Create MTab VO
@ -204,6 +204,8 @@ public class GridTabVO implements Evaluatee, Serializable
if (rs.getString("HasTree").equals("Y")) if (rs.getString("HasTree").equals("Y"))
vo.HasTree = true; vo.HasTree = true;
vo.TreeDisplayedOn = rs.getString("TreeDisplayedOn");
vo.AD_Table_ID = rs.getInt("AD_Table_ID"); vo.AD_Table_ID = rs.getInt("AD_Table_ID");
vo.TableName = rs.getString("TableName"); vo.TableName = rs.getString("TableName");
if (rs.getString("IsView").equals("Y")) if (rs.getString("IsView").equals("Y"))
@ -432,6 +434,8 @@ public class GridTabVO implements Evaluatee, Serializable
public boolean IsInsertRecord = true; public boolean IsInsertRecord = true;
/** Tree */ /** Tree */
public boolean HasTree = false; public boolean HasTree = false;
/** Tree displayed on */
public String TreeDisplayedOn = "";
/** Table */ /** Table */
public int AD_Table_ID; public int AD_Table_ID;
/** Table UUID */ /** Table UUID */
@ -546,6 +550,7 @@ public class GridTabVO implements Evaluatee, Serializable
clone.IsReadOnly = IsReadOnly; clone.IsReadOnly = IsReadOnly;
clone.IsInsertRecord = IsInsertRecord; clone.IsInsertRecord = IsInsertRecord;
clone.HasTree = HasTree; clone.HasTree = HasTree;
clone.TreeDisplayedOn = TreeDisplayedOn;
clone.AD_Table_ID = AD_Table_ID; clone.AD_Table_ID = AD_Table_ID;
clone.AD_Column_ID = AD_Column_ID; clone.AD_Column_ID = AD_Column_ID;
clone.Parent_Column_ID = Parent_Column_ID; clone.Parent_Column_ID = Parent_Column_ID;

13
org.adempiere.base/src/org/compiere/model/I_AD_Tab.java
View File

@ -519,6 +519,19 @@ public interface I_AD_Tab
*/ */
public int getTabLevel(); public int getTabLevel();
/** Column name TreeDisplayedOn */
public static final String COLUMNNAME_TreeDisplayedOn = "TreeDisplayedOn";
/** Set Tree displayed.
* The tree can be displayed on master tab, detail tab or both
*/
public void setTreeDisplayedOn (String TreeDisplayedOn);
/** Get Tree displayed.
* The tree can be displayed on master tab, detail tab or both
*/
public String getTreeDisplayedOn();
/** Column name Updated */ /** Column name Updated */
public static final String COLUMNNAME_Updated = "Updated"; public static final String COLUMNNAME_Updated = "Updated";

30
org.adempiere.base/src/org/compiere/model/X_AD_Tab.java
View File

@ -30,7 +30,7 @@ public class X_AD_Tab extends PO implements I_AD_Tab, I_Persistent
/** /**
* *
*/ */
private static final long serialVersionUID = 20131031L; private static final long serialVersionUID = 20140125L;
/** Standard Constructor */ /** Standard Constructor */
public X_AD_Tab (Properties ctx, int AD_Tab_ID, String trxName) public X_AD_Tab (Properties ctx, int AD_Tab_ID, String trxName)
@ -57,6 +57,8 @@ public class X_AD_Tab extends PO implements I_AD_Tab, I_Persistent
setSeqNo (0); setSeqNo (0);
// @SQL=SELECT COALESCE(MAX(SeqNo),0)+10 AS DefaultValue FROM AD_Tab WHERE AD_Window_ID=@AD_Window_ID@ // @SQL=SELECT COALESCE(MAX(SeqNo),0)+10 AS DefaultValue FROM AD_Tab WHERE AD_Window_ID=@AD_Window_ID@
setTabLevel (0); setTabLevel (0);
setTreeDisplayedOn (null);
// B
} */ } */
} }
@ -819,6 +821,32 @@ public class X_AD_Tab extends PO implements I_AD_Tab, I_Persistent
return ii.intValue(); return ii.intValue();
} }
/** TreeDisplayedOn AD_Reference_ID=200074 */
public static final int TREEDISPLAYEDON_AD_Reference_ID=200074;
/** Both = B */
public static final String TREEDISPLAYEDON_Both = "B";
/** DetailTab = D */
public static final String TREEDISPLAYEDON_DetailTab = "D";
/** MasterTab = M */
public static final String TREEDISPLAYEDON_MasterTab = "M";
/** Set Tree displayed.
@param TreeDisplayedOn
The tree can be displayed on master tab, detail tab or both
*/
public void setTreeDisplayedOn (String TreeDisplayedOn)
{
set_Value (COLUMNNAME_TreeDisplayedOn, TreeDisplayedOn);
}
/** Get Tree displayed.
@return The tree can be displayed on master tab, detail tab or both
*/
public String getTreeDisplayedOn ()
{
return (String)get_Value(COLUMNNAME_TreeDisplayedOn);
}
/** Set Sql WHERE. /** Set Sql WHERE.
@param WhereClause @param WhereClause
Fully qualified SQL WHERE clause Fully qualified SQL WHERE clause

6
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADSortTab.java
View File

@ -75,7 +75,7 @@ public class ADSortTab extends Panel implements IADTabpanel
/** /**
* *
*/ */
private static final long serialVersionUID = 1775234591903753429L; private static final long serialVersionUID = -4161399343247477912L;
/** /**
* Sort Tab Constructor * Sort Tab Constructor
@ -1015,5 +1015,9 @@ public class ADSortTab extends Panel implements IADTabpanel
noList.setItemRenderer(noModel); noList.setItemRenderer(noModel);
noList.setModel(noModel); noList.setModel(noModel);
} }
public ADTreePanel getTreePanel() {
return null;
}
} //ADSortTab } //ADSortTab

27
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java
View File

@ -62,6 +62,7 @@ import org.compiere.model.GridWindow;
import org.compiere.model.I_AD_Preference; import org.compiere.model.I_AD_Preference;
import org.compiere.model.MLookup; import org.compiere.model.MLookup;
import org.compiere.model.MPreference; import org.compiere.model.MPreference;
import org.compiere.model.MTab;
import org.compiere.model.MTable; import org.compiere.model.MTable;
import org.compiere.model.MToolBarButton; import org.compiere.model.MToolBarButton;
import org.compiere.model.MToolBarButtonRestrict; import org.compiere.model.MToolBarButtonRestrict;
@ -120,11 +121,10 @@ import org.zkoss.zul.impl.XulElement;
public class ADTabpanel extends Div implements Evaluatee, EventListener<Event>, public class ADTabpanel extends Div implements Evaluatee, EventListener<Event>,
DataStatusListener, IADTabpanel, IdSpace, IFieldEditorContainer DataStatusListener, IADTabpanel, IdSpace, IFieldEditorContainer
{ {
/** /**
* generated serial id *
*/ */
private static final long serialVersionUID = -6748431395547118246L; private static final long serialVersionUID = 2592856355985389339L;
private static final String ON_SAVE_OPEN_PREFERENCE_EVENT = "onSaveOpenPreference"; private static final String ON_SAVE_OPEN_PREFERENCE_EVENT = "onSaveOpenPreference";
@ -941,6 +941,22 @@ DataStatusListener, IADTabpanel, IdSpace, IFieldEditorContainer
return gridTab; return gridTab;
} }
/**
* @return TreePanel
*/
public ADTreePanel getTreePanel()
{
return treePanel;
}
/**
* @return TreePanel
*/
public String getTreeDisplayedOn()
{
return gridTab.getTreeDisplayedOn();
}
/** /**
* Refresh current row * Refresh current row
*/ */
@ -1202,6 +1218,11 @@ DataStatusListener, IADTabpanel, IdSpace, IFieldEditorContainer
//sync tree //sync tree
if (treePanel != null) if (treePanel != null)
{ {
if (getTreeDisplayedOn().equals(MTab.TREEDISPLAYEDON_MasterTab))
treePanel.getParent().setVisible(!isDetailPaneMode());
else if (getTreeDisplayedOn().equals(MTab.TREEDISPLAYEDON_DetailTab))
treePanel.getParent().setVisible(isDetailPaneMode());
if ("Deleted".equalsIgnoreCase(e.getAD_Message())) if ("Deleted".equalsIgnoreCase(e.getAD_Message()))
{ {
if (e.Record_ID != null && e.Record_ID instanceof Integer && ((Integer)e.Record_ID != gridTab.getRecord_ID())) if (e.Record_ID != null && e.Record_ID instanceof Integer && ((Integer)e.Record_ID != gridTab.getRecord_ID()))

8
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/CompositeADTabbox.java
View File

@ -32,6 +32,7 @@ import org.compiere.model.DataStatusEvent;
import org.compiere.model.DataStatusListener; import org.compiere.model.DataStatusListener;
import org.compiere.model.GridField; import org.compiere.model.GridField;
import org.compiere.model.GridTab; import org.compiere.model.GridTab;
import org.compiere.model.MTab;
import org.compiere.util.CLogger; import org.compiere.util.CLogger;
import org.compiere.util.Env; import org.compiere.util.Env;
import org.compiere.util.Evaluator; import org.compiere.util.Evaluator;
@ -581,6 +582,13 @@ public class CompositeADTabbox extends AbstractADTabbox
} }
if (selectDetailPanel instanceof ADTabpanel) if (selectDetailPanel instanceof ADTabpanel)
((ADTabpanel)selectDetailPanel).activated = true; ((ADTabpanel)selectDetailPanel).activated = true;
if (selectDetailPanel.getGridTab().isTreeTab()) {
if (selectDetailPanel.getGridTab().getTreeDisplayedOn().equals(MTab.TREEDISPLAYEDON_MasterTab))
selectDetailPanel.getTreePanel().getParent().setVisible(false);
else
selectDetailPanel.getTreePanel().getParent().setVisible(true);
}
} }
} }
} }

6
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/IADTabpanel.java
View File

@ -185,4 +185,10 @@ public interface IADTabpanel extends Component, Evaluatee {
* reset detail data grid when parent tab current record is new and not saved yet * reset detail data grid when parent tab current record is new and not saved yet
*/ */
public abstract void resetDetailForNewParentRecord(); public abstract void resetDetailForNewParentRecord();
/**
* @return treepanel instance
*/
public abstract ADTreePanel getTreePanel();
} }