From 2322a79dda65a682b5da37a2b57fd1e8559d8c80 Mon Sep 17 00:00:00 2001 From: Nicolas Micoud <58596990+nmicoud@users.noreply.github.com> Date: Fri, 21 Aug 2020 11:20:33 +0200 Subject: [PATCH] IDEMPIERE-4422 : GL Distribution - add SeqNo (#217) * IDEMPIERE-4422 : GL Distribution - add SeqNo Add SeqNo column on GL Distribution to allow users to choose the lowest one when several records are retrieved. Fix typo * IDEMPIERE-4422 : GL Distribution - add SeqNo Fix a missed typo --- .../oracle/202008201900_IDEMPIERE-4422.sql | 170 ++++++++++++++++++ .../202008201900_IDEMPIERE-4422.sql | 167 +++++++++++++++++ .../src/org/compiere/acct/Fact.java | 4 +- .../org/compiere/model/I_GL_Distribution.java | 15 ++ .../src/org/compiere/model/MDistribution.java | 1 + .../org/compiere/model/X_GL_Distribution.java | 24 ++- 6 files changed, 378 insertions(+), 3 deletions(-) create mode 100644 migration/i7.1/oracle/202008201900_IDEMPIERE-4422.sql create mode 100644 migration/i7.1/postgresql/202008201900_IDEMPIERE-4422.sql diff --git a/migration/i7.1/oracle/202008201900_IDEMPIERE-4422.sql b/migration/i7.1/oracle/202008201900_IDEMPIERE-4422.sql new file mode 100644 index 0000000000..1781d51529 --- /dev/null +++ b/migration/i7.1/oracle/202008201900_IDEMPIERE-4422.sql @@ -0,0 +1,170 @@ +SET SQLBLANKLINES ON +SET DEFINE OFF + +-- IDEMPIERE-4422 : GL DIstribution - Add SeqNo +-- 2020-08-20 06:53:44 +INSERT INTO AD_Column (AD_Column_ID,Version,Name,Description,Help,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 (214223,0,'Sequence','Method of ordering records; lowest number comes first','The Sequence indicates the order of records',708,'SeqNo','0',10,'N','N','Y','N','N',0,'N',11,0,0,'Y',TO_DATE('2020-08-20 18:53:44','YYYY-MM-DD HH24:MI:SS'),0,TO_DATE('2020-08-20 18:53:44','YYYY-MM-DD HH24:MI:SS'),0,566,'Y','N','D','N','N','N','Y','239b7b3f-8a1b-4e6d-939b-397771225725','Y',0,'N','N','N') +; + +-- 2020-08-20 06:53:47 +ALTER TABLE GL_Distribution ADD SeqNo NUMBER(10) DEFAULT 0 NOT NULL +; + +-- 2020-08-20 06:54:10 +INSERT INTO AD_Field (AD_Field_ID,Name,Description,Help,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 (206427,'Sequence','Method of ordering records; lowest number comes first','The Sequence indicates the order of records',646,214223,'Y',10,400,'N','N','N','N',0,0,'Y',TO_DATE('2020-08-20 18:54:10','YYYY-MM-DD HH24:MI:SS'),0,TO_DATE('2020-08-20 18:54:10','YYYY-MM-DD HH24:MI:SS'),0,'N','Y','D','e329fd14-f0d7-4f4f-af5d-61cf7a943de6','Y',400,2) +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET IsDisplayed='Y', SeqNo=70, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, XPosition=4, IsToolbarButton=NULL,Updated=TO_DATE('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=206427 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=80, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10144 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=90, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=56748 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=100, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10875 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=110, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10862 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=120, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10866 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=130, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10149 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=140, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10860 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=150, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10145 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=160, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10868 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=170, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10141 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=180, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10869 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=190, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10142 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=200, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10864 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=210, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10133 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=220, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10873 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=230, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10150 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=240, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10865 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=250, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10143 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=260, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10871 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=270, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10154 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=280, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10872 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=290, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10138 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=300, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10867 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=310, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10156 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=320, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10861 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=330, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10148 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=340, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10874 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=350, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10137 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=360, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10863 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=370, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10155 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=380, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10870 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=390, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10134 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=400, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10140 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=0, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=204840 +; + +-- 2020-08-20 06:54:52 +UPDATE AD_Field SET SeqNoGrid=0,IsDisplayedGrid='N', Updated=sysdate, UpdatedBy=0 WHERE AD_Field_ID=10153 +; + +-- 2020-08-20 06:54:52 +UPDATE AD_Field SET SeqNoGrid=10,IsDisplayedGrid='Y', Updated=sysdate, UpdatedBy=0 WHERE AD_Field_ID=206427 +; + +-- 2020-08-20 06:55:13 +UPDATE AD_Tab SET OrderByClause='GL_Distribution.SeqNo, GL_Distribution.Name',Updated=TO_DATE('2020-08-20 18:55:13','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Tab_ID=646 +; + +SELECT register_migration_script('202008201900_IDEMPIERE-4422.sql') FROM dual +; diff --git a/migration/i7.1/postgresql/202008201900_IDEMPIERE-4422.sql b/migration/i7.1/postgresql/202008201900_IDEMPIERE-4422.sql new file mode 100644 index 0000000000..dd2c6ab1b3 --- /dev/null +++ b/migration/i7.1/postgresql/202008201900_IDEMPIERE-4422.sql @@ -0,0 +1,167 @@ +-- IDEMPIERE-4422 : GL DIstribution - Add SeqNo +-- 2020-08-20 06:53:44 +INSERT INTO AD_Column (AD_Column_ID,Version,Name,Description,Help,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 (214223,0,'Sequence','Method of ordering records; lowest number comes first','The Sequence indicates the order of records',708,'SeqNo','0',10,'N','N','Y','N','N',0,'N',11,0,0,'Y',TO_TIMESTAMP('2020-08-20 18:53:44','YYYY-MM-DD HH24:MI:SS'),0,TO_TIMESTAMP('2020-08-20 18:53:44','YYYY-MM-DD HH24:MI:SS'),0,566,'Y','N','D','N','N','N','Y','239b7b3f-8a1b-4e6d-939b-397771225725','Y',0,'N','N','N') +; + +-- 2020-08-20 06:53:47 +ALTER TABLE GL_Distribution ADD COLUMN SeqNo NUMERIC(10) DEFAULT '0' NOT NULL +; + +-- 2020-08-20 06:54:10 +INSERT INTO AD_Field (AD_Field_ID,Name,Description,Help,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 (206427,'Sequence','Method of ordering records; lowest number comes first','The Sequence indicates the order of records',646,214223,'Y',10,400,'N','N','N','N',0,0,'Y',TO_TIMESTAMP('2020-08-20 18:54:10','YYYY-MM-DD HH24:MI:SS'),0,TO_TIMESTAMP('2020-08-20 18:54:10','YYYY-MM-DD HH24:MI:SS'),0,'N','Y','D','e329fd14-f0d7-4f4f-af5d-61cf7a943de6','Y',400,2) +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET IsDisplayed='Y', SeqNo=70, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, XPosition=4, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=206427 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=80, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10144 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=90, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=56748 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=100, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10875 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=110, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10862 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=120, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10866 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=130, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10149 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=140, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10860 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=150, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10145 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=160, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10868 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=170, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10141 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=180, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10869 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=190, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10142 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=200, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10864 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=210, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10133 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=220, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10873 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=230, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10150 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=240, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10865 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=250, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10143 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=260, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10871 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=270, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10154 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=280, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10872 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=290, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10138 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=300, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10867 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=310, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10156 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=320, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10861 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=330, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10148 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=340, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10874 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=350, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10137 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=360, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10863 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=370, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10155 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=380, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10870 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=390, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10134 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=400, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=10140 +; + +-- 2020-08-20 06:54:24 +UPDATE AD_Field SET SeqNo=0, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-08-20 18:54:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=204840 +; + +-- 2020-08-20 06:54:52 +UPDATE AD_Field SET SeqNoGrid=0,IsDisplayedGrid='N', Updated=statement_timestamp(), UpdatedBy=0 WHERE AD_Field_ID=10153 +; + +-- 2020-08-20 06:54:52 +UPDATE AD_Field SET SeqNoGrid=10,IsDisplayedGrid='Y', Updated=statement_timestamp(), UpdatedBy=0 WHERE AD_Field_ID=206427 +; + +-- 2020-08-20 06:55:13 +UPDATE AD_Tab SET OrderByClause='GL_Distribution.SeqNo, GL_Distribution.Name',Updated=TO_TIMESTAMP('2020-08-20 18:55:13','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Tab_ID=646 +; + +SELECT register_migration_script('202008201900_IDEMPIERE-4422.sql') FROM dual +; diff --git a/org.adempiere.base/src/org/compiere/acct/Fact.java b/org.adempiere.base/src/org/compiere/acct/Fact.java index c3263ec454..3cfbfb9522 100644 --- a/org.adempiere.base/src/org/compiere/acct/Fact.java +++ b/org.adempiere.base/src/org/compiere/acct/Fact.java @@ -726,8 +726,8 @@ public final class Fact //end AZ // Just the first if (distributions.length > 1) - log.warning("More then one Distributiion for " + dLine.getAccount()); - MDistribution distribution = distributions[0]; + log.warning("More than one Distribution for " + dLine.getAccount()); + MDistribution distribution = distributions[0]; // FR 2685367 - GL Distribution delete line instead reverse if (distribution.isCreateReversal()) { diff --git a/org.adempiere.base/src/org/compiere/model/I_GL_Distribution.java b/org.adempiere.base/src/org/compiere/model/I_GL_Distribution.java index 1b05eccc77..b34c141b53 100644 --- a/org.adempiere.base/src/org/compiere/model/I_GL_Distribution.java +++ b/org.adempiere.base/src/org/compiere/model/I_GL_Distribution.java @@ -573,6 +573,21 @@ public interface I_GL_Distribution /** Get Process Now */ public boolean isProcessing(); + /** Column name SeqNo */ + public static final String COLUMNNAME_SeqNo = "SeqNo"; + + /** Set Sequence. + * Method of ordering records; + lowest number comes first + */ + public void setSeqNo (int SeqNo); + + /** Get Sequence. + * Method of ordering records; + lowest number comes first + */ + public int getSeqNo(); + /** Column name Updated */ public static final String COLUMNNAME_Updated = "Updated"; diff --git a/org.adempiere.base/src/org/compiere/model/MDistribution.java b/org.adempiere.base/src/org/compiere/model/MDistribution.java index 0c9a9a81ac..f67747ac24 100644 --- a/org.adempiere.base/src/org/compiere/model/MDistribution.java +++ b/org.adempiere.base/src/org/compiere/model/MDistribution.java @@ -166,6 +166,7 @@ public class MDistribution extends X_GL_Distribution List list = new Query(ctx,I_GL_Distribution.Table_Name,whereClause,null) .setClient_ID() .setParameters(parameters) + .setOrderBy("SeqNo, GL_Distribution_ID") .list(); // retValue = new MDistribution[list.size ()]; diff --git a/org.adempiere.base/src/org/compiere/model/X_GL_Distribution.java b/org.adempiere.base/src/org/compiere/model/X_GL_Distribution.java index 1a29f387c4..98a0aa8dcf 100644 --- a/org.adempiere.base/src/org/compiere/model/X_GL_Distribution.java +++ b/org.adempiere.base/src/org/compiere/model/X_GL_Distribution.java @@ -32,7 +32,7 @@ public class X_GL_Distribution extends PO implements I_GL_Distribution, I_Persis /** * */ - private static final long serialVersionUID = 20200413L; + private static final long serialVersionUID = 20200820L; /** Standard Constructor */ public X_GL_Distribution (Properties ctx, int GL_Distribution_ID, String trxName) @@ -74,6 +74,8 @@ public class X_GL_Distribution extends PO implements I_GL_Distribution, I_Persis // N setName (null); setPercentTotal (Env.ZERO); + setSeqNo (0); +// 0 } */ } @@ -986,6 +988,26 @@ public class X_GL_Distribution extends PO implements I_GL_Distribution, I_Persis return false; } + /** Set Sequence. + @param SeqNo + Method of ordering records; lowest number comes first + */ + public void setSeqNo (int SeqNo) + { + set_Value (COLUMNNAME_SeqNo, Integer.valueOf(SeqNo)); + } + + /** Get Sequence. + @return Method of ordering records; lowest number comes first + */ + public int getSeqNo () + { + Integer ii = (Integer)get_Value(COLUMNNAME_SeqNo); + if (ii == null) + return 0; + return ii.intValue(); + } + public org.compiere.model.I_C_ElementValue getUser1() throws RuntimeException { return (org.compiere.model.I_C_ElementValue)MTable.get(getCtx(), org.compiere.model.I_C_ElementValue.Table_Name)