diff --git a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ADTreeDatasourceService.java b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ADTreeDatasourceService.java --- a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ADTreeDatasourceService.java +++ b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ADTreeDatasourceService.java @@ -554,7 +554,9 @@ * Updates the parent of a given node a returns its definition in a JSONObject and recomputes the * sequence number of the nodes if the tree is ordered */ - protected JSONObject moveNode(Map parameters, String nodeId, String newParentId, + @Override + protected JSONObject moveNode(Map parameters, + Map datasourceParameters, String nodeId, String newParentId, String prevNodeId, String nextNodeId) throws Exception { String tableId = null; String referencedTableId = parameters.get("referencedTableId"); @@ -589,7 +591,7 @@ } } - Tree tree = this.getTree(tableId); + Tree tree = (Tree) datasourceParameters.get("tree"); boolean isOrdered = this.isOrdered(tree); Long seqNo = null; if (isOrdered) { diff --git a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/LinkToParentTreeDatasourceService.java b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/LinkToParentTreeDatasourceService.java --- a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/LinkToParentTreeDatasourceService.java +++ b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/LinkToParentTreeDatasourceService.java @@ -439,7 +439,9 @@ /** * Updates the parent of a given node a returns its definition in a JSONObject */ - protected JSONObject moveNode(Map parameters, String nodeId, String newParentId, + @Override + protected JSONObject moveNode(Map parameters, + Map datasourceSpecificParams, String nodeId, String newParentId, String prevNodeId, String nextNodeId) throws Exception { String referencedTableId = parameters.get("referencedTableId"); diff --git a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/TreeDataSourceForAccountTree.java b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/TreeDataSourceForAccountTree.java new file mode 100644 --- /dev/null +++ b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/TreeDataSourceForAccountTree.java @@ -0,0 +1,44 @@ +/* + ************************************************************************* + * The contents of this file are subject to the Openbravo Public License + * Version 1.1 (the "License"), being the Mozilla Public License + * Version 1.1 with a permitted attribution clause; you may not use this + * file except in compliance with the License. You may obtain a copy of + * the License at http://www.openbravo.com/legal/license.html + * Software distributed under the License is distributed on an "AS IS" + * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the + * License for the specific language governing rights and limitations + * under the License. + * The Original Code is Openbravo ERP. + * The Initial Developer of the Original Code is Openbravo SLU + * All portions are Copyright (C) 2016 Openbravo SLU + * All Rights Reserved. + * Contributor(s): ______________________________________. + ************************************************************************ + */ + +package org.openbravo.service.datasource; + +import java.util.HashMap; +import java.util.Map; + +import org.openbravo.dal.service.OBDal; +import org.openbravo.model.ad.utility.Tree; +import org.openbravo.model.financialmgmt.accounting.coa.Element; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class TreeDataSourceForAccountTree extends ADTreeDatasourceService { + private static final Logger logger = LoggerFactory.getLogger(TreeDataSourceForAccountTree.class); + + @Override + protected Map getDatasourceSpecificParams(Map parameters) { + Map datasourceParams = new HashMap(); + String accountTreeId = parameters.get("@FinancialMgmtElement.id@"); + Element element = OBDal.getInstance().get(Element.class, accountTreeId); + Tree tree = element.getTree(); + datasourceParams.put("tree", tree); + return datasourceParams; + } + +} 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 @@ -810,10 +810,12 @@ // nodes String prevNodeId = parameters.get("prevNodeId"); String nextNodeId = parameters.get("nextNodeId"); + Map datasourceSpecificParams = this.getDatasourceSpecificParams(parameters); if (jsonObject.has("data")) { JSONObject data = jsonObject.getJSONObject("data"); JSONObject oldValues = jsonObject.getJSONObject("oldValues"); - response = processNodeMovement(parameters, data, oldValues, prevNodeId, nextNodeId); + response = processNodeMovement(parameters, datasourceSpecificParams, data, oldValues, + prevNodeId, nextNodeId); } else if (jsonObject.has("transaction")) { // If more than one nodes are moved at the same time, we need to handle a transaction JSONArray jsonResultArray = new JSONArray(); @@ -823,8 +825,8 @@ JSONObject operation = operations.getJSONObject(i); JSONObject data = operation.getJSONObject("data"); JSONObject oldValues = operation.getJSONObject("oldValues"); - jsonResultArray.put(processNodeMovement(parameters, data, oldValues, prevNodeId, - nextNodeId)); + jsonResultArray.put(processNodeMovement(parameters, datasourceSpecificParams, data, + oldValues, prevNodeId, nextNodeId)); } response = JSON_PREFIX + jsonResultArray.toString() + JSON_SUFFIX; } @@ -848,8 +850,9 @@ * new position of the node amount its peers * @throws Exception */ - private String processNodeMovement(Map parameters, JSONObject data, - JSONObject oldValues, String prevNodeId, String nextNodeId) throws Exception { + private String processNodeMovement(Map parameters, + Map datasourceSpecificParams, JSONObject data, JSONObject oldValues, + String prevNodeId, String nextNodeId) throws Exception { String nodeId = data.getString("id"); String newParentId = data.getString("parentId"); @@ -896,7 +899,8 @@ // Move it if (success) { - JSONObject updatedData = moveNode(parameters, nodeId, newParentId, prevNodeId, nextNodeId); + JSONObject updatedData = moveNode(parameters, datasourceSpecificParams, nodeId, newParentId, + prevNodeId, nextNodeId); if (updatedData != null) { dataResponse.put(updatedData); } else { @@ -924,8 +928,9 @@ return jsonResult.toString(); } - protected abstract JSONObject moveNode(Map parameters, String nodeId, - String newParentId, String prevNodeId, String nextNodeId) throws Exception; + protected abstract JSONObject moveNode(Map parameters, + Map datasourceSpecificParams, String nodeId, String newParentId, + String prevNodeId, String nextNodeId) throws Exception; /** * Exception thrown when an operation can not be done upon a node that has several parents diff --git a/src-db/database/sourcedata/AD_FIELD.xml b/src-db/database/sourcedata/AD_FIELD.xml --- a/src-db/database/sourcedata/AD_FIELD.xml +++ b/src-db/database/sourcedata/AD_FIELD.xml @@ -179195,6 +179195,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src-db/database/sourcedata/AD_TABLE_TREE.xml b/src-db/database/sourcedata/AD_TABLE_TREE.xml --- a/src-db/database/sourcedata/AD_TABLE_TREE.xml +++ b/src-db/database/sourcedata/AD_TABLE_TREE.xml @@ -128,7 +128,8 @@ - + + diff --git a/src-db/database/sourcedata/OBSERDS_DATASOURCE.xml b/src-db/database/sourcedata/OBSERDS_DATASOURCE.xml --- a/src-db/database/sourcedata/OBSERDS_DATASOURCE.xml +++ b/src-db/database/sourcedata/OBSERDS_DATASOURCE.xml @@ -53,6 +53,19 @@ + + + + + + + + + + + + +