[Erp5-report] r31472 nicolas.dumazet - /erp5/trunk/products/ERP5/Document/

[nobody at svn.erp5.org]

Author: nicolas.dumazet
Date: Mon Dec 28 08:36:01 2009
New Revision: 31472

URL: http://svn.erp5.org?rev=31472&view=rev
Log:
boolean simplification

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

Modified: erp5/trunk/products/ERP5/Document/SimulationMovement.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/SimulationMovement.py?rev=31472&r1=31471&r2=31472&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/SimulationMovement.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/SimulationMovement.py [utf8] Mon Dec 28 08:36:01 2009
@@ -334,9 +334,7 @@
   def isOrderable(self):
     applied_rule = self.getParentValue()
     rule = applied_rule.getSpecialiseValue()
-    if rule is not None:
-      return rule.isOrderable(self)
-    return 0
+    return rule is not None and rule.isOrderable(self)
 
   getOrderable = isOrderable
 
@@ -345,19 +343,14 @@
   def isDeliverable(self):
     applied_rule = self.getParentValue()
     rule = applied_rule.getSpecialiseValue()
-    if rule is not None:
-      return rule.isDeliverable(self)
-    return 0
+    return rule is not None and rule.isDeliverable(self)
 
   getDeliverable = isDeliverable
 
   security.declareProtected( Permissions.AccessContentsInformation,
                              'isDeletable')
   def isDeletable(self):
-    if not self.isFrozen() and not self._isTreeDelivered():
-      return True
-    else:
-      return False
+    return not self.isFrozen() and not self._isTreeDelivered()
 
   # Simulation Dates - acquire target dates
   security.declareProtected( Permissions.AccessContentsInformation,