Commit 1d3b9ac9 authored by Alexandre Boeglin's avatar Alexandre Boeglin

priced_quantity should be defined on supplies, not the resource

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@19792 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 6a2a6bc2
...@@ -593,6 +593,7 @@ class Resource(XMLMatrix, Variated): ...@@ -593,6 +593,7 @@ class Resource(XMLMatrix, Variated):
'exclusive_discount_ratio': None, 'exclusive_discount_ratio': None,
'variable_additional_price': [], 'variable_additional_price': [],
'non_discountable_additional_price': [], 'non_discountable_additional_price': [],
'priced_quantity': None,
} }
if mapped_value is None: if mapped_value is None:
return price_parameter_dict return price_parameter_dict
...@@ -722,7 +723,7 @@ class Resource(XMLMatrix, Variated): ...@@ -722,7 +723,7 @@ class Resource(XMLMatrix, Variated):
unit_base_price = unit_base_price * sum_surcharge_ratio unit_base_price = unit_base_price * sum_surcharge_ratio
# Divide by the priced quantity # Divide by the priced quantity
if unit_base_price is not None: 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 unit_base_price = unit_base_price / priced_quantity
# Return result # Return result
if unit_base_price is not None: if unit_base_price is not None:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment