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

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Tue Dec 15 11:56:04 2009
New Revision: 31305

URL: http://svn.erp5.org?rev=31305&view=rev
Log:
revert r31281, r31992, r31294, because 'property to be solved' should be specified in each Solver portal type itself and we don't need indexed relation between solver decision and solver.

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

Modified: erp5/trunk/products/ERP5/Document/AcceptSolver.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/AcceptSolver.py?rev=31305&r1=31304&r2=31305&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/AcceptSolver.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/AcceptSolver.py [utf8] Tue Dec 15 11:56:04 2009
@@ -66,8 +66,7 @@
     solved_property = self._getPortalTypeValue().getTestedProperty()
     for movement in self.getDeliveryValueList():
       new_value = movement.getProperty(solved_property)
-      for simulation_movement in movement.getDeliveryRelatedValueList(
-        portal_type='Simulation Movement'):
+      for simulation_movement in movement.getDeliveryRelatedValueList():
         if not simulation_movement.isPropertyRecorded(solved_property):
           simulation_movement.recordProperty(solved_property)
         # XXX hard coded

Modified: erp5/trunk/products/ERP5/Document/Delivery.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Delivery.py?rev=31305&r1=31304&r2=31305&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Delivery.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/Delivery.py [utf8] Tue Dec 15 11:56:04 2009
@@ -792,8 +792,7 @@
       # we might use a zsql method, because it can be very slow
       for m in self.getMovementList():
         if m.isSimulated():
-          sim_movement_list = m.getDeliveryRelatedValueList(
-              portal_type='Simulation Movement') # XXX hardcoded
+          sim_movement_list = m.getDeliveryRelatedValueList()
           for sim_movement in sim_movement_list:
             if sim_movement.getRootAppliedRule().getPath() \
                 not in excluded_rule_path_list:

Modified: erp5/trunk/products/ERP5/Document/Movement.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Movement.py?rev=31305&r1=31304&r2=31305&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Movement.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/Movement.py [utf8] Tue Dec 15 11:56:04 2009
@@ -493,8 +493,7 @@
     Return a list of messages that contains the divergences 
     """
     divergence_list = [] 
-    for simulation_movement in self.getDeliveryRelatedValueList(
-      portal_type='Simulation Movement'): # XXX hardcoded
+    for simulation_movement in self.getDeliveryRelatedValueList():
       divergence_list.extend(simulation_movement.getDivergenceList())
 
     return divergence_list

Modified: erp5/trunk/products/ERP5/Document/QuantitySplitSolver.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/QuantitySplitSolver.py?rev=31305&r1=31304&r2=31305&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/QuantitySplitSolver.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/QuantitySplitSolver.py [utf8] Tue Dec 15 11:56:04 2009
@@ -65,8 +65,7 @@
     """    
     for delivery_line in self.getDeliveryValueList(): 
       decision_quantity = delivery_line.getQuantity()
-      simulation_movement_list = self.getDeliveryRelatedValueList(
-        portal_type='Simulation Movement')
+      simulation_movement_list = self.getDeliveryRelatedValueList()
       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)

Modified: erp5/trunk/products/ERP5/Document/SolverDecision.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/SolverDecision.py?rev=31305&r1=31304&r2=31305&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/SolverDecision.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/SolverDecision.py [utf8] Tue Dec 15 11:56:04 2009
@@ -64,9 +64,7 @@
   meta_type = 'ERP5 Solver Decision'
   portal_type = 'Solver Decision'
   add_permission = Permissions.AddPortalContent
-  # XXX we need to index Solver Decision so as to find the related Solver
-  # Decision document from a Target Solver document.
-  # isIndexable = 0 # We do not want to fill the catalog with objects on which we need no reporting
+  isIndexable = 0 # We do not want to fill the catalog with objects on which we need no reporting
 
   # Declarative security
   security = ClassSecurityInfo()