[Erp5-report] r31303 kazuhiko - in /erp5/trunk/products/ERP5: Document/ mixin/

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Tue Dec 15 11:48:31 2009
New Revision: 31303

URL: http://svn.erp5.org?rev=31303&view=rev
Log:
fix the way to get 'property to be solved' from Solver document, that should be specified in each Solver portal type itself.

Modified:
    erp5/trunk/products/ERP5/Document/AcceptSolver.py
    erp5/trunk/products/ERP5/mixin/solver.py

Modified: erp5/trunk/products/ERP5/Document/AcceptSolver.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/AcceptSolver.py?rev=31303&r1=31302&r2=31303&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/AcceptSolver.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/AcceptSolver.py [utf8] Tue Dec 15 11:48:31 2009
@@ -32,8 +32,9 @@
 from Products.CMFCore.utils import getToolByName
 from Products.ERP5Type import Permissions, PropertySheet, interfaces
 from Products.ERP5Type.XMLObject import XMLObject
+from Products.ERP5.mixin.solver import SolverMixin
 
-class AcceptSolver(XMLObject):
+class AcceptSolver(SolverMixin, XMLObject):
   """
   """
   meta_type = 'ERP5 Accept Solver'
@@ -62,9 +63,7 @@
     Adopt new property to simulation movements, with keeping the
     original one recorded.
     """
-    solver_decision = self.getSolverRelatedValue()
-    divergence_tester = solver_decision.getCausalityValue()
-    solved_property = divergence_tester.getTestedProperty()
+    solved_property = self._getPortalTypeValue().getTestedProperty()
     for movement in self.getDeliveryValueList():
       new_value = movement.getProperty(solved_property)
       for simulation_movement in movement.getDeliveryRelatedValueList(

Modified: erp5/trunk/products/ERP5/mixin/solver.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/mixin/solver.py?rev=31303&r1=31302&r2=31303&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/mixin/solver.py [utf8] (original)
+++ erp5/trunk/products/ERP5/mixin/solver.py [utf8] Tue Dec 15 11:48:31 2009
@@ -43,3 +43,6 @@
   zope.interface.implements(interfaces.ISolver,)
 
   # Implementation of ISolver
+
+  def _getPortalTypeValue(self):
+    return self.getPortalObject().portal_types._getOb(self.getPortalType())