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
@@ -103,6 +103,10 @@
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/modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java b/modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java
--- a/modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java
+++ b/modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java
@@ -915,6 +915,12 @@
.getVariablesSecureApp(), param,
RequestContext.get().getRequestParameter("windowId") != null ? RequestContext.get()
.getRequestParameter("windowId") : "");
+
+ // not found, try to get the parameter directly from the request object
+ if (paramValue.equals("") && RequestContext.get().getRequestParameter(param) != null) {
+ paramValue = RequestContext.get().getRequestParameter(param);
+ }
+
localWhereClause = prefix + getTypedParameterAlias() + suffix;
typedParameters.add(paramValue);
}
diff --git a/modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonUtils.java b/modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonUtils.java
--- a/modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonUtils.java
+++ b/modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonUtils.java
@@ -336,7 +336,7 @@
final JSONObject criteriaJSONObject = new JSONObject(criteriaStr);
if (criteriaJSONObject.has("fieldName")) {
final String fieldName = criteriaJSONObject.getString("fieldName");
- if (!fieldName.startsWith("_")) {
+ if (!fieldName.startsWith("_") || fieldName.equals(JsonConstants.IDENTIFIER)) {
criteriaObjects.add(criteriaJSONObject);
}
} else {
diff --git a/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js b/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js
--- a/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js
+++ b/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js
@@ -605,6 +605,14 @@
// on purpose not passing the third boolean param
isc.addProperties(requestProperties.params, this.form.view.getContextInfo(false, true));
+ if (this.form.view.standardWindow) {
+ isc.addProperties(requestProperties.params, {
+ windowId: this.form.view.standardWindow.windowId,
+ tabId: this.form.view.tabId,
+ moduleId: this.form.view.moduleId
+ });
+ }
+
// also add the special ORG parameter
if (requestProperties.params.inpadOrgId) {
requestProperties.params[OB.Constants.ORG_PARAMETER] = requestProperties.params.inpadOrgId;
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 @@
-
+
+
diff --git a/src-db/database/sourcedata/AD_REFERENCE.xml b/src-db/database/sourcedata/AD_REFERENCE.xml
--- a/src-db/database/sourcedata/AD_REFERENCE.xml
+++ b/src-db/database/sourcedata/AD_REFERENCE.xml
@@ -4151,6 +4151,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src-db/database/sourcedata/OBUISEL_SELECTOR.xml b/src-db/database/sourcedata/OBUISEL_SELECTOR.xml
--- a/src-db/database/sourcedata/OBUISEL_SELECTOR.xml
+++ b/src-db/database/sourcedata/OBUISEL_SELECTOR.xml
@@ -66,6 +66,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+