Commit 9fddccd2 authored by Jérome Perrin's avatar Jérome Perrin

remove spaces at end of line and fix a typo



git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@20398 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 1eee113b
...@@ -35,7 +35,7 @@ from zLOG import LOG, WARNING ...@@ -35,7 +35,7 @@ from zLOG import LOG, WARNING
class OrderRule(DeliveryRule): class OrderRule(DeliveryRule):
""" """
Order Rule object make sure an Order in the similation Order Rule object make sure an Order in the simulation
is consistent with the real order is consistent with the real order
WARNING: what to do with movement split ? WARNING: what to do with movement split ?
...@@ -109,7 +109,8 @@ class OrderRule(DeliveryRule): ...@@ -109,7 +109,8 @@ class OrderRule(DeliveryRule):
related_order = order_movement_dict.get(movement.getPath(), None) related_order = order_movement_dict.get(movement.getPath(), None)
if related_order is None: if related_order is None:
related_order = movement.getOrderRelatedValue() related_order = movement.getOrderRelatedValue()
property_dict = self._getExpandablePropertyDict(applied_rule, movement) property_dict = self._getExpandablePropertyDict(
applied_rule, movement)
if related_order is None: if related_order is None:
# Generate a simulation movement # Generate a simulation movement
# Do not try to create meaningfull IDs, as order movement can be # Do not try to create meaningfull IDs, as order movement can be
...@@ -172,22 +173,23 @@ class OrderRule(DeliveryRule): ...@@ -172,22 +173,23 @@ class OrderRule(DeliveryRule):
# "Hardcoded properties set") # "Hardcoded properties set")
default_property_list = ( default_property_list = (
'source', 'source',
'source_section', 'source_section',
'destination', 'destination',
'destination_section', 'destination_section',
'start_date', 'start_date',
'stop_date', 'stop_date',
'resource', 'resource',
'variation_category_list', 'variation_category_list',
'variation_property_dict', 'variation_property_dict',
'aggregate_list', 'aggregate_list',
'price', 'price',
'price_currency', 'price_currency',
'quantity', 'quantity',
'quantity_unit', 'quantity_unit',
) )
for prop in default_property_list: for prop in default_property_list:
property_dict[prop] = movement.getProperty(prop) property_dict[prop] = movement.getProperty(prop)
return property_dict return property_dict
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