From a2d078c17f08ada0967aa431e54df16dfb1b8587 Mon Sep 17 00:00:00 2001 From: sofiagvaladze Date: Thu, 6 May 2021 11:01:17 +0000 Subject: [PATCH] [FIX] hr_expense: Fix traceback caused by empty company_id task - 2475520 closes odoo/odoo#70871 X-original-commit: fa38e56e605406f0c97a3e2c260d2a1b2a19dea5 Signed-off-by: Kevin Baptiste --- addons/hr_expense/models/hr_expense.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/hr_expense/models/hr_expense.py b/addons/hr_expense/models/hr_expense.py index 6b747a54759..6942b6ebe2a 100644 --- a/addons/hr_expense/models/hr_expense.py +++ b/addons/hr_expense/models/hr_expense.py @@ -123,12 +123,12 @@ class HrExpense(models.Model): @api.depends("company_currency_id") def _compute_label_total_amount_company(self): for expense in self: - expense.label_total_amount_company = _("Total %s", expense.company_currency_id.name) + expense.label_total_amount_company = _("Total %s", expense.company_currency_id.name) if expense.company_currency_id else _("Total") @api.depends('currency_id', 'company_currency_id') def _compute_same_currency(self): for expense in self: - expense.same_currency = bool(expense.currency_id and expense.currency_id == expense.company_currency_id) + expense.same_currency = bool(not expense.company_id or (expense.currency_id and expense.currency_id == expense.company_currency_id)) @api.depends('product_id') def _compute_product_has_cost(self):