[Erp5-report] r32401 kazuhiko - /erp5/trunk/products/ERP5/Document/

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Wed Feb 10 10:49:16 2010
New Revision: 32401

URL: http://svn.erp5.org?rev=32401&view=rev
Log:
no need to clear recorded property for adoption.

Modified:
    erp5/trunk/products/ERP5/Document/AdoptSolver.py
    erp5/trunk/products/ERP5/Document/UnifySolver.py

Modified: erp5/trunk/products/ERP5/Document/AdoptSolver.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/AdoptSolver.py?rev=32401&r1=32400&r2=32401&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/AdoptSolver.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/AdoptSolver.py [utf8] Wed Feb 10 10:49:16 2010
@@ -80,23 +80,11 @@
             delivery_error = total_quantity * delivery_ratio - quantity
             simulation_movement.edit(delivery_ratio=delivery_ratio,
                                      delivery_error=delivery_error)
-            self._clearRecordedPropertyRecursively(simulation_movement,
-                                                   solved_property)
         else:
           # XXX TODO we need to support multiple values for categories or
           # list type property.
           simulation_movement = movement.getDeliveryRelatedValue()
           movement.setProperty(solved_property,
                                simulation_movement.getProperty(solved_property))
-          for simulation_movement in movement.getDeliveryRelatedValueList():
-            self._clearRecordedPropertyRecursively(simulation_movement,
-                                                   solved_property)
     # Finish solving
     self.succeed()
-
-  def _clearRecordedPropertyRecursively(self, simulation_movement, property_id):
-    for applied_rule in simulation_movement.objectValues():
-      for child_simulation_movement in applied_rule.objectValues():
-        child_simulation_movement.clearRecordedProperty(property_id)
-        self._clearRecordedPropertyRecursively(child_simulation_movement,
-                                               property_id)

Modified: erp5/trunk/products/ERP5/Document/UnifySolver.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/UnifySolver.py?rev=32401&r1=32400&r2=32401&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/UnifySolver.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/UnifySolver.py [utf8] Wed Feb 10 10:49:16 2010
@@ -31,9 +31,8 @@
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, PropertySheet, interfaces
 from Products.ERP5.Document.AcceptSolver import AcceptSolver
-from Products.ERP5.Document.AdoptSolver import AdoptSolver
 
-class UnifySolver(AcceptSolver, AdoptSolver):
+class UnifySolver(AcceptSolver):
   """
   """
   meta_type = 'ERP5 Unify Solver'
@@ -79,8 +78,6 @@
       for simulation_movement in simulation_movement_list:
         value_dict = {solved_property:new_value}
         self._solveRecursively(simulation_movement, value_dict)
-        self._clearRecordedPropertyRecursively(simulation_movement,
-                                               solved_property)
         simulation_movement.expand()
     # Finish solving
     self.succeed()