[Erp5-report] r44568 leonardo - /erp5/trunk/products/ERP5/Document/AdoptSolver.py

[nobody at svn.erp5.org]

Author: leonardo
Date: Thu Mar 24 17:18:41 2011
New Revision: 44568

URL: http://svn.erp5.org?rev=44568&view=rev
Log:
Fix AdoptSolver. A movement could have more than one related Simulation Movement, and the one returned by getDeliveryRelatedValue() might not be the one that is divergent. It could be not even a Simulation Movement at all!

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

Modified: erp5/trunk/products/ERP5/Document/AdoptSolver.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/AdoptSolver.py?rev=44568&r1=44567&r2=44568&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/AdoptSolver.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/AdoptSolver.py [utf8] Thu Mar 24 17:18:41 2011
@@ -95,9 +95,18 @@ class AdoptSolver(SolverMixin, Configura
         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))
+
+          # XXX-Leo: If there is more than one simulation_movement in
+          # the simulation_movement_list, this indicates a wrong
+          # configuration or bad selection by the user. Should we do
+          # anything about it, like log or fail?
+          # Also, the behaviour below is naive, and could cause another
+          # non-divergent Simulation Movement to become divergent.
+          for simulation_movement in simulation_movement_list:
+            movement.setProperty(
+              solved_property,
+              simulation_movement.getProperty(solved_property)
+            )
     # Finish solving
     if self.getPortalObject().portal_workflow.isTransitionPossible(
       self, 'succeed'):