diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/WInfoWindowListItemRenderer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/WInfoWindowListItemRenderer.java index 69b4452e1a..2a90636eef 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/WInfoWindowListItemRenderer.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/WInfoWindowListItemRenderer.java @@ -38,6 +38,7 @@ import org.compiere.model.MStyle; import org.compiere.util.Env; import org.compiere.util.Evaluatee; import org.compiere.util.KeyNamePair; +import org.compiere.util.ValueNamePair; import org.zkoss.zhtml.Text; import org.zkoss.zk.ui.HtmlBasedComponent; import org.zkoss.zul.Listcell; @@ -124,6 +125,11 @@ public class WInfoWindowListItemRenderer extends WListItemRenderer KeyNamePair knp = (KeyNamePair)value; value = knp.getKey(); } + else if(value instanceof ValueNamePair) + { + ValueNamePair vnp = (ValueNamePair)value; + value = vnp.getValue(); + } editor.setValue(value); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java index 8fd9c6f728..7ced5e3693 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java @@ -2629,6 +2629,13 @@ public abstract class InfoPanel extends Window implements EventListener, parameters.add(knpData.getKey()); parameters.add(null); } + else if(data instanceof ValueNamePair) + { + ValueNamePair vnp = (ValueNamePair)data; + parameters.add(vnp.getValue()); + parameters.add(null); + parameters.add(null); + } else { parameters.add(data);