summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Martinelli <nim@odoo.com>2016-01-06 10:27:32 +0100
committerNicolas Martinelli <nim@odoo.com>2016-01-08 08:13:00 +0100
commitfca05dfd5cbf27fbee7f2d2f410ae993cd2a2b55 (patch)
tree80ff7dbcbf4ff026740e3da413822c5df5d8e9ef
parentc5a22592df8f4e8101c6e683af6aa1e1f278bfc2 (diff)
[IMP] product_visible_discount: clean-up
Create a specific onchange method to calculate the discount instead of extending current onchanges.
-rw-r--r--addons/product_visible_discount/product_visible_discount.py76
1 files changed, 22 insertions, 54 deletions
diff --git a/addons/product_visible_discount/product_visible_discount.py b/addons/product_visible_discount/product_visible_discount.py
index 0b60fa14d9f..008dbbd1cc4 100644
--- a/addons/product_visible_discount/product_visible_discount.py
+++ b/addons/product_visible_discount/product_visible_discount.py
@@ -41,59 +41,27 @@ class sale_order_line(osv.osv):
factor = self.pool['product.uom']._compute_price(cr, uid, uom, 1.0, product.uom_id.id)
return product[field_name] * factor, currency_id
- @api.multi
- @api.onchange('product_id')
- def product_id_change(self):
- res = super(sale_order_line, self).product_id_change()
- for line in self:
- 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)
+ @api.onchange('product_id', 'price_unit', 'product_uom', 'product_uom_qty', 'tax_id')
+ def _onchange_discount(self):
+ self.discount = 0.0
+ if not (self.product_id and self.product_uom
+ and self.order_id.partner_id and self.order_id.pricelist_id
+ and self.order_id.pricelist_id.discount_policy == 'without_discount'
+ and self.env.user.has_group('sale.group_discount_per_so_line')):
+ return
- 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)
- new_list_price = self.env['account.tax']._fix_tax_included_price(line.product_id.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.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.id)
- discount = (new_list_price - line.price_unit) / new_list_price * 100
- if discount > 0:
- line.price_unit = new_list_price
- line.discount = discount
- else:
- line.discount = 0.0
- else:
- line.discount = 0.0
- else:
- line.discount = 0.0
- return res
+ 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)
- @api.onchange('product_uom')
- def product_uom_change(self):
- res = super(sale_order_line, self).product_uom_change()
- if not self.product_uom:
- self.price_unit = 0.0
- return
- 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)
- 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.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.id)
- discount = (new_list_price - self.price_unit) / new_list_price * 100
- if discount > 0:
- self.price_unit = new_list_price
- self.discount = discount
- else:
- self.discount = 0.0
- else:
- self.discount = 0.0
- else:
- self.discount = 0.0
- return res
+ 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)
+ new_list_price = self.env['account.tax']._fix_tax_included_price(new_list_price, self.product_id.taxes_id, self.tax_id)
+
+ if list_price[self.order_id.pricelist_id.id][0] != 0 and new_list_price != 0:
+ if self.product_id.company_id and self.order_id.pricelist_id.currency_id != self.product_id.company_id.currency_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.id)
+ discount = (new_list_price - self.price_unit) / new_list_price * 100
+ if discount > 0:
+ self.discount = discount