From 5400d304437d9165dbc8bc8518628e370f3f401b Mon Sep 17 00:00:00 2001
From: Carlos Ruiz <carg67@gmail.com>
Date: Sun, 12 May 2013 14:53:35 -0500
Subject: [PATCH] IDEMPIERE-913 NPE when saving query with look-up field not
 visible on window / thanks to Anthony Sossah (xolali) it solves also
 IDEMPIERE-916 NPE in Tab : Included Roles

---
 .../src/org/adempiere/base/DefaultLookupFactory.java         | 2 ++
 org.adempiere.base/src/org/compiere/model/GridField.java     | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/org.adempiere.base/src/org/adempiere/base/DefaultLookupFactory.java b/org.adempiere.base/src/org/adempiere/base/DefaultLookupFactory.java
index d1fd5f9f64..8fa649585a 100644
--- a/org.adempiere.base/src/org/adempiere/base/DefaultLookupFactory.java
+++ b/org.adempiere.base/src/org/adempiere/base/DefaultLookupFactory.java
@@ -34,6 +34,8 @@ public class DefaultLookupFactory implements ILookupFactory{
 	@Override
 	public Lookup getLookup(GridFieldVO gridFieldVO) {
 		Lookup lookup = null;
+		if (gridFieldVO.lookupInfo == null) // IDEMPIERE-913
+			gridFieldVO.loadLookupInfo();
 		if (gridFieldVO.displayType == Location)   //  not cached
 		{
 			lookup = new MLocationLookup (gridFieldVO.ctx, gridFieldVO.WindowNo);
diff --git a/org.adempiere.base/src/org/compiere/model/GridField.java b/org.adempiere.base/src/org/compiere/model/GridField.java
index c9b62d7b35..4c080e593c 100644
--- a/org.adempiere.base/src/org/compiere/model/GridField.java
+++ b/org.adempiere.base/src/org/compiere/model/GridField.java
@@ -233,9 +233,10 @@ public class GridField
 	 *  @return lookup
 	 */
 	public Lookup getLookup()
-	{
+	{ 
+		if (m_lookup == null) loadLookupFromFactory(); // IDEMPIERE-913
 		return m_lookup;
-	}   //  getLookup
+	}    //  getLookup
 
 	/**
 	 *  Is this field a Lookup?.