From 7993bdde4823ae7829d754240bd204cfc9849c39 Mon Sep 17 00:00:00 2001 From: Nicolas Micoud Date: Wed, 4 Dec 2013 12:58:41 -0500 Subject: [PATCH] IDEMPIERE-1589 MailText template don't use language --- .../src/org/compiere/model/MMailText.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/org.adempiere.base/src/org/compiere/model/MMailText.java b/org.adempiere.base/src/org/compiere/model/MMailText.java index 8acec867b3..53ac18a862 100644 --- a/org.adempiere.base/src/org/compiere/model/MMailText.java +++ b/org.adempiere.base/src/org/compiere/model/MMailText.java @@ -18,12 +18,15 @@ package org.compiere.model; import java.sql.PreparedStatement; import java.sql.ResultSet; +import java.text.SimpleDateFormat; import java.util.Properties; import java.util.logging.Level; import org.compiere.util.CCache; import org.compiere.util.DB; +import org.compiere.util.DisplayType; import org.compiere.util.Env; +import org.compiere.util.Msg; /** * Request Mail Template Model. @@ -221,6 +224,14 @@ public class MMailText extends X_R_MailText Object value = null; if (col != null && col.isSecure()) { value = "********"; + } else if (col.getAD_Reference_ID() == DisplayType.Date || col.getAD_Reference_ID() == DisplayType.DateTime || col.getAD_Reference_ID() == DisplayType.Time) { + SimpleDateFormat sdf = DisplayType.getDateFormat(col.getAD_Reference_ID()); + value = sdf.format (po.get_Value(index)); + } else if (col.getAD_Reference_ID() == DisplayType.YesNo) { + if (po.get_ValueAsBoolean(variable)) + value = Msg.getMsg(Env.getCtx(), "Yes"); + else + value = Msg.getMsg(Env.getCtx(), "No"); } else { value = po.get_Value(index); }