[Erp5-report] r44184 jerome - /erp5/trunk/products/ERP5/mixin/rule.py

[nobody at svn.erp5.org]

Author: jerome
Date: Fri Mar 11 14:58:47 2011
New Revision: 44184

URL: http://svn.erp5.org?rev=44184&view=rev
Log:
no need to access the delivery movement, checking if a category is set is
likely enough

Modified:
    erp5/trunk/products/ERP5/mixin/rule.py

Modified: erp5/trunk/products/ERP5/mixin/rule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/mixin/rule.py?rev=44184&r1=44183&r2=44184&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/mixin/rule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/mixin/rule.py [utf8] Fri Mar 11 14:58:47 2011
@@ -219,7 +219,7 @@ class RuleMixin(Predicate):
     Only account movements which are not associated to a delivery;
     Whenever delivery is there, delivery has priority
     """
-    return movement.getDeliveryValue() is None
+    return not movement.getDelivery()
 
   # Implementation of IDivergenceController # XXX-JPS move to IDivergenceController only mixin for 
   security.declareProtected( Permissions.AccessContentsInformation,
@@ -229,10 +229,9 @@ class RuleMixin(Predicate):
     Returns true if the Simulation Movement is divergent comparing to
     the delivery value
     """
-    delivery = movement.getDeliveryValue()
-    if delivery is None:
+    if not movement.getDelivery():
       return False
-    return len(self.getDivergenceList(movement)) != 0
+    return bool(self.getDivergenceList(movement))
 
   security.declareProtected(Permissions.View, 'getDivergenceList')
   def getDivergenceList(self, movement):