diff --git a/db/ddlutils/oracle/views/AD_FIELD_V.sql b/db/ddlutils/oracle/views/AD_FIELD_V.sql
index eb55be2a8b..7be05843f5 100644
--- a/db/ddlutils/oracle/views/AD_FIELD_V.sql
+++ b/db/ddlutils/oracle/views/AD_FIELD_V.sql
@@ -19,7 +19,7 @@ CREATE OR REPLACE VIEW AD_FIELD_V AS
c.IsAutocomplete, COALESCE(f.IsAllowCopy, c.IsAllowCopy) AS IsAllowCopy,
f.isdisplayedgrid,
f.seqnogrid,
- c.seqnoselection
+ c.seqnoselection, f.xposition, f.columnspan, f.numlines
FROM AD_FIELD f
INNER JOIN AD_TAB t ON (f.AD_Tab_ID = t.AD_Tab_ID)
LEFT OUTER JOIN AD_FIELDGROUP fg ON (f.AD_FieldGroup_ID = fg.AD_FieldGroup_ID)
diff --git a/db/ddlutils/oracle/views/AD_FIELD_VT.sql b/db/ddlutils/oracle/views/AD_FIELD_VT.sql
index aafbdcad10..550477edbc 100644
--- a/db/ddlutils/oracle/views/AD_FIELD_VT.sql
+++ b/db/ddlutils/oracle/views/AD_FIELD_VT.sql
@@ -18,7 +18,7 @@ CREATE OR REPLACE VIEW AD_FIELD_VT AS
c.IsAutocomplete, COALESCE(f.IsAllowCopy, c.IsAllowCopy) AS IsAllowCopy,
f.isdisplayedgrid,
f.seqnogrid,
- c.seqnoselection
+ c.seqnoselection, f.xposition, f.columnspan, f.numlines
FROM AD_FIELD f
INNER JOIN AD_FIELD_TRL trl ON (f.AD_Field_ID = trl.AD_Field_ID)
INNER JOIN AD_TAB t ON (f.AD_Tab_ID = t.AD_Tab_ID)
diff --git a/db/ddlutils/postgresql/views/AD_FIELD_V.sql b/db/ddlutils/postgresql/views/AD_FIELD_V.sql
index fe0e4cc7c3..cf3bc20218 100644
--- a/db/ddlutils/postgresql/views/AD_FIELD_V.sql
+++ b/db/ddlutils/postgresql/views/AD_FIELD_V.sql
@@ -15,7 +15,7 @@ CREATE OR REPLACE VIEW ad_field_v AS
COALESCE(f.IsAllowCopy, c.IsAllowCopy) AS IsAllowCopy,
f.isdisplayedgrid,
f.seqnogrid,
- c.seqnoselection
+ c.seqnoselection, f.xposition, f.columnspan, f.numlines
FROM ad_field f
JOIN ad_tab t ON f.ad_tab_id = t.ad_tab_id
LEFT JOIN ad_fieldgroup fg ON f.ad_fieldgroup_id = fg.ad_fieldgroup_id
diff --git a/db/ddlutils/postgresql/views/AD_FIELD_VT.sql b/db/ddlutils/postgresql/views/AD_FIELD_VT.sql
index 5b79d61f60..2d15d0a1fc 100644
--- a/db/ddlutils/postgresql/views/AD_FIELD_VT.sql
+++ b/db/ddlutils/postgresql/views/AD_FIELD_VT.sql
@@ -10,7 +10,7 @@ CREATE OR REPLACE VIEW ad_field_vt AS
COALESCE(f.IsAllowCopy, c.IsAllowCopy) AS IsAllowCopy,
f.isdisplayedgrid,
f.seqnogrid,
- c.seqnoselection
+ c.seqnoselection, f.xposition, f.columnspan, f.numlines
FROM ad_field f
JOIN ad_field_trl trl ON f.ad_field_id = trl.ad_field_id
JOIN ad_tab t ON f.ad_tab_id = t.ad_tab_id
diff --git a/migration/360lts-release/oracle/892_IDEMPIERE_368.sql b/migration/360lts-release/oracle/892_IDEMPIERE_368.sql
new file mode 100644
index 0000000000..50a0980b51
--- /dev/null
+++ b/migration/360lts-release/oracle/892_IDEMPIERE_368.sql
@@ -0,0 +1,430 @@
+-- Aug 23, 2012 11:30:43 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+INSERT INTO AD_Column (Version,AD_Table_ID,AD_Column_ID,EntityType,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsSyncDatabase,IsKey,AD_Element_ID,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsEncrypted,IsUpdateable,IsAlwaysUpdateable,ColumnName,Description,DefaultValue,Help,Name,IsAllowCopy,CreatedBy,Updated,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID,SeqNoSelection) VALUES (0,107,200351,'U','N','N','N',0,'N',10,'N',11,'N','N',1810,'N','Y','3bfff65c-fb60-43e8-b00c-5c1fbf6185e3','N','Y','N','XPosition','Absolute X (horizontal) position in 1/72 of an inch','1','Absolute X (horizontal) position in 1/72 of an inch','X Position','Y',100,TO_DATE('2012-08-23 11:30:42','YYYY-MM-DD HH24:MI:SS'),0,'Y',TO_DATE('2012-08-23 11:30:42','YYYY-MM-DD HH24:MI:SS'),100,0,0)
+;
+
+-- Aug 23, 2012 11:30:43 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=200351 AND NOT EXISTS (SELECT * FROM AD_Column_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Column_ID=t.AD_Column_ID)
+;
+
+
+-- Aug 23, 2012 11:33:34 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Column SET EntityType='D',Updated=TO_DATE('2012-08-23 11:33:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200351
+;
+
+
+-- Aug 23, 2012 11:37:33 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+INSERT INTO AD_Element (ColumnName,AD_Element_ID,EntityType,Name,Description,PrintName,AD_Element_UU,AD_Client_ID,Created,Updated,AD_Org_ID,CreatedBy,UpdatedBy,IsActive) VALUES ('ColumnSpan',200098,'D','Column Span','Number of column for a box of field','Column Span','51989873-702b-453d-8b4a-de2cc6c64f9b',0,TO_DATE('2012-08-23 11:37:32','YYYY-MM-DD HH24:MI:SS'),TO_DATE('2012-08-23 11:37:32','YYYY-MM-DD HH24:MI:SS'),0,100,100,'Y')
+;
+
+-- Aug 23, 2012 11:37:33 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+INSERT INTO AD_Element_Trl (AD_Language,AD_Element_ID, Help,PO_Description,PO_Help,Name,Description,PrintName,PO_Name,PO_PrintName, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Element_ID, t.Help,t.PO_Description,t.PO_Help,t.Name,t.Description,t.PrintName,t.PO_Name,t.PO_PrintName, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Element t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Element_ID=200098 AND NOT EXISTS (SELECT * FROM AD_Element_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Element_ID=t.AD_Element_ID)
+;
+
+
+
+-- Aug 23, 2012 11:39:15 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+INSERT INTO AD_Element (ColumnName,AD_Element_ID,Help,EntityType,Name,Description,PrintName,AD_Element_UU,AD_Client_ID,Created,Updated,AD_Org_ID,CreatedBy,UpdatedBy,IsActive) VALUES ('NumLines',200099,'Number of rows for a field','D','Number of Lines','Number of lines for a field','Number of Lines','0431edfc-f488-43c9-9c35-64b8058c8256',0,TO_DATE('2012-08-23 11:39:13','YYYY-MM-DD HH24:MI:SS'),TO_DATE('2012-08-23 11:39:13','YYYY-MM-DD HH24:MI:SS'),0,100,100,'Y')
+;
+
+-- Aug 23, 2012 11:39:15 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+INSERT INTO AD_Element_Trl (AD_Language,AD_Element_ID, Help,PO_Description,PO_Help,Name,Description,PrintName,PO_Name,PO_PrintName, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Element_ID, t.Help,t.PO_Description,t.PO_Help,t.Name,t.Description,t.PrintName,t.PO_Name,t.PO_PrintName, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Element t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Element_ID=200099 AND NOT EXISTS (SELECT * FROM AD_Element_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Element_ID=t.AD_Element_ID)
+;
+
+
+
+
+
+-- Aug 23, 2012 11:41:08 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+INSERT INTO AD_Column (Version,AD_Table_ID,AD_Column_ID,EntityType,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsSyncDatabase,IsKey,AD_Element_ID,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsEncrypted,IsUpdateable,IsAlwaysUpdateable,ColumnName,Description,DefaultValue,Name,IsAllowCopy,CreatedBy,Updated,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID,SeqNoSelection) VALUES (0,107,200352,'D','N','N','N',0,'N',10,'N',11,'N','N',54137,'N','Y','13585828-61e9-4a35-beec-ea8e1e58e60c','N','Y','N','SpanX','Number of columns spanned','1','Column span','Y',100,TO_DATE('2012-08-23 11:41:08','YYYY-MM-DD HH24:MI:SS'),0,'Y',TO_DATE('2012-08-23 11:41:08','YYYY-MM-DD HH24:MI:SS'),100,0,0)
+;
+
+-- Aug 23, 2012 11:41:08 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=200352 AND NOT EXISTS (SELECT * FROM AD_Column_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Column_ID=t.AD_Column_ID)
+;
+
+
+-- Aug 23, 2012 11:41:41 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Column SET AD_Element_ID=200098, ColumnName='ColumnSpan', Description='Number of column for a box of field', Help=NULL, Name='Column Span',Updated=TO_DATE('2012-08-23 11:41:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200352
+;
+
+-- Aug 23, 2012 11:41:41 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET Name='Column Span', Description='Number of column for a box of field', Help=NULL WHERE AD_Column_ID=200352 AND IsCentrallyMaintained='Y'
+;
+
+-- Aug 23, 2012 11:43:00 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+INSERT INTO AD_Column (Version,AD_Table_ID,AD_Column_ID,EntityType,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsSyncDatabase,IsKey,AD_Element_ID,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsEncrypted,IsUpdateable,IsAlwaysUpdateable,ColumnName,Description,DefaultValue,Help,Name,IsAllowCopy,CreatedBy,Updated,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID,SeqNoSelection) VALUES (0,107,200354,'D','N','N','N',0,'N',10,'N',11,'N','N',200099,'N','Y','6f9339fa-3339-4199-957e-9358bc90d4af','N','Y','N','NumLines','Number of lines for a field','1','Number of Lines','Number of Lines','Y',100,TO_DATE('2012-08-23 11:42:59','YYYY-MM-DD HH24:MI:SS'),0,'Y',TO_DATE('2012-08-23 11:42:59','YYYY-MM-DD HH24:MI:SS'),100,0,0)
+;
+
+-- Aug 23, 2012 11:43:00 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=200354 AND NOT EXISTS (SELECT * FROM AD_Column_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Column_ID=t.AD_Column_ID)
+;
+
+
+
+-- Aug 23, 2012 11:43:54 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+ALTER TABLE AD_Field ADD XPosition NUMBER(10) DEFAULT 1
+;
+
+-- Aug 23, 2012 11:46:09 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+ALTER TABLE AD_Field ADD NumLines NUMBER(10) DEFAULT 1
+;
+
+
+-- Aug 23, 2012 11:46:54 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+ALTER TABLE AD_Field ADD ColumnSpan NUMBER(10) DEFAULT 1
+;
+
+CREATE OR REPLACE VIEW AD_FIELD_V AS
+ SELECT t.AD_Window_ID, f.AD_Tab_ID, f.AD_Field_ID, tbl.AD_Table_ID, f.AD_Column_ID,
+ f.NAME, f.Description, f.Help, f.IsDisplayed, f.DisplayLogic, f.DisplayLength,
+ f.SeqNo, f.SortNo, f.IsSameLine, f.IsHeading, f.IsFieldOnly, f.IsReadOnly,
+ f.IsEncrypted AS IsEncryptedField, f.ObscureType,
+ c.ColumnName, c.ColumnSQL, c.FieldLength, c.VFormat,
+ COALESCE(f.DefaultValue, c.DefaultValue) AS DefaultValue,
+ c.IsKey, c.IsParent,
+ COALESCE(f.IsMandatory, c.IsMandatory) AS IsMandatory,
+ c.IsIdentifier, c.IsTranslated, COALESCE(f.AD_Reference_Value_ID, c.AD_Reference_Value_ID) AS AD_Reference_Value_ID,
+ c.Callout, COALESCE(f.AD_Reference_ID, c.AD_Reference_ID) AS AD_Reference_ID,
+ COALESCE(f.AD_Val_Rule_ID, c.AD_Val_Rule_ID) AS AD_Val_Rule_ID, c.AD_Process_ID, c.IsAlwaysUpdateable,
+ c.ReadOnlyLogic, c.MandatoryLogic, c.IsUpdateable, c.IsEncrypted AS IsEncryptedColumn,
+ c.IsSelectionColumn,
+ tbl.TableName, c.ValueMin, c.ValueMax,
+ fg.NAME AS FieldGroup, vr.Code AS ValidationCode,
+ f.Included_Tab_ID, fg.FieldGroupType, fg.IsCollapsedByDefault,
+ COALESCE(f.InfoFactoryClass, c.InfoFactoryClass) as InfoFactoryClass,
+ c.IsAutocomplete, COALESCE(f.IsAllowCopy, c.IsAllowCopy) AS IsAllowCopy,
+ f.isdisplayedgrid,
+ f.seqnogrid,
+ c.seqnoselection, f.xposition, f.columnspan, f.numlines
+FROM AD_FIELD f
+ INNER JOIN AD_TAB t ON (f.AD_Tab_ID = t.AD_Tab_ID)
+ LEFT OUTER JOIN AD_FIELDGROUP fg ON (f.AD_FieldGroup_ID = fg.AD_FieldGroup_ID)
+ LEFT OUTER JOIN AD_COLUMN c ON (f.AD_Column_ID = c.AD_Column_ID)
+ INNER JOIN AD_TABLE tbl ON (c.AD_Table_ID = tbl.AD_Table_ID)
+ INNER JOIN AD_REFERENCE r ON (c.AD_Reference_ID = r.AD_Reference_ID)
+ LEFT OUTER JOIN AD_VAL_RULE vr ON (vr.AD_Val_Rule_ID = COALESCE(f.AD_Val_Rule_ID, c.AD_Val_Rule_ID))
+WHERE f.IsActive = 'Y'
+ AND c.IsActive = 'Y';
+
+CREATE OR REPLACE VIEW AD_FIELD_VT AS
+ SELECT trl.AD_LANGUAGE, t.AD_Window_ID, f.AD_Tab_ID, f.AD_Field_ID, tbl.AD_Table_ID, f.AD_Column_ID,
+ trl.NAME, trl.Description, trl.Help, f.IsDisplayed, f.DisplayLogic, f.DisplayLength,
+ f.SeqNo, f.SortNo, f.IsSameLine, f.IsHeading, f.IsFieldOnly, f.IsReadOnly,
+ f.IsEncrypted AS IsEncryptedField, f.ObscureType,
+ c.ColumnName, c.ColumnSQL, c.FieldLength, c.VFormat,
+ COALESCE(f.DefaultValue, c.DefaultValue) AS DefaultValue,
+ c.IsKey, c.IsParent,
+ COALESCE(f.IsMandatory, c.IsMandatory) AS IsMandatory,
+ c.IsIdentifier, c.IsTranslated, COALESCE(f.AD_Reference_Value_ID, c.AD_Reference_Value_ID) AS AD_Reference_Value_ID,
+ c.Callout, COALESCE(f.AD_Reference_ID, c.AD_Reference_ID) AS AD_Reference_ID,
+ COALESCE(f.AD_Val_Rule_ID, c.AD_Val_Rule_ID) as AD_Val_Rule_ID, c.AD_Process_ID, c.IsAlwaysUpdateable,
+ c.ReadOnlyLogic, c.MandatoryLogic, c.IsUpdateable, c.IsEncrypted AS IsEncryptedColumn, c.IsSelectionColumn,
+ tbl.TableName, c.ValueMin, c.ValueMax,
+ fgt.NAME AS FieldGroup, vr.Code AS ValidationCode,
+ f.Included_Tab_ID, fg.FieldGroupType, fg.IsCollapsedByDefault,
+ COALESCE(f.InfoFactoryClass, c.InfoFactoryClass) as InfoFactoryClass,
+ c.IsAutocomplete, COALESCE(f.IsAllowCopy, c.IsAllowCopy) AS IsAllowCopy,
+ f.isdisplayedgrid,
+ f.seqnogrid,
+ c.seqnoselection, f.xposition, f.columnspan, f.numlines
+ FROM AD_FIELD f
+ INNER JOIN AD_FIELD_TRL trl ON (f.AD_Field_ID = trl.AD_Field_ID)
+ INNER JOIN AD_TAB t ON (f.AD_Tab_ID = t.AD_Tab_ID)
+ LEFT OUTER JOIN AD_FIELDGROUP fg ON (f.AD_FieldGroup_ID = fg.AD_FieldGroup_ID)
+ LEFT OUTER JOIN AD_FIELDGROUP_TRL fgt ON
+ (f.AD_FieldGroup_ID = fgt.AD_FieldGroup_ID AND trl.AD_LANGUAGE=fgt.AD_LANGUAGE)
+ LEFT OUTER JOIN AD_COLUMN c ON (f.AD_Column_ID = c.AD_Column_ID)
+ INNER JOIN AD_TABLE tbl ON (c.AD_Table_ID = tbl.AD_Table_ID)
+ INNER JOIN AD_REFERENCE r ON (c.AD_Reference_ID = r.AD_Reference_ID)
+ LEFT OUTER JOIN AD_VAL_RULE vr ON (vr.AD_Val_Rule_ID=COALESCE(f.AD_Val_Rule_ID, c.AD_Val_Rule_ID))
+ WHERE f.IsActive = 'Y'
+ AND c.IsActive = 'Y';
+
+-- Aug 23, 2012 11:49:35 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+INSERT INTO AD_Field (IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,EntityType,Description,Name,IsDisplayed,IsFieldOnly,AD_Field_UU,UpdatedBy,AD_Org_ID,Created,AD_Client_ID,CreatedBy,Updated,IsActive) VALUES ('N',107,10,'N','N',200352,'Y',200348,'N','D','Number of column for a box of field','Column Span','Y','N','b5de9fd6-5c23-41da-ad6b-25b0ef06ca77',100,0,TO_DATE('2012-08-23 11:49:34','YYYY-MM-DD HH24:MI:SS'),0,100,TO_DATE('2012-08-23 11:49:34','YYYY-MM-DD HH24:MI:SS'),'Y')
+;
+
+-- Aug 23, 2012 11:49:35 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Help,Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Field_ID, t.Help,t.Description,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=200348 AND NOT EXISTS (SELECT * FROM AD_Field_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Field_ID=t.AD_Field_ID)
+;
+
+-- Aug 23, 2012 11:49:35 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+INSERT INTO AD_Field (IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,Help,EntityType,Description,Name,IsDisplayed,IsFieldOnly,AD_Field_UU,UpdatedBy,AD_Org_ID,Created,AD_Client_ID,CreatedBy,Updated,IsActive) VALUES ('N',107,10,'N','N',200354,'Y',200349,'N','Number of lines for a field','D','Number of lines for a field','Number of Lines','Y','N','f29bc74a-88d5-487a-ae62-c38f235bebe0',100,0,TO_DATE('2012-08-23 11:49:35','YYYY-MM-DD HH24:MI:SS'),0,100,TO_DATE('2012-08-23 11:49:35','YYYY-MM-DD HH24:MI:SS'),'Y')
+;
+
+-- Aug 23, 2012 11:49:35 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Help,Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Field_ID, t.Help,t.Description,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=200349 AND NOT EXISTS (SELECT * FROM AD_Field_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Field_ID=t.AD_Field_ID)
+;
+
+
+-- Aug 23, 2012 11:49:36 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+INSERT INTO AD_Field (IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,Help,EntityType,Description,Name,IsDisplayed,IsFieldOnly,AD_Field_UU,UpdatedBy,AD_Org_ID,Created,AD_Client_ID,CreatedBy,Updated,IsActive) VALUES ('N',107,10,'N','N',200351,'Y',200350,'N','Absolute X (horizontal) position in 1/72 of an inch','D','Absolute X (horizontal) position in 1/72 of an inch','X Position','Y','N','85043584-8b26-4a6e-8107-22fe1244cc41',100,0,TO_DATE('2012-08-23 11:49:35','YYYY-MM-DD HH24:MI:SS'),0,100,TO_DATE('2012-08-23 11:49:35','YYYY-MM-DD HH24:MI:SS'),'Y')
+;
+
+-- Aug 23, 2012 11:49:36 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Help,Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Field_ID, t.Help,t.Description,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=200350 AND NOT EXISTS (SELECT * FROM AD_Field_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Field_ID=t.AD_Field_ID)
+;
+
+-- Aug 23, 2012 11:51:32 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+INSERT INTO AD_FieldGroup (EntityType,IsCollapsedByDefault,Name,AD_FieldGroup_ID,AD_FieldGroup_UU,AD_Client_ID,Created,CreatedBy,Updated,AD_Org_ID,UpdatedBy,IsActive) VALUES ('D','N','Swing Position',200000,'56cfcf5b-ab15-42b9-89eb-6fba4038b2a8',0,TO_DATE('2012-08-23 11:51:31','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2012-08-23 11:51:31','YYYY-MM-DD HH24:MI:SS'),0,100,'Y')
+;
+
+-- Aug 23, 2012 11:51:32 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+INSERT INTO AD_FieldGroup_Trl (AD_Language,AD_FieldGroup_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_FieldGroup_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_FieldGroup t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_FieldGroup_ID=200000 AND NOT EXISTS (SELECT * FROM AD_FieldGroup_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_FieldGroup_ID=t.AD_FieldGroup_ID)
+;
+
+
+-- Aug 23, 2012 11:51:53 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+INSERT INTO AD_FieldGroup (EntityType,IsCollapsedByDefault,Name,AD_FieldGroup_ID,AD_FieldGroup_UU,AD_Client_ID,Created,CreatedBy,Updated,AD_Org_ID,UpdatedBy,IsActive) VALUES ('D','N','Web Position',200001,'16383246-000c-4479-bd25-e728e440d64e',0,TO_DATE('2012-08-23 11:51:53','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2012-08-23 11:51:53','YYYY-MM-DD HH24:MI:SS'),0,100,'Y')
+;
+
+-- Aug 23, 2012 11:51:53 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+INSERT INTO AD_FieldGroup_Trl (AD_Language,AD_FieldGroup_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_FieldGroup_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_FieldGroup t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_FieldGroup_ID=200001 AND NOT EXISTS (SELECT * FROM AD_FieldGroup_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_FieldGroup_ID=t.AD_FieldGroup_ID)
+;
+
+-- Aug 23, 2012 11:53:14 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET AD_FieldGroup_ID=200001,Updated=TO_DATE('2012-08-23 11:53:14','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200350
+;
+
+-- Aug 23, 2012 11:53:23 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET AD_FieldGroup_ID=200001,Updated=TO_DATE('2012-08-23 11:53:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200349
+;
+
+-- Aug 23, 2012 11:53:33 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET AD_FieldGroup_ID=200001,Updated=TO_DATE('2012-08-23 11:53:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200348
+;
+
+-- Aug 23, 2012 11:54:13 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET AD_FieldGroup_ID=200000,Updated=TO_DATE('2012-08-23 11:54:13','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=136
+;
+
+-- Aug 23, 2012 11:54:28 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET AD_FieldGroup_ID=200000,Updated=TO_DATE('2012-08-23 11:54:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=139
+;
+
+-- Aug 23, 2012 11:54:50 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET SeqNo=170,IsDisplayed='Y' WHERE AD_Field_ID=142
+;
+
+-- Aug 23, 2012 11:54:50 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET SeqNo=180,IsDisplayed='Y' WHERE AD_Field_ID=137
+;
+
+-- Aug 23, 2012 11:54:50 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET SeqNo=190,IsDisplayed='Y' WHERE AD_Field_ID=200274
+;
+
+-- Aug 23, 2012 11:54:50 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET SeqNo=200,IsDisplayed='Y' WHERE AD_Field_ID=136
+;
+
+-- Aug 23, 2012 11:54:50 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET SeqNo=330,IsDisplayed='Y' WHERE AD_Field_ID=200348
+;
+
+-- Aug 23, 2012 11:54:50 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET SeqNo=340,IsDisplayed='Y' WHERE AD_Field_ID=200349
+;
+
+-- Aug 23, 2012 11:54:50 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET SeqNo=350,IsDisplayed='Y' WHERE AD_Field_ID=200350
+;
+
+-- Aug 23, 2012 11:58:37 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET SeqNo=330,IsDisplayed='Y' WHERE AD_Field_ID=200350
+;
+
+-- Aug 23, 2012 11:58:37 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET SeqNo=340,IsDisplayed='Y' WHERE AD_Field_ID=200348
+;
+
+-- Aug 23, 2012 11:58:37 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET SeqNo=350,IsDisplayed='Y' WHERE AD_Field_ID=200349
+;
+
+-- Aug 23, 2012 12:07:26 PM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET IsSameLine='Y',Updated=TO_DATE('2012-08-23 12:07:26','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200348
+;
+
+-- Aug 23, 2012 12:08:15 PM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET SeqNo=200,IsDisplayed='Y' WHERE AD_Field_ID=138
+;
+
+-- Aug 23, 2012 12:08:15 PM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET SeqNo=210,IsDisplayed='Y' WHERE AD_Field_ID=8343
+;
+
+-- Aug 23, 2012 12:08:15 PM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET SeqNo=220,IsDisplayed='Y' WHERE AD_Field_ID=140
+;
+
+-- Aug 23, 2012 12:08:15 PM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET SeqNo=230,IsDisplayed='Y' WHERE AD_Field_ID=141
+;
+
+-- Aug 23, 2012 12:08:15 PM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET SeqNo=240,IsDisplayed='Y' WHERE AD_Field_ID=13425
+;
+
+-- Aug 23, 2012 12:08:15 PM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET SeqNo=250,IsDisplayed='Y' WHERE AD_Field_ID=54401
+;
+
+-- Aug 23, 2012 12:08:15 PM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET SeqNo=260,IsDisplayed='Y' WHERE AD_Field_ID=54402
+;
+
+-- Aug 23, 2012 12:08:15 PM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET SeqNo=270,IsDisplayed='Y' WHERE AD_Field_ID=13424
+;
+
+-- Aug 23, 2012 12:08:15 PM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET SeqNo=280,IsDisplayed='Y' WHERE AD_Field_ID=62468
+;
+
+-- Aug 23, 2012 12:08:16 PM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET SeqNo=290,IsDisplayed='Y' WHERE AD_Field_ID=53280
+;
+
+-- Aug 23, 2012 12:08:16 PM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET SeqNo=300,IsDisplayed='Y' WHERE AD_Field_ID=200275
+;
+
+-- Aug 23, 2012 12:08:16 PM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET SeqNo=310,IsDisplayed='Y' WHERE AD_Field_ID=136
+;
+
+-- Aug 23, 2012 12:08:16 PM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET SeqNo=320,IsDisplayed='Y' WHERE AD_Field_ID=139
+;
+
+
+UPDATE AD_Field SET XPosition=3
+WHERE IsSameLine='Y'
+AND IsActive='Y';
+
+UPDATE AD_Field SET XPosition=1
+WHERE IsSameline='N'
+AND IsActive='Y';
+
+UPDATE AD_Field SET ColumnSpan=1
+WHERE DisplayLength<30
+AND IsActive='Y';
+
+
+UPDATE AD_Field SET ColumnSpan=3
+WHERE DisplayLength>=30
+AND IsActive='Y';
+
+UPDATE AD_Field SET NumLines=3
+WHERE AD_Column_ID IN (SELECT AD_Column_ID FROM AD_Column WHERE AD_Reference_ID=14)
+AND IsActive='Y';
+
+UPDATE AD_Field SET NumLines=5
+WHERE AD_Column_ID IN (SELECT AD_Column_ID FROM AD_Column WHERE AD_Reference_ID=36)
+AND IsActive='Y';
+
+UPDATE AD_Field SET NumLines=8
+WHERE AD_Column_ID IN (SELECT AD_Column_ID FROM AD_Column WHERE AD_Reference_ID=34)
+AND IsActive='Y';
+
+
+
+UPDATE AD_Field SET ColumnSpan=2
+WHERE AD_Field_ID IN(
+SELECT AD_Field_ID
+FROM AD_Field
+WHERE XPosition=1
+AND ColumnSpan=1
+AND IsActive='Y');
+
+
+UPDATE AD_Field SET XPosition=4,ColumnSpan=2
+WHERE AD_Field_ID IN(
+SELECT AD_Field_ID
+FROM AD_Field
+WHERE XPosition=3
+AND ColumnSpan=1
+AND IsActive='Y');
+
+
+UPDATE AD_Field SET XPosition=XPosition+1
+WHERE AD_Field_ID IN(
+SELECT fi.AD_Field_ID
+FROM AD_Field fi
+INNER JOIN AD_Column c ON (fi.AD_Column_ID=C.AD_Column_ID)
+WHERE c.AD_Reference_ID in (20,28)
+AND fi.IsActive='Y');
+
+UPDATE AD_Field SET ColumnSpan=5
+WHERE AD_Field_ID IN(
+SELECT AD_Field_ID
+FROM AD_Field
+WHERE XPosition=1
+AND ColumnSpan=3
+AND IsActive='Y');
+
+
+UPDATE AD_Field SET XPosition=XPosition+1
+WHERE IsFieldOnly='Y';
+
+UPDATE AD_System
+ SET LastMigrationScriptApplied='892_IDEMPIERE_368.sql'
+WHERE LastMigrationScriptApplied<'892_IDEMPIERE_368.sql'
+ OR LastMigrationScriptApplied IS NULL
+;
diff --git a/migration/360lts-release/postgresql/892_IDEMPIERE_368.sql b/migration/360lts-release/postgresql/892_IDEMPIERE_368.sql
new file mode 100644
index 0000000000..4d3e8d7a1b
--- /dev/null
+++ b/migration/360lts-release/postgresql/892_IDEMPIERE_368.sql
@@ -0,0 +1,415 @@
+-- Aug 23, 2012 11:30:43 AM COT
+-- XPosition
+INSERT INTO AD_Column (Version,AD_Table_ID,AD_Column_ID,EntityType,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsSyncDatabase,IsKey,AD_Element_ID,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsEncrypted,IsUpdateable,IsAlwaysUpdateable,ColumnName,Description,DefaultValue,Help,Name,IsAllowCopy,CreatedBy,Updated,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID,SeqNoSelection) VALUES (0,107,200351,'U','N','N','N',0,'N',10,'N',11,'N','N',1810,'N','Y','3bfff65c-fb60-43e8-b00c-5c1fbf6185e3','N','Y','N','XPosition','Absolute X (horizontal) position in 1/72 of an inch','1','Absolute X (horizontal) position in 1/72 of an inch','X Position','Y',100,TO_TIMESTAMP('2012-08-23 11:30:42','YYYY-MM-DD HH24:MI:SS'),0,'Y',TO_TIMESTAMP('2012-08-23 11:30:42','YYYY-MM-DD HH24:MI:SS'),100,0,0)
+;
+
+-- Aug 23, 2012 11:30:43 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=200351 AND NOT EXISTS (SELECT * FROM AD_Column_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Column_ID=t.AD_Column_ID)
+;
+
+
+-- Aug 23, 2012 11:33:34 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Column SET EntityType='D',Updated=TO_TIMESTAMP('2012-08-23 11:33:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200351
+;
+
+
+-- Aug 23, 2012 11:37:33 AM COT
+-- ColumnSpan System Element
+INSERT INTO AD_Element (ColumnName,AD_Element_ID,EntityType,Name,Description,PrintName,AD_Element_UU,AD_Client_ID,Created,Updated,AD_Org_ID,CreatedBy,UpdatedBy,IsActive) VALUES ('ColumnSpan',200098,'D','Column Span','Number of column for a box of field','Column Span','51989873-702b-453d-8b4a-de2cc6c64f9b',0,TO_TIMESTAMP('2012-08-23 11:37:32','YYYY-MM-DD HH24:MI:SS'),TO_TIMESTAMP('2012-08-23 11:37:32','YYYY-MM-DD HH24:MI:SS'),0,100,100,'Y')
+;
+
+-- Aug 23, 2012 11:37:33 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+INSERT INTO AD_Element_Trl (AD_Language,AD_Element_ID, Help,PO_Description,PO_Help,Name,Description,PrintName,PO_Name,PO_PrintName, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Element_ID, t.Help,t.PO_Description,t.PO_Help,t.Name,t.Description,t.PrintName,t.PO_Name,t.PO_PrintName, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Element t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Element_ID=200098 AND NOT EXISTS (SELECT * FROM AD_Element_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Element_ID=t.AD_Element_ID)
+;
+
+
+
+-- Aug 23, 2012 11:39:15 AM COT
+-- Row Span Element
+INSERT INTO AD_Element (ColumnName,AD_Element_ID,Help,EntityType,Name,Description,PrintName,AD_Element_UU,AD_Client_ID,Created,Updated,AD_Org_ID,CreatedBy,UpdatedBy,IsActive) VALUES ('NumLines',200099,'Number of lines for a field','D','Number of Lines','Number of lines for a field','Number of Lines','0431edfc-f488-43c9-9c35-64b8058c8256',0,TO_TIMESTAMP('2012-08-23 11:39:13','YYYY-MM-DD HH24:MI:SS'),TO_TIMESTAMP('2012-08-23 11:39:13','YYYY-MM-DD HH24:MI:SS'),0,100,100,'Y')
+;
+
+-- Aug 23, 2012 11:39:15 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+INSERT INTO AD_Element_Trl (AD_Language,AD_Element_ID, Help,PO_Description,PO_Help,Name,Description,PrintName,PO_Name,PO_PrintName, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Element_ID, t.Help,t.PO_Description,t.PO_Help,t.Name,t.Description,t.PrintName,t.PO_Name,t.PO_PrintName, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Element t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Element_ID=200099 AND NOT EXISTS (SELECT * FROM AD_Element_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Element_ID=t.AD_Element_ID)
+;
+
+
+-- Aug 23, 2012 11:41:08 AM COT
+-- Column Span
+INSERT INTO AD_Column (Version,AD_Table_ID,AD_Column_ID,EntityType,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsSyncDatabase,IsKey,AD_Element_ID,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsEncrypted,IsUpdateable,IsAlwaysUpdateable,ColumnName,Description,DefaultValue,Name,IsAllowCopy,CreatedBy,Updated,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID,SeqNoSelection) VALUES (0,107,200352,'U','N','N','N',0,'N',10,'N',11,'N','N',54137,'N','Y','13585828-61e9-4a35-beec-ea8e1e58e60c','N','Y','N','SpanX','Number of columns spanned','1','Column span','Y',100,TO_TIMESTAMP('2012-08-23 11:41:08','YYYY-MM-DD HH24:MI:SS'),0,'Y',TO_TIMESTAMP('2012-08-23 11:41:08','YYYY-MM-DD HH24:MI:SS'),100,0,0)
+;
+
+-- Aug 23, 2012 11:41:08 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=200352 AND NOT EXISTS (SELECT * FROM AD_Column_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Column_ID=t.AD_Column_ID)
+;
+
+
+-- Aug 23, 2012 11:41:41 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Column SET AD_Element_ID=200098, ColumnName='ColumnSpan', Description='Number of column for a box of field', Help=NULL, Name='Column Span',Updated=TO_TIMESTAMP('2012-08-23 11:41:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200352
+;
+
+
+-- Aug 23, 2012 11:41:41 AM COT
+-- Description of the field
+UPDATE AD_Field SET Name='Column Span', Description='Number of column for a box of field', Help=NULL WHERE AD_Column_ID=200352 AND IsCentrallyMaintained='Y'
+;
+
+-- Aug 23, 2012 11:43:00 AM COT
+-- NumLines
+INSERT INTO AD_Column (Version,AD_Table_ID,AD_Column_ID,EntityType,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsSyncDatabase,IsKey,AD_Element_ID,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsEncrypted,IsUpdateable,IsAlwaysUpdateable,ColumnName,Description,DefaultValue,Help,Name,IsAllowCopy,CreatedBy,Updated,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID,SeqNoSelection) VALUES (0,107,200354,'U','N','N','N',0,'N',10,'N',11,'N','N',200099,'N','Y','6f9339fa-3339-4199-957e-9358bc90d4af','N','Y','N','NumLines','Number of lines for a field','1','Number of lines for a field','Number of Lines','Y',100,TO_TIMESTAMP('2012-08-23 11:42:59','YYYY-MM-DD HH24:MI:SS'),0,'Y',TO_TIMESTAMP('2012-08-23 11:42:59','YYYY-MM-DD HH24:MI:SS'),100,0,0)
+;
+
+-- Aug 23, 2012 11:43:00 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=200354 AND NOT EXISTS (SELECT * FROM AD_Column_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Column_ID=t.AD_Column_ID)
+;
+
+-- Aug 23, 2012 11:43:54 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+ALTER TABLE AD_Field ADD COLUMN XPosition NUMERIC(10) DEFAULT '1'
+;
+
+-- Aug 23, 2012 11:46:09 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+ALTER TABLE AD_Field ADD COLUMN NumLines NUMERIC(10) DEFAULT '1'
+;
+
+-- Aug 23, 2012 11:46:54 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+ALTER TABLE AD_Field ADD COLUMN ColumnSpan NUMERIC(10) DEFAULT '1'
+;
+
+CREATE OR REPLACE VIEW ad_field_v AS
+ SELECT t.ad_window_id, f.ad_tab_id, f.ad_field_id, tbl.ad_table_id, f.ad_column_id,
+ f.name, f.description, f.help, f.isdisplayed, f.displaylogic, f.displaylength, f.seqno,
+ f.sortno, f.issameline, f.isheading, f.isfieldonly, f.isreadonly, f.isencrypted AS isencryptedfield,
+ f.obscuretype, c.columnname, c.columnsql, c.fieldlength, c.vformat,
+ COALESCE(f.defaultvalue, c.defaultvalue) AS defaultvalue, c.iskey, c.isparent,
+ COALESCE(f.ismandatory, c.ismandatory) AS ismandatory, c.isidentifier, c.istranslated,
+ COALESCE(f.ad_reference_value_id, c.ad_reference_value_id) AS ad_reference_value_id, c.callout,
+ COALESCE(f.ad_reference_id, c.ad_reference_id) AS ad_reference_id,
+ COALESCE(f.ad_val_rule_id, c.ad_val_rule_id) AS ad_val_rule_id, c.ad_process_id,
+ c.isalwaysupdateable, c.readonlylogic, c.mandatorylogic, c.isupdateable,
+ c.isencrypted AS isencryptedcolumn, c.isselectioncolumn, tbl.tablename, c.valuemin, c.valuemax,
+ fg.name AS fieldgroup, vr.code AS validationcode, f.included_tab_id, fg.fieldgrouptype, fg.iscollapsedbydefault,
+ COALESCE(f.infofactoryclass, c.infofactoryclass) AS infofactoryclass, c.isautocomplete,
+ COALESCE(f.IsAllowCopy, c.IsAllowCopy) AS IsAllowCopy,
+ f.isdisplayedgrid,
+ f.seqnogrid,
+ c.seqnoselection, f.xposition, f.columnspan, f.numlines
+ FROM ad_field f
+ JOIN ad_tab t ON f.ad_tab_id = t.ad_tab_id
+ LEFT JOIN ad_fieldgroup fg ON f.ad_fieldgroup_id = fg.ad_fieldgroup_id
+ LEFT JOIN ad_column c ON f.ad_column_id = c.ad_column_id
+ JOIN ad_table tbl ON c.ad_table_id = tbl.ad_table_id
+ JOIN ad_reference r ON c.ad_reference_id = r.ad_reference_id
+ LEFT JOIN ad_val_rule vr ON vr.ad_val_rule_id = COALESCE(f.ad_val_rule_id, c.ad_val_rule_id)
+ WHERE f.isactive = 'Y'::bpchar AND c.isactive = 'Y'::bpchar;
+
+CREATE OR REPLACE VIEW ad_field_vt AS
+ SELECT trl.ad_language, t.ad_window_id, f.ad_tab_id, f.ad_field_id, tbl.ad_table_id, f.ad_column_id, trl.name, trl.description,
+ trl.help, f.isdisplayed, f.displaylogic, f.displaylength, f.seqno, f.sortno, f.issameline, f.isheading, f.isfieldonly, f.isreadonly,
+ f.isencrypted AS isencryptedfield, f.obscuretype, c.columnname, c.columnsql, c.fieldlength, c.vformat, COALESCE(f.defaultvalue, c.defaultvalue) AS defaultvalue,
+ c.iskey, c.isparent, COALESCE(f.ismandatory, c.ismandatory) AS ismandatory, c.isidentifier, c.istranslated,
+ COALESCE(f.ad_reference_value_id, c.ad_reference_value_id) AS ad_reference_value_id, c.callout, COALESCE(f.ad_reference_id, c.ad_reference_id) AS ad_reference_id,
+ COALESCE(f.ad_val_rule_id, c.ad_val_rule_id) AS ad_val_rule_id, c.ad_process_id, c.isalwaysupdateable, c.readonlylogic, c.mandatorylogic, c.isupdateable,
+ c.isencrypted AS isencryptedcolumn, c.isselectioncolumn, tbl.tablename, c.valuemin, c.valuemax, fgt.name AS fieldgroup, vr.code AS validationcode,
+ f.included_tab_id, fg.fieldgrouptype, fg.iscollapsedbydefault, COALESCE(f.infofactoryclass, c.infofactoryclass) AS infofactoryclass, c.isautocomplete,
+ COALESCE(f.IsAllowCopy, c.IsAllowCopy) AS IsAllowCopy,
+ f.isdisplayedgrid,
+ f.seqnogrid,
+ c.seqnoselection, f.xposition, f.columnspan, f.numlines
+ FROM ad_field f
+ JOIN ad_field_trl trl ON f.ad_field_id = trl.ad_field_id
+ JOIN ad_tab t ON f.ad_tab_id = t.ad_tab_id
+ LEFT JOIN ad_fieldgroup fg ON f.ad_fieldgroup_id = fg.ad_fieldgroup_id
+ LEFT JOIN ad_fieldgroup_trl fgt ON f.ad_fieldgroup_id = fgt.ad_fieldgroup_id AND trl.ad_language::text = fgt.ad_language::text
+ LEFT JOIN ad_column c ON f.ad_column_id = c.ad_column_id
+ JOIN ad_table tbl ON c.ad_table_id = tbl.ad_table_id
+ JOIN ad_reference r ON c.ad_reference_id = r.ad_reference_id
+ LEFT JOIN ad_val_rule vr ON vr.ad_val_rule_id = COALESCE(f.ad_val_rule_id, c.ad_val_rule_id)
+ WHERE f.isactive = 'Y'::bpchar AND c.isactive = 'Y'::bpchar;
+
+-- Aug 23, 2012 11:49:35 AM COT
+-- Field Column Span
+INSERT INTO AD_Field (IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,EntityType,Description,Name,IsDisplayed,IsFieldOnly,AD_Field_UU,UpdatedBy,AD_Org_ID,Created,AD_Client_ID,CreatedBy,Updated,IsActive) VALUES ('N',107,10,'N','N',200352,'Y',200348,'N','D','Number of column for a box of field','Column Span','Y','N','b5de9fd6-5c23-41da-ad6b-25b0ef06ca77',100,0,TO_TIMESTAMP('2012-08-23 11:49:34','YYYY-MM-DD HH24:MI:SS'),0,100,TO_TIMESTAMP('2012-08-23 11:49:34','YYYY-MM-DD HH24:MI:SS'),'Y')
+;
+
+-- Aug 23, 2012 11:49:35 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Help,Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Field_ID, t.Help,t.Description,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=200348 AND NOT EXISTS (SELECT * FROM AD_Field_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Field_ID=t.AD_Field_ID)
+;
+
+
+
+-- Aug 23, 2012 11:49:35 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+INSERT INTO AD_Field (IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,Help,EntityType,Description,Name,IsDisplayed,IsFieldOnly,AD_Field_UU,UpdatedBy,AD_Org_ID,Created,AD_Client_ID,CreatedBy,Updated,IsActive) VALUES ('N',107,10,'N','N',200354,'Y',200349,'N','Number of lines for a field','D','Number of lines for a field','Number of Lines','Y','N','f29bc74a-88d5-487a-ae62-c38f235bebe0',100,0,TO_TIMESTAMP('2012-08-23 11:49:35','YYYY-MM-DD HH24:MI:SS'),0,100,TO_TIMESTAMP('2012-08-23 11:49:35','YYYY-MM-DD HH24:MI:SS'),'Y')
+;
+
+-- Aug 23, 2012 11:49:35 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Help,Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Field_ID, t.Help,t.Description,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=200349 AND NOT EXISTS (SELECT * FROM AD_Field_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Field_ID=t.AD_Field_ID)
+;
+
+
+-- Aug 23, 2012 11:49:36 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+INSERT INTO AD_Field (IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,Help,EntityType,Description,Name,IsDisplayed,IsFieldOnly,AD_Field_UU,UpdatedBy,AD_Org_ID,Created,AD_Client_ID,CreatedBy,Updated,IsActive) VALUES ('N',107,10,'N','N',200351,'Y',200350,'N','Absolute X (horizontal) position in 1/72 of an inch','D','Absolute X (horizontal) position in 1/72 of an inch','X Position','Y','N','85043584-8b26-4a6e-8107-22fe1244cc41',100,0,TO_TIMESTAMP('2012-08-23 11:49:35','YYYY-MM-DD HH24:MI:SS'),0,100,TO_TIMESTAMP('2012-08-23 11:49:35','YYYY-MM-DD HH24:MI:SS'),'Y')
+;
+
+-- Aug 23, 2012 11:49:36 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Help,Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Field_ID, t.Help,t.Description,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=200350 AND NOT EXISTS (SELECT * FROM AD_Field_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Field_ID=t.AD_Field_ID)
+;
+
+
+
+-- Aug 23, 2012 11:51:32 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+INSERT INTO AD_FieldGroup (EntityType,IsCollapsedByDefault,Name,AD_FieldGroup_ID,AD_FieldGroup_UU,AD_Client_ID,Created,CreatedBy,Updated,AD_Org_ID,UpdatedBy,IsActive) VALUES ('D','N','Swing Position',200000,'56cfcf5b-ab15-42b9-89eb-6fba4038b2a8',0,TO_TIMESTAMP('2012-08-23 11:51:31','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2012-08-23 11:51:31','YYYY-MM-DD HH24:MI:SS'),0,100,'Y')
+;
+
+-- Aug 23, 2012 11:51:32 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+INSERT INTO AD_FieldGroup_Trl (AD_Language,AD_FieldGroup_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_FieldGroup_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_FieldGroup t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_FieldGroup_ID=200000 AND NOT EXISTS (SELECT * FROM AD_FieldGroup_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_FieldGroup_ID=t.AD_FieldGroup_ID)
+;
+
+
+-- Aug 23, 2012 11:51:53 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+INSERT INTO AD_FieldGroup (EntityType,IsCollapsedByDefault,Name,AD_FieldGroup_ID,AD_FieldGroup_UU,AD_Client_ID,Created,CreatedBy,Updated,AD_Org_ID,UpdatedBy,IsActive) VALUES ('D','N','Web Position',200001,'16383246-000c-4479-bd25-e728e440d64e',0,TO_TIMESTAMP('2012-08-23 11:51:53','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2012-08-23 11:51:53','YYYY-MM-DD HH24:MI:SS'),0,100,'Y')
+;
+
+-- Aug 23, 2012 11:51:53 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+INSERT INTO AD_FieldGroup_Trl (AD_Language,AD_FieldGroup_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_FieldGroup_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_FieldGroup t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_FieldGroup_ID=200001 AND NOT EXISTS (SELECT * FROM AD_FieldGroup_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_FieldGroup_ID=t.AD_FieldGroup_ID)
+;
+
+
+
+-- Aug 23, 2012 11:53:14 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET AD_FieldGroup_ID=200001,Updated=TO_TIMESTAMP('2012-08-23 11:53:14','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200350
+;
+
+-- Aug 23, 2012 11:53:23 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET AD_FieldGroup_ID=200001,Updated=TO_TIMESTAMP('2012-08-23 11:53:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200349
+;
+
+-- Aug 23, 2012 11:53:33 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET AD_FieldGroup_ID=200001,Updated=TO_TIMESTAMP('2012-08-23 11:53:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200348
+;
+
+-- Aug 23, 2012 11:54:13 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET AD_FieldGroup_ID=200000,Updated=TO_TIMESTAMP('2012-08-23 11:54:13','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=136
+;
+
+-- Aug 23, 2012 11:54:28 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET AD_FieldGroup_ID=200000,Updated=TO_TIMESTAMP('2012-08-23 11:54:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=139
+;
+
+-- Aug 23, 2012 11:54:50 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET SeqNo=170,IsDisplayed='Y' WHERE AD_Field_ID=142
+;
+
+-- Aug 23, 2012 11:54:50 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET SeqNo=180,IsDisplayed='Y' WHERE AD_Field_ID=137
+;
+
+-- Aug 23, 2012 11:54:50 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET SeqNo=190,IsDisplayed='Y' WHERE AD_Field_ID=200274
+;
+
+-- Aug 23, 2012 11:54:50 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET SeqNo=200,IsDisplayed='Y' WHERE AD_Field_ID=136
+;
+
+-- Aug 23, 2012 11:54:50 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET SeqNo=330,IsDisplayed='Y' WHERE AD_Field_ID=200348
+;
+
+-- Aug 23, 2012 11:54:50 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET SeqNo=340,IsDisplayed='Y' WHERE AD_Field_ID=200349
+;
+
+-- Aug 23, 2012 11:54:50 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET SeqNo=350,IsDisplayed='Y' WHERE AD_Field_ID=200350
+;
+
+-- Aug 23, 2012 11:58:37 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET SeqNo=330,IsDisplayed='Y' WHERE AD_Field_ID=200350
+;
+
+-- Aug 23, 2012 11:58:37 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET SeqNo=340,IsDisplayed='Y' WHERE AD_Field_ID=200348
+;
+
+-- Aug 23, 2012 11:58:37 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET SeqNo=350,IsDisplayed='Y' WHERE AD_Field_ID=200349
+;
+
+-- Aug 23, 2012 12:07:26 PM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET IsSameLine='Y',Updated=TO_TIMESTAMP('2012-08-23 12:07:26','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200348
+;
+
+-- Aug 23, 2012 12:08:15 PM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET SeqNo=200,IsDisplayed='Y' WHERE AD_Field_ID=138
+;
+
+-- Aug 23, 2012 12:08:15 PM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET SeqNo=210,IsDisplayed='Y' WHERE AD_Field_ID=8343
+;
+
+-- Aug 23, 2012 12:08:15 PM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET SeqNo=220,IsDisplayed='Y' WHERE AD_Field_ID=140
+;
+
+-- Aug 23, 2012 12:08:15 PM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET SeqNo=230,IsDisplayed='Y' WHERE AD_Field_ID=141
+;
+
+-- Aug 23, 2012 12:08:15 PM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET SeqNo=240,IsDisplayed='Y' WHERE AD_Field_ID=13425
+;
+
+-- Aug 23, 2012 12:08:15 PM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET SeqNo=250,IsDisplayed='Y' WHERE AD_Field_ID=54401
+;
+
+-- Aug 23, 2012 12:08:15 PM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET SeqNo=260,IsDisplayed='Y' WHERE AD_Field_ID=54402
+;
+
+-- Aug 23, 2012 12:08:15 PM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET SeqNo=270,IsDisplayed='Y' WHERE AD_Field_ID=13424
+;
+
+-- Aug 23, 2012 12:08:15 PM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET SeqNo=280,IsDisplayed='Y' WHERE AD_Field_ID=62468
+;
+
+-- Aug 23, 2012 12:08:16 PM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET SeqNo=290,IsDisplayed='Y' WHERE AD_Field_ID=53280
+;
+
+-- Aug 23, 2012 12:08:16 PM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET SeqNo=300,IsDisplayed='Y' WHERE AD_Field_ID=200275
+;
+
+-- Aug 23, 2012 12:08:16 PM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET SeqNo=310,IsDisplayed='Y' WHERE AD_Field_ID=136
+;
+
+-- Aug 23, 2012 12:08:16 PM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET SeqNo=320,IsDisplayed='Y' WHERE AD_Field_ID=139
+;
+
+UPDATE AD_Field SET XPosition=3
+WHERE IsSameLine='Y'
+AND IsActive='Y';
+
+UPDATE AD_Field SET XPosition=1
+WHERE IsSameline='N'
+AND IsActive='Y';
+
+UPDATE AD_Field SET ColumnSpan=1
+WHERE DisplayLength<30
+AND IsActive='Y';
+
+
+UPDATE AD_Field SET ColumnSpan=3
+WHERE DisplayLength>=30
+AND IsActive='Y';
+
+UPDATE AD_Field SET NumLines=3
+WHERE AD_Column_ID IN (SELECT AD_Column_ID FROM AD_Column WHERE AD_Reference_ID=14)
+AND IsActive='Y';
+
+UPDATE AD_Field SET NumLines=5
+WHERE AD_Column_ID IN (SELECT AD_Column_ID FROM AD_Column WHERE AD_Reference_ID=36)
+AND IsActive='Y';
+
+UPDATE AD_Field SET NumLines=8
+WHERE AD_Column_ID IN (SELECT AD_Column_ID FROM AD_Column WHERE AD_Reference_ID=34)
+AND IsActive='Y';
+
+UPDATE AD_Field SET ColumnSpan=2
+WHERE AD_Field_ID IN(
+SELECT AD_Field_ID
+FROM AD_Field
+WHERE XPosition=1
+AND ColumnSpan=1
+AND IsActive='Y');
+
+
+UPDATE AD_Field SET XPosition=4,ColumnSpan=2
+WHERE AD_Field_ID IN(
+SELECT AD_Field_ID
+FROM AD_Field
+WHERE XPosition=3
+AND ColumnSpan=1
+AND IsActive='Y');
+
+
+UPDATE AD_Field SET XPosition=XPosition+1
+WHERE AD_Field_ID IN(
+SELECT fi.AD_Field_ID
+FROM AD_Field fi
+INNER JOIN AD_Column c ON (fi.AD_Column_ID=C.AD_Column_ID)
+WHERE c.AD_Reference_ID in (20,28)
+AND fi.IsActive='Y');
+
+UPDATE AD_Field SET ColumnSpan=5
+WHERE AD_Field_ID IN(
+SELECT AD_Field_ID
+FROM AD_Field
+WHERE XPosition=1
+AND ColumnSpan=3
+AND IsActive='Y');
+
+
+UPDATE AD_Field SET XPosition=XPosition+1
+WHERE IsFieldOnly='Y';
+
+UPDATE AD_System
+ SET LastMigrationScriptApplied='892_IDEMPIERE_368.sql'
+WHERE LastMigrationScriptApplied<'892_IDEMPIERE_368.sql'
+ OR LastMigrationScriptApplied IS NULL
+;
+
+
diff --git a/org.adempiere.base/src/org/compiere/model/GridField.java b/org.adempiere.base/src/org/compiere/model/GridField.java
index 55c0bbe187..c589734106 100644
--- a/org.adempiere.base/src/org/compiere/model/GridField.java
+++ b/org.adempiere.base/src/org/compiere/model/GridField.java
@@ -74,10 +74,12 @@ import org.compiere.util.Evaluator;
public class GridField
implements Serializable, Evaluatee
{
+
+
/**
*
*/
- private static final long serialVersionUID = -2943313231011246615L;
+ private static final long serialVersionUID = -2384947306143518488L;
/**
* Field Constructor.
@@ -1945,4 +1947,21 @@ public class GridField
return isParentTabField(m_vo.ColumnName);
}
+ /*IDEMPIERE-358*/
+
+ public int getXPosition()
+ {
+ return m_vo.XPosition;
+ }
+
+ public int getColumnSpan()
+ {
+ return m_vo.ColumnSpan;
+ }
+
+ public int getNumLines()
+ {
+ return m_vo.NumLines;
+ }
+
} // MField
diff --git a/org.adempiere.base/src/org/compiere/model/GridFieldVO.java b/org.adempiere.base/src/org/compiere/model/GridFieldVO.java
index 78d5f0d1e5..3ffe7a0bce 100644
--- a/org.adempiere.base/src/org/compiere/model/GridFieldVO.java
+++ b/org.adempiere.base/src/org/compiere/model/GridFieldVO.java
@@ -42,10 +42,12 @@ import static org.compiere.model.SystemIDs.*;
*/
public class GridFieldVO implements Serializable
{
+
+
/**
*
*/
- private static final long serialVersionUID = 3576685994073893942L;
+ private static final long serialVersionUID = -6196878184196075974L;
/**
* Return the SQL statement used for the MFieldVO.create
@@ -193,6 +195,13 @@ public class GridFieldVO implements Serializable
vo.IsAllowCopy = "Y".equals(rs.getString(i));
else if (columnName.equalsIgnoreCase("AD_Field_ID"))
vo.AD_Field_ID = rs.getInt(i);
+ /*IDEMPIERE-358*/
+ else if (columnName.equalsIgnoreCase("XPosition"))
+ vo.XPosition=rs.getInt(i);
+ else if (columnName.equalsIgnoreCase("ColumnSpan"))
+ vo.ColumnSpan=rs.getInt(i);
+ else if (columnName.equalsIgnoreCase("NumLines"))
+ vo.NumLines=rs.getInt(i);
}
if (vo.Header == null)
vo.Header = vo.ColumnName;
@@ -508,6 +517,15 @@ public class GridFieldVO implements Serializable
/** Field ID */
public int AD_Field_ID = 0;
+ /***** XPosition IDEMPIERE368***/
+ public int XPosition=0;
+
+ /***** ColumnSpan IDEMPIERE368***/
+ public int ColumnSpan=0;
+
+ /***** NumLines IDEMPIERE368***/
+ public int NumLines=0;
+
//* Feature Request FR [ 1757088 ]
public int Included_Tab_ID = 0;
diff --git a/org.adempiere.base/src/org/compiere/model/GridTab.java b/org.adempiere.base/src/org/compiere/model/GridTab.java
index 477075c255..85199c4b98 100644
--- a/org.adempiere.base/src/org/compiere/model/GridTab.java
+++ b/org.adempiere.base/src/org/compiere/model/GridTab.java
@@ -108,10 +108,12 @@ import org.compiere.util.ValueNamePair;
*/
public class GridTab implements DataStatusListener, Evaluatee, Serializable
{
+
+
/**
*
*/
- private static final long serialVersionUID = 6841849146086698231L;
+ private static final long serialVersionUID = -6259178346327832664L;
public static final String DEFAULT_STATUS_MESSAGE = "NavigateOrUpdate";
@@ -3237,4 +3239,15 @@ public class GridTab implements DataStatusListener, Evaluatee, Serializable
return null;
return m_window.getTab(parentTabNo);
}
+
+ public int getColumns(){
+ int col=0;
+
+ String sql="SELECT MAX(f.XPosition+f.ColumnSpan-case when f.isfieldonly='Y' OR c.ad_reference_id in (20/*yesno*/,28/*button*/) then 1 else 0 end)"
+ +" FROM AD_Field f JOIN AD_Column c ON (f.AD_Column_ID=c.AD_Column_ID)"
+ +" WHERE f.isdisplayed='Y' AND f.isactive='Y' AND c.isactive='Y' AND f.AD_Tab_ID=?";
+ col=DB.getSQLValue(null, sql, getAD_Tab_ID());
+
+ return col;
+ }
} // GridTab
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Field.java b/org.adempiere.base/src/org/compiere/model/I_AD_Field.java
index 24ea6a2809..8caa7c58e2 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Field.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Field.java
@@ -174,6 +174,19 @@ public interface I_AD_Field
public org.compiere.model.I_AD_Val_Rule getAD_Val_Rule() throws RuntimeException;
+ /** Column name ColumnSpan */
+ public static final String COLUMNNAME_ColumnSpan = "ColumnSpan";
+
+ /** Set Column Span.
+ * Number of column for a box of field
+ */
+ public void setColumnSpan (int ColumnSpan);
+
+ /** Get Column Span.
+ * Number of column for a box of field
+ */
+ public int getColumnSpan();
+
/** Column name Created */
public static final String COLUMNNAME_Created = "Created";
@@ -355,10 +368,10 @@ public interface I_AD_Field
/** Column name IsDisplayedGrid */
public static final String COLUMNNAME_IsDisplayedGrid = "IsDisplayedGrid";
- /** Set Display in Grid */
+ /** Set Show in Grid */
public void setIsDisplayedGrid (boolean IsDisplayedGrid);
- /** Get Display in Grid */
+ /** Get Show in Grid */
public boolean isDisplayedGrid();
/** Column name IsEncrypted */
@@ -465,6 +478,19 @@ public interface I_AD_Field
*/
public String getObscureType();
+ /** Column name NumLines */
+ public static final String COLUMNNAME_NumLines = "NumLines";
+
+ /** Set Row Span.
+ * Number of rows for a field
+ */
+ public void setNumLines (int NumLines);
+
+ /** Get Row Span.
+ * Number of rows for a field
+ */
+ public int getNumLines();
+
/** Column name SeqNo */
public static final String COLUMNNAME_SeqNo = "SeqNo";
@@ -517,4 +543,17 @@ public interface I_AD_Field
* User who updated this records
*/
public int getUpdatedBy();
+
+ /** Column name XPosition */
+ public static final String COLUMNNAME_XPosition = "XPosition";
+
+ /** Set X Position.
+ * Absolute X (horizontal) position in 1/72 of an inch
+ */
+ public void setXPosition (int XPosition);
+
+ /** Get X Position.
+ * Absolute X (horizontal) position in 1/72 of an inch
+ */
+ public int getXPosition();
}
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Field.java b/org.adempiere.base/src/org/compiere/model/X_AD_Field.java
index 9ec85e97a6..222216a389 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Field.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Field.java
@@ -32,7 +32,7 @@ public class X_AD_Field extends PO implements I_AD_Field, I_Persistent
/**
*
*/
- private static final long serialVersionUID = 20110918L;
+ private static final long serialVersionUID = 20120831L;
/** Standard Constructor */
public X_AD_Field (Properties ctx, int AD_Field_ID, String trxName)
@@ -291,6 +291,26 @@ public class X_AD_Field extends PO implements I_AD_Field, I_Persistent
return ii.intValue();
}
+ /** Set Column Span.
+ @param ColumnSpan
+ Number of column for a box of field
+ */
+ public void setColumnSpan (int ColumnSpan)
+ {
+ set_Value (COLUMNNAME_ColumnSpan, Integer.valueOf(ColumnSpan));
+ }
+
+ /** Get Column Span.
+ @return Number of column for a box of field
+ */
+ public int getColumnSpan ()
+ {
+ Integer ii = (Integer)get_Value(COLUMNNAME_ColumnSpan);
+ if (ii == null)
+ return 0;
+ return ii.intValue();
+ }
+
/** Set Default Logic.
@param DefaultValue
Default value hierarchy, separated by ;
@@ -516,15 +536,15 @@ public class X_AD_Field extends PO implements I_AD_Field, I_Persistent
return false;
}
- /** Set Display in Grid.
- @param IsDisplayedGrid Display in Grid */
+ /** Set Show in Grid.
+ @param IsDisplayedGrid Show in Grid */
public void setIsDisplayedGrid (boolean IsDisplayedGrid)
{
set_Value (COLUMNNAME_IsDisplayedGrid, Boolean.valueOf(IsDisplayedGrid));
}
- /** Get Display in Grid.
- @return Display in Grid */
+ /** Get Show in Grid.
+ @return Show in Grid */
public boolean isDisplayedGrid ()
{
Object oo = get_Value(COLUMNNAME_IsDisplayedGrid);
@@ -734,6 +754,26 @@ public class X_AD_Field extends PO implements I_AD_Field, I_Persistent
return (String)get_Value(COLUMNNAME_ObscureType);
}
+ /** Set Row Span.
+ @param NumLines
+ Number of rows for a field
+ */
+ public void setNumLines (int NumLines)
+ {
+ set_Value (COLUMNNAME_NumLines, Integer.valueOf(NumLines));
+ }
+
+ /** Get Row Span.
+ @return Number of rows for a field
+ */
+ public int getNumLines ()
+ {
+ Integer ii = (Integer)get_Value(COLUMNNAME_NumLines);
+ if (ii == null)
+ return 0;
+ return ii.intValue();
+ }
+
/** Set Sequence.
@param SeqNo
Method of ordering records; lowest number comes first
@@ -790,4 +830,24 @@ public class X_AD_Field extends PO implements I_AD_Field, I_Persistent
return Env.ZERO;
return bd;
}
+
+ /** Set X Position.
+ @param XPosition
+ Absolute X (horizontal) position in 1/72 of an inch
+ */
+ public void setXPosition (int XPosition)
+ {
+ set_Value (COLUMNNAME_XPosition, Integer.valueOf(XPosition));
+ }
+
+ /** Get X Position.
+ @return Absolute X (horizontal) position in 1/72 of an inch
+ */
+ public int getXPosition ()
+ {
+ Integer ii = (Integer)get_Value(COLUMNNAME_XPosition);
+ if (ii == null)
+ return 0;
+ return ii.intValue();
+ }
}
\ No newline at end of file
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Row.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Row.java
index 1139727e18..68ac17acc3 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Row.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Row.java
@@ -17,6 +17,9 @@
package org.adempiere.webui.component;
+import org.zkoss.zk.ui.Component;
+import org.zkoss.zul.Cell;
+
/**
*
* @author Ashley G Ramdass
@@ -28,5 +31,18 @@ public class Row extends org.zkoss.zul.Row
/**
*
*/
- private static final long serialVersionUID = -3096460956090507074L;
+ private static final long serialVersionUID = 3587841381101659893L;
+
+ public boolean appendCellChild(Component child) {
+ return this.appendCellChild(child, 1);
+ }
+
+ public boolean appendCellChild(Component child, int colspan) {
+ Cell cell = new Cell();
+ cell.setColspan(colspan);
+ cell.setRowspan(1);
+ cell.appendChild(child);
+ return super.appendChild(cell);
+ }
+
}
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WEditor.java
index 28e8a686fa..f5899aa408 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WEditor.java
@@ -471,7 +471,7 @@ public abstract class WEditor implements EventListener, PropertyChangeLis
* Stretch editor component to fill container
*/
public void fillHorizontal() {
- //streach component to fill grid cell
+ //stretch component to fill grid cell
if (getComponent() instanceof HtmlBasedComponent) {
//can't stretch bandbox & datebox
if (!(getComponent() instanceof Bandbox) &&
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WStringEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WStringEditor.java
index 15c728abdf..4f052c3e0d 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WStringEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WStringEditor.java
@@ -115,22 +115,21 @@ public class WStringEditor extends WEditor implements ContextMenuListener
displayLength = MAX_DISPLAY_LENGTH;
}
getComponent().setCols(displayLength);
-
if (gridField.getDisplayType() == DisplayType.Text)
{
getComponent().setMultiline(true);
- getComponent().setRows(3);
}
else if (gridField.getDisplayType() == DisplayType.TextLong)
{
getComponent().setMultiline(true);
- getComponent().setRows(5);
}
else if (gridField.getDisplayType() == DisplayType.Memo)
{
getComponent().setMultiline(true);
- getComponent().setRows(8);
}
+ else
+ getComponent().setMultiline(false);
+ getComponent().setRows(gridField.getNumLines());
if (getComponent() instanceof Textbox)
((Textbox)getComponent()).setObscureType(obscureType);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ADTabpanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ADTabpanel.java
index ea2229f2d2..ca8339dd36 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ADTabpanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ADTabpanel.java
@@ -58,8 +58,10 @@ import org.compiere.model.MTree;
import org.compiere.model.MTreeNode;
import org.compiere.model.X_AD_FieldGroup;
import org.compiere.util.CLogger;
+import org.compiere.util.DisplayType;
import org.compiere.util.Env;
import org.compiere.util.Evaluatee;
+import org.compiere.util.Util;
import org.zkoss.zk.au.out.AuFocus;
import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.Executions;
@@ -127,11 +129,11 @@ DataStatusListener, IADTabpanel
private GridPanel listPanel;
- private Map> fieldGroupContents = new HashMap>();
+ private Map> fieldGroupContents = new HashMap>();
private Map> fieldGroupHeaders = new HashMap>();
- private ArrayList rowList;
+ private ArrayList rowList;
private Component formComponent = null;
@@ -255,286 +257,252 @@ DataStatusListener, IADTabpanel
if (uiCreated) return;
uiCreated = true;
+
+ int numCols=gridTab.getColumns();
+ if (numCols <= 0) {
+ numCols=4;
+ }
- //setup columns
+ // set size in percentage per column leaving a MARGIN on right
Columns columns = new Columns();
grid.appendChild(columns);
- Column col = new Column();
- col.setWidth("14%");
- columns.appendChild(col);
- col = new Column();
- col.setWidth("35%");
- columns.appendChild(col);
- col = new Column();
- col.setWidth("14%");
- columns.appendChild(col);
- col = new Column();
- col.setWidth("35%");
- columns.appendChild(col);
- col = new Column();
- col.setWidth("2%");
- columns.appendChild(col);
+ String numColsS=String.valueOf(numCols);
+ int equalWidth = 98 / numCols;
+
+ for (int h=0;h 0)
- {
- if (row.getChildren().size() == 2)
- {
- row.appendChild(createSpacer());
- row.appendChild(createSpacer());
- row.appendChild(createSpacer());
- rows.appendChild(row);
- if (rowList != null)
- rowList.add(row);
- } else if (row.getChildren().size() > 0)
+ GridField field = fields[i];
+ if (!field.isDisplayed())
+ continue;
+
+ //included tab
+ if (field.getIncluded_Tab_ID() > 0)
+ {
+ // NOT CHANGING INCLUDED TAB AS THIS IS BEING REDESIGNED WITH
+ // IDEMPIERE-369 Master Detail layout improvements
+ if (row.getChildren().size() == 2)
+ {
+ row.appendChild(createSpacer());
+ row.appendChild(createSpacer());
+ row.appendChild(createSpacer());
+ rows.appendChild(row);
+ if (rowList != null)
+ rowList.add(row);
+ } else if (row.getChildren().size() > 0)
+ {
+ rows.appendChild(row);
+ if (rowList != null)
+ rowList.add(row);
+ }
+
+ //end current field group
+ if (currentGroup != null) {
+ Groupfoot rowg = new Groupfoot();
+ rows.appendChild(rowg);
+ currentGroup = null;
+ currentFieldGroup = null;
+ }
+
+ row = new Row();
+ row.setSpans("5");
+ row.appendChild(new Separator());
+ rows.appendChild(row);
+
+ Group rowg = new Group();
+ rowg.setSpans("2,3");
+ rows.appendChild(rowg);
+ includedTab.put(field.getIncluded_Tab_ID(), (Group)rowg);
+ Groupfoot rowgf = new Groupfoot();
+ rows.appendChild(rowgf);
+ includedTabFooter.put(field.getIncluded_Tab_ID(), (Groupfoot)rowgf);
+
+ row = new Row();
+ row.setSpans("5");
+ row.appendChild(new Separator());
+ rows.appendChild(row);
+
+ for (EmbeddedPanel ep : includedPanel) {
+ if (ep.adTabId == field.getIncluded_Tab_ID()) {
+ ep.group = includedTab.get(ep.adTabId);
+ createEmbeddedPanelUI(ep, field.getDisplayLength());
+ break;
+ }
+ }
+
+ row = new Row();
+ continue;
+ }
+ // field group
+ String fieldGroup = field.getFieldGroup();
+ if (!Util.isEmpty(fieldGroup) && !fieldGroup.equals(currentFieldGroup)) // group changed
+ {
+ currentFieldGroup = fieldGroup;
+
+ if (numCols - actualxpos > 0)
+ row.appendCellChild(createSpacer(), numCols - actualxpos);
+ rows.appendChild(row);
+ if (rowList != null)
+ rowList.add(row);
+
+ row = new Row();
+ actualxpos = 0;
+
+ List headerRows = new ArrayList();
+ fieldGroupHeaders.put(fieldGroup, headerRows);
+
+ row.appendCellChild(new Separator(), numCols);
+ rows.appendChild(row);
+ headerRows.add(row);
+
+ rowList = new ArrayList();
+ fieldGroupContents.put(fieldGroup, rowList);
+
+ if (X_AD_FieldGroup.FIELDGROUPTYPE_Label.equals(field.getFieldGroupType()))
+ {
+ row = new Row();
+ Label groupLabel = new Label(fieldGroup);
+ row.appendCellChild(groupLabel, numCols);
+ rows.appendChild(row);
+ headerRows.add(row);
+
+ row = new Row();
+ Separator separator = new Separator();
+ separator.setBar(true);
+ row.appendCellChild(separator, numCols);
+ rows.appendChild(row);
+ headerRows.add(row);
+ }
+ else
+ {
+ Group rowg = new Group(fieldGroup);
+ rowg.setSpans(numColsS);
+ if (X_AD_FieldGroup.FIELDGROUPTYPE_Tab.equals(field.getFieldGroupType()) || field.getIsCollapsedByDefault())
{
+ rowg.setOpen(false);
+ }
+ currentGroup = rowg;
+ rows.appendChild(rowg);
+ headerRows.add(rowg);
+ }
+
+ row = new Row();
+ actualxpos = 0;
+ }
+
+ //normal field
+ if (field.getXPosition() <= actualxpos) {
+ // Fill right part of the row with spacers until number of columns
+ if (numCols - actualxpos + 1 > 0)
+ row.appendCellChild(createSpacer(), numCols - actualxpos + 1);
+ rows.appendChild(row);
+ row=new Row();
+ actualxpos = 0;
+ }
+ // Fill left part of the field
+ if (field.getXPosition()-1 - actualxpos > 0)
+ row.appendCellChild(createSpacer(), field.getXPosition()-1 - actualxpos);
+ boolean paintLabel = ! (field.getDisplayType() == DisplayType.Button || field.getDisplayType() == DisplayType.YesNo || field.isFieldOnly());
+ if (field.isHeading())
+ actualxpos = field.getXPosition();
+ else
+ actualxpos = field.getXPosition() + field.getColumnSpan()-1 + (paintLabel ? 1 : 0);
+
+ if (! field.isHeading()) {
+
+ WEditor editor = WebEditorFactory.getEditor(gridTab, field, false);
+
+ if (editor != null) // Not heading
+ {
+ editor.setGridTab(this.getGridTab());
+ field.addPropertyChangeListener(editor);
+ editors.add(editor);
+ editorComps.add(editor.getComponent());
+ if (paintLabel) {
+ Div div = new Div();
+ div.setAlign("right");
+ Label label = editor.getLabel();
+ div.appendChild(label);
+ if (label.getDecorator() != null)
+ div.appendChild(label.getDecorator());
+ row.appendCellChild(div,1);
+ }
+ row.appendCellChild(editor.getComponent(), field.getColumnSpan());
+
+ /*
+ if (field.isLongField()) {
+ row.setSpans("1,3,1");
+ row.appendCellChild(createSpacer());
rows.appendChild(row);
if (rowList != null)
- rowList.add(row);
+ rowList.add(row);
+ //row = new Row();
+ }
+ */
+
+ if (editor instanceof WButtonEditor)
+ {
+ if (windowPanel != null)
+ ((WButtonEditor)editor).addActionListener(windowPanel);
+ }
+ else
+ {
+ editor.addValueChangeListener(dataBinder);
}
- //end current field group
- if (currentGroup != null) {
- row = new Groupfoot();
- rows.appendChild(row);
- currentGroup = null;
- currentFieldGroup = null;
- }
+ //stretch component to fill grid cell
+ editor.fillHorizontal();
- row = new Row();
- row.setSpans("5");
- row.appendChild(new Separator());
- rows.appendChild(row);
+ //setup editor context menu
+ WEditorPopupMenu popupMenu = editor.getPopupMenu();
+ if (popupMenu != null)
+ {
+ popupMenu.addMenuListener((ContextMenuListener)editor);
+ this.appendChild(popupMenu);
+ if (!field.isFieldOnly())
+ {
+ Label label = editor.getLabel();
+ if (popupMenu.isZoomEnabled() && editor instanceof IZoomableEditor)
+ {
+ label.addEventListener(Events.ON_CLICK, new ZoomListener((IZoomableEditor) editor));
+ }
- row = new Group();
- row.setSpans("2,3");
- rows.appendChild(row);
- includedTab.put(field.getIncluded_Tab_ID(), (Group)row);
- row = new Groupfoot();
- rows.appendChild(row);
- includedTabFooter.put(field.getIncluded_Tab_ID(), (Groupfoot)row);
-
- row = new Row();
- row.setSpans("5");
- row.appendChild(new Separator());
- rows.appendChild(row);
-
- for (EmbeddedPanel ep : includedPanel) {
- if (ep.adTabId == field.getIncluded_Tab_ID()) {
- ep.group = includedTab.get(ep.adTabId);
- createEmbeddedPanelUI(ep, field.getDisplayLength());
- break;
- }
- }
-
- row = new Row();
- continue;
- }
-
- //normal field
- String fieldGroup = field.getFieldGroup();
- if (fieldGroup != null && fieldGroup.trim().length() > 0)
- {
- if (!fieldGroup.equals(currentFieldGroup))
- {
- currentFieldGroup = fieldGroup;
- if (row.getChildren().size() == 2)
- {
- row.appendChild(createSpacer());
- row.appendChild(createSpacer());
- row.appendChild(createSpacer());
- rows.appendChild(row);
- if (rowList != null)
- rowList.add(row);
- row = new Row();
- } else if (row.getChildren().size() > 0)
- {
- rows.appendChild(row);
- if (rowList != null)
- rowList.add(row);
- row = new Row();
- }
-
- List headerRows = new ArrayList();
- fieldGroupHeaders.put(fieldGroup, headerRows);
-
- row.setSpans("5");
- row.appendChild(new Separator());
- rows.appendChild(row);
- headerRows.add(row);
-
- rowList = new ArrayList();
- fieldGroupContents.put(fieldGroup, rowList);
-
- if (X_AD_FieldGroup.FIELDGROUPTYPE_Label.equals(field.getFieldGroupType()))
- {
- row = new Row();
- row.setSpans("4");
- Label groupLabel = new Label(fieldGroup);
- row.appendChild(groupLabel);
- row.appendChild(createSpacer());
- rows.appendChild(row);
- headerRows.add(row);
-
- row = new Row();
- row.setSpans("4");
- Separator separator = new Separator();
- separator.setBar(true);
- row.appendChild(separator);
- row.appendChild(createSpacer());
- rows.appendChild(row);
- headerRows.add(row);
- }
- else
- {
- row = new Group(fieldGroup);
- row.setSpans("5");
- if (X_AD_FieldGroup.FIELDGROUPTYPE_Tab.equals(field.getFieldGroupType()) || field.getIsCollapsedByDefault())
- {
- ((Group)row).setOpen(false);
- }
- currentGroup = (Group)row;
- rows.appendChild(row);
- headerRows.add(row);
- }
-
- row = new Row();
- }
- }
-
- if (!field.isSameLine() || field.isLongField())
- {
- //next line
- if(row.getChildren().size() > 0)
- {
- if (row.getChildren().size() == 2)
- {
- row.appendChild(createSpacer());
- row.appendChild(createSpacer());
- row.appendChild(createSpacer());
- }
- {
- row.appendChild(createSpacer());
- }
- rows.appendChild(row);
- if (rowList != null)
- rowList.add(row);
- row = new Row();
- }
- }
- else if (row.getChildren().size() == 4)
- {
- //next line if reach max column ( 4 )
- row.appendChild(createSpacer());
- rows.appendChild(row);
- if (rowList != null)
- rowList.add(row);
- row = new Row();
- }
-
- WEditor editor = WebEditorFactory.getEditor(gridTab, field, false);
-
- if (editor != null) // Not heading
- {
- editor.setGridTab(this.getGridTab());
- field.addPropertyChangeListener(editor);
- editors.add(editor);
- editorComps.add(editor.getComponent());
- if (field.isFieldOnly())
- {
- row.appendChild(createSpacer());
- }
- else
- {
- Div div = new Div();
- div.setAlign("right");
- Label label = editor.getLabel();
- div.appendChild(label);
- if (label.getDecorator() != null)
- div.appendChild(label.getDecorator());
- row.appendChild(div);
- }
- row.appendChild(editor.getComponent());
- if (field.isLongField()) {
- row.setSpans("1,3,1");
- row.appendChild(createSpacer());
- rows.appendChild(row);
- if (rowList != null)
- rowList.add(row);
- row = new Row();
- }
-
- if (editor instanceof WButtonEditor)
- {
- if (windowPanel != null)
- ((WButtonEditor)editor).addActionListener(windowPanel);
- }
- else
- {
- editor.addValueChangeListener(dataBinder);
- }
-
- //streach component to fill grid cell
- editor.fillHorizontal();
-
- //setup editor context menu
- WEditorPopupMenu popupMenu = editor.getPopupMenu();
- if (popupMenu != null)
- {
- popupMenu.addMenuListener((ContextMenuListener)editor);
- this.appendChild(popupMenu);
- if (!field.isFieldOnly())
- {
- Label label = editor.getLabel();
- if (popupMenu.isZoomEnabled() && editor instanceof IZoomableEditor)
- {
- label.addEventListener(Events.ON_CLICK, new ZoomListener((IZoomableEditor) editor));
- }
-
- popupMenu.addContextElement(label);
- if (editor.getComponent() instanceof XulElement)
- {
- popupMenu.addContextElement((XulElement) editor.getComponent());
- }
- }
- }
- }
- else if (field.isHeading())
- {
- //display just a label if we are "heading only"
- Label label = new Label(field.getHeader());
- Div div = new Div();
- div.setAlign("center");
- row.appendChild(createSpacer());
- div.appendChild(label);
- row.appendChild(div);
- }
- }
- }
-
- //last row
- if (row.getChildren().size() > 0)
- {
- if (row.getChildren().size() == 2)
- {
- row.appendChild(createSpacer());
- row.appendChild(createSpacer());
- row.appendChild(createSpacer());
- }
- rows.appendChild(row);
- if (rowList != null)
- rowList.add(row);
+ popupMenu.addContextElement(label);
+ if (editor.getComponent() instanceof XulElement)
+ {
+ popupMenu.addContextElement((XulElement) editor.getComponent());
+ }
+ }
+ }
+ }
+ }
+ else // just heading
+ {
+ //display just a label if we are "heading only"
+ Label label = new Label(field.getHeader());
+ Div div = new Div();
+ div.setAlign("center");
+ row.appendCellChild(createSpacer());
+ div.appendChild(label);
+ row.appendCellChild(div);
+ }
}
+ if (numCols - actualxpos + 1 > 0)
+ row.appendCellChild(createSpacer(), numCols - actualxpos + 1);
+ rows.appendChild(row);
+ if (rowList != null)
+ rowList.add(row);
//create tree
if (gridTab.isTreeTab() && treePanel != null) {
@@ -623,7 +591,8 @@ DataStatusListener, IADTabpanel
boolean editorRow = false;
for (int j = 0; j < components.size(); j++)
{
- Component component = (Component) components.get(j);
+ Component cellComponent = (Component) components.get(j);
+ Component component = cellComponent.getFirstChild();
if (editorComps.contains(component))
{
editorRow = true;
@@ -645,9 +614,9 @@ DataStatusListener, IADTabpanel
for(Iterator>> i = fieldGroupHeaders.entrySet().iterator(); i.hasNext();)
{
Map.Entry> entry = i.next();
- List contents = fieldGroupContents.get(entry.getKey());
+ List contents = fieldGroupContents.get(entry.getKey());
boolean visible = false;
- for (org.zkoss.zul.Row row : contents)
+ for (Row row : contents)
{
if (row.isVisible())
{
@@ -1153,7 +1122,7 @@ DataStatusListener, IADTabpanel
}
private void createEmbeddedPanelUI(EmbeddedPanel ep, int height) {
- org.zkoss.zul.Row row = new Row();
+ Row row = new Row();
row.setSpans("5");
grid.getRows().insertBefore(row, includedTabFooter.get(ep.adTabId));
ep.windowPanel.createPart(row);