diff --git a/addons/purchase_requisition/models/purchase_requisition.py b/addons/purchase_requisition/models/purchase_requisition.py index 86ad0cc1ca4..6e3749f4e90 100644 --- a/addons/purchase_requisition/models/purchase_requisition.py +++ b/addons/purchase_requisition/models/purchase_requisition.py @@ -268,8 +268,8 @@ class PurchaseOrderLine(models.Model): for line in self.order_id.requisition_id.line_ids: if line.product_id == self.product_id: if line.product_uom_id != self.product_uom: - self.price_unit = self.env['product.uom']._compute_price( - line.product_uom_id.id, line.price_unit, to_uom_id=self.product_uom.id) + self.price_unit = line.product_uom_id._compute_price( + line.price_unit, self.product_uom) else: self.price_unit = line.price_unit break diff --git a/addons/sale_margin/models/sale_order.py b/addons/sale_margin/models/sale_order.py index ee62b277751..63dc3f872f0 100644 --- a/addons/sale_margin/models/sale_order.py +++ b/addons/sale_margin/models/sale_order.py @@ -28,7 +28,7 @@ class SaleOrderLine(models.Model): to_cur = pricelist.currency_id purchase_price = product.standard_price if product_uom != product.uom_id: - purchase_price = self.env['product.uom']._compute_price(product.uom_id.id, purchase_price, to_uom_id=product_uom.id) + purchase_price = product.uom_id._compute_price(purchase_price, product_uom) ctx = self.env.context.copy() ctx['date'] = date price = frm_cur.with_context(ctx).compute(purchase_price, to_cur, round=False) diff --git a/addons/sale_mrp/sale_mrp.py b/addons/sale_mrp/sale_mrp.py index bf6fc426f01..c94c0430247 100644 --- a/addons/sale_mrp/sale_mrp.py +++ b/addons/sale_mrp/sale_mrp.py @@ -89,5 +89,5 @@ class AccountInvoiceLine(models.Model): prod_quantity = factor * quantity average_price_unit += self._compute_average_price(prod_qty_done, prod_quantity, prod_moves) price_unit = average_price_unit or price_unit - price_unit = self.product_id.uom_id._compute_price(self.product_id.uom_id.id, price_unit, to_uom_id=self.uom_id.id) + price_unit = self.product_id.uom_id._compute_price(price_unit, self.uom_id) return price_unit diff --git a/addons/sale_stock/models/account_invoice.py b/addons/sale_stock/models/account_invoice.py index 0760d7509b1..96f35cf5424 100644 --- a/addons/sale_stock/models/account_invoice.py +++ b/addons/sale_stock/models/account_invoice.py @@ -34,7 +34,7 @@ class AccountInvoiceLine(models.Model): # on the moves we encounter. average_price_unit = self._compute_average_price(qty_done, quantity, moves) price_unit = average_price_unit or price_unit - price_unit = self.product_id.uom_id._compute_price(self.product_id.uom_id.id, price_unit, to_uom_id=self.uom_id.id) + price_unit = self.product_id.uom_id._compute_price(price_unit, self.uom_id) return price_unit def _compute_average_price(self, qty_done, quantity, moves): diff --git a/addons/stock_account/models/account_invoice.py b/addons/stock_account/models/account_invoice.py index 9e64bdb1d34..e6c4d8c135d 100644 --- a/addons/stock_account/models/account_invoice.py +++ b/addons/stock_account/models/account_invoice.py @@ -77,7 +77,7 @@ class AccountInvoiceLine(models.Model): if not self.uom_id or self.product_id.uom_id == self.uom_id: return price else: - return self.product_id.uom_id._compute_price(self.product_id.uom_id.id, price, to_uom_id=self.uom_id.id) + return self.product_id.uom_id._compute_price(price, self.uom_id) def _get_price(self, company_currency, price_unit): if self.invoice_id.currency_id.id != company_currency.id: