[Erp5-report] r38661 tatuya - /erp5/trunk/products/ERP5/MovementGroup.py

[nobody at svn.erp5.org]

Author: tatuya
Date: Mon Sep 27 13:27:09 2010
New Revision: 38661

URL: http://svn.erp5.org?rev=38661&view=rev
Log:
Check that the movement whether to have the getMappedProperty method or not, before calling it.
Because not all the movement have the method.

Modified:
    erp5/trunk/products/ERP5/MovementGroup.py

Modified: erp5/trunk/products/ERP5/MovementGroup.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/MovementGroup.py?rev=38661&r1=38660&r2=38661&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/MovementGroup.py [utf8] (original)
+++ erp5/trunk/products/ERP5/MovementGroup.py [utf8] Mon Sep 27 13:27:09 2010
@@ -412,7 +412,10 @@ class FakeMovement:
     """
     total_quantity = 0
     for movement in self.getMovementList():
-      quantity = movement.getMappedProperty('quantity')
+      if getattr(movement, 'getMappedProperty', None) is not None:
+        quantity = movement.getMappedProperty('quantity')
+      else:
+        quantity = movement.getQuantity()
       if quantity != None:
         total_quantity += quantity
     return total_quantity
@@ -423,7 +426,10 @@ class FakeMovement:
     """
     total_price = 0
     for movement in self.getMovementList():
-      quantity = movement.getMappedProperty('quantity')
+      if getattr(movement, 'getMappedProperty', None) is not None:
+        quantity = movement.getMappedProperty('quantity')
+      else:
+        quantity = movement.getQuantity()
       price = movement.getPrice()
       if (quantity is not None) and (price is not None):
         total_price += (quantity * price)