From dcaddc41b618e779ff8a51ab05f7e69533825939 Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Thu, 13 Aug 2015 03:55:41 +0800
Subject: [PATCH] IDEMPIERE-979:WSearchEditor used in forms don't have popup
 menu menu for wtableDirEditor in case hasn't gfield

---
 .../webui/apps/form/WAllocation.java          |  2 ++
 .../webui/editor/WTableDirEditor.java         | 25 ++++++++++---------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WAllocation.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WAllocation.java
index cb839f1586..e4fd4b1371 100755
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WAllocation.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WAllocation.java
@@ -211,11 +211,13 @@ public class WAllocation extends Allocation
 		row.appendCellChild(organizationLabel.rightAlign());
 		organizationPick.getComponent().setHflex("true");
 		row.appendCellChild(organizationPick.getComponent(),1);
+		organizationPick.showMenu();
 		
 		row = rows.newRow();
 		row.appendCellChild(currencyLabel.rightAlign(),1);
 		currencyPick.getComponent().setHflex("true");
 		row.appendCellChild(currencyPick.getComponent(),1);		
+		currencyPick.showMenu();
 		row.appendCellChild(multiCurrency,1);		
 		row.appendCellChild(autoWriteOff,2);
 		row.appendCellChild(new Space(),1);		
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTableDirEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTableDirEditor.java
index 364f6ea6d0..2e42ae27cb 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTableDirEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTableDirEditor.java
@@ -174,19 +174,20 @@ ContextMenuListener, IZoomableEditor
             	refreshList();            
         }
         
+        String tableName_temp = lookup.getColumnName();	// Returns AD_Org.AD_Org_ID
+        int posPoint = tableName_temp.indexOf(".");
+		String tableName = tableName_temp.substring(0, posPoint);
+		
+        if (tableName.toUpperCase().equals("C_BPARTNER_LOCATION"))    				
+		{
+			popupMenu = new WEditorPopupMenu(true, true, isShowPreference(), false, false, true, lookup);
+		} else {
+        	popupMenu = new WEditorPopupMenu(zoom, true, isShowPreference(), false, false, false, lookup);
+		}
+    	addChangeLogMenu(popupMenu);
+    	
         if (gridField != null) 
         {
-        	String tableName_temp = lookup.getColumnName();	// Returns AD_Org.AD_Org_ID
-    		int posPoint = tableName_temp.indexOf(".");
-    		String tableName = tableName_temp.substring(0, posPoint);
-    		if (tableName.toUpperCase().equals("C_BPARTNER_LOCATION"))    				
-    		{
-    			popupMenu = new WEditorPopupMenu(true, true, isShowPreference(), false, false, true, lookup);
-    		} else {
-            	popupMenu = new WEditorPopupMenu(zoom, true, isShowPreference(), false, false, false, lookup);
-    		}
-        	addChangeLogMenu(popupMenu);
-
         	//	IDEMPIERE 90
         	boolean isShortListAvailable = false;	// Short List available for this lookup
         	if (lookup != null && (lookup.getDisplayType() == DisplayType.TableDir || lookup.getDisplayType() == DisplayType.Table))	// only for Table & TableDir
@@ -199,7 +200,7 @@ ContextMenuListener, IZoomableEditor
         			lookup.setShortList(true);
         			getLabel().setText(">" + getGridField().getHeader() + "<");
         			actionRefresh();
-
+        			
         			// add in popup menu
         			Menuitem searchMode;
         			searchMode = new Menuitem();