[Erp5-report] r44611 kazuhiko - /erp5/trunk/products/ERP5/mixin/rule.py

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Fri Mar 25 11:57:33 2011
New Revision: 44611

URL: http://svn.erp5.org?rev=44611&view=rev
Log:
revert this part, because if re-expand occurs from the upward for simulation movements that already have recorded properties and we have differences between upward values and recorded values, we need to update anyway (and to clear recorded propertyes that are already well implemented in other place).
this should fix the current failure of test_19_ChangeResourceOnPackingListAndOrder in testPackingList.py.

Modified:
    erp5/trunk/products/ERP5/mixin/rule.py

Modified: erp5/trunk/products/ERP5/mixin/rule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/mixin/rule.py?rev=44611&r1=44610&r2=44611&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/mixin/rule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/mixin/rule.py [utf8] Fri Mar 25 11:57:33 2011
@@ -421,14 +421,7 @@ class RuleMixin(Predicate):
           kw = {}
           for tester in profit_updating_tester_list:
             if not tester.compare(prevision_movement, decision_movement):
-              # Only update those updatable properties which are not recorded
-              kw_candidate = tester.getUpdatablePropertyDict(prevision_movement,
-                                                             decision_movement)
-              accept_candidate = True
-              for property_key in kw_candidate.keys():
-                if decision_movement.isPropertyRecorded(property_key):
-                  del kw_candidate[property_key]
-              kw.update(kw_candidate)
+              kw.update(tester.getUpdatablePropertyDict(prevision_movement, decision_movement))
           if kw:
             movement_collection_diff.addUpdatableMovement(decision_movement, kw)
       else:
@@ -446,14 +439,7 @@ class RuleMixin(Predicate):
           kw = {}
           for tester in updating_tester_list:
             if not tester.compare(prevision_movement, decision_movement):
-              # Only update those updatable properties which are not recorded
-              kw_candidate = tester.getUpdatablePropertyDict(prevision_movement,
-                                                             decision_movement)
-              accept_candidate = True
-              for property_key in kw_candidate.keys():
-                if decision_movement.isPropertyRecorded(property_key):
-                  del kw_candidate[property_key]
-              kw.update(kw_candidate)
+              kw.update(tester.getUpdatablePropertyDict(prevision_movement, decision_movement))
               # XXX-JPS - there is a risk here that quantity is wrongly updated
           if kw:
             movement_collection_diff.addUpdatableMovement(decision_movement, kw)