Commit 15b5d1fd authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

support both legacy Delivery Rule and new Delivery Root Simulation Rule.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@32983 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent c5a0ebc0
...@@ -59,7 +59,7 @@ parent = movement.getParentValue()\n ...@@ -59,7 +59,7 @@ parent = movement.getParentValue()\n
if parent.getPortalType() == \'Applied Rule\':\n if parent.getPortalType() == \'Applied Rule\':\n
parent_rule = parent.getSpecialiseValue()\n parent_rule = parent.getSpecialiseValue()\n
parent_rule_portal_type = parent_rule.getPortalType()\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 return False\n
# XXX can we create invoicing rule for Production Order?\n # XXX can we create invoicing rule for Production Order?\n
if parent_rule_portal_type in [\'Delivery Simulation Rule\',] and \\\n if parent_rule_portal_type in [\'Delivery Simulation Rule\',] and \\\n
......
337 338
\ No newline at end of file \ No newline at end of file
...@@ -59,7 +59,7 @@ parent = movement.getParentValue()\n ...@@ -59,7 +59,7 @@ parent = movement.getParentValue()\n
if parent.getPortalType() == \'Applied Rule\':\n if parent.getPortalType() == \'Applied Rule\':\n
parent_rule = parent.getSpecialiseValue()\n parent_rule = parent.getSpecialiseValue()\n
parent_rule_portal_type = parent_rule.getPortalType()\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 return False\n
# XXX can we create tax rule for Production Order?\n # XXX can we create tax rule for Production Order?\n
if parent_rule_portal_type in [\'Delivery Simulation Rule\',] and \\\n if parent_rule_portal_type in [\'Delivery Simulation Rule\',] and \\\n
......
11 12
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment