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 / IDEMPIERE-3977

This commit is contained in:
Carlos Ruiz 2020-03-23 19:12:13 +01:00
parent 43d77dee4e
commit 2cbed92cc4
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -133,7 +133,7 @@ public class AlertProcessor extends AdempiereServer
if (log.isLoggable(Level.INFO)) log.info("" + alert); if (log.isLoggable(Level.INFO)) log.info("" + alert);
MSystem system = MSystem.get(Env.getCtx()); 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 // parse variables from Client, then from System
String alertMessage = Env.parseVariable(alert.getAlertMessage(), client, null, true); String alertMessage = Env.parseVariable(alert.getAlertMessage(), client, null, true);
alertMessage = Env.parseVariable(alertMessage, system, 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 // parse variables from Client, then from System
String alertSubject = Env.parseVariable(alert.getAlertSubject(), client, null, true); String alertSubject = Env.parseVariable(alert.getAlertSubject(), client, null, true);
alertSubject = Env.parseVariable(alertSubject, system, 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 // IDEMPIERE-2864
for(File attachment : attachments) for(File attachment : attachments)
@ -259,9 +259,10 @@ public class AlertProcessor extends AdempiereServer
* @param subject email subject * @param subject email subject
* @param message email message * @param message email message
* @param attachments * @param attachments
* @param alert
* @return how many email were sent * @return how many email were sent
*/ */
protected int notifyUsers(Collection<Integer> users, String subject, String message, Collection<File> attachments) protected int notifyUsers(Collection<Integer> users, String subject, String message, Collection<File> attachments, MAlert alert)
{ {
int countMail = 0; int countMail = 0;
for (int user_id : users) { for (int user_id : users) {
@ -282,14 +283,14 @@ public class AlertProcessor extends AdempiereServer
// Notice // Notice
int AD_Message_ID = 52244; /* TODO - Hardcoded message=notes */ int AD_Message_ID = 52244; /* 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(m_model.getAD_Client_ID(), m_model.getAD_Org_ID()); note.setClientOrg(alert.getAD_Client_ID(), alert.getAD_Org_ID());
note.setTextMsg(message); note.setTextMsg(message);
note.setDescription(subject); note.setDescription(subject);
note.saveEx(); note.saveEx();
if (attachments.size() > 0) { if (attachments.size() > 0) {
// Attachment // Attachment
MAttachment attachment = new MAttachment (getCtx(), MNote.Table_ID, note.getAD_Note_ID(), trx.getTrxName()); 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) { for (File f : attachments) {
attachment.addEntry(f); attachment.addEntry(f);
} }