details: https://code.openbravo.com/erp/devel/pi/rev/c229892e1b36 changeset: 27889:c229892e1b36 user: David Miguelez <david.miguelez <at> openbravo.com> date: Mon Nov 16 13:43:53 2015 +0100 summary: Backed out changeset 54816dff1cfb
diffstat: src/org/openbravo/costing/CostAdjustmentProcess.java | 7 ------- src/org/openbravo/costing/StandardCostAdjustment.java | 16 ++++------------ 2 files changed, 4 insertions(+), 19 deletions(-) diffs (50 lines): diff -r 54816dff1cfb -r c229892e1b36 src/org/openbravo/costing/CostAdjustmentProcess.java --- a/src/org/openbravo/costing/CostAdjustmentProcess.java Mon Nov 16 12:31:48 2015 +0100 +++ b/src/org/openbravo/costing/CostAdjustmentProcess.java Mon Nov 16 13:43:53 2015 +0100 @@ -144,13 +144,6 @@ } } - /** - * Permanently adjusted Transactions with and adjustment amount different than zero should not be - * adjusted. The only exception are the Opening Inventories. Due to backdated Transactions that - * can modify the stock or the stock valuation, it is necessary to adjust this Opening Inventories - * to fix rounding issues. - */ - private void checkPermanentelyAdjustedTrx(String strCostAdjId) throws OBException { StringBuffer where = new StringBuffer(); where.append(" as cal"); diff -r 54816dff1cfb -r c229892e1b36 src/org/openbravo/costing/StandardCostAdjustment.java --- a/src/org/openbravo/costing/StandardCostAdjustment.java Mon Nov 16 12:31:48 2015 +0100 +++ b/src/org/openbravo/costing/StandardCostAdjustment.java Mon Nov 16 13:43:53 2015 +0100 @@ -131,12 +131,8 @@ final OrganizationStructureProvider osp = OBContext.getOBContext() .getOrganizationStructureProvider(trx.getClient().getId()); - Set<String> orgs = osp.getChildTree(strCostOrgId, true); - HashMap<CostDimension, BaseOBObject> costDimensions = getCostDimensions(); - if (trx.getProduct().isProduction()) { - orgs = osp.getChildTree("0", false); - costDimensions = CostingUtils.getEmptyDimensions(); - } + final Set<String> orgs = osp.getChildTree(strCostOrgId, true); + final HashMap<CostDimension, BaseOBObject> costDimensions = getCostDimensions(); final Warehouse warehouse = (Warehouse) costDimensions.get(CostDimension.Warehouse); // Get the movement date of the first Inventory Amount Update after trx @@ -238,12 +234,8 @@ final OrganizationStructureProvider osp = OBContext.getOBContext() .getOrganizationStructureProvider(trx.getClient().getId()); - Set<String> orgs = osp.getChildTree(strCostOrgId, true); - HashMap<CostDimension, BaseOBObject> costDimensions = getCostDimensions(); - if (trx.getProduct().isProduction()) { - orgs = osp.getChildTree("0", false); - costDimensions = CostingUtils.getEmptyDimensions(); - } + final Set<String> orgs = osp.getChildTree(strCostOrgId, true); + final HashMap<CostDimension, BaseOBObject> costDimensions = getCostDimensions(); final Warehouse warehouse = (Warehouse) costDimensions.get(CostDimension.Warehouse); StringBuffer where = new StringBuffer(); ------------------------------------------------------------------------------ Presto, an open source distributed SQL query engine for big data, initially developed by Facebook, enables you to easily query your data on Hadoop in a more interactive manner. Teradata is also now providing full enterprise support for Presto. Download a free open source copy now. http://pubads.g.doubleclick.net/gampad/clk?id=250295911&iu=/4140 _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits