diff --git a/addons/sale_expense/models/__init__.py b/addons/sale_expense/models/__init__.py index 598d0341d6d..8a3abae39bd 100644 --- a/addons/sale_expense/models/__init__.py +++ b/addons/sale_expense/models/__init__.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. +from . import account_move_line from . import hr_expense from . import hr_expense_sheet from . import hr_expense_split -from . import sale_order from . import product_template -from . import account_move +from . import sale_order diff --git a/addons/sale_expense/models/account_move.py b/addons/sale_expense/models/account_move_line.py similarity index 94% rename from addons/sale_expense/models/account_move.py rename to addons/sale_expense/models/account_move_line.py index c2e90b800a0..03263720556 100644 --- a/addons/sale_expense/models/account_move.py +++ b/addons/sale_expense/models/account_move_line.py @@ -32,8 +32,7 @@ class AccountMoveLine(models.Model): def _sale_prepare_sale_line_values(self, order, price): # Add expense quantity to sales order line and update the sales order price because it will be charged to the customer in the end. - self.ensure_one() res = super()._sale_prepare_sale_line_values(order, price) if self.expense_id: - res.update({'product_uom_qty': self.expense_id.quantity}) + res['product_uom_qty'] = self.expense_id.quantity return res diff --git a/addons/sale_expense_margin/models/__init__.py b/addons/sale_expense_margin/models/__init__.py index f41f60b3a11..ac1d552c24d 100644 --- a/addons/sale_expense_margin/models/__init__.py +++ b/addons/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 diff --git a/addons/sale_expense_margin/models/account_move.py b/addons/sale_expense_margin/models/account_move_line.py similarity index 100% rename from addons/sale_expense_margin/models/account_move.py rename to addons/sale_expense_margin/models/account_move_line.py