diff --git a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-search.js b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-search.js
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-search.js
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-search.js
@@ -54,11 +54,15 @@
         }
       }
       targetFld._hasChanged = true;
-      targetFld.form.handleItemChange(targetFld);
+      if (targetFld.form.handleItemChange) {
+        targetFld.form.handleItemChange(targetFld);
+      }
       // fire with a delay otherwise results in strange errors
       targetFld.fireOnPause('validate', targetFld.validate, null, targetFld);
 
-      targetFld.form.focusInNextItem(targetFld.name);
+      if (targetFld.form.focusInNextItem) {
+        targetFld.form.focusInNextItem(targetFld.name);
+      }
     }
     isc.OBSearchItem.openedWindow.close();
     isc.OBSearchItem.openSearchItem = null;
@@ -173,7 +177,7 @@
     var hidden, i;
     var displayedValue = '';
 
-    if (this.valueMap[this.getValue()]) {
+    if (this.valueMap && this.valueMap[this.getValue()]) {
       displayedValue = this.valueMap[this.getValue()];
     }
 
diff --git a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js
@@ -102,7 +102,11 @@
     });
 
     OB.TestRegistry.register('org.openbravo.client.application.process.pickandexecute.Grid', this);
-
+    
+    this.editFormProperties = {
+      view: this.view.parentWindow.activeView
+    };
+    
     this.Super('initWidget', arguments);
   },
 
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
@@ -282407,7 +282407,8 @@
 <!--B0D44F14A9F4533DE040007F01004FD0-->  <HELP><![CDATA[The Locator ID indicates where in a Warehouse a product is located.]]></HELP>
 <!--B0D44F14A9F4533DE040007F01004FD0-->  <COLUMNNAME><![CDATA[M_Locator_ID]]></COLUMNNAME>
 <!--B0D44F14A9F4533DE040007F01004FD0-->  <AD_TABLE_ID><![CDATA[09C5EA393D0D41CEBB522DEC67534574]]></AD_TABLE_ID>
-<!--B0D44F14A9F4533DE040007F01004FD0-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--B0D44F14A9F4533DE040007F01004FD0-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--B0D44F14A9F4533DE040007F01004FD0-->  <AD_REFERENCE_VALUE_ID><![CDATA[31]]></AD_REFERENCE_VALUE_ID>
 <!--B0D44F14A9F4533DE040007F01004FD0-->  <AD_VAL_RULE_ID><![CDATA[3934616F1F6745D8964D66CF4B9C8895]]></AD_VAL_RULE_ID>
 <!--B0D44F14A9F4533DE040007F01004FD0-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--B0D44F14A9F4533DE040007F01004FD0-->  <ISKEY><![CDATA[N]]></ISKEY>