19.0 vanilla

odoo-bringout-oca-ocb-sale_expense_margin/sale_expense_margin/models/__init__.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from . import account_move
+from . import account_move_line
 from . import sale_order_line

odoo-bringout-oca-ocb-sale_expense_margin/sale_expense_margin/models/sale_order_line.py

@@ -1,8 +1,8 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from odoo import api, models, fields
 
+
 class SaleOrderLine(models.Model):
     _inherit = "sale.order.line"
 
@@ -10,24 +10,10 @@ class SaleOrderLine(models.Model):
 
     @api.depends('is_expense')
     def _compute_purchase_price(self):
-        date_today = fields.Date.context_today(self)
         expense_lines = self.filtered('expense_id')
         for line in expense_lines:
-            if line.expense_id.product_has_cost:
-                product_cost = line.expense_id.untaxed_amount / line.expense_id.quantity
-            else:
-                product_cost = line.expense_id.untaxed_amount
+            expense = line.expense_id
+            product_cost = expense.untaxed_amount_currency / (expense.quantity or 1.0)
+            line.purchase_price = line._convert_to_sol_currency(product_cost, expense.currency_id)
 
-            from_currency = line.expense_id.currency_id
-            to_currency = line.currency_id or line.order_id.currency_id
-
-            if to_currency and product_cost and from_currency != to_currency:
-                line.purchase_price = from_currency._convert(
-                    from_amount=product_cost,
-                    to_currency=to_currency,
-                    company=line.company_id or self.env.company,
-                    date=line.order_id.date_order or date_today,
-                    round=False)
-            else:
-                line.purchase_price = product_cost
         return super(SaleOrderLine, self - expense_lines)._compute_purchase_price()