From ed7a7dcbde418bae73e296b4b0a09557c8b4f579 Mon Sep 17 00:00:00 2001
From: Diego Ruiz <12065321+d-ruiz@users.noreply.github.com>
Date: Thu, 5 Nov 2020 17:12:53 +0100
Subject: [PATCH] IDEMPIERE-4525 Translate MailText in Print Invoices to the
 corresponding BP Language (#356)

---
 .../src/org/compiere/process/InvoicePrint.java    |  2 +-
 .../src/org/compiere/model/MMailText.java         | 15 +++++----------
 .../org/adempiere/webui/process/InvoicePrint.java |  2 +-
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/org.adempiere.base.process/src/org/compiere/process/InvoicePrint.java b/org.adempiere.base.process/src/org/compiere/process/InvoicePrint.java
index 218f67aa0b..c1d90c801d 100644
--- a/org.adempiere.base.process/src/org/compiere/process/InvoicePrint.java
+++ b/org.adempiere.base.process/src/org/compiere/process/InvoicePrint.java
@@ -288,6 +288,7 @@ public class InvoicePrint extends SvrProcess
 				boolean printed = false;
 				if (p_EMailPDF)
 				{
+					mText.setBPartner(C_BPartner_ID);	//	Context - Translation
 					StringBuilder subject =new StringBuilder(mText.getMailHeader()).append(" - ").append(DocumentNo);
 					EMail email = client.createEMail(to.getEMail(), subject.toString(), null);
 					if (!email.isValid())
@@ -298,7 +299,6 @@ public class InvoicePrint extends SvrProcess
 						continue;
 					}
 					mText.setUser(to);					//	Context
-					mText.setBPartner(C_BPartner_ID);	//	Context
 					mText.setPO(new MInvoice(getCtx(), C_Invoice_ID, get_TrxName()));
 					String message = mText.getMailText(true);
 					if (mText.isHtml())
diff --git a/org.adempiere.base/src/org/compiere/model/MMailText.java b/org.adempiere.base/src/org/compiere/model/MMailText.java
index 7739de2c7b..3433a56079 100644
--- a/org.adempiere.base/src/org/compiere/model/MMailText.java
+++ b/org.adempiere.base/src/org/compiere/model/MMailText.java
@@ -89,8 +89,7 @@ public class MMailText extends X_R_MailText
 	 */
 	public String getMailText(boolean all)
 	{
-		if (m_MailText == null)
-			translate();
+		translate();
 		if (!all)
 			return parse(m_MailText);
 		//
@@ -112,8 +111,7 @@ public class MMailText extends X_R_MailText
 	 */
 	public String getMailText()
 	{
-		if (m_MailText == null)
-			translate();
+		translate();
 		return parse (m_MailText);
 	}	//	getMailText
 	
@@ -123,8 +121,7 @@ public class MMailText extends X_R_MailText
 	 */
 	public String getMailText2()
 	{
-		if (m_MailText == null)
-			translate();
+		translate();
 		return parse (m_MailText2);
 	}	//	getMailText2
 
@@ -134,8 +131,7 @@ public class MMailText extends X_R_MailText
 	 */
 	public String getMailText3()
 	{
-		if (m_MailText == null)
-			translate();
+		translate();
 		return parse (m_MailText3);
 	}	//	getMailText3
 
@@ -145,8 +141,7 @@ public class MMailText extends X_R_MailText
 	 */
 	public String getMailHeader()
 	{
-		if (m_MailHeader == null)
-			translate();
+		translate();
 		return parse(m_MailHeader);
 	}	//	getMailHeader
 	
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/InvoicePrint.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/InvoicePrint.java
index 58ba243cd0..dde4e33c13 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/InvoicePrint.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/InvoicePrint.java
@@ -249,6 +249,7 @@ public class InvoicePrint extends SvrProcess
 				boolean printed = false;
 				if (p_EMailPDF)
 				{
+					mText.setBPartner(C_BPartner_ID);	//	Context - Translation
 					String subject = mText.getMailHeader() + " - " + DocumentNo;
 					EMail email = client.createEMail(to.getEMail(), subject, null);
 					if (!email.isValid())
@@ -259,7 +260,6 @@ public class InvoicePrint extends SvrProcess
 						continue;
 					}
 					mText.setUser(to);					//	Context
-					mText.setBPartner(C_BPartner_ID);	//	Context
 					mText.setPO(new MInvoice(getCtx(), C_Invoice_ID, get_TrxName()));
 					String message = mText.getMailText(true);
 					if (mText.isHtml())