diff --git a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionOrder_getConsumptionMovementList.xml b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionOrder_getConsumptionMovementList.xml index c74abe8d059225d50e774b56789df57e4198b96d..fab927ee223db38910fd7bc6eddaa617a298ef85 100644 --- a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionOrder_getConsumptionMovementList.xml +++ b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionOrder_getConsumptionMovementList.xml @@ -85,19 +85,22 @@ if omit_order_resources:\n if q.getResourceUid() is not None]\n \n query = NegatedQuery(\n - Query(operator=\'IN\',**{\'movement.resource_uid\':ignored_resource_uid_list})\n + Query(operator=\'IN\',**{\'stock.resource_uid\':ignored_resource_uid_list})\n )\n \n kw.update(**query.asSQLExpression())\n \n kw[\'explanation_uid\'] = [context.getUid()] + [q.getUid() for q in \\\n context.getCausalityRelatedValueList(portal_type=context.getPortalDeliveryTypeList())]\n +\n kw[\'group_by_date\'] = 1\n kw[\'group_by_node\'] = 1\n kw[\'group_by_variation\'] = 1\n kw[\'group_by_resource\'] = 1\n kwargs.update(**kw)\n # XXX: below filtering to be replaced by HAVING expression\n +if kwargs.get(\'src__\',0) == 1:\n + return simulation_tool.getFutureInventoryList(*args,**kwargs)\n return [q for q in simulation_tool.getFutureInventoryList(*args,**kwargs) if q.inventory < 0.0]\n diff --git a/bt5/erp5_mrp/bt/revision b/bt5/erp5_mrp/bt/revision index 2a9c18ad50e6731f71e354121996a406a20a90fe..b0e9f8d0ff9ef600d88b4447f44c13eed00eaca6 100644 --- a/bt5/erp5_mrp/bt/revision +++ b/bt5/erp5_mrp/bt/revision @@ -1 +1 @@ -357 \ No newline at end of file +358 \ No newline at end of file