diff --git a/bt5/erp5_legacy_tax_system/SkinTemplateItem/portal_skins/erp5_legacy_tax_system/SimulationMovement_testTaxRule.xml b/bt5/erp5_legacy_tax_system/SkinTemplateItem/portal_skins/erp5_legacy_tax_system/SimulationMovement_testTaxRule.xml index 37abd244da32d5a8002ec0d161e416ed7ad88a0e..ec3a6862025ae265da1d18d375e47ef8ee5a40e9 100644 --- a/bt5/erp5_legacy_tax_system/SkinTemplateItem/portal_skins/erp5_legacy_tax_system/SimulationMovement_testTaxRule.xml +++ b/bt5/erp5_legacy_tax_system/SkinTemplateItem/portal_skins/erp5_legacy_tax_system/SimulationMovement_testTaxRule.xml @@ -58,7 +58,12 @@ parent = movement.getParentValue()\n if parent.getPortalType() == \'Applied Rule\':\n parent_rule = parent.getSpecialiseValue()\n - if parent_rule.getPortalType() not in [\'Delivery Rule\', \'Order Rule\']:\n + parent_rule_portal_type = parent_rule.getPortalType()\n + if parent_rule_portal_type not in [\'Order Rule\', \'Delivery Rule\', \'Delivering Simulation Rule\']:\n + return False\n + # XXX can we create tax rule for Production Order?\n + if parent_rule_portal_type in [\'Delivering Simulation Rule\',] and \\\n + parent.getParentValue().getParentValue().getSpecialiseValue().getPortalType() not in [\'Order Simulation Rule\']:\n return False\n \n return True\n @@ -104,6 +109,7 @@ return True\n <string>_getattr_</string> <string>parent</string> <string>parent_rule</string> + <string>parent_rule_portal_type</string> <string>False</string> <string>True</string> </tuple> diff --git a/bt5/erp5_legacy_tax_system/bt/revision b/bt5/erp5_legacy_tax_system/bt/revision index 301160a93062df23030a69f4b5e4d9bf71866ee9..f11c82a4cb6cc2e8f3bdf52b5cdeaad4d5bb214e 100644 --- a/bt5/erp5_legacy_tax_system/bt/revision +++ b/bt5/erp5_legacy_tax_system/bt/revision @@ -1 +1 @@ -8 \ No newline at end of file +9 \ No newline at end of file