From 00404541e05efddf491e6f41718595f2313d7b98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Mottet=20=28oms=29?= <oms@odoo.com>
Date: Wed, 11 Mar 2020 16:01:41 +0000
Subject: [PATCH] [IMP] mass_mailing: add minor improvements to views and
 reporting

Improve the mailing.trace.report search view to help users find their statistics based on specific campaigns, and added some minor changes to mailing views

- Rename "mass mail campaign" to "mailing campaign"
- Rename "create a mass mailing list" to "create a mailing list"
- Add sum footer on bounce
- Add mailing and campaign field to reporting search view
- Hide campaign field in search views when campaign option is not activated

Task ID 2210331

closes odoo/odoo#48711

Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
---
 addons/mass_mailing/report/mailing_trace_report.py        | 2 +-
 addons/mass_mailing/report/mailing_trace_report_views.xml | 2 ++
 addons/mass_mailing/views/mailing_contact_views.xml       | 2 +-
 addons/mass_mailing/views/mailing_list_views.xml          | 2 +-
 addons/mass_mailing/views/mailing_mailing_views.xml       | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/mass_mailing/report/mailing_trace_report.py b/addons/mass_mailing/report/mailing_trace_report.py
index fa2ead4201b..71c39fd389d 100644
--- a/addons/mass_mailing/report/mailing_trace_report.py
+++ b/addons/mass_mailing/report/mailing_trace_report.py
@@ -12,7 +12,7 @@ class MailingTraceReport(models.Model):
     # mailing
     name = fields.Char(string='Mass Mail', readonly=True)
     mailing_type = fields.Selection([('mail', 'Mail')], string='Type', default='mail', required=True)
-    campaign = fields.Char(string='Mass Mail Campaign', readonly=True)
+    campaign = fields.Char(string='Mailing Campaign', readonly=True)
     scheduled_date = fields.Datetime(string='Scheduled Date', readonly=True)
     state = fields.Selection(
         [('draft', 'Draft'), ('test', 'Tested'), ('done', 'Sent')],
diff --git a/addons/mass_mailing/report/mailing_trace_report_views.xml b/addons/mass_mailing/report/mailing_trace_report_views.xml
index 0ec3e88e483..2fde307f2ff 100644
--- a/addons/mass_mailing/report/mailing_trace_report_views.xml
+++ b/addons/mass_mailing/report/mailing_trace_report_views.xml
@@ -32,6 +32,8 @@
             <field name="model">mailing.trace.report</field>
             <field name="arch" type="xml">
                 <search string="Mass Mailing Statistics">
+                    <field name="name" string="Mailing"/>
+                    <field name="campaign" string="Campaign" groups="mass_mailing.group_mass_mailing_campaign"/>
                     <group expand="0" string="Extended Filters...">
                         <field name="scheduled_date"/>
                     </group>
diff --git a/addons/mass_mailing/views/mailing_contact_views.xml b/addons/mass_mailing/views/mailing_contact_views.xml
index 9be56e791e7..2fd029fd6e7 100644
--- a/addons/mass_mailing/views/mailing_contact_views.xml
+++ b/addons/mass_mailing/views/mailing_contact_views.xml
@@ -95,7 +95,7 @@
                 <field name="company_name"/>
                 <field name="email"/>
                 <field name="is_blacklisted" string="Email Blacklisted"/>
-                <field name="message_bounce"/>
+                <field name="message_bounce" sum="Total Bounces"/>
                 <field name="opt_out" invisible="'default_list_ids' not in context"/>
             </tree>
         </field>
diff --git a/addons/mass_mailing/views/mailing_list_views.xml b/addons/mass_mailing/views/mailing_list_views.xml
index 0d01237caa5..188ed8b900f 100644
--- a/addons/mass_mailing/views/mailing_list_views.xml
+++ b/addons/mass_mailing/views/mailing_list_views.xml
@@ -86,7 +86,7 @@
     </record>
 
     <record id="open_create_mass_mailing_list" model="ir.actions.act_window">
-        <field name="name">Create a Mass Mailing List</field>
+        <field name="name">Create a Mailing List</field>
         <field name="res_model">mailing.list</field>
         <field name="view_mode">form</field>
         <field name="view_id" ref="mailing_list_view_form_simplified"/>
diff --git a/addons/mass_mailing/views/mailing_mailing_views.xml b/addons/mass_mailing/views/mailing_mailing_views.xml
index 22c9c2ccbeb..9a4b5159ba6 100644
--- a/addons/mass_mailing/views/mailing_mailing_views.xml
+++ b/addons/mass_mailing/views/mailing_mailing_views.xml
@@ -7,7 +7,7 @@
             <field name="arch" type="xml">
                <search string="Mailings">
                     <field name="name" string="Mailing" filter_domain="['|', ('name', 'ilike', self), ('subject', 'ilike', self)]"/>
-                    <field name="campaign_id" string="Campaign"/>
+                    <field name="campaign_id" string="Campaign" groups="mass_mailing.group_mass_mailing_campaign"/>
                     <filter string="My Mailings" name="assigned_to_me"
                             domain="[('user_id', '=', uid)]"
                             help="Mailings that are assigned to me"/>