From 34485f97f88f3f68a0354dd7c0dfd3bcdd266a1d Mon Sep 17 00:00:00 2001 From: Zuhri Utama Date: Tue, 26 Sep 2023 18:49:25 +0700 Subject: [PATCH] IDEMPIERE-5862 : Move Always Updatable Payment Rule to Dictionary (#2023) * IDEMPIERE-5862 : Move Always Updatable Payment Rule to Dictionary * Update oracle/202309261054_IDEMPIERE-5862.sql * Update postgresql/202309261054_IDEMPIERE-5862.sql --------- Co-authored-by: Carlos Ruiz --- .../oracle/202309261054_IDEMPIERE-5862.sql | 50 +++++++++++++++++++ .../202309261054_IDEMPIERE-5862.sql | 47 +++++++++++++++++ .../src/org/compiere/model/GridField.java | 1 - 3 files changed, 97 insertions(+), 1 deletion(-) create mode 100644 migration/iD11/oracle/202309261054_IDEMPIERE-5862.sql create mode 100644 migration/iD11/postgresql/202309261054_IDEMPIERE-5862.sql diff --git a/migration/iD11/oracle/202309261054_IDEMPIERE-5862.sql b/migration/iD11/oracle/202309261054_IDEMPIERE-5862.sql new file mode 100644 index 0000000000..9968f3032d --- /dev/null +++ b/migration/iD11/oracle/202309261054_IDEMPIERE-5862.sql @@ -0,0 +1,50 @@ +SET SQLBLANKLINES ON +SET DEFINE OFF + +-- Sep 26, 2023, 10:54:33 AM WIB +UPDATE AD_Column SET IsAlwaysUpdateable='Y',Updated=TO_TIMESTAMP('2023-09-26 10:54:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=10 WHERE AD_Column_ID=6215 +; + +-- Sep 26, 2023, 10:54:33 AM WIB +UPDATE AD_Column SET IsAlwaysUpdateable='Y',Updated=TO_TIMESTAMP('2023-09-26 10:54:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=10 WHERE AD_Column_ID=7718 +; + +-- Sep 26, 2023, 10:54:33 AM WIB +UPDATE AD_Column SET IsAlwaysUpdateable='Y',Updated=TO_TIMESTAMP('2023-09-26 10:54:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=10 WHERE AD_Column_ID=54896 +; + +-- Sep 26, 2023, 10:54:33 AM WIB +UPDATE AD_Column SET IsAlwaysUpdateable='Y',Updated=TO_TIMESTAMP('2023-09-26 10:54:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=10 WHERE AD_Column_ID=3084 +; + +-- Sep 26, 2023, 10:54:33 AM WIB +UPDATE AD_Column SET IsAlwaysUpdateable='Y',Updated=TO_TIMESTAMP('2023-09-26 10:54:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=10 WHERE AD_Column_ID=54679 +; + +-- Sep 26, 2023, 10:54:33 AM WIB +UPDATE AD_Column SET IsAlwaysUpdateable='Y',Updated=TO_TIMESTAMP('2023-09-26 10:54:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=10 WHERE AD_Column_ID=4019 +; + +-- Sep 26, 2023, 10:54:33 AM WIB +UPDATE AD_Column SET IsAlwaysUpdateable='Y',Updated=TO_TIMESTAMP('2023-09-26 10:54:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=10 WHERE AD_Column_ID=4020 +; + +-- Sep 26, 2023, 10:54:33 AM WIB +UPDATE AD_Column SET IsAlwaysUpdateable='Y',Updated=TO_TIMESTAMP('2023-09-26 10:54:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=10 WHERE AD_Column_ID=201246 +; + +-- Sep 26, 2023, 10:54:33 AM WIB +UPDATE AD_Column SET IsAlwaysUpdateable='Y',Updated=TO_TIMESTAMP('2023-09-26 10:54:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=10 WHERE AD_Column_ID=202209 +; + +-- Sep 26, 2023, 10:54:33 AM WIB +UPDATE AD_Column SET IsAlwaysUpdateable='Y',Updated=TO_TIMESTAMP('2023-09-26 10:54:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=10 WHERE AD_Column_ID=5637 +; + +UPDATE AD_Column SET IsAlwaysUpdateable='Y' +WHERE IsAlwaysUpdateable='N' AND ColumnName='PaymentRule' +AND EXISTS (SELECT 1 FROM AD_Table t WHERE t.AD_Table_ID=AD_Column.AD_Table_ID AND t.IsView='N') +; + +-- IDEMPIERE-5862 +SELECT register_migration_script('202309261054_IDEMPIERE-5862.sql') FROM dual; diff --git a/migration/iD11/postgresql/202309261054_IDEMPIERE-5862.sql b/migration/iD11/postgresql/202309261054_IDEMPIERE-5862.sql new file mode 100644 index 0000000000..d8af645a4f --- /dev/null +++ b/migration/iD11/postgresql/202309261054_IDEMPIERE-5862.sql @@ -0,0 +1,47 @@ +-- Sep 26, 2023, 10:54:33 AM WIB +UPDATE AD_Column SET IsAlwaysUpdateable='Y',Updated=TO_TIMESTAMP('2023-09-26 10:54:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=10 WHERE AD_Column_ID=6215 +; + +-- Sep 26, 2023, 10:54:33 AM WIB +UPDATE AD_Column SET IsAlwaysUpdateable='Y',Updated=TO_TIMESTAMP('2023-09-26 10:54:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=10 WHERE AD_Column_ID=7718 +; + +-- Sep 26, 2023, 10:54:33 AM WIB +UPDATE AD_Column SET IsAlwaysUpdateable='Y',Updated=TO_TIMESTAMP('2023-09-26 10:54:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=10 WHERE AD_Column_ID=54896 +; + +-- Sep 26, 2023, 10:54:33 AM WIB +UPDATE AD_Column SET IsAlwaysUpdateable='Y',Updated=TO_TIMESTAMP('2023-09-26 10:54:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=10 WHERE AD_Column_ID=3084 +; + +-- Sep 26, 2023, 10:54:33 AM WIB +UPDATE AD_Column SET IsAlwaysUpdateable='Y',Updated=TO_TIMESTAMP('2023-09-26 10:54:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=10 WHERE AD_Column_ID=54679 +; + +-- Sep 26, 2023, 10:54:33 AM WIB +UPDATE AD_Column SET IsAlwaysUpdateable='Y',Updated=TO_TIMESTAMP('2023-09-26 10:54:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=10 WHERE AD_Column_ID=4019 +; + +-- Sep 26, 2023, 10:54:33 AM WIB +UPDATE AD_Column SET IsAlwaysUpdateable='Y',Updated=TO_TIMESTAMP('2023-09-26 10:54:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=10 WHERE AD_Column_ID=4020 +; + +-- Sep 26, 2023, 10:54:33 AM WIB +UPDATE AD_Column SET IsAlwaysUpdateable='Y',Updated=TO_TIMESTAMP('2023-09-26 10:54:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=10 WHERE AD_Column_ID=201246 +; + +-- Sep 26, 2023, 10:54:33 AM WIB +UPDATE AD_Column SET IsAlwaysUpdateable='Y',Updated=TO_TIMESTAMP('2023-09-26 10:54:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=10 WHERE AD_Column_ID=202209 +; + +-- Sep 26, 2023, 10:54:33 AM WIB +UPDATE AD_Column SET IsAlwaysUpdateable='Y',Updated=TO_TIMESTAMP('2023-09-26 10:54:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=10 WHERE AD_Column_ID=5637 +; + +UPDATE AD_Column SET IsAlwaysUpdateable='Y' +WHERE IsAlwaysUpdateable='N' AND ColumnName='PaymentRule' +AND EXISTS (SELECT 1 FROM AD_Table t WHERE t.AD_Table_ID=AD_Column.AD_Table_ID AND t.IsView='N') +; + +-- IDEMPIERE-5862 +SELECT register_migration_script('202309261054_IDEMPIERE-5862.sql') FROM dual; diff --git a/org.adempiere.base/src/org/compiere/model/GridField.java b/org.adempiere.base/src/org/compiere/model/GridField.java index eac984b1be..8a48c153ae 100644 --- a/org.adempiere.base/src/org/compiere/model/GridField.java +++ b/org.adempiere.base/src/org/compiere/model/GridField.java @@ -570,7 +570,6 @@ public class GridField // Always editable if Active if (checkContext && "Y".equals(Env.getContext(ctx, m_vo.WindowNo, m_vo.TabNo, "IsActive")) && ( m_vo.ColumnName.equals("Processing") - || m_vo.ColumnName.equals("PaymentRule") || m_vo.ColumnName.equals("DocAction") || m_vo.ColumnName.equals("GenerateTo"))) return true;