[Erp5-report] r36746 kazuhiko - in /erp5/trunk/products/ERP5: Document/ Tool/

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Wed Jun 30 16:35:10 2010
New Revision: 36746

URL: http://svn.erp5.org?rev=36746&view=rev
Log:
* no need to propagate temp_object argument to creating Solver Decision, because if parent object is temp object, its childrean are also temp object.
* fix a bug that newSolverProcess() returns None for non-temp case.

Modified:
    erp5/trunk/products/ERP5/Document/SolverProcess.py
    erp5/trunk/products/ERP5/Tool/SolverProcessTool.py

Modified: erp5/trunk/products/ERP5/Document/SolverProcess.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/SolverProcess.py?rev=36746&r1=36745&r2=36746&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/SolverProcess.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/SolverProcess.py [utf8] Wed Jun 30 16:35:10 2010
@@ -192,8 +192,7 @@ class SolverProcess(XMLObject, ActivePro
     this helps reducing CPU time.
     """
 
-  def buildSolverDecisionList(self, delivery_or_movement=None,
-                              temp_object=False):
+  def buildSolverDecisionList(self, delivery_or_movement=None):
     """
     Build (or rebuild) the solver decisions in the solver process
 
@@ -239,7 +238,6 @@ class SolverProcess(XMLObject, ActivePro
     # Now build the solver decision instances based on the previous
     # grouping
     solver_decision_list = self.objectValues(portal_type='Solver Decision')
-    index = 1
     for solver_decision_key, movement_dict in solver_decision_dict.items():
       causality, delivery_list, solver_list = solver_decision_key
       matched_solver_decision_list = [
@@ -249,14 +247,7 @@ class SolverProcess(XMLObject, ActivePro
       if len(matched_solver_decision_list) > 0:
         solver_decision_list.remove(matched_solver_decision_list[0])
       else:
-        if temp_object:
-          new_decision = self.newContent(portal_type='Solver Decision',
-                                         temp_object=True,
-                                         #id=index,
-                                         uid='new_%s' % index)
-          index += 1
-        else:
-          new_decision = self.newContent(portal_type='Solver Decision')
+        new_decision = self.newContent(portal_type='Solver Decision')
         new_decision._setDeliveryValueList(movement_dict.keys())
         new_decision._setCausality(solver_decision_key[0])
         # If we have only one available automatic solver, we just use it

Modified: erp5/trunk/products/ERP5/Tool/SolverProcessTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Tool/SolverProcessTool.py?rev=36746&r1=36745&r2=36746&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Tool/SolverProcessTool.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Tool/SolverProcessTool.py [utf8] Wed Jun 30 16:35:10 2010
@@ -92,8 +92,7 @@ class SolverProcessTool(BaseTool):
     new_solver = self.newContent(portal_type='Solver Process',
                                  temp_object=temp_object)
     # And build decisions
-    new_solver.buildSolverDecisionList(delivery_or_movement=delivery_or_movement,
-                                       temp_object=temp_object)
+    new_solver.buildSolverDecisionList(delivery_or_movement)
 
     if not temp_object:
       # Append the solver process into the delivery's solver category
@@ -104,4 +103,5 @@ class SolverProcessTool(BaseTool):
       solver_list = delivery.getSolverValueList()
       solver_list.append(new_solver)
       delivery.setSolverValueList(solver_list)
-      return new_solver
+
+    return new_solver