From 2cbed92cc4188c7b84f4e00f90eab5152e2c69ff Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Mon, 23 Mar 2020 19:12:13 +0100 Subject: [PATCH] IDEMPIERE-4218 Note and attachment from scheduler created in wrong client / IDEMPIERE-3977 --- .../server/org/compiere/server/AlertProcessor.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/org.adempiere.server/src/main/server/org/compiere/server/AlertProcessor.java b/org.adempiere.server/src/main/server/org/compiere/server/AlertProcessor.java index 807ded2d66..7f0f8357f5 100644 --- a/org.adempiere.server/src/main/server/org/compiere/server/AlertProcessor.java +++ b/org.adempiere.server/src/main/server/org/compiere/server/AlertProcessor.java @@ -133,7 +133,7 @@ public class AlertProcessor extends AdempiereServer if (log.isLoggable(Level.INFO)) log.info("" + alert); MSystem system = MSystem.get(Env.getCtx()); - MClient client = MClient.get(Env.getCtx()); + MClient client = MClient.get(Env.getCtx(), alert.getAD_Client_ID()); // parse variables from Client, then from System String alertMessage = Env.parseVariable(alert.getAlertMessage(), client, null, true); alertMessage = Env.parseVariable(alertMessage, system, null, true); @@ -240,7 +240,7 @@ public class AlertProcessor extends AdempiereServer // parse variables from Client, then from System String alertSubject = Env.parseVariable(alert.getAlertSubject(), client, null, true); alertSubject = Env.parseVariable(alertSubject, system, null, true); - int countMail = notifyUsers(users, alertSubject, message.toString(), attachments); + int countMail = notifyUsers(users, alertSubject, message.toString(), attachments, alert); // IDEMPIERE-2864 for(File attachment : attachments) @@ -259,9 +259,10 @@ public class AlertProcessor extends AdempiereServer * @param subject email subject * @param message email message * @param attachments + * @param alert * @return how many email were sent */ - protected int notifyUsers(Collection users, String subject, String message, Collection attachments) + protected int notifyUsers(Collection users, String subject, String message, Collection attachments, MAlert alert) { int countMail = 0; for (int user_id : users) { @@ -282,14 +283,14 @@ public class AlertProcessor extends AdempiereServer // Notice int AD_Message_ID = 52244; /* TODO - Hardcoded message=notes */ MNote note = new MNote(getCtx(), AD_Message_ID, user_id, trx.getTrxName()); - note.setClientOrg(m_model.getAD_Client_ID(), m_model.getAD_Org_ID()); + note.setClientOrg(alert.getAD_Client_ID(), alert.getAD_Org_ID()); note.setTextMsg(message); note.setDescription(subject); note.saveEx(); if (attachments.size() > 0) { // Attachment MAttachment attachment = new MAttachment (getCtx(), MNote.Table_ID, note.getAD_Note_ID(), trx.getTrxName()); - attachment.setClientOrg(m_model.getAD_Client_ID(), m_model.getAD_Org_ID()); + attachment.setClientOrg(alert.getAD_Client_ID(), alert.getAD_Org_ID()); for (File f : attachments) { attachment.addEntry(f); }