diff --git a/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoicingRule.xml b/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoicingRule.xml index dc6898a98e254a8ebb4c9c5ff3baddd4480180e3..dc94e4ddd4db82813f1294c0f51e32f0dd9d9672 100644 --- a/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoicingRule.xml +++ b/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoicingRule.xml @@ -59,7 +59,7 @@ parent = movement.getParentValue()\n if parent.getPortalType() == \'Applied Rule\':\n parent_rule = parent.getSpecialiseValue()\n parent_rule_portal_type = parent_rule.getPortalType()\n - if parent_rule_portal_type not in [\'Order Rule\', \'Delivery Rule\', \'Delivery Simulation Rule\']:\n + if parent_rule_portal_type not in [\'Order Rule\', \'Delivery Rule\', \'Delivery Root Simulation Rule\', \'Delivery Simulation Rule\']:\n return False\n # XXX can we create invoicing rule for Production Order?\n if parent_rule_portal_type in [\'Delivery Simulation Rule\',] and \\\n diff --git a/bt5/erp5_invoicing/bt/revision b/bt5/erp5_invoicing/bt/revision index ef491079a37cc374abca2e517e35441c362236d2..4b74f2216dbbf61c34b833c71a1bf5ce78c85b6a 100644 --- a/bt5/erp5_invoicing/bt/revision +++ b/bt5/erp5_invoicing/bt/revision @@ -1 +1 @@ -337 \ No newline at end of file +338 \ No newline at end of file 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 1b6ec93da94ac6c06493d4318a88c5a97fb170ab..e4725d79949a43531444276210fefc514d1534da 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 @@ -59,7 +59,7 @@ parent = movement.getParentValue()\n if parent.getPortalType() == \'Applied Rule\':\n parent_rule = parent.getSpecialiseValue()\n parent_rule_portal_type = parent_rule.getPortalType()\n - if parent_rule_portal_type not in [\'Order Rule\', \'Delivery Rule\', \'Delivery Simulation Rule\']:\n + if parent_rule_portal_type not in [\'Order Rule\', \'Delivery Rule\', \'Delivery Root Simulation Rule\', \'Delivery Simulation Rule\']:\n return False\n # XXX can we create tax rule for Production Order?\n if parent_rule_portal_type in [\'Delivery Simulation Rule\',] and \\\n diff --git a/bt5/erp5_legacy_tax_system/bt/revision b/bt5/erp5_legacy_tax_system/bt/revision index 9d607966b721abde8931ddd052181fae905db503..3cacc0b93c9c9c03a72da624ca28a09ba5c1336f 100644 --- a/bt5/erp5_legacy_tax_system/bt/revision +++ b/bt5/erp5_legacy_tax_system/bt/revision @@ -1 +1 @@ -11 \ No newline at end of file +12 \ No newline at end of file