[Erp5-report] r44229 jerome - /erp5/trunk/products/ERP5/Document/

[nobody at svn.erp5.org]

Author: jerome
Date: Mon Mar 14 11:31:40 2011
New Revision: 44229

URL: http://svn.erp5.org?rev=44229&view=rev
Log:
simplify code

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

Modified: erp5/trunk/products/ERP5/Document/SimulationMovement.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/SimulationMovement.py?rev=44229&r1=44228&r2=44229&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/SimulationMovement.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/SimulationMovement.py [utf8] Mon Mar 14 11:31:40 2011
@@ -593,7 +593,7 @@ class SimulationMovement(PropertyRecorda
                             'isBuildable')
   def isBuildable(self):
     """Simulation Movement buildable logic"""
-    if self.getDeliveryValue() is not None:
+    if self.getDelivery():
       # already delivered
       return False
 
@@ -815,8 +815,7 @@ class SimulationMovement(PropertyRecorda
         else:
           return quantity - profit_quantity + delivery_error
       return mapping.getMappedProperty(self, property)
-    else:
-      return self.getProperty(property)
+    return self.getProperty(property)
 
   security.declareProtected(Permissions.ModifyPortalContent,
                             'setMappedProperty')
@@ -824,5 +823,4 @@ class SimulationMovement(PropertyRecorda
     mapping = self.getPropertyMappingValue()
     if mapping is not None:
       return mapping.setMappedProperty(self, property, value)
-    else:
-      return self.setProperty(property, value)
+    return self.setProperty(property, value)

Modified: erp5/trunk/products/ERP5/Document/SubscriptionItem.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/SubscriptionItem.py?rev=44229&r1=44228&r2=44229&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/SubscriptionItem.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/SubscriptionItem.py [utf8] Mon Mar 14 11:31:40 2011
@@ -206,4 +206,4 @@ class SubscriptionItem(Item, MovementGen
           id_index += 1
 
     # And now return result
-    return result
\ No newline at end of file
+    return result