From aecc0e3e0a80a6ebc11fea38942a3cdd16bcad2c Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Fri, 10 Nov 2023 20:17:01 +0100 Subject: [PATCH] IDEMPIERE-5261 Workflow EMail notification enhancement (#2102) - add @_noDocInfo_@ variable to allow sending the email without adding extra information --- org.adempiere.base/src/org/compiere/wf/MWFActivity.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/wf/MWFActivity.java b/org.adempiere.base/src/org/compiere/wf/MWFActivity.java index 153f8b575c..70a65d8bd0 100644 --- a/org.adempiere.base/src/org/compiere/wf/MWFActivity.java +++ b/org.adempiere.base/src/org/compiere/wf/MWFActivity.java @@ -1814,15 +1814,14 @@ public class MWFActivity extends X_AD_WF_Activity implements Runnable // String subject = null; String raw = text.getMailHeader(false); - int first = raw != null ? raw.indexOf("@") : -1; - if (raw != null && first >= 0 && raw.indexOf("@", first) > first) - subject = text.getMailHeader(); + if (raw != null && raw.contains("@_noDocInfo_@")) + subject = text.getMailHeader().replaceAll("@_noDocInfo_@", ""); else subject = doc.getDocumentInfo() + ": " + text.getMailHeader(); String message = null; raw = text.getMailText(true, false); if (raw != null && (raw.contains("@=DocumentInfo") || raw.contains("@=documentInfo") - || raw.contains("@=Summary") || raw.contains("@=summary"))) + || raw.contains("@=Summary") || raw.contains("@=summary") || raw.contains("@_noDocInfo_@"))) message = text.getMailText(true); else message = text.getMailText(true)