From 24fddf6e9f290aa3ca6ad68c7c092cb84883a1e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Hennecart?= <jeh@odoo.com>
Date: Mon, 3 Aug 2020 08:07:47 +0000
Subject: [PATCH] [FIX] crm: fix redundancy of action menu

Fix the redundancy of "Send email" menu on the crm.lead model. We now correctly
have a form action in comment mode, and a list action in mass mail mode.

We also update the use of those actions according to the business flow: form
based from a single record, mass mail from a batch of records.

Task ID-2310462

Somehow forward-port of X-Original-Commit: odoo/odoo@9ded57d87f2a721492ca0028099189d303383569

closes odoo/odoo#58774

X-original-commit: ad7d28ab1abe484102cd3ec18ee6ce9c9ac7b5bb
Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
---
 addons/crm/views/crm_lead_views.xml | 31 ++++++++++++++---------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/addons/crm/views/crm_lead_views.xml b/addons/crm/views/crm_lead_views.xml
index 11a711372c3..a74433bdebb 100644
--- a/addons/crm/views/crm_lead_views.xml
+++ b/addons/crm/views/crm_lead_views.xml
@@ -600,34 +600,33 @@
             </field>
         </record>
 
+        <!--
+            MASS MAILING
+        -->
         <record id="crm_lead_act_window_compose" model="ir.actions.act_window">
             <field name="name">Send email</field>
             <field name="res_model">mail.compose.message</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
-            <field name="context">{
-                'default_composition_mode': 'comment',
-                'default_use_template': True,
-                'default_template_id': ref('crm.email_template_opportunity_mail'),
-                }</field>
+            <field name="context" eval="{
+    'default_composition_mode': 'comment',
+    'default_use_template': True,
+    'default_template_id': ref('crm.email_template_opportunity_mail'),
+                }"/>
             <field name="binding_model_id" ref="model_crm_lead"/>
-            <field name="binding_view_types">list</field>
+            <field name="binding_view_types">form</field>
         </record>
 
-        <!--
-            MASS MAILING
-        -->
-        <record id="crm.action_lead_mass_mail" model="ir.actions.act_window">
+        <record id="action_lead_mass_mail" model="ir.actions.act_window">
             <field name="name">Send email</field>
             <field name="res_model">mail.compose.message</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
-            <field name="context">{
-                            'default_composition_mode': 'mass_mail',
-                            'default_email_to':'{($object.email or \'\')|safe}',
-                            'default_use_template': True,
-                            'default_template_id': ref('crm.email_template_opportunity_mail'),
-                        }</field>
+            <field name="context" eval="{
+    'default_composition_mode': 'mass_mail',
+    'default_use_template': True,
+    'default_template_id': ref('crm.email_template_opportunity_mail'),
+                }"/>
             <field name="binding_model_id" ref="model_crm_lead"/>
             <field name="binding_view_types">list</field>
         </record>