[Erp5-report] r17723 - /erp5/trunk/products/ERP5/Document/Delivery.py

[nobody at svn.erp5.org]

Author: alex
Date: Wed Nov 21 11:51:43 2007
New Revision: 17723

URL: http://svn.erp5.org?rev=17723&view=rev
Log:
* updateAppliedRule: fix comment
* _createAppliedRule: remove wrong block and comment (block was never reached,
  and we should not automatically delete simulation objects)

Modified:
    erp5/trunk/products/ERP5/Document/Delivery.py

Modified: erp5/trunk/products/ERP5/Document/Delivery.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Delivery.py?rev=17723&r1=17722&r2=17723&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Delivery.py (original)
+++ erp5/trunk/products/ERP5/Document/Delivery.py Wed Nov 21 11:51:43 2007
@@ -685,9 +685,9 @@
       else:
         rule_id = rule_reference
 
+      # only expand if we are not in a "too early" or "too late" state
       if (self.getSimulationState() not in
           self.getPortalDraftOrderStateList()):
-        # Nothing to do if we are already simulated
         self._createAppliedRule(rule_id, force=force, **kw)
 
     def _createAppliedRule(self, rule_id, force=0, activate_kw=None, **kw):
@@ -695,12 +695,6 @@
         Create a new Applied Rule is none is related, or call expand
         on the existing one.
       """
-      # Return if draft or cancelled simulation_state
-      if self.getSimulationState() in ('cancelled',):
-        # The applied rule should be cleaned up 
-        # ie. empty all movements which have no confirmed children
-        return
-      # Otherwise, expand
       # Look up if existing applied rule
       my_applied_rule_list = self.getCausalityRelatedValueList(
           portal_type='Applied Rule')