From 76214475009574e73b968175b78db72dfe0bb4ca Mon Sep 17 00:00:00 2001
From: matheus-marcelinux <matheusmarcelino1998@hotmail.com>
Date: Sun, 27 Nov 2022 03:06:39 -0300
Subject: [PATCH] # IDEMPIERE-5494 - enable zoom in WLocationEditor (#1586)

---
 .../src/org/compiere/model/MLocationLookup.java | 11 ++++++++++-
 .../adempiere/webui/editor/WLocationEditor.java | 17 +++++++++++++----
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/org.adempiere.base/src/org/compiere/model/MLocationLookup.java b/org.adempiere.base/src/org/compiere/model/MLocationLookup.java
index 6bf9648f9a..ae7263f8c3 100644
--- a/org.adempiere.base/src/org/compiere/model/MLocationLookup.java
+++ b/org.adempiere.base/src/org/compiere/model/MLocationLookup.java
@@ -137,9 +137,18 @@ public final class MLocationLookup extends Lookup
 	 */
 	public String getColumnName()
 	{
-		return "C_Location_ID";
+		return "C_Location.C_Location_ID";
 	}   //  getColumnName
 
+	/**
+	 *	Get Zoom - Location Window
+	 *  @return Zoom AD_Window_ID
+	 */
+	@Override
+	public int getZoom() {
+		return MTable.get(MLocation.Table_ID).getAD_Window_ID();
+	}
+	
 	/**
 	 *	Return data as sorted Array - not implemented
 	 *  @param mandatory mandatory
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocationEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocationEditor.java
index 806df057cf..88943af590 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocationEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocationEditor.java
@@ -24,6 +24,7 @@ import java.util.logging.Level;
 import org.adempiere.webui.ClientInfo;
 import org.adempiere.webui.LayoutUtils;
 import org.adempiere.webui.ValuePreference;
+import org.adempiere.webui.apps.AEnv;
 import org.adempiere.webui.component.Locationbox;
 import org.adempiere.webui.event.ContextMenuEvent;
 import org.adempiere.webui.event.ContextMenuListener;
@@ -50,7 +51,7 @@ import org.zkoss.zk.ui.event.OpenEvent;
  * 
  * This class is based on VLocation written by Jorg Janke
  **/
-public class WLocationEditor extends WEditor implements EventListener<Event>, PropertyChangeListener, ContextMenuListener
+public class WLocationEditor extends WEditor implements EventListener<Event>, PropertyChangeListener, ContextMenuListener, IZoomableEditor
 {
     private static final String[] LISTENER_EVENTS = {Events.ON_CLICK};
     
@@ -103,7 +104,7 @@ public class WLocationEditor extends WEditor implements EventListener<Event>, Pr
     	else
     		getComponent().setButtonImage(ThemeManager.getThemeResource("images/Location16.png"));
     	
-    	popupMenu = new WEditorPopupMenu(false, false, isShowPreference());
+    	popupMenu = new WEditorPopupMenu(true, false, isShowPreference(), false, false, false, gridField.getLookup());
     	popupMenu.addMenuListener(this);
     	addChangeLogMenu(popupMenu);
 		if (gridField != null)
@@ -265,6 +266,10 @@ public class WLocationEditor extends WEditor implements EventListener<Event>, Pr
 			if (isShowPreference())
 				ValuePreference.start (getComponent(), this.getGridField(), getValue());
 		}
+		else if (WEditorPopupMenu.ZOOM_EVENT.equals(evt.getContextEvent())) 
+		{
+			actionZoom();
+		}
 	}
 
 	@Override
@@ -272,6 +277,10 @@ public class WLocationEditor extends WEditor implements EventListener<Event>, Pr
 		super.setTableEditor(b);
 		getComponent().setTableEditorMode(b);
 	}
-    
-    
+
+	@Override
+	public void actionZoom() {
+		AEnv.actionZoom(m_Location, getValue());
+	}
+
 }