midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-4660 Wrong code in virtual columns broke IDEMPIERE-2356 (#541) 

IDEMPIERE-4087
IDEMPIERE-3760
This commit is contained in:
Carlos Ruiz 2021-01-21 14:28:15 +01:00 committed by GitHub
parent f3741b8f31
commit 2d76f90f9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.adempiere.base/src/org/compiere/model/MLookupFactory.java
View File

@ -459,7 +459,7 @@ public class MLookupFactory
displayColumnSQL = rs.getString(11); displayColumnSQL = rs.getString(11);
if (displayColumnSQL != null && displayColumnSQL.length() > 0 && (displayColumnSQL.startsWith("@SQL=") || displayColumnSQL.startsWith("@SQLFIND="))) if (displayColumnSQL != null && displayColumnSQL.length() > 0 && (displayColumnSQL.startsWith("@SQL=") || displayColumnSQL.startsWith("@SQLFIND=")))
displayColumnSQL = "NULL"; displayColumnSQL = "NULL";
if (displayColumnSQL != null && displayColumnSQL.contains("@") && displayColumnSQL.startsWith("@SQL=")) if (displayColumnSQL != null && displayColumnSQL.contains("@"))
displayColumnSQL = Env.parseContext(Env.getCtx(), -1, displayColumnSQL, false, true); displayColumnSQL = Env.parseContext(Env.getCtx(), -1, displayColumnSQL, false, true);
overrideZoomWindow = rs.getInt(12); overrideZoomWindow = rs.getInt(12);
infoWindowId = rs.getInt(13); infoWindowId = rs.getInt(13);

2
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoGeneralPanel.java
View File

@ -485,7 +485,7 @@ public class InfoGeneralPanel extends InfoPanel implements EventListener<Event>
boolean isDisplayed = rs.getString(4).equals("Y"); boolean isDisplayed = rs.getString(4).equals("Y");
int AD_Reference_Value_ID = rs.getInt(5); int AD_Reference_Value_ID = rs.getInt(5);
String columnSql = rs.getString(6); 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"; columnSql = "NULL";
if (columnSql != null && columnSql.contains("@")) if (columnSql != null && columnSql.contains("@"))
columnSql = Env.parseContext(Env.getCtx(), -1, columnSql, false, true); columnSql = Env.parseContext(Env.getCtx(), -1, columnSql, false, true);