diff --git a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/TransformationRule_selectMovement.xml b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/TransformationRule_selectMovement.xml index 2e2cd6cd1ab301fe6f4291211148f767bdd6cb9e..170c8b9bd3dca9d36bd9f4c65a0f68c46c0bf7cb 100644 --- a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/TransformationRule_selectMovement.xml +++ b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/TransformationRule_selectMovement.xml @@ -60,7 +60,8 @@ parent_applied_rule = movement.getParentValue()\n parent_rule = parent_applied_rule.getSpecialiseValue()\n return (\n - root_rule.getPortalType() == "Production Order Rule" and\\\n + root_rule.getPortalType() in ("Production Order Rule",\n + "Production Order Simulation Rule") and\\\n parent_rule.getPortalType() == "Transformation Rule" and\\\n root_movement.getSimulationState() == "confirmed"\n )\n diff --git a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/TransformationSourcingRule_selectMovement.xml b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/TransformationSourcingRule_selectMovement.xml index 61e3bdfc173dfc59a699e402df25b72e078d5aa6..a2b9c8afc93752a82ae8a736bf86952c870827aa 100644 --- a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/TransformationSourcingRule_selectMovement.xml +++ b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/TransformationSourcingRule_selectMovement.xml @@ -60,18 +60,18 @@ parent_applied_rule = movement.getParentValue()\n parent_rule = parent_applied_rule.getSpecialiseValue()\n return (\n - ((root_rule.getPortalType() == "Production Order Rule" and\\\n - (parent_rule.getPortalType() in ("Transformation Sourcing Rule",))) or \\\n - (root_rule.getPortalType() == "Production Order Simulation Rule" and\\\n - (parent_rule.getPortalType() in ("Delivering Simulation Rule",))))\\\n - and\\\n + root_rule.getPortalType() in ("Production Order Rule",\n + "Production Order Simulation Rule") and\\\n + (parent_rule.getPortalType() in ("Transformation Sourcing Rule",\n + "Delivering Rule",\n + "Delivering Simulation Rule")) and\\\n root_movement.getSimulationState() == "confirmed"\n )\n \n # XXX need to implement this part in the catalog\n # portal type causality of root applied rule\n search_kw = {\n - \'explanation_portal_type\': (\'Production Order\', \'Production Simulation Order\'),\n + \'explanation_portal_type\': \'Production Order\',\n \'portal_type\': \'Simulation Movement\',\n }\n if explanation_uid is not None:\n diff --git a/bt5/erp5_mrp/bt/revision b/bt5/erp5_mrp/bt/revision index 2da56739379b4c88eeb8bcda0c2ce6fbd891af9d..f9945368e6a42bd79f66d17333a2c68a0d5f1e96 100644 --- a/bt5/erp5_mrp/bt/revision +++ b/bt5/erp5_mrp/bt/revision @@ -1 +1 @@ -418 \ No newline at end of file +419 \ No newline at end of file