From 8938fe1d3c9d10ccba935180250228429668a6fa Mon Sep 17 00:00:00 2001
From: Diego Ruiz <12065321+d-ruiz@users.noreply.github.com>
Date: Fri, 5 Jul 2024 12:30:51 +0200
Subject: [PATCH] IDEMPIERE-6186 - Fix MMailText setting the wrong language
 when bp language is null (#2410)

---
 org.adempiere.base/src/org/compiere/model/MMailText.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/org.adempiere.base/src/org/compiere/model/MMailText.java b/org.adempiere.base/src/org/compiere/model/MMailText.java
index 94cc816225..5e49f654c2 100644
--- a/org.adempiere.base/src/org/compiere/model/MMailText.java
+++ b/org.adempiere.base/src/org/compiere/model/MMailText.java
@@ -332,7 +332,7 @@ public class MMailText extends X_R_MailText
 		m_MailText3 = super.getMailText3();
 		if ((m_bpartner != null && m_bpartner.getAD_Language() != null) || !Util.isEmpty(m_language))
 		{
-			String adLanguage = m_bpartner != null ? m_bpartner.getAD_Language() : m_language;
+			String adLanguage = m_bpartner != null && m_bpartner.getAD_Language() != null ? m_bpartner.getAD_Language() : m_language;
 			StringBuilder key = new StringBuilder().append(adLanguage).append(get_ID());
 			MMailTextTrl trl = s_cacheTrl.get(key.toString());
 			if (trl == null)