From 2cfb699c6fc4688e2e808096959eb6f26b7b6cd7 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 6 Jan 2021 15:22:33 +0100 Subject: [PATCH] IDEMPIERE-4631 Lead window -> NPE GridFieldVO.loadLookupInfo: No LookupInfo for BP_Location_ID (#511) --- org.adempiere.base/src/org/compiere/model/MLookupFactory.java | 2 ++ org.adempiere.base/src/org/compiere/model/MQuery.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/org.adempiere.base/src/org/compiere/model/MLookupFactory.java b/org.adempiere.base/src/org/compiere/model/MLookupFactory.java index 45b1a3dc74..1a3d14109e 100644 --- a/org.adempiere.base/src/org/compiere/model/MLookupFactory.java +++ b/org.adempiere.base/src/org/compiere/model/MLookupFactory.java @@ -1028,6 +1028,8 @@ public class MLookupFactory private static ArrayList getListIdentifiers(String TableName) { ArrayList list = new ArrayList(); MTable table = MTable.get(Env.getCtx(), TableName); + if (table == null) + return null; for (String idColumnName : table.getIdentifierColumns()) { MColumn column = table.getColumn(idColumnName); LookupDisplayColumn ldc = new LookupDisplayColumn(column.getColumnName(), column.getColumnSQL(true), column.isTranslated(), column.getAD_Reference_ID(), column.getAD_Reference_Value_ID()); diff --git a/org.adempiere.base/src/org/compiere/model/MQuery.java b/org.adempiere.base/src/org/compiere/model/MQuery.java index ddda0af3a4..1b06ea8460 100644 --- a/org.adempiere.base/src/org/compiere/model/MQuery.java +++ b/org.adempiere.base/src/org/compiere/model/MQuery.java @@ -279,7 +279,7 @@ public class MQuery implements Serializable, Cloneable return "C_BPartner_Location_ID"; if (columnName.equals("Account_ID")) return "C_ElementValue_ID"; - if (columnName.equals("C_LocFrom_ID") || columnName.equals("C_LocTo_ID")) + if (columnName.equals("C_LocFrom_ID") || columnName.equals("C_LocTo_ID") || columnName.equals("BP_Location_ID")) return "C_Location_ID"; if (columnName.equals("C_UOM_To_ID")) return "C_UOM_ID";