From 2a27ac6c9f8d7a4e8e2987a48ca76f1921c62091 Mon Sep 17 00:00:00 2001
From: Nicolas Micoud <nmicoud@tgi.fr>
Date: Wed, 3 Feb 2016 19:31:54 +0100
Subject: [PATCH] IDEMPIERE-2954 Hardcoded messages when an error occurs on
 converting currencies in invoices

---
 .../src/org/compiere/model/MConversionRateUtil.java             | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/org.adempiere.base/src/org/compiere/model/MConversionRateUtil.java b/org.adempiere.base/src/org/compiere/model/MConversionRateUtil.java
index 8e76c0a2d3..a034fab118 100644
--- a/org.adempiere.base/src/org/compiere/model/MConversionRateUtil.java
+++ b/org.adempiere.base/src/org/compiere/model/MConversionRateUtil.java
@@ -106,6 +106,8 @@ public final class MConversionRateUtil
 	/** Return the message to show when no exchange rate is found */
 	public static String getErrorMessage(Properties ctx, String adMessage, int currencyFromID, int currencyToID, int convertionTypeID, Timestamp date, String trxName)
 	{
+		if (convertionTypeID == 0)
+			convertionTypeID = MConversionType.getDefault(Env.getAD_Client_ID(ctx));
 		String retValue = Msg.getMsg(ctx, adMessage,
 				new Object[] {MCurrency.get(ctx, currencyFromID).getISO_Code(), MCurrency.get(ctx, currencyToID).getISO_Code(), new MConversionType(ctx, convertionTypeID, trxName).getName(), date});
 		return retValue;