From 69794ff93635553f67a6447034872c4ac9418d40 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Fri, 3 Sep 2021 23:01:24 +0200 Subject: [PATCH] IDEMPIERE-4470 Window Advanced Search - New operator types: AND Not, Or Not (#864) * Revert "IDEMPIERE-4470 Window Advanced Search - New operator types: AND Not, Or Not (#850)" This reverts commit 39ad82ebf0086412d37aabbb38dfb6e83c80b180. * IDEMPIERE-4470 Window Advanced Search - New operator types: AND Not, Or Not Based on pull request 170 Co-authored-by: Igor Pojzl * IDEMPIERE-4470 Window Advanced Search - New operator types: AND Not, Or Not Fix naming of migration scripts as suggested by Heng Sin --- ...1531_IDEMPIERE-4470.sql => 202103081000_IDEMPIERE-4724.sql} | 3 ++- ...1100_IDEMPIERE-4364.sql => 202109032257_IDEMPIERE-4470.sql} | 3 ++- ...1531_IDEMPIERE-4470.sql => 202103081000_IDEMPIERE-4724.sql} | 3 ++- ...1100_IDEMPIERE-4364.sql => 202109032257_IDEMPIERE-4470.sql} | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) rename migration/i8.2z/oracle/{202109031531_IDEMPIERE-4470.sql => 202103081000_IDEMPIERE-4724.sql} (98%) rename migration/i8.2z/oracle/{202007171100_IDEMPIERE-4364.sql => 202109032257_IDEMPIERE-4470.sql} (93%) rename migration/i8.2z/postgresql/{202109031531_IDEMPIERE-4470.sql => 202103081000_IDEMPIERE-4724.sql} (98%) rename migration/i8.2z/postgresql/{202007171100_IDEMPIERE-4364.sql => 202109032257_IDEMPIERE-4470.sql} (93%) diff --git a/migration/i8.2z/oracle/202109031531_IDEMPIERE-4470.sql b/migration/i8.2z/oracle/202103081000_IDEMPIERE-4724.sql similarity index 98% rename from migration/i8.2z/oracle/202109031531_IDEMPIERE-4470.sql rename to migration/i8.2z/oracle/202103081000_IDEMPIERE-4724.sql index f7fd946ef1..afe12c4d80 100644 --- a/migration/i8.2z/oracle/202109031531_IDEMPIERE-4470.sql +++ b/migration/i8.2z/oracle/202103081000_IDEMPIERE-4724.sql @@ -46,6 +46,7 @@ UPDATE AD_Field SET SeqNo=170,IsDisplayed='Y', Updated=getDate(), UpdatedBy=100 UPDATE AD_Field SET DisplayLogic='@DataType@=S', AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-03-07 21:09:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=206602 ; -SELECT register_migration_script('202109031531_IDEMPIERE-4470.sql') FROM dual +SELECT register_migration_script('202103081000_IDEMPIERE-4724.sql') FROM dual ; + diff --git a/migration/i8.2z/oracle/202007171100_IDEMPIERE-4364.sql b/migration/i8.2z/oracle/202109032257_IDEMPIERE-4470.sql similarity index 93% rename from migration/i8.2z/oracle/202007171100_IDEMPIERE-4364.sql rename to migration/i8.2z/oracle/202109032257_IDEMPIERE-4470.sql index ef88d0e5b6..7d723992ad 100644 --- a/migration/i8.2z/oracle/202007171100_IDEMPIERE-4364.sql +++ b/migration/i8.2z/oracle/202109032257_IDEMPIERE-4470.sql @@ -10,5 +10,6 @@ INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created, INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','OR NOT',0,0,'Y',TO_DATE('2020-07-17 09:35:20','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2020-07-17 09:35:20','YYYY-MM-DD HH24:MI:SS'),100,200622,'ORNOT','D','dc113e24-35bc-4736-8de0-22a036e9f01b') ; -SELECT register_migration_script('202007171100_IDEMPIERE-4364.sql') FROM dual +SELECT register_migration_script('202109032257_IDEMPIERE-4470.sql') FROM dual ; + diff --git a/migration/i8.2z/postgresql/202109031531_IDEMPIERE-4470.sql b/migration/i8.2z/postgresql/202103081000_IDEMPIERE-4724.sql similarity index 98% rename from migration/i8.2z/postgresql/202109031531_IDEMPIERE-4470.sql rename to migration/i8.2z/postgresql/202103081000_IDEMPIERE-4724.sql index b3de358bef..df2f129584 100644 --- a/migration/i8.2z/postgresql/202109031531_IDEMPIERE-4470.sql +++ b/migration/i8.2z/postgresql/202103081000_IDEMPIERE-4724.sql @@ -43,6 +43,7 @@ UPDATE AD_Field SET SeqNo=170,IsDisplayed='Y', Updated=statement_timestamp(), Up UPDATE AD_Field SET DisplayLogic='@DataType@=S', AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-03-07 21:09:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=206602 ; -SELECT register_migration_script('202109031531_IDEMPIERE-4470.sql') FROM dual +SELECT register_migration_script('202103081000_IDEMPIERE-4724.sql') FROM dual ; + diff --git a/migration/i8.2z/postgresql/202007171100_IDEMPIERE-4364.sql b/migration/i8.2z/postgresql/202109032257_IDEMPIERE-4470.sql similarity index 93% rename from migration/i8.2z/postgresql/202007171100_IDEMPIERE-4364.sql rename to migration/i8.2z/postgresql/202109032257_IDEMPIERE-4470.sql index 41742f09a7..cbaa1a0756 100644 --- a/migration/i8.2z/postgresql/202007171100_IDEMPIERE-4364.sql +++ b/migration/i8.2z/postgresql/202109032257_IDEMPIERE-4470.sql @@ -7,5 +7,6 @@ INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created, INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','OR NOT',0,0,'Y',TO_TIMESTAMP('2020-07-17 09:35:20','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2020-07-17 09:35:20','YYYY-MM-DD HH24:MI:SS'),100,200622,'ORNOT','D','dc113e24-35bc-4736-8de0-22a036e9f01b') ; -SELECT register_migration_script('202007171100_IDEMPIERE-4364.sql') FROM dual +SELECT register_migration_script('202109032257_IDEMPIERE-4470.sql') FROM dual ; +