diff --git a/migration/iD11/oracle/202309111358_IDEMPIERE-5852.sql b/migration/iD11/oracle/202309111358_IDEMPIERE-5852.sql new file mode 100644 index 0000000000..ef0c941239 --- /dev/null +++ b/migration/iD11/oracle/202309111358_IDEMPIERE-5852.sql @@ -0,0 +1,30 @@ +-- IDEMPIERE-3989 +SELECT register_migration_script('202309111358_IDEMPIERE-5852.sql') FROM dual; + +SET SQLBLANKLINES ON +SET DEFINE OFF + +-- Sep 11, 2023, 1:58:52 PM BRT +UPDATE AD_Column SET FieldLength=0, AD_Reference_ID=36,Updated=TO_TIMESTAMP('2023-09-11 13:58:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200985 +; + +-- Sep 11, 2023, 1:58:58 PM BRT +ALTER TABLE AD_BroadcastMessage ADD (Tmp_BroadcastMessage_ToRename CLOB); +UPDATE AD_BroadcastMessage SET Tmp_BroadcastMessage_ToRename = BroadcastMessage; +ALTER TABLE AD_BroadcastMessage DROP COLUMN BroadcastMessage; +ALTER TABLE AD_BroadcastMessage RENAME COLUMN Tmp_BroadcastMessage_ToRename TO BroadcastMessage; + +-- Sep 11, 2023, 1:59:52 PM BRT +UPDATE AD_Column SET FieldLength=0, AD_Reference_ID=36, FKConstraintType=NULL,Updated=TO_TIMESTAMP('2023-09-11 13:59:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=211151 +; + +-- Sep 11, 2023, 1:59:58 PM BRT +ALTER TABLE AD_BroadcastMessage_Trl ADD (Tmp_BroadcastMessage_ToRename CLOB); +UPDATE AD_BroadcastMessage_Trl SET Tmp_BroadcastMessage_ToRename = BroadcastMessage; +ALTER TABLE AD_BroadcastMessage_Trl DROP COLUMN BroadcastMessage; +ALTER TABLE AD_BroadcastMessage_Trl RENAME COLUMN Tmp_BroadcastMessage_ToRename TO BroadcastMessage; + +-- 14/09/2023, 12:52:19 p. m. GMT+02:00 +UPDATE AD_Column SET IsAlwaysUpdateable='Y', IsToolbarButton='N',Updated=TO_DATE('2023-09-14 12:52:19','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200979 +; + diff --git a/migration/iD11/postgresql/202309111358_IDEMPIERE-5852.sql b/migration/iD11/postgresql/202309111358_IDEMPIERE-5852.sql new file mode 100644 index 0000000000..9d597d53bf --- /dev/null +++ b/migration/iD11/postgresql/202309111358_IDEMPIERE-5852.sql @@ -0,0 +1,23 @@ +-- IDEMPIERE-3989 +SELECT register_migration_script('202309111358_IDEMPIERE-5852.sql') FROM dual; + +-- Sep 11, 2023, 1:58:52 PM BRT +UPDATE AD_Column SET FieldLength=0, AD_Reference_ID=36,Updated=TO_TIMESTAMP('2023-09-11 13:58:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200985 +; + +-- Sep 11, 2023, 1:58:58 PM BRT +INSERT INTO t_alter_column values('ad_broadcastmessage','BroadcastMessage','TEXT',null,null) +; + +-- Sep 11, 2023, 1:59:52 PM BRT +UPDATE AD_Column SET FieldLength=0, AD_Reference_ID=36, FKConstraintType=NULL,Updated=TO_TIMESTAMP('2023-09-11 13:59:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=211151 +; + +-- Sep 11, 2023, 1:59:58 PM BRT +INSERT INTO t_alter_column values('ad_broadcastmessage_trl','BroadcastMessage','TEXT',null,null) +; + +-- 14/09/2023, 12:52:20 p. m. GMT+02:00 +UPDATE AD_Column SET IsAlwaysUpdateable='Y', IsToolbarButton='N',Updated=TO_TIMESTAMP('2023-09-14 12:52:19','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200979 +; + diff --git a/org.adempiere.base/src/org/idempiere/broadcast/BroadcastMsgUtil.java b/org.adempiere.base/src/org/idempiere/broadcast/BroadcastMsgUtil.java index 7e67131c3b..6eb2e6f90a 100644 --- a/org.adempiere.base/src/org/idempiere/broadcast/BroadcastMsgUtil.java +++ b/org.adempiere.base/src/org/idempiere/broadcast/BroadcastMsgUtil.java @@ -168,6 +168,7 @@ public class BroadcastMsgUtil + " AND n.AD_Client_ID = ? " + " AND ( bm.BroadcastType = 'IL' OR bm.BroadcastType = 'L' ) " + " AND bm.isPublished = 'Y' " + + " AND bm.IsActive = 'Y' " + " AND ( n.Processed = 'N' OR ( n.Processed = 'Y' AND bm.BroadcastFrequency = 'E' ) ) " + " AND ( bm.Expired = 'N' AND ( bm.Expiration IS NULL OR bm.Expiration > getDate() ) ) ";