# HG changeset patch # User Augusto Mauch # Date 1405598314 -7200 # Thu Jul 17 13:58:34 2014 +0200 # Node ID bf844ee869c868f69195158e33eb885e9be457c3 # Parent 571b30a9364576f658637c97cc16143b5e50a699 Fixes issue 26988: Whereclauses do not work on a field with Tree Reference The context info was not being sent to the datasource in the request. diff --git a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-tree.js b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-tree.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-tree.js +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-tree.js @@ -286,6 +286,8 @@ dsRequest.params._startRow = 0; dsRequest.params._endRow = OB.Properties.TreeDatasourceFetchLimit; dsRequest.params.treeReferenceId = target.treeItem.treeReferenceId; + var contextInfo = target.treeItem.form.view.getContextInfo(false, true); + isc.addProperties(dsRequest.params, contextInfo); return this.Super('transformRequest', arguments); }; @@ -516,11 +518,14 @@ setDataSource: function (ds, fields) { var me = this; ds.transformRequest = function (dsRequest) { - var target = window[dsRequest.componentId]; + var target = window[dsRequest.componentId], + contextInfo; dsRequest.params = dsRequest.params || {}; dsRequest.params._startRow = 0; dsRequest.params._endRow = OB.Properties.TreeDatasourceFetchLimit; dsRequest.params.treeReferenceId = target.treeItem.treeReferenceId; + contextInfo = target.treeItem.form.view.getContextInfo(false, true); + isc.addProperties(dsRequest.params, contextInfo); return this.Super('transformRequest', arguments); }; @@ -674,11 +679,12 @@ isc.OBTreeFilterSelectItem.addProperties({ filterDataBoundPickList: function (requestProperties, dropCache) { + var contextInfo; requestProperties = requestProperties || {}; requestProperties.params = requestProperties.params || {}; // on purpose not passing the third boolean param - var contextInfo = this.treeWindow.treeItem.form.view.getContextInfo(false, true); - + contextInfo = this.treeWindow.treeItem.form.view.getContextInfo(false, true); + isc.addProperties(requestProperties.params, contextInfo); // also add the special ORG parameter if (this.treeWindow.treeItem.form.getField('organization')) { requestProperties.params[OB.Constants.ORG_PARAMETER] = this.treeWindow.treeItem.form.getValue('organization'); diff --git a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/TreeDatasourceService.java b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/TreeDatasourceService.java --- a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/TreeDatasourceService.java +++ b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/TreeDatasourceService.java @@ -733,7 +733,14 @@ HashMap replacements = new HashMap(); while (matcher.find()) { String contextPropertyName = hqlTreeWhereClause.substring(matcher.start(), matcher.end()); - String value = parameters.get(contextPropertyName); + String value = null; + if (parameters.containsKey(contextPropertyName)) { + value = parameters.get(contextPropertyName); + } else if (parameters.containsKey(contextPropertyName.substring(1, + contextPropertyName.length() - 1))) { + // try again without the '@' + value = parameters.get(contextPropertyName.substring(1, contextPropertyName.length() - 1)); + } replacements.put(contextPropertyName, "'" + value + "'"); } String hqlCopy = new String(hqlTreeWhereClause); diff --git a/src-db/database/model/functions/C_INVOICE_CREATE.xml b/src-db/database/model/functions/C_INVOICE_CREATE.xml --- a/src-db/database/model/functions/C_INVOICE_CREATE.xml +++ b/src-db/database/model/functions/C_INVOICE_CREATE.xml @@ -803,7 +803,7 @@ SELECT count(*) INTO v_isSchedule - FROM DUAL WHERE EXISTS (SELECT 1 FROM C_ORDER WHERE ISSELECTED = 'Y' AND INVOICERULE IN ('S','D')); + FROM DUAL WHERE EXISTS (SELECT 1 FROM C_ORDER WHERE ISSELECTED = 'Y' AND INVOICERULE = 'S'); /** * Invoice Schedule ====================================================== diff --git a/src-db/database/model/tables/M_RESERVATION.xml b/src-db/database/model/tables/M_RESERVATION.xml --- a/src-db/database/model/tables/M_RESERVATION.xml +++ b/src-db/database/model/tables/M_RESERVATION.xml @@ -123,15 +123,6 @@ - - - - - - - - - diff --git a/src-db/database/model/tables/M_RESERVATION_STOCK.xml b/src-db/database/model/tables/M_RESERVATION_STOCK.xml --- a/src-db/database/model/tables/M_RESERVATION_STOCK.xml +++ b/src-db/database/model/tables/M_RESERVATION_STOCK.xml @@ -82,12 +82,6 @@ - - - - - - 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 @@ -29420,7 +29420,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 @@ -4644,6 +4644,18 @@ + + + + + + + + + + + +