From 2d76f90f9c097075892fc7f4e03ca3f7975d18db Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Thu, 21 Jan 2021 14:28:15 +0100 Subject: [PATCH] IDEMPIERE-4660 Wrong code in virtual columns broke IDEMPIERE-2356 (#541) IDEMPIERE-4087 IDEMPIERE-3760 --- org.adempiere.base/src/org/compiere/model/MLookupFactory.java | 2 +- .../WEB-INF/src/org/adempiere/webui/panel/InfoGeneralPanel.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/model/MLookupFactory.java b/org.adempiere.base/src/org/compiere/model/MLookupFactory.java index 1a3d14109e..1aa3861a1e 100644 --- a/org.adempiere.base/src/org/compiere/model/MLookupFactory.java +++ b/org.adempiere.base/src/org/compiere/model/MLookupFactory.java @@ -459,7 +459,7 @@ public class MLookupFactory displayColumnSQL = rs.getString(11); if (displayColumnSQL != null && displayColumnSQL.length() > 0 && (displayColumnSQL.startsWith("@SQL=") || displayColumnSQL.startsWith("@SQLFIND="))) displayColumnSQL = "NULL"; - if (displayColumnSQL != null && displayColumnSQL.contains("@") && displayColumnSQL.startsWith("@SQL=")) + if (displayColumnSQL != null && displayColumnSQL.contains("@")) displayColumnSQL = Env.parseContext(Env.getCtx(), -1, displayColumnSQL, false, true); overrideZoomWindow = rs.getInt(12); infoWindowId = rs.getInt(13); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoGeneralPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoGeneralPanel.java index 42d4e0714e..08b3a68a90 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoGeneralPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoGeneralPanel.java @@ -485,7 +485,7 @@ public class InfoGeneralPanel extends InfoPanel implements EventListener boolean isDisplayed = rs.getString(4).equals("Y"); int AD_Reference_Value_ID = rs.getInt(5); String columnSql = rs.getString(6); - if (columnSql != null && columnSql.length() > 0 && columnSql.contains("@")) + if (columnSql != null && columnSql.length() > 0 && (columnSql.startsWith("@SQL=") || columnSql.startsWith("@SQLFIND="))) columnSql = "NULL"; if (columnSql != null && columnSql.contains("@")) columnSql = Env.parseContext(Env.getCtx(), -1, columnSql, false, true);