[Erp5-report] r19792 - /erp5/trunk/products/ERP5/Document/Resource.py

[nobody at svn.erp5.org]

Author: alex
Date: Tue Mar 11 14:49:55 2008
New Revision: 19792

URL: http://svn.erp5.org?rev=19792&view=rev
Log:
priced_quantity should be defined on supplies, not the resource

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

Modified: erp5/trunk/products/ERP5/Document/Resource.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Resource.py?rev=19792&r1=19791&r2=19792&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Resource.py (original)
+++ erp5/trunk/products/ERP5/Document/Resource.py Tue Mar 11 14:49:55 2008
@@ -593,6 +593,7 @@
         'exclusive_discount_ratio': None,
         'variable_additional_price': [],
         'non_discountable_additional_price': [],
+        'priced_quantity': None,
       }
       if mapped_value is None:
         return price_parameter_dict
@@ -722,7 +723,7 @@
         unit_base_price = unit_base_price * sum_surcharge_ratio
       # Divide by the priced quantity
       if unit_base_price is not None:
-        priced_quantity = self.getPricedQuantity()
+        priced_quantity = price_parameter_dict['priced_quantity']
         unit_base_price = unit_base_price / priced_quantity
       # Return result
       if unit_base_price is not None: