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

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Mon Dec 14 14:55:38 2009
New Revision: 31281

URL: http://svn.erp5.org?rev=31281&view=rev
Log:
'delivery' category is also used to record the relation between a solver decision and a delivery movement, so we need to specify portal_type in order to get related simulation movements only.

Modified:
    erp5/trunk/products/ERP5/Document/AcceptSolver.py
    erp5/trunk/products/ERP5/Document/QuantitySplitSolver.py

Modified: erp5/trunk/products/ERP5/Document/AcceptSolver.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/AcceptSolver.py?rev=31281&r1=31280&r2=31281&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/AcceptSolver.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/AcceptSolver.py [utf8] Mon Dec 14 14:55:38 2009
@@ -60,9 +60,10 @@
     solved_property = self.getPortalTypeValue().getTestedProperty()
     for movement in self.getDeliveryValueList():
       new_value = movement.getProperty(solved_property)
-      for simulation_movement in movement.getDeliveryRelatedValueList():
+      for simulation_movement in movement.getDeliveryRelatedValueList(
+        portal_type='Simulation Movement'):
         if not simulation_movement.isPropertyRecorded(solved_property):
           simulation_movement.recordProperty(solved_property)
         solved_property.setProperty(solved_property, new_value)
     # Finish solving
-    self.succeed()
+    self.succeed()

Modified: erp5/trunk/products/ERP5/Document/QuantitySplitSolver.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/QuantitySplitSolver.py?rev=31281&r1=31280&r2=31281&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/QuantitySplitSolver.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/QuantitySplitSolver.py [utf8] Mon Dec 14 14:55:38 2009
@@ -64,7 +64,8 @@
     """    
     for delivery_line in self.getDeliveryValueList(): 
       decision_quantity = delivery_line.getQuantity()
-      simulation_movement_list = self.getDeliveryRelatedValueList()
+      simulation_movement_list = self.getDeliveryRelatedValueList(
+        portal_type='Simulation Movement')
       delivery_solver = self.portal_solvers.newDeliverySolver(self.getDeliverySolver(), simulation_movement_list)
       # Update the quantity using delivery solver algorithm
       split_list = delivery_solver.setTotalQuantity(decision_quantity)
@@ -73,4 +74,4 @@
         new_movement = simulation_movement.copy() # Copy at same level
         new_movement._setQuantity(split_quantity)
         new_movement._setStartDate(self.getStartDate())
-        new_movement._setStopDate(self.getStopDate())
+        new_movement._setStopDate(self.getStopDate())