diff --git a/client/src/org/compiere/grid/ed/VLocation.java b/client/src/org/compiere/grid/ed/VLocation.java
index 7c250e73dc..945cd84644 100644
--- a/client/src/org/compiere/grid/ed/VLocation.java
+++ b/client/src/org/compiere/grid/ed/VLocation.java
@@ -36,6 +36,8 @@ import org.compiere.util.*;
 public class VLocation extends JComponent
 	implements VEditor, ActionListener
 {
+	int m_WindowNo = 0;
+	
 	/**
 	 *	Constructor
 	 *
@@ -55,6 +57,7 @@ public class VLocation extends JComponent
 		//
 		LookAndFeel.installBorder(this, "TextField.border");
 		this.setLayout(new BorderLayout());
+		
 		//  Size
 		this.setPreferredSize(m_text.getPreferredSize());		//	causes r/o to be the same length
 		int height = m_text.getPreferredSize().height;
@@ -86,7 +89,22 @@ public class VLocation extends JComponent
 		popupMenu.add(mDelete);
 
 	}	//	VLocation
-
+	/**
+	 *	Constructor
+	 *
+	 * 	@param columnName column name
+	 * 	@param mandatory mandatory
+	 * 	@param isReadOnly read only
+	 * 	@param isUpdateable updateable
+	 * 	@param mLocation location model
+	 */
+	public VLocation(String columnName, boolean mandatory, boolean isReadOnly, boolean isUpdateable,
+		MLocationLookup mLocation, int windowno)
+	{
+		this(columnName, mandatory, isReadOnly, isUpdateable, mLocation);
+		m_WindowNo = windowno;
+		
+	}
 	/**
 	 *  Dispose
 	 */
@@ -269,7 +287,7 @@ public class VLocation extends JComponent
 		//
 		log.config( "actionPerformed - " + m_value);
 		VLocationDialog ld = new VLocationDialog(Env.getFrame(this),
-			Msg.getMsg(Env.getCtx(), "Location"), m_value);
+			Msg.getMsg(Env.getCtx(), "Location"), m_value, m_WindowNo);
 		ld.setVisible(true);
 		m_value = ld.getValue();
 		//