diff --git a/src-db/database/sourcedata/AD_AUXILIARINPUT.xml b/src-db/database/sourcedata/AD_AUXILIARINPUT.xml
--- a/src-db/database/sourcedata/AD_AUXILIARINPUT.xml
+++ b/src-db/database/sourcedata/AD_AUXILIARINPUT.xml
@@ -815,6 +815,17 @@
 <!--0FFA9E5DB5C24B7BBBB191108B2C1312-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--0FFA9E5DB5C24B7BBBB191108B2C1312--></AD_AUXILIARINPUT>
 
+<!--102534378B87400791404542846CA8AE--><AD_AUXILIARINPUT>
+<!--102534378B87400791404542846CA8AE-->  <AD_AUXILIARINPUT_ID><![CDATA[102534378B87400791404542846CA8AE]]></AD_AUXILIARINPUT_ID>
+<!--102534378B87400791404542846CA8AE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--102534378B87400791404542846CA8AE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--102534378B87400791404542846CA8AE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--102534378B87400791404542846CA8AE-->  <AD_TAB_ID><![CDATA[256]]></AD_TAB_ID>
+<!--102534378B87400791404542846CA8AE-->  <NAME><![CDATA[M_Warehouse_ID]]></NAME>
+<!--102534378B87400791404542846CA8AE-->  <CODE><![CDATA[@SQL=SELECT M_Warehouse_ID FROM M_INVENTORY WHERE M_INVENTORY_ID = @M_INVENTORY_ID@]]></CODE>
+<!--102534378B87400791404542846CA8AE-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--102534378B87400791404542846CA8AE--></AD_AUXILIARINPUT>
+
 <!--10444AA4DB1D49D7A621F1EF47787122--><AD_AUXILIARINPUT>
 <!--10444AA4DB1D49D7A621F1EF47787122-->  <AD_AUXILIARINPUT_ID><![CDATA[10444AA4DB1D49D7A621F1EF47787122]]></AD_AUXILIARINPUT_ID>
 <!--10444AA4DB1D49D7A621F1EF47787122-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1024,6 +1035,17 @@
 <!--3ACE8CFB656847998D9236DAA1D66E49-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--3ACE8CFB656847998D9236DAA1D66E49--></AD_AUXILIARINPUT>
 
+<!--3BC05D242CF749FBAC016CAF3071EAB0--><AD_AUXILIARINPUT>
+<!--3BC05D242CF749FBAC016CAF3071EAB0-->  <AD_AUXILIARINPUT_ID><![CDATA[3BC05D242CF749FBAC016CAF3071EAB0]]></AD_AUXILIARINPUT_ID>
+<!--3BC05D242CF749FBAC016CAF3071EAB0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3BC05D242CF749FBAC016CAF3071EAB0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3BC05D242CF749FBAC016CAF3071EAB0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3BC05D242CF749FBAC016CAF3071EAB0-->  <AD_TAB_ID><![CDATA[258]]></AD_TAB_ID>
+<!--3BC05D242CF749FBAC016CAF3071EAB0-->  <NAME><![CDATA[M_Warehouse_ID]]></NAME>
+<!--3BC05D242CF749FBAC016CAF3071EAB0-->  <CODE><![CDATA[@SQL=SELECT M_Warehouse_ID FROM M_INOUT WHERE M_INOUT_ID = @M_INOUT_ID@]]></CODE>
+<!--3BC05D242CF749FBAC016CAF3071EAB0-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--3BC05D242CF749FBAC016CAF3071EAB0--></AD_AUXILIARINPUT>
+
 <!--3C0056E8C25843C387DFB2896D83FEE3--><AD_AUXILIARINPUT>
 <!--3C0056E8C25843C387DFB2896D83FEE3-->  <AD_AUXILIARINPUT_ID><![CDATA[3C0056E8C25843C387DFB2896D83FEE3]]></AD_AUXILIARINPUT_ID>
 <!--3C0056E8C25843C387DFB2896D83FEE3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1277,6 +1299,17 @@
 <!--6C811AE6CB66451097642D8E8B3DA196-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--6C811AE6CB66451097642D8E8B3DA196--></AD_AUXILIARINPUT>
 
