[Erp5-report] r33423 kazuhiko - /erp5/trunk/products/ERP5/Document/

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Fri Mar  5 09:12:14 2010
New Revision: 33423

URL: http://svn.erp5.org?rev=33423&view=rev
Log:
getMappedProperty does not exist on newTempMovement.

Modified:
    erp5/trunk/products/ERP5/Document/CategoryMovementGroup.py
    erp5/trunk/products/ERP5/Document/OrderBuilder.py
    erp5/trunk/products/ERP5/Document/PropertyMovementGroup.py

Modified: erp5/trunk/products/ERP5/Document/CategoryMovementGroup.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/CategoryMovementGroup.py?rev=33423&r1=33422&r2=33423&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/CategoryMovementGroup.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/CategoryMovementGroup.py [utf8] Fri Mar  5 09:12:14 2010
@@ -40,7 +40,7 @@
 
   def _getPropertyDict(self, movement, **kw):
     property_dict = {}
-    getProperty = movement.getMappedProperty
+    getProperty = getattr(movement, 'getMappedProperty', movement.getProperty)
     for prop in self.getTestedPropertyList():
       list_prop = '%s_list' % prop
       property_dict[list_prop] = sorted(getProperty(list_prop))

Modified: erp5/trunk/products/ERP5/Document/OrderBuilder.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/OrderBuilder.py?rev=33423&r1=33422&r2=33423&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/OrderBuilder.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/OrderBuilder.py [utf8] Fri Mar  5 09:12:14 2010
@@ -690,7 +690,10 @@
     if not update_existing_movement or force_update:
       # Now, only 1 movement is possible, so copy from this movement
       # XXX hardcoded value
-      property_dict['quantity'] = simulation_movement.getMappedProperty('quantity')
+      if getattr(simulation_movement, 'getMappedProperty', None) is not None:
+        property_dict['quantity'] = simulation_movement.getMappedProperty('quantity')
+      else:
+        property_dict['quantity'] = simulation_movement.getQuantity()
       property_dict['price'] = simulation_movement.getPrice()
       # Update properties on object (quantity, price...)
       delivery_movement._edit(force_update=1, **property_dict)

Modified: erp5/trunk/products/ERP5/Document/PropertyMovementGroup.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/PropertyMovementGroup.py?rev=33423&r1=33422&r2=33423&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/PropertyMovementGroup.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/PropertyMovementGroup.py [utf8] Fri Mar  5 09:12:14 2010
@@ -40,7 +40,7 @@
 
   def _getPropertyDict(self, movement, **kw):
     property_dict = {}
-    getProperty = movement.getMappedProperty
+    getProperty = getattr(movement, 'getMappedProperty', movement.getProperty)
     for prop in self.getTestedPropertyList():
       property_dict[prop] = getProperty(prop)
     return property_dict