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

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Fri Jun 25 16:57:34 2010
New Revision: 36604

URL: http://svn.erp5.org?rev=36604&view=rev
Log:
the condition was wrong in r35806 (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=36604&r1=36603&r2=36604&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Legacy/Document/Rule.py [utf8] (original)
+++ erp5/trunk/products/ERP5Legacy/Document/Rule.py [utf8] Fri Jun 25 16:57:34 2010
@@ -338,10 +338,10 @@ class Rule(Predicate, XMLObject):
       if movement.isFrozen():
         immutable_movement_list.append(movement)
       else:
-        if is_root and movement.hasOrder():
-          ignore_first = False
-        else:
+        if is_root and not movement.hasOrder():
           ignore_first = True
+        else:
+          ignore_first = False
         if movement._isTreeDelivered(ignore_first=ignore_first):
           mutable_movement_list.append(movement)
         else: