From 2e065e6e610c316e46e7ae947baacecf35210e9a Mon Sep 17 00:00:00 2001 From: Hideaki Hagiwara <58879487+HideakiHagiwara@users.noreply.github.com> Date: Tue, 19 May 2020 20:47:27 +0900 Subject: [PATCH] IDEMPIERE-4293 Excel that download from Info Window is displayed ID Number (#67) --- .../org/adempiere/webui/info/InfoWindow.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java index 2261f3f8f3..0a4ef1afbe 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java @@ -71,6 +71,7 @@ import org.compiere.model.AccessSqlParser.TableInfo; import org.compiere.model.GridField; import org.compiere.model.GridFieldVO; import org.compiere.model.GridWindow; +import org.compiere.model.Lookup; import org.compiere.model.MInfoColumn; import org.compiere.model.MInfoWindow; import org.compiere.model.MLookupFactory; @@ -2688,14 +2689,16 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL { throw new AdempiereException(e); } - /* not required - the info window splits the column in key name pairs - GridField gridField = columnInfos[col].getGridField(); - Lookup lookup = gridField.getLookup(); - if (val != null && lookup != null) + + if(val != null && !columnInfos[col].isKeyPairCol() + && columnInfos[col].getGridField().getLookup() != null) { - val = lookup.getDisplay(val); - } - */ + Lookup lookup = columnInfos[col].getGridField().getLookup(); + if (lookup != null) + { + val = lookup.getDisplay(val); + } + } return val; }