midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-4218 Note and attachment from scheduler created in wrong client / also cross-tenant AD_UserMail

This commit is contained in:
Carlos Ruiz 2020-03-23 20:39:11 +01:00
parent 2cbed92cc4
commit e32ed5c5cd
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
org.adempiere.base/src/org/compiere/model/SystemIDs.java
View File

@ -56,6 +56,7 @@ public class SystemIDs
public final static int MESSAGE_REQUESTUPDATE = 834; public final static int MESSAGE_REQUESTUPDATE = 834;
public final static int MESSAGE_WORKFLOWRESULT = 753; public final static int MESSAGE_WORKFLOWRESULT = 753;
public final static int MESSAGE_NOTES = 52244;
public final static int PRINTFORMAT_STATEMENTOFACCOUNT = 134; public final static int PRINTFORMAT_STATEMENTOFACCOUNT = 134;
public final static int PRINTFORMAT_ORDER_HEADER_TEMPLATE = 100; public final static int PRINTFORMAT_ORDER_HEADER_TEMPLATE = 100;

6
org.adempiere.server/src/main/server/org/compiere/server/AlertProcessor.java
View File

@ -37,6 +37,7 @@ import org.compiere.model.MNote;
import org.compiere.model.MSysConfig; import org.compiere.model.MSysConfig;
import org.compiere.model.MSystem; import org.compiere.model.MSystem;
import org.compiere.model.MUser; import org.compiere.model.MUser;
import org.compiere.model.SystemIDs;
import org.compiere.util.CLogger; import org.compiere.util.CLogger;
import org.compiere.util.DB; import org.compiere.util.DB;
import org.compiere.util.DisplayType; import org.compiere.util.DisplayType;
@ -269,7 +270,8 @@ public class AlertProcessor extends AdempiereServer
MUser user = MUser.get(getCtx(), user_id); MUser user = MUser.get(getCtx(), user_id);
if (user.isNotificationEMail()) { if (user.isNotificationEMail()) {
String messageHTML = message.replaceAll(Env.NL, "<br>"); String messageHTML = message.replaceAll(Env.NL, "<br>");
if (m_client.sendEMailAttachments (user_id, subject, messageHTML, attachments, true)) MClient client = MClient.get(Env.getCtx(), alert.getAD_Client_ID());
if (client.sendEMailAttachments (user_id, subject, messageHTML, attachments, true))
{ {
countMail++; countMail++;
} }
@ -281,7 +283,7 @@ public class AlertProcessor extends AdempiereServer
trx = Trx.get(Trx.createTrxName("AP_NU"), true); trx = Trx.get(Trx.createTrxName("AP_NU"), true);
trx.setDisplayName(getClass().getName()+"_"+m_model.getName()+"_notifyUsers"); trx.setDisplayName(getClass().getName()+"_"+m_model.getName()+"_notifyUsers");
// Notice // Notice
int AD_Message_ID = 52244; /* TODO - Hardcoded message=notes */ int AD_Message_ID = SystemIDs.MESSAGE_NOTES; /* TODO - Hardcoded message=notes */
MNote note = new MNote(getCtx(), AD_Message_ID, user_id, trx.getTrxName()); MNote note = new MNote(getCtx(), AD_Message_ID, user_id, trx.getTrxName());
note.setClientOrg(alert.getAD_Client_ID(), alert.getAD_Org_ID()); note.setClientOrg(alert.getAD_Client_ID(), alert.getAD_Org_ID());
note.setTextMsg(message); note.setTextMsg(message);