From e5c6c5db4274a97f0a70bf44dd49b7537f8a1289 Mon Sep 17 00:00:00 2001 From: Joren Van Onder Date: Thu, 15 Feb 2018 15:30:26 -0800 Subject: [PATCH 1/2] [FIX] stock_account: correct forward-port 251b2fdc 5ca0ef97 was forward-ported from 9.0. In 10.0 the function signature of product.uom's _compute_price has changed. In 10.0 it uses the new API and it no longer takes a to_uom_id keyword argument. opw-816738 --- addons/stock_account/models/product.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/stock_account/models/product.py b/addons/stock_account/models/product.py index 126bc59960a..58d02d203c8 100644 --- a/addons/stock_account/models/product.py +++ b/addons/stock_account/models/product.py @@ -203,7 +203,7 @@ class ProductProduct(models.Model): price = self.standard_price if not uom or self.uom_id.id == uom.id: return price - return self.uom_id._compute_price(self.uom_id.id, price, to_uom_id=uom.id) + return self.uom_id._compute_price(price, uom) class ProductCategory(models.Model): From dce265e8fe92560479b0142fb31280b442709d23 Mon Sep 17 00:00:00 2001 From: xmo-odoo Date: Fri, 16 Feb 2018 12:49:29 +0100 Subject: [PATCH 2/2] [FIX] stock_account: typos causing errors OPW-816769 --- addons/stock_account/models/product.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/stock_account/models/product.py b/addons/stock_account/models/product.py index 58d02d203c8..6707c437c68 100644 --- a/addons/stock_account/models/product.py +++ b/addons/stock_account/models/product.py @@ -178,7 +178,7 @@ class ProductProduct(models.Model): 'product_id': product.id, 'uom_id': uom.id, 'account_analytic_id': account_analytic and account_analytic.id, - 'analytic_tag_ids': analytic_tags and analytic_tag.ids and [(6, 0, analytic_tag.ids)] or False, + 'analytic_tag_ids': analytic_tags and analytic_tags.ids and [(6, 0, analytic_tags.ids)] or False, }, {