From 94a372dee72f44f8927e65d35eafa2731024ec24 Mon Sep 17 00:00:00 2001
From: std-odoo <std@odoo.com>
Date: Wed, 6 Apr 2022 07:23:05 +0000
Subject: [PATCH] [IMP] mail: improve the tree view of the <mail.mail>

Purpose
=======
Show the state of the <mail.mail> in the tree view and color only the
badge widget instead of the entire row.

Fix a typo in the help of the scheduled_date field on mail template.

Task-2587345

Part-of: odoo/odoo#73271
---
 addons/mail/models/mail_template.py   | 2 +-
 addons/mail/views/mail_mail_views.xml | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/mail/models/mail_template.py b/addons/mail/models/mail_template.py
index d3544717cf8..af51abcb7da 100644
--- a/addons/mail/models/mail_template.py
+++ b/addons/mail/models/mail_template.py
@@ -61,7 +61,7 @@ class MailTemplate(models.Model):
     mail_server_id = fields.Many2one('ir.mail_server', 'Outgoing Mail Server', readonly=False,
                                      help="Optional preferred server for outgoing mails. If not set, the highest "
                                           "priority one will be used.")
-    scheduled_date = fields.Char('Scheduled Date', help="If set, the queue manager will send the email after the date. If not set, the email will be send as soon as possible. You can use dynamic expressions expression.")
+    scheduled_date = fields.Char('Scheduled Date', help="If set, the queue manager will send the email after the date. If not set, the email will be send as soon as possible. You can use dynamic expression.")
     auto_delete = fields.Boolean(
         'Auto Delete', default=True,
         help="This option permanently removes any track of email after it's been sent, including from the Technical menu in the Settings, in order to preserve storage space of your Odoo database.")
diff --git a/addons/mail/views/mail_mail_views.xml b/addons/mail/views/mail_mail_views.xml
index d599b404d5c..66d4d324e96 100644
--- a/addons/mail/views/mail_mail_views.xml
+++ b/addons/mail/views/mail_mail_views.xml
@@ -29,7 +29,8 @@
                         <group>
                             <field name="email_from"/>
                             <field name="email_to"/>
-                            <field name="recipient_ids" widget="many2many_tags"/>
+                            <field name="recipient_ids" widget="many2many_tags"
+                                domain="[('type', '!=', 'private'), ('active', '=', True)]"/>
                             <field name="email_cc"/>
                             <field name="reply_to"/>
                             <field name="scheduled_date"/>
@@ -77,7 +78,7 @@
             <field name="name">mail.mail.tree</field>
             <field name="model">mail.mail</field>
             <field name="arch" type="xml">
-                <tree string="Emails" decoration-muted="state in ('sent', 'cancel')" decoration-info="state=='outgoing'" decoration-danger="state=='exception'">
+                <tree string="Emails">
                     <header>
                         <button name="action_retry" string="Retry" type="object"/>
                     </header>
@@ -89,8 +90,9 @@
                     <field name="model" invisible="1"/>
                     <field name="res_id" invisible="1"/>
                     <field name="email_from" invisible="1"/>
-                    <field name="state" invisible="1"/>
                     <field name="message_type" invisible="1"/>
+                    <field name="state" widget="badge" decoration-muted="state in ('sent', 'cancel')"
+                        decoration-info="state=='outgoing'" decoration-danger="state=='exception'"/>
                     <button name="send" string="Send Now" type="object" icon="fa-paper-plane" states='outgoing'/>
                     <button name="mark_outgoing" string="Retry" type="object" icon="fa-repeat" states='exception,cancel'/>
                     <button name="cancel" string="Cancel Email" type="object" icon="fa-times-circle" states='outgoing'/>