From d612daae719ce3da86c3e44a91a6138a1733dcc2 Mon Sep 17 00:00:00 2001 From: Goffin Simon Date: Thu, 23 Feb 2017 20:00:05 +0100 Subject: [PATCH] [FIX] product_visible_discount: product_id_change When computing the discount in product_id_change, before the fix discount was equal to (new_list_price - line.price_unit) / new_list_price * 100 But line.price_unit was already rounded so the discount computed was not the discount set in the pricelist due to rounding error. opw:709704 --- .../product_visible_discount.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/addons/product_visible_discount/product_visible_discount.py b/addons/product_visible_discount/product_visible_discount.py index bac99688d58..91ecccc380d 100644 --- a/addons/product_visible_discount/product_visible_discount.py +++ b/addons/product_visible_discount/product_visible_discount.py @@ -65,16 +65,16 @@ class sale_order_line(osv.osv): context_partner = dict(self.env.context, partner_id=line.order_id.partner_id.id) if line.product_id and line.order_id.pricelist_id and self.env.user.has_group('sale.group_discount_per_so_line'): pricelist_context = dict(context_partner, uom=line.product_uom.id, date=line.order_id.date_order) - list_price = line.order_id.pricelist_id.with_context(pricelist_context).price_rule_get(line.product_id.id, line.product_uom_qty or 1.0, line.order_id.partner_id) - - new_list_price, currency_id = line.with_context(context_partner)._get_real_price_currency(line.product_id.id, list_price, line.product_uom_qty, line.product_uom.id, line.order_id.pricelist_id.id) + list_price_dict = line.order_id.pricelist_id.with_context(pricelist_context).price_rule_get(line.product_id.id, line.product_uom_qty or 1.0, line.order_id.partner_id) + list_price = list_price_dict[line.order_id.pricelist_id.id][0] + new_list_price, currency_id = line.with_context(context_partner)._get_real_price_currency(line.product_id.id, list_price_dict, line.product_uom_qty, line.product_uom.id, line.order_id.pricelist_id.id) new_list_price = self.env['account.tax']._fix_tax_included_price(new_list_price, line.product_id.taxes_id, line.tax_id) - if line.order_id.pricelist_id.discount_policy == 'without_discount' and list_price[line.order_id.pricelist_id.id][0] != 0 and new_list_price != 0: + if line.order_id.pricelist_id.discount_policy == 'without_discount' and list_price != 0 and new_list_price != 0: if line.product_id.company_id and line.order_id.pricelist_id.currency_id.id != line.product_id.company_id.currency_id.id: # new_list_price is in company's currency while price in pricelist currency ctx = dict(context_partner, date=self.order_id.date_order) new_list_price = self.env['res.currency'].browse(currency_id).with_context(ctx).compute(new_list_price, line.order_id.pricelist_id.currency_id) - discount = (new_list_price - line.price_unit) / new_list_price * 100 + discount = (new_list_price - list_price) / new_list_price * 100 if discount > 0: line.price_unit = new_list_price line.discount = discount @@ -95,15 +95,16 @@ class sale_order_line(osv.osv): if self.order_id.pricelist_id and self.order_id.partner_id and self.env.user.has_group('sale.group_discount_per_so_line'): context_partner = dict(self.env.context, partner_id=self.order_id.partner_id.id) pricelist_context = dict(context_partner, uom=self.product_uom.id, date=self.order_id.date_order) - list_price = self.order_id.pricelist_id.with_context(pricelist_context).price_rule_get(self.product_id.id, self.product_uom_qty or 1.0, self.order_id.partner_id) - new_list_price, currency_id = self.with_context(context_partner)._get_real_price_currency(self.product_id.id, list_price, self.product_uom_qty, self.product_uom.id, self.order_id.pricelist_id.id) + list_price_dict = self.order_id.pricelist_id.with_context(pricelist_context).price_rule_get(self.product_id.id, self.product_uom_qty or 1.0, self.order_id.partner_id) + list_price = list_price_dict[self.order_id.pricelist_id.id][0] + new_list_price, currency_id = self.with_context(context_partner)._get_real_price_currency(self.product_id.id, list_price_dict, self.product_uom_qty, self.product_uom.id, self.order_id.pricelist_id.id) new_list_price = self.env['account.tax']._fix_tax_included_price(new_list_price, self.product_id.taxes_id, self.tax_id) - if self.order_id.pricelist_id.discount_policy == 'without_discount' and list_price[self.order_id.pricelist_id.id][0] != 0 and new_list_price != 0: + if self.order_id.pricelist_id.discount_policy == 'without_discount' and list_price != 0 and new_list_price != 0: if self.product_id.company_id and self.order_id.pricelist_id.currency_id.id != self.product_id.company_id.currency_id.id: # new_list_price is in company's currency while price in pricelist currency ctx = dict(context_partner, date=self.order_id.date_order) new_list_price = self.env['res.currency'].browse(currency_id).with_context(ctx).compute(new_list_price, self.order_id.pricelist_id.currency_id) - discount = (new_list_price - self.price_unit) / new_list_price * 100 + discount = (new_list_price - list_price) / new_list_price * 100 if discount > 0: self.price_unit = new_list_price self.discount = discount