[Erp5-report] r31891 kazuhiko - /erp5/trunk/products/ERP5/Document/UnifySolver.py
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Jan 21 18:44:20 CET 2010
Author: kazuhiko
Date: Thu Jan 21 18:44:17 2010
New Revision: 31891
URL: http://svn.erp5.org?rev=31891&view=rev
Log:
inherit AcceptSolver and AdoptSolver in UnifySolver, because it is a mixture of both solvers.
Modified:
erp5/trunk/products/ERP5/Document/UnifySolver.py
Modified: erp5/trunk/products/ERP5/Document/UnifySolver.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/UnifySolver.py?rev=31891&r1=31890&r2=31891&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/UnifySolver.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/UnifySolver.py [utf8] Thu Jan 21 18:44:17 2010
@@ -30,11 +30,10 @@
import zope.interface
from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Permissions, PropertySheet, interfaces
-from Products.ERP5Type.XMLObject import XMLObject
-from Products.ERP5.mixin.solver import SolverMixin
-from Products.ERP5.mixin.configurable import ConfigurableMixin
+from Products.ERP5.Document.AcceptSolver import AcceptSolver
+from Products.ERP5.Document.AdoptSolver import AdoptSolver
-class UnifySolver(SolverMixin, ConfigurableMixin, XMLObject):
+class UnifySolver(AcceptSolver, AdoptSolver):
"""
"""
meta_type = 'ERP5 Unify Solver'
@@ -76,9 +75,10 @@
[x.getDeliveryRelatedValueList() \
for x in self.getDeliveryValue().getMovementList()], [])
for simulation_movement in simulation_movement_list:
- if not simulation_movement.isPropertyRecorded(solved_property):
- simulation_movement.recordProperty(solved_property)
- simulation_movement.setProperty(solved_property, new_value)
+ value_dict = {solved_property:new_value}
+ self._solveRecursively(simulation_movement, value_dict)
+ self._clearRecordedPropertyRecursively(simulation_movement,
+ solved_property)
simulation_movement.expand()
# Finish solving
self.succeed()
More information about the Erp5-report
mailing list