Commit 2df80ffd authored by Romain Courteaud's avatar Romain Courteaud

Do not expand simulation related to an Order when expanding.

This part is not managed with the order_simulation_interaction_workflow and
order_movement_simulation_interaction_workflow.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@16011 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent d6343b18
...@@ -144,14 +144,6 @@ class Order(Delivery): ...@@ -144,14 +144,6 @@ class Order(Delivery):
LOG('Order.updateAppliedRule ',0,'This method this method should not be used anymore.') LOG('Order.updateAppliedRule ',0,'This method this method should not be used anymore.')
Delivery.updateAppliedRule(self, rule_id, force=force,**kw) Delivery.updateAppliedRule(self, rule_id, force=force,**kw)
def recursiveReindexObject(self, activate_kw=None, *k, **kw):
"""
Reindex children and simulation
"""
Delivery.recursiveReindexObject(self, activate_kw=activate_kw, *k, **kw)
self.activate(activate_kw=activate_kw).\
expandAppliedRuleRelatedToOrder(activate_kw=activate_kw, **kw)
def expandAppliedRuleRelatedToOrder(self, activate_kw=None,**kw): def expandAppliedRuleRelatedToOrder(self, activate_kw=None,**kw):
""" """
Expand the applied rule related Expand the applied rule related
......
...@@ -74,11 +74,3 @@ class OrderCell(DeliveryCell): ...@@ -74,11 +74,3 @@ class OrderCell(DeliveryCell):
Reindex children and simulation Reindex children and simulation
""" """
self.recursiveReindexObject(*k,**kw) self.recursiveReindexObject(*k,**kw)
security.declarePublic('recursiveReindexObject')
def recursiveReindexObject(self, activate_kw={}, *k, **kw):
"""
Reindex children and simulation
"""
self.getExplanationValue().expandAppliedRuleRelatedToOrder(activate_kw=activate_kw, **kw)
DeliveryCell.recursiveReindexObject(self, activate_kw=activate_kw, *k, **kw)
...@@ -96,17 +96,6 @@ class OrderLine(DeliveryLine): ...@@ -96,17 +96,6 @@ class OrderLine(DeliveryLine):
# And apply # And apply
getattr(my_simulation_movement, method_id)() getattr(my_simulation_movement, method_id)()
security.declarePublic('recursiveReindexObject')
def recursiveReindexObject(self, activate_kw={}, *k, **kw):
"""
Reindex children and simulation
"""
self.getExplanationValue().expandAppliedRuleRelatedToOrder(activate_kw=activate_kw, **kw)
DeliveryLine.recursiveReindexObject(self, activate_kw=activate_kw, *k, **kw)
#self.activate().applyToOrderLineRelatedMovement(method_id = 'expand')
# We do it at Order level through edit
# This logic should actually be put in worklow
# Simulation Consistency Check # Simulation Consistency Check
def getSimulationQuantity(self): def getSimulationQuantity(self):
""" """
......
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