From 5da36c71f6613cd413820b3dbbb7e209a9738c90 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Sun, 11 Oct 2015 12:42:40 -0500 Subject: [PATCH] IDEMPIERE-2672 Region field in Tax Rate window default OR when default country is not USA / IDEMPIERE-2880 <1000000> IDs in webui problem --- .../src/org/compiere/model/MLookupFactory.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/org.adempiere.base/src/org/compiere/model/MLookupFactory.java b/org.adempiere.base/src/org/compiere/model/MLookupFactory.java index ebc8e2ac63..cb424539be 100644 --- a/org.adempiere.base/src/org/compiere/model/MLookupFactory.java +++ b/org.adempiere.base/src/org/compiere/model/MLookupFactory.java @@ -402,7 +402,11 @@ public class MLookupFactory } else { lang = language.getAD_Language(); } - StringBuilder key = new StringBuilder().append(Env.getAD_Client_ID(ctx)).append("|").append(lang).append("|").append(String.valueOf(AD_Reference_Value_ID)); + StringBuilder key = new StringBuilder() + .append(Env.getAD_Client_ID(ctx)).append("|") + .append(Env.getAD_User_ID(ctx)).append("|") + .append(lang).append("|") + .append(String.valueOf(AD_Reference_Value_ID)); MLookupInfo retValue = (MLookupInfo)s_cacheRefTable.get(key.toString()); if (retValue != null) { @@ -748,6 +752,7 @@ public class MLookupFactory //try cache StringBuilder cacheKey = new StringBuilder() .append(Env.getAD_Client_ID(ctx)).append("|") + .append(Env.getAD_User_ID(ctx)).append("|") .append(language.getAD_Language()).append("|") .append(TableName).append(".") .append(KeyColumn);