[Erp5-report] r36787 kazuhiko - /erp5/trunk/products/ERP5/Document/Delivery.py

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Thu Jul  1 23:56:47 2010
New Revision: 36787

URL: http://svn.erp5.org?rev=36787&view=rev
Log:
If delivery is not simulated (PackingList.isDivergent() returns True in such a case), we cannot solve divergence anyway. This change should fix recent (random) failures of testImmobilisation.

Modified:
    erp5/trunk/products/ERP5/Document/Delivery.py

Modified: erp5/trunk/products/ERP5/Document/Delivery.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Delivery.py?rev=36787&r1=36786&r2=36787&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Delivery.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/Delivery.py [utf8] Thu Jul  1 23:56:47 2010
@@ -380,7 +380,10 @@ class Delivery(XMLObject, Immobilisation
       if isTransitionPossible(self, 'diverge') and \
           isTransitionPossible(self, 'converge'):
         if self.isDivergent(**kw):
-          if solve_automatically and \
+          # If delivery is not simulated (PackingList.isDivergent()
+          # returns True in such a case), we cannot solve divergence
+          # anyway.
+          if self.isSimulated() and solve_automatically and \
               isTransitionPossible(self, 'solve_automatically'):
             self.solveAutomatically()
           else: