From 5bb431474003f1807a3add00683cef182be257ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexandre=20D=C3=ADaz?= Date: Tue, 27 Aug 2019 11:38:07 +0000 Subject: [PATCH] [FIX] website_sale_stock: change '_get_combination_info' signature This commit changes the '_get_combination_info' signature according to main method signature to avoid inheritance problems. closes odoo/odoo#36125 Signed-off-by: Martin Trigaux (mat) --- addons/website_sale_stock/models/product_template.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/website_sale_stock/models/product_template.py b/addons/website_sale_stock/models/product_template.py index b0706bfee30..7ad389ce46a 100644 --- a/addons/website_sale_stock/models/product_template.py +++ b/addons/website_sale_stock/models/product_template.py @@ -17,10 +17,10 @@ class ProductTemplate(models.Model): custom_message = fields.Text(string='Custom Message', default='', translate=True) @api.multi - def _get_combination_info(self, combination=False, product_id=False, add_qty=1, pricelist=False, reference_product=False, only_template=False): + def _get_combination_info(self, combination=False, product_id=False, add_qty=1, pricelist=False, parent_combination=False, only_template=False): combination_info = super(ProductTemplate, self)._get_combination_info( combination=combination, product_id=product_id, add_qty=add_qty, pricelist=pricelist, - parent_combination=reference_product, only_template=only_template) + parent_combination=parent_combination, only_template=only_template) if not self.env.context.get('website_sale_stock_get_quantity'): return combination_info