From 0ace1aa24619df869dcdf2ff84fa42ca1d9e0e95 Mon Sep 17 00:00:00 2001 From: Nicolas Micoud <58596990+nmicoud@users.noreply.github.com> Date: Mon, 30 Aug 2021 15:41:45 +0200 Subject: [PATCH] IDEMPIERE-4936 : Add IsDisplayedGrid on UserDefWindow (#849) --- .../oracle/202108271700_IDEMPIERE-4936.sql | 114 +++++++++++++++++ .../202108271700_IDEMPIERE-4936.sql | 111 +++++++++++++++++ .../src/org/compiere/model/GridFieldVO.java | 2 + .../compiere/model/I_AD_UserDef_Field.java | 39 +++--- .../compiere/model/X_AD_UserDef_Field.java | 115 +++++++++++------- 5 files changed, 319 insertions(+), 62 deletions(-) create mode 100644 migration/i8.2z/oracle/202108271700_IDEMPIERE-4936.sql create mode 100644 migration/i8.2z/postgresql/202108271700_IDEMPIERE-4936.sql diff --git a/migration/i8.2z/oracle/202108271700_IDEMPIERE-4936.sql b/migration/i8.2z/oracle/202108271700_IDEMPIERE-4936.sql new file mode 100644 index 0000000000..ef8e697400 --- /dev/null +++ b/migration/i8.2z/oracle/202108271700_IDEMPIERE-4936.sql @@ -0,0 +1,114 @@ +SET SQLBLANKLINES ON +SET DEFINE OFF + +-- IDEMPIERE-4936 +-- Aug 27, 2021, 4:48:42 PM CEST +INSERT INTO AD_Column (AD_Column_ID,Version,Name,AD_Table_ID,ColumnName,FieldLength,IsKey,IsParent,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsEncrypted,AD_Reference_ID,AD_Reference_Value_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Element_ID,IsUpdateable,IsSelectionColumn,EntityType,IsSyncDatabase,IsAlwaysUpdateable,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsAllowCopy,SeqNoSelection,IsToolbarButton,IsSecure,IsHtml) VALUES (214581,0,'Show in Grid',464,'IsDisplayedGrid',1,'N','N','N','N','N',0,'N',17,319,0,0,'Y',TO_DATE('2021-08-27 16:48:41','YYYY-MM-DD HH24:MI:SS'),0,TO_DATE('2021-08-27 16:48:41','YYYY-MM-DD HH24:MI:SS'),0,200083,'Y','N','D','N','N','N','Y','4354dad8-0dcc-4d10-954e-266cf323de28','Y',0,'N','N','N') +; + +-- Aug 27, 2021, 4:48:47 PM CEST +ALTER TABLE AD_UserDef_Field ADD IsDisplayedGrid CHAR(1) DEFAULT NULL +; + +-- Aug 27, 2021, 4:49:05 PM CEST +INSERT INTO AD_Field (AD_Field_ID,Name,AD_Tab_ID,AD_Column_ID,IsDisplayed,DisplayLength,SeqNo,IsSameLine,IsHeading,IsFieldOnly,IsEncrypted,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,IsReadOnly,IsCentrallyMaintained,EntityType,AD_Field_UU,IsDisplayedGrid,SeqNoGrid,ColumnSpan) VALUES (206743,'Show in Grid',395,214581,'Y',1,380,'N','N','N','N',0,0,'Y',TO_DATE('2021-08-27 16:49:05','YYYY-MM-DD HH24:MI:SS'),0,TO_DATE('2021-08-27 16:49:05','YYYY-MM-DD HH24:MI:SS'),0,'N','Y','D','d8a8c406-56ae-4473-a06d-f5a7ebedb966','Y',350,2) +; + +-- Aug 27, 2021, 4:49:27 PM CEST +UPDATE AD_Field SET IsDisplayed='Y', SeqNo=150, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, XPosition=1, IsToolbarButton=NULL,Updated=TO_DATE('2021-08-27 16:49:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=206743 +; + +-- Aug 27, 2021, 4:49:27 PM CEST +UPDATE AD_Field SET IsDisplayed='Y', SeqNo=160, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, XPosition=4, IsToolbarButton=NULL,Updated=TO_DATE('2021-08-27 16:49:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=206670 +; + +-- Aug 27, 2021, 4:49:27 PM CEST +UPDATE AD_Field SET SeqNo=170, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-08-27 16:49:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=11252 +; + +-- Aug 27, 2021, 4:49:27 PM CEST +UPDATE AD_Field SET SeqNo=180, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-08-27 16:49:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=206521 +; + +-- Aug 27, 2021, 4:49:27 PM CEST +UPDATE AD_Field SET SeqNo=190, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-08-27 16:49:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=200857 +; + +-- Aug 27, 2021, 4:49:27 PM CEST +UPDATE AD_Field SET SeqNo=200, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-08-27 16:49:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=200850 +; + +-- Aug 27, 2021, 4:49:27 PM CEST +UPDATE AD_Field SET SeqNo=210, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-08-27 16:49:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=200853 +; + +-- Aug 27, 2021, 4:49:27 PM CEST +UPDATE AD_Field SET SeqNo=220, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-08-27 16:49:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=204215 +; + +-- Aug 27, 2021, 4:49:27 PM CEST +UPDATE AD_Field SET SeqNo=230, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-08-27 16:49:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=204216 +; + +-- Aug 27, 2021, 4:49:27 PM CEST +UPDATE AD_Field SET SeqNo=240, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-08-27 16:49:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=200858 +; + +-- Aug 27, 2021, 4:49:27 PM CEST +UPDATE AD_Field SET SeqNo=250, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-08-27 16:49:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=200856 +; + +-- Aug 27, 2021, 4:49:27 PM CEST +UPDATE AD_Field SET SeqNo=260, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-08-27 16:49:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=200855 +; + +-- Aug 27, 2021, 4:49:27 PM CEST +UPDATE AD_Field SET SeqNo=270, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-08-27 16:49:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=203266 +; + +-- Aug 27, 2021, 4:49:27 PM CEST +UPDATE AD_Field SET SeqNo=280, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-08-27 16:49:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=204221 +; + +-- Aug 27, 2021, 4:49:27 PM CEST +UPDATE AD_Field SET SeqNo=290, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-08-27 16:49:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=206130 +; + +-- Aug 27, 2021, 4:49:27 PM CEST +UPDATE AD_Field SET SeqNo=300, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-08-27 16:49:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=5054 +; + +-- Aug 27, 2021, 4:49:27 PM CEST +UPDATE AD_Field SET SeqNo=310, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-08-27 16:49:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=200849 +; + +-- Aug 27, 2021, 4:49:27 PM CEST +UPDATE AD_Field SET SeqNo=320, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-08-27 16:49:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=200851 +; + +-- Aug 27, 2021, 4:49:27 PM CEST +UPDATE AD_Field SET SeqNo=330, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-08-27 16:49:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=206408 +; + +-- Aug 27, 2021, 4:49:27 PM CEST +UPDATE AD_Field SET SeqNo=340, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-08-27 16:49:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=200852 +; + +-- Aug 27, 2021, 4:49:27 PM CEST +UPDATE AD_Field SET SeqNo=350, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-08-27 16:49:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=203499 +; + +-- Aug 27, 2021, 4:49:27 PM CEST +UPDATE AD_Field SET SeqNo=360, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-08-27 16:49:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=200854 +; + +-- Aug 27, 2021, 4:49:27 PM CEST +UPDATE AD_Field SET SeqNo=370, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-08-27 16:49:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=5051 +; + +-- Aug 27, 2021, 4:49:27 PM CEST +UPDATE AD_Field SET SeqNo=380, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-08-27 16:49:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=5057 +; + +SELECT register_migration_script('202108271700_IDEMPIERE-4936.sql') FROM dual +; diff --git a/migration/i8.2z/postgresql/202108271700_IDEMPIERE-4936.sql b/migration/i8.2z/postgresql/202108271700_IDEMPIERE-4936.sql new file mode 100644 index 0000000000..053717c3e5 --- /dev/null +++ b/migration/i8.2z/postgresql/202108271700_IDEMPIERE-4936.sql @@ -0,0 +1,111 @@ +-- IDEMPIERE-4936 +-- Aug 27, 2021, 4:48:42 PM CEST +INSERT INTO AD_Column (AD_Column_ID,Version,Name,AD_Table_ID,ColumnName,FieldLength,IsKey,IsParent,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsEncrypted,AD_Reference_ID,AD_Reference_Value_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Element_ID,IsUpdateable,IsSelectionColumn,EntityType,IsSyncDatabase,IsAlwaysUpdateable,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsAllowCopy,SeqNoSelection,IsToolbarButton,IsSecure,IsHtml) VALUES (214581,0,'Show in Grid',464,'IsDisplayedGrid',1,'N','N','N','N','N',0,'N',17,319,0,0,'Y',TO_TIMESTAMP('2021-08-27 16:48:41','YYYY-MM-DD HH24:MI:SS'),0,TO_TIMESTAMP('2021-08-27 16:48:41','YYYY-MM-DD HH24:MI:SS'),0,200083,'Y','N','D','N','N','N','Y','4354dad8-0dcc-4d10-954e-266cf323de28','Y',0,'N','N','N') +; + +-- Aug 27, 2021, 4:48:47 PM CEST +ALTER TABLE AD_UserDef_Field ADD COLUMN IsDisplayedGrid CHAR(1) DEFAULT NULL +; + +-- Aug 27, 2021, 4:49:05 PM CEST +INSERT INTO AD_Field (AD_Field_ID,Name,AD_Tab_ID,AD_Column_ID,IsDisplayed,DisplayLength,SeqNo,IsSameLine,IsHeading,IsFieldOnly,IsEncrypted,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,IsReadOnly,IsCentrallyMaintained,EntityType,AD_Field_UU,IsDisplayedGrid,SeqNoGrid,ColumnSpan) VALUES (206743,'Show in Grid',395,214581,'Y',1,380,'N','N','N','N',0,0,'Y',TO_TIMESTAMP('2021-08-27 16:49:05','YYYY-MM-DD HH24:MI:SS'),0,TO_TIMESTAMP('2021-08-27 16:49:05','YYYY-MM-DD HH24:MI:SS'),0,'N','Y','D','d8a8c406-56ae-4473-a06d-f5a7ebedb966','Y',350,2) +; + +-- Aug 27, 2021, 4:49:27 PM CEST +UPDATE AD_Field SET IsDisplayed='Y', SeqNo=150, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, XPosition=1, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-08-27 16:49:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=206743 +; + +-- Aug 27, 2021, 4:49:27 PM CEST +UPDATE AD_Field SET IsDisplayed='Y', SeqNo=160, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, XPosition=4, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-08-27 16:49:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=206670 +; + +-- Aug 27, 2021, 4:49:27 PM CEST +UPDATE AD_Field SET SeqNo=170, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-08-27 16:49:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=11252 +; + +-- Aug 27, 2021, 4:49:27 PM CEST +UPDATE AD_Field SET SeqNo=180, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-08-27 16:49:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=206521 +; + +-- Aug 27, 2021, 4:49:27 PM CEST +UPDATE AD_Field SET SeqNo=190, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-08-27 16:49:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=200857 +; + +-- Aug 27, 2021, 4:49:27 PM CEST +UPDATE AD_Field SET SeqNo=200, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-08-27 16:49:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=200850 +; + +-- Aug 27, 2021, 4:49:27 PM CEST +UPDATE AD_Field SET SeqNo=210, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-08-27 16:49:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=200853 +; + +-- Aug 27, 2021, 4:49:27 PM CEST +UPDATE AD_Field SET SeqNo=220, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-08-27 16:49:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=204215 +; + +-- Aug 27, 2021, 4:49:27 PM CEST +UPDATE AD_Field SET SeqNo=230, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-08-27 16:49:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=204216 +; + +-- Aug 27, 2021, 4:49:27 PM CEST +UPDATE AD_Field SET SeqNo=240, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-08-27 16:49:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=200858 +; + +-- Aug 27, 2021, 4:49:27 PM CEST +UPDATE AD_Field SET SeqNo=250, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-08-27 16:49:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=200856 +; + +-- Aug 27, 2021, 4:49:27 PM CEST +UPDATE AD_Field SET SeqNo=260, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-08-27 16:49:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=200855 +; + +-- Aug 27, 2021, 4:49:27 PM CEST +UPDATE AD_Field SET SeqNo=270, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-08-27 16:49:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=203266 +; + +-- Aug 27, 2021, 4:49:27 PM CEST +UPDATE AD_Field SET SeqNo=280, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-08-27 16:49:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=204221 +; + +-- Aug 27, 2021, 4:49:27 PM CEST +UPDATE AD_Field SET SeqNo=290, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-08-27 16:49:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=206130 +; + +-- Aug 27, 2021, 4:49:27 PM CEST +UPDATE AD_Field SET SeqNo=300, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-08-27 16:49:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=5054 +; + +-- Aug 27, 2021, 4:49:27 PM CEST +UPDATE AD_Field SET SeqNo=310, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-08-27 16:49:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=200849 +; + +-- Aug 27, 2021, 4:49:27 PM CEST +UPDATE AD_Field SET SeqNo=320, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-08-27 16:49:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=200851 +; + +-- Aug 27, 2021, 4:49:27 PM CEST +UPDATE AD_Field SET SeqNo=330, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-08-27 16:49:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=206408 +; + +-- Aug 27, 2021, 4:49:27 PM CEST +UPDATE AD_Field SET SeqNo=340, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-08-27 16:49:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=200852 +; + +-- Aug 27, 2021, 4:49:27 PM CEST +UPDATE AD_Field SET SeqNo=350, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-08-27 16:49:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=203499 +; + +-- Aug 27, 2021, 4:49:27 PM CEST +UPDATE AD_Field SET SeqNo=360, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-08-27 16:49:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=200854 +; + +-- Aug 27, 2021, 4:49:27 PM CEST +UPDATE AD_Field SET SeqNo=370, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-08-27 16:49:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=5051 +; + +-- Aug 27, 2021, 4:49:27 PM CEST +UPDATE AD_Field SET SeqNo=380, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-08-27 16:49:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=5057 +; + +SELECT register_migration_script('202108271700_IDEMPIERE-4936.sql') FROM dual +; diff --git a/org.adempiere.base/src/org/compiere/model/GridFieldVO.java b/org.adempiere.base/src/org/compiere/model/GridFieldVO.java index 13f882b185..afe68f11eb 100644 --- a/org.adempiere.base/src/org/compiere/model/GridFieldVO.java +++ b/org.adempiere.base/src/org/compiere/model/GridFieldVO.java @@ -170,6 +170,8 @@ public class GridFieldVO implements Serializable, Cloneable //IDEMPIERE-1120 Implement Field SeqNo customization if (userDef.getSeqNo() > 0) vo.SeqNo = userDef.getSeqNo(); + if (userDef.getIsDisplayedGrid() != null) + vo.IsDisplayedGrid = "Y".equals(userDef.getIsDisplayedGrid()); if (userDef.getSeqNoGrid() > 0) vo.SeqNoGrid = userDef.getSeqNoGrid(); if (userDef.getAD_Val_Rule_ID() > 0) diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_UserDef_Field.java b/org.adempiere.base/src/org/compiere/model/I_AD_UserDef_Field.java index 6d98e2f7ab..9b4f495207 100644 --- a/org.adempiere.base/src/org/compiere/model/I_AD_UserDef_Field.java +++ b/org.adempiere.base/src/org/compiere/model/I_AD_UserDef_Field.java @@ -49,21 +49,6 @@ public interface I_AD_UserDef_Field */ public int getAD_Client_ID(); - /** Column name AD_FieldGroup_ID */ - public static final String COLUMNNAME_AD_FieldGroup_ID = "AD_FieldGroup_ID"; - - /** Set Field Group. - * Logical grouping of fields - */ - public void setAD_FieldGroup_ID (int AD_FieldGroup_ID); - - /** Get Field Group. - * Logical grouping of fields - */ - public int getAD_FieldGroup_ID(); - - public org.compiere.model.I_AD_FieldGroup getAD_FieldGroup() throws RuntimeException; - /** Column name AD_Field_ID */ public static final String COLUMNNAME_AD_Field_ID = "AD_Field_ID"; @@ -79,6 +64,21 @@ public interface I_AD_UserDef_Field public org.compiere.model.I_AD_Field getAD_Field() throws RuntimeException; + /** Column name AD_FieldGroup_ID */ + public static final String COLUMNNAME_AD_FieldGroup_ID = "AD_FieldGroup_ID"; + + /** Set Field Group. + * Logical grouping of fields + */ + public void setAD_FieldGroup_ID (int AD_FieldGroup_ID); + + /** Get Field Group. + * Logical grouping of fields + */ + public int getAD_FieldGroup_ID(); + + public org.compiere.model.I_AD_FieldGroup getAD_FieldGroup() throws RuntimeException; + /** Column name AD_FieldStyle_ID */ public static final String COLUMNNAME_AD_FieldStyle_ID = "AD_FieldStyle_ID"; @@ -359,6 +359,15 @@ public interface I_AD_UserDef_Field */ public String getIsDisplayed(); + /** Column name IsDisplayedGrid */ + public static final String COLUMNNAME_IsDisplayedGrid = "IsDisplayedGrid"; + + /** Set Show in Grid */ + public void setIsDisplayedGrid (String IsDisplayedGrid); + + /** Get Show in Grid */ + public String getIsDisplayedGrid(); + /** Column name IsMandatory */ public static final String COLUMNNAME_IsMandatory = "IsMandatory"; diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Field.java b/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Field.java index 6c18224ac9..15364888f7 100644 --- a/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Field.java +++ b/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Field.java @@ -30,7 +30,7 @@ public class X_AD_UserDef_Field extends PO implements I_AD_UserDef_Field, I_Pers /** * */ - private static final long serialVersionUID = 20210611L; + private static final long serialVersionUID = 20210827L; /** Standard Constructor */ public X_AD_UserDef_Field (Properties ctx, int AD_UserDef_Field_ID, String trxName) @@ -76,34 +76,6 @@ public class X_AD_UserDef_Field extends PO implements I_AD_UserDef_Field, I_Pers return sb.toString(); } - public org.compiere.model.I_AD_FieldGroup getAD_FieldGroup() throws RuntimeException - { - return (org.compiere.model.I_AD_FieldGroup)MTable.get(getCtx(), org.compiere.model.I_AD_FieldGroup.Table_Name) - .getPO(getAD_FieldGroup_ID(), get_TrxName()); } - - /** Set Field Group. - @param AD_FieldGroup_ID - Logical grouping of fields - */ - public void setAD_FieldGroup_ID (int AD_FieldGroup_ID) - { - if (AD_FieldGroup_ID < 1) - set_Value (COLUMNNAME_AD_FieldGroup_ID, null); - else - set_Value (COLUMNNAME_AD_FieldGroup_ID, Integer.valueOf(AD_FieldGroup_ID)); - } - - /** Get Field Group. - @return Logical grouping of fields - */ - public int getAD_FieldGroup_ID () - { - Integer ii = (Integer)get_Value(COLUMNNAME_AD_FieldGroup_ID); - if (ii == null) - return 0; - return ii.intValue(); - } - public org.compiere.model.I_AD_Field getAD_Field() throws RuntimeException { return (org.compiere.model.I_AD_Field)MTable.get(getCtx(), org.compiere.model.I_AD_Field.Table_Name) @@ -140,6 +112,34 @@ public class X_AD_UserDef_Field extends PO implements I_AD_UserDef_Field, I_Pers return new KeyNamePair(get_ID(), String.valueOf(getAD_Field_ID())); } + public org.compiere.model.I_AD_FieldGroup getAD_FieldGroup() throws RuntimeException + { + return (org.compiere.model.I_AD_FieldGroup)MTable.get(getCtx(), org.compiere.model.I_AD_FieldGroup.Table_Name) + .getPO(getAD_FieldGroup_ID(), get_TrxName()); } + + /** Set Field Group. + @param AD_FieldGroup_ID + Logical grouping of fields + */ + public void setAD_FieldGroup_ID (int AD_FieldGroup_ID) + { + if (AD_FieldGroup_ID < 1) + set_Value (COLUMNNAME_AD_FieldGroup_ID, null); + else + set_Value (COLUMNNAME_AD_FieldGroup_ID, Integer.valueOf(AD_FieldGroup_ID)); + } + + /** Get Field Group. + @return Logical grouping of fields + */ + public int getAD_FieldGroup_ID () + { + Integer ii = (Integer)get_Value(COLUMNNAME_AD_FieldGroup_ID); + if (ii == null) + return 0; + return ii.intValue(); + } + public org.compiere.model.I_AD_Style getAD_FieldStyle() throws RuntimeException { return (org.compiere.model.I_AD_Style)MTable.get(getCtx(), org.compiere.model.I_AD_Style.Table_Name) @@ -477,10 +477,10 @@ public class X_AD_UserDef_Field extends PO implements I_AD_UserDef_Field, I_Pers /** IsAlwaysUpdateable AD_Reference_ID=319 */ public static final int ISALWAYSUPDATEABLE_AD_Reference_ID=319; - /** Yes = Y */ - public static final String ISALWAYSUPDATEABLE_Yes = "Y"; /** No = N */ public static final String ISALWAYSUPDATEABLE_No = "N"; + /** Yes = Y */ + public static final String ISALWAYSUPDATEABLE_Yes = "Y"; /** Set Always Updatable. @param IsAlwaysUpdateable The column is always updateable, even if the record is not active or processed @@ -501,10 +501,10 @@ public class X_AD_UserDef_Field extends PO implements I_AD_UserDef_Field, I_Pers /** IsAutocomplete AD_Reference_ID=319 */ public static final int ISAUTOCOMPLETE_AD_Reference_ID=319; - /** Yes = Y */ - public static final String ISAUTOCOMPLETE_Yes = "Y"; /** No = N */ public static final String ISAUTOCOMPLETE_No = "N"; + /** Yes = Y */ + public static final String ISAUTOCOMPLETE_Yes = "Y"; /** Set Autocomplete. @param IsAutocomplete Automatic completion for textfields @@ -525,10 +525,10 @@ public class X_AD_UserDef_Field extends PO implements I_AD_UserDef_Field, I_Pers /** IsDisplayed AD_Reference_ID=319 */ public static final int ISDISPLAYED_AD_Reference_ID=319; - /** Yes = Y */ - public static final String ISDISPLAYED_Yes = "Y"; /** No = N */ public static final String ISDISPLAYED_No = "N"; + /** Yes = Y */ + public static final String ISDISPLAYED_Yes = "Y"; /** Set Displayed. @param IsDisplayed Determines, if this field is displayed @@ -547,12 +547,33 @@ public class X_AD_UserDef_Field extends PO implements I_AD_UserDef_Field, I_Pers return (String)get_Value(COLUMNNAME_IsDisplayed); } + /** IsDisplayedGrid AD_Reference_ID=319 */ + public static final int ISDISPLAYEDGRID_AD_Reference_ID=319; + /** No = N */ + public static final String ISDISPLAYEDGRID_No = "N"; + /** Yes = Y */ + public static final String ISDISPLAYEDGRID_Yes = "Y"; + /** Set Show in Grid. + @param IsDisplayedGrid Show in Grid */ + public void setIsDisplayedGrid (String IsDisplayedGrid) + { + + set_Value (COLUMNNAME_IsDisplayedGrid, IsDisplayedGrid); + } + + /** Get Show in Grid. + @return Show in Grid */ + public String getIsDisplayedGrid () + { + return (String)get_Value(COLUMNNAME_IsDisplayedGrid); + } + /** IsMandatory AD_Reference_ID=319 */ public static final int ISMANDATORY_AD_Reference_ID=319; - /** Yes = Y */ - public static final String ISMANDATORY_Yes = "Y"; /** No = N */ public static final String ISMANDATORY_No = "N"; + /** Yes = Y */ + public static final String ISMANDATORY_Yes = "Y"; /** Set Mandatory. @param IsMandatory Data entry is required in this column @@ -573,10 +594,10 @@ public class X_AD_UserDef_Field extends PO implements I_AD_UserDef_Field, I_Pers /** IsReadOnly AD_Reference_ID=319 */ public static final int ISREADONLY_AD_Reference_ID=319; - /** Yes = Y */ - public static final String ISREADONLY_Yes = "Y"; /** No = N */ public static final String ISREADONLY_No = "N"; + /** Yes = Y */ + public static final String ISREADONLY_Yes = "Y"; /** Set Read Only. @param IsReadOnly Field is read only @@ -597,10 +618,10 @@ public class X_AD_UserDef_Field extends PO implements I_AD_UserDef_Field, I_Pers /** IsSameLine AD_Reference_ID=319 */ public static final int ISSAMELINE_AD_Reference_ID=319; - /** Yes = Y */ - public static final String ISSAMELINE_Yes = "Y"; /** No = N */ public static final String ISSAMELINE_No = "N"; + /** Yes = Y */ + public static final String ISSAMELINE_Yes = "Y"; /** Set Same Line. @param IsSameLine Displayed on same line as previous field @@ -621,12 +642,12 @@ public class X_AD_UserDef_Field extends PO implements I_AD_UserDef_Field, I_Pers /** IsToolbarButton AD_Reference_ID=200099 */ public static final int ISTOOLBARBUTTON_AD_Reference_ID=200099; - /** Toolbar = Y */ - public static final String ISTOOLBARBUTTON_Toolbar = "Y"; - /** Window = N */ - public static final String ISTOOLBARBUTTON_Window = "N"; /** Both = B */ public static final String ISTOOLBARBUTTON_Both = "B"; + /** Window = N */ + public static final String ISTOOLBARBUTTON_Window = "N"; + /** Toolbar = Y */ + public static final String ISTOOLBARBUTTON_Toolbar = "Y"; /** Set Toolbar Button. @param IsToolbarButton Show the button on the toolbar, the window, or both @@ -647,10 +668,10 @@ public class X_AD_UserDef_Field extends PO implements I_AD_UserDef_Field, I_Pers /** IsUpdateable AD_Reference_ID=319 */ public static final int ISUPDATEABLE_AD_Reference_ID=319; - /** Yes = Y */ - public static final String ISUPDATEABLE_Yes = "Y"; /** No = N */ public static final String ISUPDATEABLE_No = "N"; + /** Yes = Y */ + public static final String ISUPDATEABLE_Yes = "Y"; /** Set Updatable. @param IsUpdateable Determines, if the field can be updated