[Erp5-report] r35806 kazuhiko - /erp5/trunk/products/ERP5Legacy/Document/Rule.py

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Mon May 31 17:48:03 2010
New Revision: 35806

URL: http://svn.erp5.org?rev=35806&view=rev
Log:
if delivery category is used in root applied rule, we don't want to check if we have delivery in the first level simulation movement to determine if the simulation is mutable or deletable.

Modified:
    erp5/trunk/products/ERP5Legacy/Document/Rule.py

Modified: erp5/trunk/products/ERP5Legacy/Document/Rule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Legacy/Document/Rule.py?rev=35806&r1=35805&r2=35806&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Legacy/Document/Rule.py [utf8] (original)
+++ erp5/trunk/products/ERP5Legacy/Document/Rule.py [utf8] Mon May 31 17:48:03 2010
@@ -330,11 +330,19 @@
     mutable_movement_list = []
     deletable_movement_list = []
 
+    is_root = applied_rule.isRootAppliedRule()
     for movement in applied_rule.contentValues(portal_type=self.movement_type):
+      # XXX in root applied rule case, movement.isFrozen() is not a good
+      # criteria to determine if movement is immutable or not. Same for
+      # non-root case?
       if movement.isFrozen():
         immutable_movement_list.append(movement)
       else:
-        if movement._isTreeDelivered():
+        if is_root and movement.hasOrder():
+          ignore_first = False
+        else:
+          ignore_first = True
+        if movement._isTreeDelivered(ignore_first=ignore_first):
           mutable_movement_list.append(movement)
         else:
           deletable_movement_list.append(movement)