From 45bb6f6e3907e89ae70ddcaa3f1ce92a542546aa Mon Sep 17 00:00:00 2001
From: Kevin Baptiste <kba@odoo.com>
Date: Tue, 18 Aug 2020 14:06:15 +0000
Subject: [PATCH] [IMP] hr_expense: show alias_email on list helper

The "Incoming Emails" setting is now enabled by default and the email
address shown on the list helper.

closes odoo/odoo#56069

Taskid: 2300864
Related: odoo/enterprise#12494
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
---
 addons/hr_expense/data/hr_expense_data.xml |  3 +++
 addons/hr_expense/models/hr_expense.py     | 23 +++++++++++-----------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/addons/hr_expense/data/hr_expense_data.xml b/addons/hr_expense/data/hr_expense_data.xml
index 0bf9cebc1bf..5133dc6d8a8 100644
--- a/addons/hr_expense/data/hr_expense_data.xml
+++ b/addons/hr_expense/data/hr_expense_data.xml
@@ -11,4 +11,7 @@
             <field name="can_be_expensed" eval="True"/>
         </record>
     </data>
+    <data>
+        <function model="ir.config_parameter" name="set_param" eval="('hr_expense.use_mailgateway', True)"/>
+    </data>
 </odoo>
diff --git a/addons/hr_expense/models/hr_expense.py b/addons/hr_expense/models/hr_expense.py
index 2635966599d..fd16ee2b266 100644
--- a/addons/hr_expense/models/hr_expense.py
+++ b/addons/hr_expense/models/hr_expense.py
@@ -268,17 +268,18 @@ class HrExpense(models.Model):
 
     @api.model
     def get_empty_list_help(self, help_message):
-        if help_message and "o_view_nocontent_smiling_face" not in help_message:
-            use_mailgateway = self.env['ir.config_parameter'].sudo().get_param('hr_expense.use_mailgateway')
-            alias_record = use_mailgateway and self.env.ref('hr_expense.mail_alias_expense') or False
-            if alias_record and alias_record.alias_domain and alias_record.alias_name:
-                link = "<a id='o_mail_test' href='mailto:%(email)s?subject=Lunch%%20with%%20customer%%3A%%20%%2412.32'>%(email)s</a>" % {
-                    'email': '%s@%s' % (alias_record.alias_name, alias_record.alias_domain)
-                }
-                return '<p class="o_view_nocontent_smiling_face">%s</p><p class="oe_view_nocontent_alias">%s</p>' % (
-                    _('Add a new expense,'),
-                    _('or send receipts by email to %s.') % (link),)
-        return super(HrExpense, self).get_empty_list_help(help_message)
+        return super(HrExpense, self).get_empty_list_help(help_message + self._get_empty_list_mail_alias())
+
+    @api.model
+    def _get_empty_list_mail_alias(self):
+        use_mailgateway = self.env['ir.config_parameter'].sudo().get_param('hr_expense.use_mailgateway')
+        alias_record = use_mailgateway and self.env.ref('hr_expense.mail_alias_expense') or False
+        if alias_record and alias_record.alias_domain and alias_record.alias_name:
+            return """
+<p>
+Or send your receipts at <a href="mailto:%(email)s?subject=Lunch%%20with%%20customer%%3A%%20%%2412.32">%(email)s</a>.
+</p>""" % {'email': '%s@%s' % (alias_record.alias_name, alias_record.alias_domain)}
+        return ""
 
     # ----------------------------------------
     # Actions