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

Fix [2785621] - NOTIFICATIONTYPE_EMailPlusNotice is not considered 

Additional changes for other classes to use the new methods
This commit is contained in:
Carlos Ruiz 2009-05-02 15:53:14 +00:00
parent fce07572ac
commit 4a14d10084
2 changed files with 12 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
base/src/org/compiere/wf/MWFActivity.java
View File

@ -1272,11 +1272,9 @@ public class MWFActivity extends X_AD_WF_Activity implements Runnable
// Send Approval Notification // Send Approval Notification
if (newState.equals(StateEngine.STATE_Aborted)) { if (newState.equals(StateEngine.STATE_Aborted)) {
MUser to = new MUser(getCtx(), doc.getDoc_User_ID(), null); MUser to = new MUser(getCtx(), doc.getDoc_User_ID(), null);
String NotificationType = to.getNotificationType();
// send email // send email
if (MUser.NOTIFICATIONTYPE_EMail.equals(NotificationType) if (to.isNotificationEMail()) {
|| MUser.NOTIFICATIONTYPE_EMailPlusNotice.equals(NotificationType)) {
MClient client = MClient.get(getCtx(), doc.getAD_Client_ID()); MClient client = MClient.get(getCtx(), doc.getAD_Client_ID());
client.sendEMail(doc.getDoc_User_ID(), Msg.getMsg(getCtx(), "NotApproved") client.sendEMail(doc.getDoc_User_ID(), Msg.getMsg(getCtx(), "NotApproved")
+ ": " + doc.getDocumentNo(), + ": " + doc.getDocumentNo(),
@ -1286,8 +1284,7 @@ public class MWFActivity extends X_AD_WF_Activity implements Runnable
} }
// Send Note // Send Note
if (MUser.NOTIFICATIONTYPE_Notice.equals(NotificationType) if (to.isNotificationNote()) {
|| MUser.NOTIFICATIONTYPE_EMailPlusNotice.equals(NotificationType)) {
MNote note = new MNote(getCtx(), "NotApproved", doc.getDoc_User_ID(), null); MNote note = new MNote(getCtx(), "NotApproved", doc.getDoc_User_ID(), null);
note.setTextMsg((doc.getSummary() != null ? doc.getSummary() + "\n" : "" ) note.setTextMsg((doc.getSummary() != null ? doc.getSummary() + "\n" : "" )
+ (doc.getProcessMsg() != null ? doc.getProcessMsg() + "\n" : "") + (doc.getProcessMsg() != null ? doc.getProcessMsg() + "\n" : "")

32
serverRoot/src/main/server/org/compiere/server/Scheduler.java
View File

@ -1,5 +1,5 @@
/****************************************************************************** /******************************************************************************
* Product: Adempiere ERP & CRM Smart Business Solution * * Product: Adempiere ERP & CRM Smart Business Solution *
* Copyright (C) 1999-2006 ComPiere, Inc. All Rights Reserved. * * Copyright (C) 1999-2006 ComPiere, Inc. All Rights Reserved. *
* This program is free software; you can redistribute it and/or modify it * * This program is free software; you can redistribute it and/or modify it *
* under the terms version 2 of the GNU General Public License as published * * under the terms version 2 of the GNU General Public License as published *
@ -31,9 +31,6 @@ import org.compiere.model.MScheduler;
import org.compiere.model.MSchedulerLog; import org.compiere.model.MSchedulerLog;
import org.compiere.model.MSchedulerPara; import org.compiere.model.MSchedulerPara;
import org.compiere.model.MUser; import org.compiere.model.MUser;
import org.compiere.model.X_AD_Note;
import org.compiere.model.X_AD_PInstance;
import org.compiere.model.X_AD_User;
import org.compiere.print.ReportEngine; import org.compiere.print.ReportEngine;
import org.compiere.process.ProcessInfo; import org.compiere.process.ProcessInfo;
import org.compiere.process.ProcessInfoUtil; import org.compiere.process.ProcessInfoUtil;
@ -149,11 +146,8 @@ public class Scheduler extends AdempiereServer
for (int i = 0; i < userIDs.length; i++) for (int i = 0; i < userIDs.length; i++)
{ {
MUser user = new MUser(getCtx(), userIDs[i].intValue(), null); MUser user = new MUser(getCtx(), userIDs[i].intValue(), null);
String type = user.getNotificationType(); boolean email = user.isNotificationEMail();
boolean email = X_AD_User.NOTIFICATIONTYPE_EMail.equals(type) || boolean notice = user.isNotificationNote();
X_AD_User.NOTIFICATIONTYPE_EMailPlusNotice.equals(type);
boolean notice = X_AD_User.NOTIFICATIONTYPE_Notice.equals(type) ||
X_AD_User.NOTIFICATIONTYPE_EMailPlusNotice.equals(type);
if (notice) if (notice)
{ {
@ -166,7 +160,7 @@ public class Scheduler extends AdempiereServer
note.save(); note.save();
// Attachment // Attachment
MAttachment attachment = new MAttachment (getCtx(), MAttachment attachment = new MAttachment (getCtx(),
X_AD_Note.Table_ID, note.getAD_Note_ID(), m_trx.getTrxName()); MNote.Table_ID, note.getAD_Note_ID(), m_trx.getTrxName());
attachment.setClientOrg(m_model.getAD_Client_ID(), m_model.getAD_Org_ID()); attachment.setClientOrg(m_model.getAD_Client_ID(), m_model.getAD_Org_ID());
attachment.addEntry(report); attachment.addEntry(report);
attachment.setTextMsg(m_model.getName()); attachment.setTextMsg(m_model.getName());
@ -214,11 +208,8 @@ public class Scheduler extends AdempiereServer
if (supervisor > 0) if (supervisor > 0)
{ {
MUser user = new MUser(getCtx(), supervisor, null); MUser user = new MUser(getCtx(), supervisor, null);
String type = user.getNotificationType(); boolean email = user.isNotificationEMail();
boolean email = X_AD_User.NOTIFICATIONTYPE_EMail.equals(type) || boolean notice = user.isNotificationNote();
X_AD_User.NOTIFICATIONTYPE_EMailPlusNotice.equals(type);
boolean notice = X_AD_User.NOTIFICATIONTYPE_Notice.equals(type) ||
X_AD_User.NOTIFICATIONTYPE_EMailPlusNotice.equals(type);
if (email || notice) if (email || notice)
ProcessInfoUtil.setLogFromDB(pi); ProcessInfoUtil.setLogFromDB(pi);
@ -235,7 +226,7 @@ public class Scheduler extends AdempiereServer
note.setClientOrg(m_model.getAD_Client_ID(), m_model.getAD_Org_ID()); note.setClientOrg(m_model.getAD_Client_ID(), m_model.getAD_Org_ID());
note.setTextMsg(pi.getSummary()); note.setTextMsg(pi.getSummary());
//note.setDescription(); //note.setDescription();
note.setRecord(X_AD_PInstance.Table_ID, pi.getAD_PInstance_ID()); note.setRecord(MPInstance.Table_ID, pi.getAD_PInstance_ID());
note.save(); note.save();
} }
} }
@ -249,11 +240,8 @@ public class Scheduler extends AdempiereServer
for (int i = 0; i < userIDs.length; i++) for (int i = 0; i < userIDs.length; i++)
{ {
MUser user = new MUser(getCtx(), userIDs[i].intValue(), null); MUser user = new MUser(getCtx(), userIDs[i].intValue(), null);
String type = user.getNotificationType(); boolean email = user.isNotificationEMail();
boolean email = X_AD_User.NOTIFICATIONTYPE_EMail.equals(type) || boolean notice = user.isNotificationNote();
X_AD_User.NOTIFICATIONTYPE_EMailPlusNotice.equals(type);
boolean notice = X_AD_User.NOTIFICATIONTYPE_Notice.equals(type) ||
X_AD_User.NOTIFICATIONTYPE_EMailPlusNotice.equals(type);
if (email) if (email)
{ {
@ -267,7 +255,7 @@ public class Scheduler extends AdempiereServer
note.setClientOrg(m_model.getAD_Client_ID(), m_model.getAD_Org_ID()); note.setClientOrg(m_model.getAD_Client_ID(), m_model.getAD_Org_ID());
note.setTextMsg(pi.getSummary()); note.setTextMsg(pi.getSummary());
//note.setDescription(); //note.setDescription();
note.setRecord(X_AD_PInstance.Table_ID, pi.getAD_PInstance_ID()); note.setRecord(MPInstance.Table_ID, pi.getAD_PInstance_ID());
note.save(); note.save();
} }
} }