From 5bd412092829da49ca8464354264e9b12060a79a Mon Sep 17 00:00:00 2001
From: SaddemAmine <sana@odoo.com>
Date: Mon, 31 Jul 2023 13:39:29 +0000
Subject: [PATCH] [IMP] hr_expense,project_sale_expense: Clarifying user error
 when partner is missing

When the partner is missing, the error message is not clear enough.
This commit adds a new error message to clarify the issue.

Task ID: 3438559

closes odoo/odoo#132029

X-original-commit: 5be853ebb6da19a4f0a147944995583e234bf1b9
Related: odoo/enterprise#45779
Signed-off-by: Laurent Smet (las) <las@odoo.com>
Signed-off-by: Naceur Amine Saddem (sana) <sana@odoo.com>
---
 addons/hr_expense/models/hr_expense.py                         | 3 +++
 addons/hr_expense/views/hr_expense_views.xml                   | 2 +-
 .../project_sale_expense/tests/test_project_profitability.py   | 3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/addons/hr_expense/models/hr_expense.py b/addons/hr_expense/models/hr_expense.py
index bc30c161a4d..6d27704a239 100644
--- a/addons/hr_expense/models/hr_expense.py
+++ b/addons/hr_expense/models/hr_expense.py
@@ -1446,6 +1446,9 @@ class HrExpenseSheet(models.Model):
         if any(not sheet.journal_id for sheet in self):
             raise UserError(_("Specify expense journal to generate accounting entries."))
 
+        if not self.employee_id.work_email:
+            raise UserError(_("The work email of the employee is required to post the expense report. Please add it on the employee form."))
+
     def _do_submit(self):
         self.write({'approval_state': 'submit'})
         self.sudo().activity_update()
diff --git a/addons/hr_expense/views/hr_expense_views.xml b/addons/hr_expense/views/hr_expense_views.xml
index 33b8c4a83f1..f5eaee01093 100644
--- a/addons/hr_expense/views/hr_expense_views.xml
+++ b/addons/hr_expense/views/hr_expense_views.xml
@@ -192,7 +192,7 @@
                                 <field name="amount_tax"
                                     attrs="{'invisible': [('product_has_tax', '=', False)]}"/>
                             </div>
-                            <field name="employee_id" groups="hr_expense.group_hr_expense_team_approver" context="{'default_company_id': company_id}" widget="many2one_avatar_user"/>
+                            <field name="employee_id" groups="hr_expense.group_hr_expense_team_approver" context="{'default_company_id': company_id}" widget="many2one_avatar_user" options="{'no_create': True}" />
                             <label id="lo" for="payment_mode" attrs="{'invisible': [('product_has_cost', '=', True)]}"/>
                             <div id="payment_mode" attrs="{'invisible': [('product_has_cost', '=', True)]}">
                                 <field name="payment_mode" widget="radio"/>
diff --git a/addons/project_sale_expense/tests/test_project_profitability.py b/addons/project_sale_expense/tests/test_project_profitability.py
index 399d28b03ba..5c11555401d 100644
--- a/addons/project_sale_expense/tests/test_project_profitability.py
+++ b/addons/project_sale_expense/tests/test_project_profitability.py
@@ -24,7 +24,8 @@ class TestProjectSaleExpenseProfitability(TestProjectProfitabilityCommon, TestPr
         foreign_employee = self.env['hr.employee'].create({
             'name': 'foreign_employee',
             'company_id': foreign_company.id,
-            'work_contact_id': foreign_partner.id
+            'work_contact_id': foreign_partner.id,
+            'work_email': 'email@email',
         })
 
         expense = self.env['hr.expense'].create({