From 0e6e5efc7db754d6717a677866f019ef3df20532 Mon Sep 17 00:00:00 2001 From: Nicolas Micoud <58596990+nmicoud@users.noreply.github.com> Date: Mon, 28 Jun 2021 16:11:42 +0200 Subject: [PATCH] IDEMPIERE-4829 - Add SeqNoGrid on UserDefWindow (#718) * IDEMPIERE-4829 - Add SeqNoGrid on UserDefWindow * IDEMPIERE-4829 : scripts moved to i8.2z --- .../oracle/202106111345_IDEMPIERE-4829.sql | 109 ++++++++++++++++++ .../202106111345_IDEMPIERE-4829.sql | 106 +++++++++++++++++ .../src/org/compiere/model/GridFieldVO.java | 2 + .../compiere/model/I_AD_UserDef_Field.java | 9 ++ .../compiere/model/X_AD_UserDef_Field.java | 21 +++- 5 files changed, 246 insertions(+), 1 deletion(-) create mode 100644 migration/i8.2z/oracle/202106111345_IDEMPIERE-4829.sql create mode 100644 migration/i8.2z/postgresql/202106111345_IDEMPIERE-4829.sql diff --git a/migration/i8.2z/oracle/202106111345_IDEMPIERE-4829.sql b/migration/i8.2z/oracle/202106111345_IDEMPIERE-4829.sql new file mode 100644 index 0000000000..411f85ceef --- /dev/null +++ b/migration/i8.2z/oracle/202106111345_IDEMPIERE-4829.sql @@ -0,0 +1,109 @@ +SET SQLBLANKLINES ON +SET DEFINE OFF + +-- Jun 11, 2021, 1:31:49 PM CEST +INSERT INTO AD_Column (AD_Column_ID,Version,Name,AD_Table_ID,ColumnName,DefaultValue,FieldLength,IsKey,IsParent,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsEncrypted,AD_Reference_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 (214504,0,'Grid Sequence No',464,'SeqNoGrid','0',22,'N','N','Y','N','N',0,'N',11,0,0,'Y',TO_DATE('2021-06-11 13:31:48','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2021-06-11 13:31:48','YYYY-MM-DD HH24:MI:SS'),100,200084,'Y','N','D','N','N','N','Y','0df84ed3-d2cc-4fbf-96da-e866c997417c','Y',0,'N','N','N') +; + +-- Jun 11, 2021, 1:32:01 PM CEST +ALTER TABLE AD_UserDef_Field ADD SeqNoGrid NUMBER(10) DEFAULT 0 NOT NULL +; + +-- Jun 11, 2021, 1:32:26 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 (206670,'Grid Sequence No',395,214504,'Y',22,360,'N','N','N','N',0,0,'Y',TO_DATE('2021-06-11 13:32:26','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2021-06-11 13:32:26','YYYY-MM-DD HH24:MI:SS'),100,'N','Y','D','4e9bd14e-d409-4dcd-a3e7-dd3c9535f4d4','Y',340,2) +; + +-- Jun 11, 2021, 1:32:53 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-06-11 13:32:53','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=206670 +; + +-- Jun 11, 2021, 1:32:53 PM CEST +UPDATE AD_Field SET SeqNo=160, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-06-11 13:32:53','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11252 +; + +-- Jun 11, 2021, 1:32:53 PM CEST +UPDATE AD_Field SET SeqNo=170, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-06-11 13:32:53','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=206521 +; + +-- Jun 11, 2021, 1:32:53 PM CEST +UPDATE AD_Field SET SeqNo=180, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-06-11 13:32:53','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200857 +; + +-- Jun 11, 2021, 1:32:53 PM CEST +UPDATE AD_Field SET SeqNo=190, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-06-11 13:32:53','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200850 +; + +-- Jun 11, 2021, 1:32:53 PM CEST +UPDATE AD_Field SET SeqNo=200, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-06-11 13:32:53','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200853 +; + +-- Jun 11, 2021, 1:32:53 PM CEST +UPDATE AD_Field SET SeqNo=210, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-06-11 13:32:53','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=204215 +; + +-- Jun 11, 2021, 1:32:53 PM CEST +UPDATE AD_Field SET SeqNo=220, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-06-11 13:32:53','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=204216 +; + +-- Jun 11, 2021, 1:32:53 PM CEST +UPDATE AD_Field SET SeqNo=230, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-06-11 13:32:53','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200858 +; + +-- Jun 11, 2021, 1:32:53 PM CEST +UPDATE AD_Field SET SeqNo=240, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-06-11 13:32:53','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200856 +; + +-- Jun 11, 2021, 1:32:53 PM CEST +UPDATE AD_Field SET SeqNo=250, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-06-11 13:32:53','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200855 +; + +-- Jun 11, 2021, 1:32:53 PM CEST +UPDATE AD_Field SET SeqNo=260, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-06-11 13:32:53','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=203266 +; + +-- Jun 11, 2021, 1:32:53 PM CEST +UPDATE AD_Field SET SeqNo=270, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-06-11 13:32:53','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=204221 +; + +-- Jun 11, 2021, 1:32:53 PM CEST +UPDATE AD_Field SET SeqNo=280, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-06-11 13:32:53','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=206130 +; + +-- Jun 11, 2021, 1:32:53 PM CEST +UPDATE AD_Field SET SeqNo=290, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-06-11 13:32:53','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5054 +; + +-- Jun 11, 2021, 1:32:54 PM CEST +UPDATE AD_Field SET SeqNo=300, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-06-11 13:32:54','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200849 +; + +-- Jun 11, 2021, 1:32:54 PM CEST +UPDATE AD_Field SET SeqNo=310, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-06-11 13:32:54','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200851 +; + +-- Jun 11, 2021, 1:32:54 PM CEST +UPDATE AD_Field SET SeqNo=320, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-06-11 13:32:54','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=206408 +; + +-- Jun 11, 2021, 1:32:54 PM CEST +UPDATE AD_Field SET SeqNo=330, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-06-11 13:32:54','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200852 +; + +-- Jun 11, 2021, 1:32:54 PM CEST +UPDATE AD_Field SET SeqNo=340, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-06-11 13:32:54','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=203499 +; + +-- Jun 11, 2021, 1:32:54 PM CEST +UPDATE AD_Field SET SeqNo=350, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-06-11 13:32:54','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200854 +; + +-- Jun 11, 2021, 1:32:54 PM CEST +UPDATE AD_Field SET SeqNo=360, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-06-11 13:32:54','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5051 +; + +-- Jun 11, 2021, 1:32:54 PM CEST +UPDATE AD_Field SET SeqNo=370, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-06-11 13:32:54','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5057 +; + +SELECT register_migration_script('202106111345_IDEMPIERE-4829.sql') FROM dual +; diff --git a/migration/i8.2z/postgresql/202106111345_IDEMPIERE-4829.sql b/migration/i8.2z/postgresql/202106111345_IDEMPIERE-4829.sql new file mode 100644 index 0000000000..e2c68b2a60 --- /dev/null +++ b/migration/i8.2z/postgresql/202106111345_IDEMPIERE-4829.sql @@ -0,0 +1,106 @@ +-- Jun 11, 2021, 1:31:49 PM CEST +INSERT INTO AD_Column (AD_Column_ID,Version,Name,AD_Table_ID,ColumnName,DefaultValue,FieldLength,IsKey,IsParent,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsEncrypted,AD_Reference_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 (214504,0,'Grid Sequence No',464,'SeqNoGrid','0',22,'N','N','Y','N','N',0,'N',11,0,0,'Y',TO_TIMESTAMP('2021-06-11 13:31:48','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2021-06-11 13:31:48','YYYY-MM-DD HH24:MI:SS'),100,200084,'Y','N','D','N','N','N','Y','0df84ed3-d2cc-4fbf-96da-e866c997417c','Y',0,'N','N','N') +; + +-- Jun 11, 2021, 1:32:01 PM CEST +ALTER TABLE AD_UserDef_Field ADD COLUMN SeqNoGrid NUMERIC(10) DEFAULT '0' NOT NULL +; + +-- Jun 11, 2021, 1:32:26 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 (206670,'Grid Sequence No',395,214504,'Y',22,360,'N','N','N','N',0,0,'Y',TO_TIMESTAMP('2021-06-11 13:32:26','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2021-06-11 13:32:26','YYYY-MM-DD HH24:MI:SS'),100,'N','Y','D','4e9bd14e-d409-4dcd-a3e7-dd3c9535f4d4','Y',340,2) +; + +-- Jun 11, 2021, 1:32:53 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-06-11 13:32:53','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=206670 +; + +-- Jun 11, 2021, 1:32:53 PM CEST +UPDATE AD_Field SET SeqNo=160, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-06-11 13:32:53','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11252 +; + +-- Jun 11, 2021, 1:32:53 PM CEST +UPDATE AD_Field SET SeqNo=170, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-06-11 13:32:53','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=206521 +; + +-- Jun 11, 2021, 1:32:53 PM CEST +UPDATE AD_Field SET SeqNo=180, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-06-11 13:32:53','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200857 +; + +-- Jun 11, 2021, 1:32:53 PM CEST +UPDATE AD_Field SET SeqNo=190, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-06-11 13:32:53','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200850 +; + +-- Jun 11, 2021, 1:32:53 PM CEST +UPDATE AD_Field SET SeqNo=200, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-06-11 13:32:53','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200853 +; + +-- Jun 11, 2021, 1:32:53 PM CEST +UPDATE AD_Field SET SeqNo=210, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-06-11 13:32:53','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=204215 +; + +-- Jun 11, 2021, 1:32:53 PM CEST +UPDATE AD_Field SET SeqNo=220, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-06-11 13:32:53','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=204216 +; + +-- Jun 11, 2021, 1:32:53 PM CEST +UPDATE AD_Field SET SeqNo=230, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-06-11 13:32:53','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200858 +; + +-- Jun 11, 2021, 1:32:53 PM CEST +UPDATE AD_Field SET SeqNo=240, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-06-11 13:32:53','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200856 +; + +-- Jun 11, 2021, 1:32:53 PM CEST +UPDATE AD_Field SET SeqNo=250, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-06-11 13:32:53','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200855 +; + +-- Jun 11, 2021, 1:32:53 PM CEST +UPDATE AD_Field SET SeqNo=260, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-06-11 13:32:53','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=203266 +; + +-- Jun 11, 2021, 1:32:53 PM CEST +UPDATE AD_Field SET SeqNo=270, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-06-11 13:32:53','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=204221 +; + +-- Jun 11, 2021, 1:32:53 PM CEST +UPDATE AD_Field SET SeqNo=280, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-06-11 13:32:53','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=206130 +; + +-- Jun 11, 2021, 1:32:53 PM CEST +UPDATE AD_Field SET SeqNo=290, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-06-11 13:32:53','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5054 +; + +-- Jun 11, 2021, 1:32:54 PM CEST +UPDATE AD_Field SET SeqNo=300, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-06-11 13:32:54','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200849 +; + +-- Jun 11, 2021, 1:32:54 PM CEST +UPDATE AD_Field SET SeqNo=310, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-06-11 13:32:54','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200851 +; + +-- Jun 11, 2021, 1:32:54 PM CEST +UPDATE AD_Field SET SeqNo=320, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-06-11 13:32:54','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=206408 +; + +-- Jun 11, 2021, 1:32:54 PM CEST +UPDATE AD_Field SET SeqNo=330, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-06-11 13:32:54','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200852 +; + +-- Jun 11, 2021, 1:32:54 PM CEST +UPDATE AD_Field SET SeqNo=340, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-06-11 13:32:54','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=203499 +; + +-- Jun 11, 2021, 1:32:54 PM CEST +UPDATE AD_Field SET SeqNo=350, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-06-11 13:32:54','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200854 +; + +-- Jun 11, 2021, 1:32:54 PM CEST +UPDATE AD_Field SET SeqNo=360, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-06-11 13:32:54','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5051 +; + +-- Jun 11, 2021, 1:32:54 PM CEST +UPDATE AD_Field SET SeqNo=370, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-06-11 13:32:54','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5057 +; + +SELECT register_migration_script('202106111345_IDEMPIERE-4829.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 24392741ec..cc34f0985f 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.getSeqNoGrid() > 0) + vo.SeqNoGrid = userDef.getSeqNoGrid(); if (userDef.getAD_Val_Rule_ID() > 0) vo.ValidationCode = MValRule.get(vo.ctx, userDef.getAD_Val_Rule_ID()).getCode(); if (userDef.getAD_Val_Rule_Lookup_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 55d97ceccc..6d98e2f7ab 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 @@ -507,6 +507,15 @@ public interface I_AD_UserDef_Field */ public int getSeqNo(); + /** Column name SeqNoGrid */ + public static final String COLUMNNAME_SeqNoGrid = "SeqNoGrid"; + + /** Set Grid Sequence No */ + public void setSeqNoGrid (int SeqNoGrid); + + /** Get Grid Sequence No */ + public int getSeqNoGrid(); + /** Column name SortNo */ public static final String COLUMNNAME_SortNo = "SortNo"; 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 9e7493339f..6c18224ac9 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 = 20201220L; + private static final long serialVersionUID = 20210611L; /** Standard Constructor */ public X_AD_UserDef_Field (Properties ctx, int AD_UserDef_Field_ID, String trxName) @@ -42,6 +42,8 @@ public class X_AD_UserDef_Field extends PO implements I_AD_UserDef_Field, I_Pers setAD_UserDef_Field_ID (0); setAD_UserDef_Tab_ID (0); setSeqNo (0); +// 0 + setSeqNoGrid (0); // 0 } */ } @@ -794,6 +796,23 @@ public class X_AD_UserDef_Field extends PO implements I_AD_UserDef_Field, I_Pers return ii.intValue(); } + /** Set Grid Sequence No. + @param SeqNoGrid Grid Sequence No */ + public void setSeqNoGrid (int SeqNoGrid) + { + set_Value (COLUMNNAME_SeqNoGrid, Integer.valueOf(SeqNoGrid)); + } + + /** Get Grid Sequence No. + @return Grid Sequence No */ + public int getSeqNoGrid () + { + Integer ii = (Integer)get_Value(COLUMNNAME_SeqNoGrid); + if (ii == null) + return 0; + return ii.intValue(); + } + /** Set Record Sort No. @param SortNo Determines in what order the records are displayed