From c23a3d8e5e69d88cb13b52b6ef4c6b8c91086017 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Tue, 13 Feb 2024 07:44:39 +0100 Subject: [PATCH] IDEMPIERE-6038 BP/Product Icon not used in Order Info Window (#2239) --- .../org/adempiere/webui/editor/WChosenboxSearchEditor.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WChosenboxSearchEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WChosenboxSearchEditor.java index 301a64f380..9032653742 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WChosenboxSearchEditor.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WChosenboxSearchEditor.java @@ -213,14 +213,16 @@ public class WChosenboxSearchEditor extends WEditor implements ContextMenuListen if (lookup instanceof MLookup) { MLookup mlookup = (MLookup) lookup; - if ("C_BPartner_ID".equals(mlookup.getLookupInfo().KeyColumn)) + if ("C_BPartner_ID".equals(mlookup.getLookupInfo().KeyColumn) + || (mlookup.getLookupInfo().KeyColumn != null && mlookup.getLookupInfo().KeyColumn.endsWith(".C_BPartner_ID"))) { if (ThemeManager.isUseFontIconForImage()) imageUrl = "z-icon-BPartner"; else imageUrl = ThemeManager.getThemeResource("images/BPartner16.png"); } - else if ("M_Product_ID".equals(mlookup.getLookupInfo().KeyColumn)) + else if ("M_Product_ID".equals(mlookup.getLookupInfo().KeyColumn) + || (mlookup.getLookupInfo().KeyColumn != null && mlookup.getLookupInfo().KeyColumn.endsWith(".M_Product_ID"))) { if (ThemeManager.isUseFontIconForImage()) imageUrl = "z-icon-Product";