+<!--6DDE5291DEB245BAB84FFD042AE66D4C--><AD_AUXILIARINPUT>
+<!--6DDE5291DEB245BAB84FFD042AE66D4C-->  <AD_AUXILIARINPUT_ID><![CDATA[6DDE5291DEB245BAB84FFD042AE66D4C]]></AD_AUXILIARINPUT_ID>
+<!--6DDE5291DEB245BAB84FFD042AE66D4C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6DDE5291DEB245BAB84FFD042AE66D4C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6DDE5291DEB245BAB84FFD042AE66D4C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6DDE5291DEB245BAB84FFD042AE66D4C-->  <AD_TAB_ID><![CDATA[297]]></AD_TAB_ID>
+<!--6DDE5291DEB245BAB84FFD042AE66D4C-->  <NAME><![CDATA[M_Warehouse_ID]]></NAME>
+<!--6DDE5291DEB245BAB84FFD042AE66D4C-->  <CODE><![CDATA[@SQL=SELECT M_Warehouse_ID FROM M_INOUT WHERE M_INOUT_ID = @M_INOUT_ID@]]></CODE>
+<!--6DDE5291DEB245BAB84FFD042AE66D4C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--6DDE5291DEB245BAB84FFD042AE66D4C--></AD_AUXILIARINPUT>
+
 <!--78C534BFE24E45779C5F0B874C5B00E9--><AD_AUXILIARINPUT>
 <!--78C534BFE24E45779C5F0B874C5B00E9-->  <AD_AUXILIARINPUT_ID><![CDATA[78C534BFE24E45779C5F0B874C5B00E9]]></AD_AUXILIARINPUT_ID>
 <!--78C534BFE24E45779C5F0B874C5B00E9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/src-db/database/sourcedata/AD_COLUMN.xml b/src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml
+++ b/src-db/database/sourcedata/AD_COLUMN.xml
@@ -58041,7 +58041,7 @@
 <!--3537-->  <AD_REFERENCE_VALUE_ID><![CDATA[31]]></AD_REFERENCE_VALUE_ID>
 <!--3537-->  <AD_VAL_RULE_ID><![CDATA[127]]></AD_VAL_RULE_ID>
 <!--3537-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
-<!--3537-->  <DEFAULTVALUE><![CDATA[@M_Locator_ID@]]></DEFAULTVALUE>
+<!--3537-->  <DEFAULTVALUE><![CDATA[@SQL=SELECT M_LOCATOR_ID AS DEFAULTVALUE FROM M_LOCATOR WHERE AD_ISORGINCLUDED(@AD_Org_ID@, M_LOCATOR.AD_Org_ID, @#AD_Client_ID@) <> -1 AND ISACTIVE='Y' AND M_WAREHOUSE_ID=@M_WAREHOUSE_ID@  ORDER BY M_LOCATOR.ISDEFAULT DESC]]></DEFAULTVALUE>
 <!--3537-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--3537-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--3537-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
@@ -58939,7 +58939,7 @@
 <!--3564-->  <AD_REFERENCE_VALUE_ID><![CDATA[31]]></AD_REFERENCE_VALUE_ID>
 <!--3564-->  <AD_VAL_RULE_ID><![CDATA[127]]></AD_VAL_RULE_ID>
 <!--3564-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
-<!--3564-->  <DEFAULTVALUE><![CDATA[@M_Locator_ID@]]></DEFAULTVALUE>
+<!--3564-->  <DEFAULTVALUE><![CDATA[@SQL=SELECT M_LOCATOR_ID AS DEFAULTVALUE FROM M_LOCATOR WHERE AD_ISORGINCLUDED(@AD_Org_ID@, M_LOCATOR.AD_Org_ID, @#AD_Client_ID@) <> -1 AND ISACTIVE='Y' AND M_WAREHOUSE_ID=@M_WAREHOUSE_ID@  ORDER BY M_LOCATOR.ISDEFAULT DESC]]></DEFAULTVALUE>
 <!--3564-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--3564-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--3564-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
diff --git a/src/org/openbravo/erpCommon/info/Locator.java b/src/org/openbravo/erpCommon/info/Locator.java
--- a/src/org/openbravo/erpCommon/info/Locator.java
+++ b/src/org/openbravo/erpCommon/info/Locator.java
@@ -58,16 +58,18 @@
 
     if (vars.commandIn("DEFAULT")) {
       removePageSessionVariables(vars);
-      String strWarehouse = vars.getRequestGlobalVariable("inpNameValue", "Locator.warehousename");
-      if (strWarehouse.equals("") || strWarehouse == null) {
-        String windowId = vars.getRequestGlobalVariable("WindowID", "Locator.windowId");
-        if (!windowId.equals("") && windowId != null)
-          strWarehouse = LocatorData.selectname(this, Utility.getContext(this, vars,
-              "M_Warehouse_ID", windowId));
+      String strName = vars.getRequestGlobalVariable("inpNameValue", "Locator.warehousename");
+      String strWarehouse = "";
+      String windowId = vars.getRequestGlobalVariable("WindowID", "Locator.windowId");
+      if (!windowId.equals("") && windowId != null) {
+        strWarehouse = LocatorData.selectname(this, Utility.getContext(this, vars,
+            "M_Warehouse_ID", windowId));
       }
+      strName = strName + "%";
       strWarehouse = strWarehouse + "%";
+      vars.setSessionValue("Locator.name", strName);
       vars.setSessionValue("Locator.warehousename", strWarehouse);
-      printPage(response, vars, "", strWarehouse);
+      printPage(response, vars, strName, strWarehouse);
     } else if (vars.commandIn("KEY")) {
       removePageSessionVariables(vars);
       String strKeyValue = vars.getRequestGlobalVariable("inpNameValue", "Locator.name");