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

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Tue Jul  6 11:25:48 2010
New Revision: 36886

URL: http://svn.erp5.org?rev=36886&view=rev
Log:
call solver_workflow's method only when it is possible, because we don't want to use solver_workflow for automatic solvers.

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

Modified: erp5/trunk/products/ERP5/Document/AcceptSolver.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/AcceptSolver.py?rev=36886&r1=36885&r2=36886&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/AcceptSolver.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/AcceptSolver.py [utf8] Tue Jul  6 11:25:48 2010
@@ -88,4 +88,6 @@ class AcceptSolver(SolverMixin, Configur
         simulation_movement.setMappedProperty(property_id, value)
       simulation_movement.expand(activate_kw=activate_kw)
     # Finish solving
-    self.succeed()
+    if self.getPortalObject().portal_workflow.isTransitionPossible(
+      solver, 'succeed'):
+      self.succeed()

Modified: erp5/trunk/products/ERP5/Document/AdoptSolver.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/AdoptSolver.py?rev=36886&r1=36885&r2=36886&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/AdoptSolver.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/AdoptSolver.py [utf8] Tue Jul  6 11:25:48 2010
@@ -96,4 +96,6 @@ class AdoptSolver(SolverMixin, Configura
           movement.setProperty(solved_property,
                                simulation_movement.getProperty(solved_property))
     # Finish solving
-    self.succeed()
+    if self.getPortalObject().portal_workflow.isTransitionPossible(
+      solver, 'succeed'):
+      self.succeed()

Modified: erp5/trunk/products/ERP5/Document/QuantitySplitSolver.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/QuantitySplitSolver.py?rev=36886&r1=36885&r2=36886&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/QuantitySplitSolver.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/QuantitySplitSolver.py [utf8] Tue Jul  6 11:25:48 2010
@@ -111,4 +111,6 @@ class QuantitySplitSolver(SolverMixin, C
         # new_movement.expand(activate_kw=activate_kw)
 
     # Finish solving
-    self.succeed()
+    if self.getPortalObject().portal_workflow.isTransitionPossible(
+      solver, 'succeed'):
+      self.succeed()

Modified: erp5/trunk/products/ERP5/Document/TradeModelSolver.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/TradeModelSolver.py?rev=36886&r1=36885&r2=36886&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/TradeModelSolver.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/TradeModelSolver.py [utf8] Tue Jul  6 11:25:48 2010
@@ -137,4 +137,6 @@ class TradeModelSolver(AcceptSolver):
                                simulation_movement.getProperty(solved_property))
 
     # Finish solving
-    self.succeed()
+    if self.getPortalObject().portal_workflow.isTransitionPossible(
+      solver, 'succeed'):
+      self.succeed()

Modified: erp5/trunk/products/ERP5/Document/UnifySolver.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/UnifySolver.py?rev=36886&r1=36885&r2=36886&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/UnifySolver.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/UnifySolver.py [utf8] Tue Jul  6 11:25:48 2010
@@ -89,4 +89,6 @@ class UnifySolver(AcceptSolver):
           simulation_movement.setMappedProperty(property_id, value)
         simulation_movement.expand(activate_kw=activate_kw)
     # Finish solving
-    self.succeed()
+    if self.getPortalObject().portal_workflow.isTransitionPossible(
+      solver, 'succeed'):
+      self.succeed()