Commit b689ddba authored by Jean-Paul Smets's avatar Jean-Paul Smets

Only reexpand if silulation_state is compatible

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@309 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent d89639eb
No related merge requests found
......@@ -118,8 +118,9 @@ An order..."""
security.declarePrivate( '_edit' )
def _edit(self, REQUEST=None, force_update = 0, **kw):
Delivery._edit(self, REQUEST=REQUEST, force_update = force_update, **kw)
# We must expand our applied rule
self.updateAppliedRule() # This should be implemented with the interaction tool rather than with this hard coding
# We must expand our applied rule only if not confirmed
if self.getSimulationState() in planned_order_state:
self.updateAppliedRule() # This should be implemented with the interaction tool rather than with this hard coding
def updateAppliedRule(self):
if self.getSimulationState() not in draft_order_state:
......@@ -284,6 +285,6 @@ An order..."""
Delete related Applied Rule
"""
for o in self.getCausalityRelatedValueList(portal_type='Applied Rule'):
o.aq_parent.deleteContent(o.getId())
o.aq_parent.activate().deleteContent(o.getId())
Delivery.manage_beforeDelete(self, item, container)
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