From 9b13c2dec46cc58a857b639b4140bd57e430b72d Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 31 Jul 2013 09:06:41 -0500 Subject: [PATCH] IDEMPIERE-840 Improvement to Request model class --- .../oracle/201307310904_IDEMPIERE-840.sql | 13 +++++++++++++ .../postgresql/201307310904_IDEMPIERE-840.sql | 13 +++++++++++++ org.adempiere.base/OSGI-INF/requesteventhandler.xml | 4 ++-- .../adempiere/base/event/RequestEventHandler.java | 3 ++- 4 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 migration/i1.0c-release/oracle/201307310904_IDEMPIERE-840.sql create mode 100644 migration/i1.0c-release/postgresql/201307310904_IDEMPIERE-840.sql diff --git a/migration/i1.0c-release/oracle/201307310904_IDEMPIERE-840.sql b/migration/i1.0c-release/oracle/201307310904_IDEMPIERE-840.sql new file mode 100644 index 0000000000..fc67f94a15 --- /dev/null +++ b/migration/i1.0c-release/oracle/201307310904_IDEMPIERE-840.sql @@ -0,0 +1,13 @@ +-- Jul 31, 2013 9:00:38 AM COT +-- IDEMPIERE-840 Improvement to Request model class +INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Org_ID,Created,AD_Client_ID) VALUES ('I','Sent by iDempiereMail',200218,'D','e1049e33-cbdc-4fc4-94fa-9e99f6bb07cc','RequestSentBy','Y',TO_DATE('2013-07-31 09:00:30','YYYY-MM-DD HH24:MI:SS'),100,100,0,TO_DATE('2013-07-31 09:00:30','YYYY-MM-DD HH24:MI:SS'),0) +; + +-- Jul 31, 2013 9:00:38 AM COT +-- IDEMPIERE-840 Improvement to Request model class +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200218 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID) +; + +SELECT register_migration_script('201307310904_IDEMPIERE-840.sql') FROM dual +; + diff --git a/migration/i1.0c-release/postgresql/201307310904_IDEMPIERE-840.sql b/migration/i1.0c-release/postgresql/201307310904_IDEMPIERE-840.sql new file mode 100644 index 0000000000..4e383774bb --- /dev/null +++ b/migration/i1.0c-release/postgresql/201307310904_IDEMPIERE-840.sql @@ -0,0 +1,13 @@ +-- Jul 31, 2013 9:00:38 AM COT +-- IDEMPIERE-840 Improvement to Request model class +INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Org_ID,Created,AD_Client_ID) VALUES ('I','Sent by iDempiereMail',200218,'D','e1049e33-cbdc-4fc4-94fa-9e99f6bb07cc','RequestSentBy','Y',TO_TIMESTAMP('2013-07-31 09:00:30','YYYY-MM-DD HH24:MI:SS'),100,100,0,TO_TIMESTAMP('2013-07-31 09:00:30','YYYY-MM-DD HH24:MI:SS'),0) +; + +-- Jul 31, 2013 9:00:38 AM COT +-- IDEMPIERE-840 Improvement to Request model class +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200218 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID) +; + +SELECT register_migration_script('201307310904_IDEMPIERE-840.sql') FROM dual +; + diff --git a/org.adempiere.base/OSGI-INF/requesteventhandler.xml b/org.adempiere.base/OSGI-INF/requesteventhandler.xml index f3d44317f0..db7e6d403f 100644 --- a/org.adempiere.base/OSGI-INF/requesteventhandler.xml +++ b/org.adempiere.base/OSGI-INF/requesteventhandler.xml @@ -1,5 +1,5 @@ - + @@ -7,4 +7,4 @@ - \ No newline at end of file + diff --git a/org.adempiere.base/src/org/adempiere/base/event/RequestEventHandler.java b/org.adempiere.base/src/org/adempiere/base/event/RequestEventHandler.java index fa5faa40af..4348922954 100644 --- a/org.adempiere.base/src/org/adempiere/base/event/RequestEventHandler.java +++ b/org.adempiere.base/src/org/adempiere/base/event/RequestEventHandler.java @@ -410,7 +410,8 @@ public class RequestEventHandler extends AbstractEventHandler implements Managed .append(Msg.translate(r.getCtx(), "R_Request_ID")) .append(": ").append(r.getDocumentNo()) .append(" ").append(r.getMailTag()) - .append("\nSent by AdempiereMail"); + .append("\n") + .append(Msg.getMsg(r.getCtx(), "RequestSentBy")); if (serverAddress != null) sb.append(" from ").append(serverAddress); return sb.toString();