From 35d51fe71f5687eda07cee124077f6c213646e96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 15 Apr 2014 11:58:17 +0200
Subject: [PATCH] [REM] mass_mailing: removed report, a graph view on
 statistics will be sufficient

bzr revid: tde@openerp.com-20140415095817-rx7bokd6qc5rkrhq
---
 addons/mass_mailing/__openerp__.py            |  1 -
 .../mass_mailing/data/mass_mailing_demo.xml   |  5 +-
 addons/mass_mailing/models/__init__.py        |  1 -
 .../models/mass_mailing_report.py             | 30 ----------
 .../mass_mailing/security/ir.model.access.csv |  3 +-
 addons/mass_mailing/views/mass_mailing.xml    | 24 ++++----
 .../views/mass_mailing_report.xml             | 58 -------------------
 7 files changed, 16 insertions(+), 106 deletions(-)
 delete mode 100644 addons/mass_mailing/models/mass_mailing_report.py
 delete mode 100644 addons/mass_mailing/views/mass_mailing_report.xml

diff --git a/addons/mass_mailing/__openerp__.py b/addons/mass_mailing/__openerp__.py
index ca9ea76a7bd..507d5c9bea0 100644
--- a/addons/mass_mailing/__openerp__.py
+++ b/addons/mass_mailing/__openerp__.py
@@ -44,7 +44,6 @@ professional emails and reuse templates in a few clicks.
         'data/mass_mailing_data.xml',
         'wizard/mail_compose_message_view.xml',
         'wizard/test_mailing.xml',
-        'views/mass_mailing_report.xml',
         'views/mass_mailing.xml',
         'views/res_config.xml',
         'views/res_partner.xml',
diff --git a/addons/mass_mailing/data/mass_mailing_demo.xml b/addons/mass_mailing/data/mass_mailing_demo.xml
index b35608e6fbc..568528319b2 100644
--- a/addons/mass_mailing/data/mass_mailing_demo.xml
+++ b/addons/mass_mailing/data/mass_mailing_demo.xml
@@ -105,14 +105,15 @@
         <record id="mass_mail_1" model="mail.mass_mailing">
             <field name="name">First Newsletter</field>
             <field name="state">done</field>
-            <field name="date" eval="(DateTime.today() - relativedelta(days=5)).strftime('%Y-%m-%d %H:%M:%S')"/>
+            <field name="create_date" eval="(DateTime.today() - relativedelta(days=7)).strftime('%Y-%m-%d %H:%M:%S')"/>
+            <field name="sent_date" eval="(DateTime.today() - relativedelta(days=5)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field name="mass_mailing_campaign_id" eval="ref('mass_mail_campaign_1')"/>
             <field name="contact_list_ids" eval="[(4, ref('mass_mail_list_2'))]"/>
         </record>
         <record id="mass_mail_2" model="mail.mass_mailing">
             <field name="name">Second Newsletter</field>
             <field name="state">test</field>
-            <field name="date" eval="(DateTime.today() - relativedelta(days=3)).strftime('%Y-%m-%d %H:%M:%S')"/>
+            <field name="create_date" eval="(DateTime.today() - relativedelta(days=3)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field name="mass_mailing_campaign_id" eval="ref('mass_mail_campaign_1')"/>
         </record>
 
diff --git a/addons/mass_mailing/models/__init__.py b/addons/mass_mailing/models/__init__.py
index 702da268d84..2cffe48642b 100644
--- a/addons/mass_mailing/models/__init__.py
+++ b/addons/mass_mailing/models/__init__.py
@@ -5,4 +5,3 @@ import mass_mailing_stats
 import mail_mail
 import mail_thread
 import res_config
-import mass_mailing_report
diff --git a/addons/mass_mailing/models/mass_mailing_report.py b/addons/mass_mailing/models/mass_mailing_report.py
deleted file mode 100644
index dbb2d5023d2..00000000000
--- a/addons/mass_mailing/models/mass_mailing_report.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from openerp.osv import fields, osv
-from openerp import tools
-
-
-class MassMailingnReport(osv.Model):
-    _name = 'mail.mass_mailing.report'
-    _auto = False
-    _description = 'Mass Mailing Analysis'
-    _rec_name = 'mailing_date'
-
-    _columns = {
-        'mailing_date': fields.datetime('Mailing Date', readonly=True),
-    }
-
-    def init(self, cr):
-        """ Mass Mailing Report: based on mail.mass_mailing model that models the
-        various mailing performed, and mail.mail.statistics that models the various
-        statistics collected for each mailing. """
-        tools.drop_view_if_exists(cr, 'mail_mass_mailing_report')
-        cr.execute("""
-            CREATE OR REPLACE VIEW mail_mass_mailing_report AS (
-                SELECT
-                    id,
-
-                    date_trunc('day', m.sent_date) as mailing_date
-                FROM
-                    mail_mass_mailing m
-            )""")
diff --git a/addons/mass_mailing/security/ir.model.access.csv b/addons/mass_mailing/security/ir.model.access.csv
index 3a24002f674..d5c76b9f69d 100644
--- a/addons/mass_mailing/security/ir.model.access.csv
+++ b/addons/mass_mailing/security/ir.model.access.csv
@@ -7,5 +7,4 @@ access_mass_mailing_campaign,mail.mass_mailing.campaign,model_mail_mass_mailing_
 access_mass_mailing_campaign_system,mail.mass_mailing.campaign.system,model_mail_mass_mailing_campaign,base.group_system,1,1,1,1
 access_mass_mailing,mail.mass_mailing,model_mail_mass_mailing,base.group_user,1,1,1,0
 access_mass_mailing_system,mail.mass_mailing.system,model_mail_mass_mailing,base.group_system,1,1,1,1
-access_mail_mail_statistics,mail.mail.statistics,model_mail_mail_statistics,base.group_user,1,1,1,1
-access_mass_mailing_report,mail.mass_mailing.report,model_mail_mass_mailing_report,base.group_user,1,1,1,1
\ No newline at end of file
+access_mail_mail_statistics,mail.mail.statistics,model_mail_mail_statistics,base.group_user,1,1,1,1
\ No newline at end of file
diff --git a/addons/mass_mailing/views/mass_mailing.xml b/addons/mass_mailing/views/mass_mailing.xml
index e89d357d766..452630b2ec9 100644
--- a/addons/mass_mailing/views/mass_mailing.xml
+++ b/addons/mass_mailing/views/mass_mailing.xml
@@ -47,7 +47,7 @@
             </field>
         </record>
 
-        <record id="action_view_mass_mailing_contacts" model="ir.actions.act_window">
+        <record model="ir.actions.act_window" id="action_view_mass_mailing_contacts">
             <field name="name">Mailing List Subscribers</field>
             <field name="res_model">mail.mass_mailing.contact</field>
             <field name="view_type">form</field>
@@ -55,7 +55,7 @@
             <field name="context">{'search_default_not_opt_out': 1}</field>
         </record>
 
-        <record id="action_view_mass_mailing_contacts_from_list" model="ir.actions.act_window">
+        <record model="ir.actions.act_window" id="action_view_mass_mailing_contacts_from_list">
             <field name="name">Recipients</field>
             <field name="res_model">mail.mass_mailing.contact</field>
             <field name="view_type">form</field>
@@ -118,7 +118,7 @@
             </field>
         </record>
 
-        <record id="action_view_mass_mailing_lists" model="ir.actions.act_window">
+        <record model="ir.actions.act_window" id="action_view_mass_mailing_lists">
             <field name="name">Contact Lists</field>
             <field name="res_model">mail.mass_mailing.list</field>
             <field name="view_type">form</field>
@@ -194,21 +194,21 @@
                     </div>
                     <sheet>
                         <div class="oe_button_box pull-right" attrs="{'invisible': [('state', 'in', ('draft','test'))]}">
-                            <button name="%(action_mail_mass_mailing_report)d"
+                            <button name="%(action_view_mass_mailing_contacts)d"
                                 type="action" class="oe_stat_button">
                                 <field name="received_ratio" string="Received" widget="percentpie"/>
                             </button>
-                            <button name="%(action_mail_mass_mailing_report)d"
+                            <button name="%(action_view_mass_mailing_contacts)d"
                                 type="action" class="oe_stat_button">
                                 <field name="opened_ratio" string="Opened" widget="percentpie"/>
                             </button>
-                            <button name="%(action_mail_mass_mailing_report)d"
+                            <button name="%(action_view_mass_mailing_contacts)d"
                                 type="action" class="oe_stat_button">
                                 <field name="replied_ratio" string="Replied" widget="percentpie"/>
                             </button>
                         </div>
                         <div class="oe_button_box" attrs="{'invisible': [('state', 'in', ('draft','test'))]}" style="margin-bottom: 32px">
-                            <button name="%(action_mail_mass_mailing_report)d" type="action"
+                            <button name="%(action_view_mass_mailing_contacts)d" type="action"
                                 icon="fa-envelope-o" class="oe_stat_button">
                                 <field name="total" string="Emails" widget="statinfo"/>
                             </button>
@@ -216,11 +216,11 @@
                         <div class="oe_button_box"
                             style="margin-top: 8px;"
                             attrs="{'invisible': [('total', '=', 0)]}">
-                            <button name="%(action_mail_mass_mailing_report)d"
+                            <button name="%(action_view_mass_mailing_contacts)d"
                                 type="action" class="oe_stat_button oe_inline">
                                 <field name="opened_dayly" string="Opened Daily" widget="barchart"/>
                             </button>
-                            <button name="%(action_mail_mass_mailing_report)d"
+                            <button name="%(action_view_mass_mailing_contacts)d"
                                 type="action" class="oe_stat_button oe_inline">
                                 <field name="replied_dayly" string="Replied Daily" widget="barchart"/>
                             </button>
@@ -456,17 +456,17 @@
                                 <field name="total" invisible="1"/>
                                 <div class="oe_right oe_button_box" name="buttons"
                                     attrs="{'invisible': [('total', '=', 0)]}">
-                                    <button name="%(action_mail_mass_mailing_report)d"
+                                    <button name="%(action_view_mass_mailing_contacts)d"
                                         type="action" class="oe_stat_button oe_inline">
                                         <field name="received_ratio" widget="percentpie"/>
                                         <span>Received</span>
                                     </button>
-                                    <button name="%(action_mail_mass_mailing_report)d"
+                                    <button name="%(action_view_mass_mailing_contacts)d"
                                         type="action" class="oe_stat_button oe_inline">
                                         <field name="opened_ratio" widget="percentpie"/>
                                         <span>Opened</span>
                                     </button>
-                                    <button name="%(action_mail_mass_mailing_report)d"
+                                    <button name="%(action_view_mass_mailing_contacts)d"
                                         type="action" class="oe_stat_button oe_inline">
                                         <field name="replied_ratio" widget="percentpie"/>
                                         <span>Replied</span>
diff --git a/addons/mass_mailing/views/mass_mailing_report.xml b/addons/mass_mailing/views/mass_mailing_report.xml
deleted file mode 100644
index 9ac21b34df9..00000000000
--- a/addons/mass_mailing/views/mass_mailing_report.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="view_mail_mass_mailing_report_graph" model="ir.ui.view">
-            <field name="name">mail.mass_mailing.report.graph</field>
-            <field name="model">mail.mass_mailing.report</field>
-            <field name="arch" type="xml">
-                <graph string="Mass Mailing Analysis" type="pivot" stacked="True">
-                    <field name="mailing_date" interval="day" type="col"/>
-                </graph>
-            </field>
-        </record>
-
-        <record id="view_mail_mass_mailing_report_search" model="ir.ui.view">
-            <field name="name">mail.mass_mailing.report.search</field>
-            <field name="model">mail.mass_mailing.report</field>
-            <field name="arch" type="xml">
-                <search string="Mass Mailing Analysis">
-                    <group expand="0" string="Extended Filters...">
-                        <!-- <separator orientation="vertical"/> -->
-                        <!-- <newline/> -->
-                        <field name="mailing_date"/>
-                    </group>
-                    <group expand="1" string="Group By...">
-                        <!-- <separator orientation="vertical" /> -->
-                        <filter string="Mailing Date (day)"
-                            domain="[]" context="{'group_by':'mailing_date:day'}"/>
-                        <filter string="Mailing Date (week)"
-                            domain="[]" context="{'group_by':'mailing_date:week'}"/>
-                        <filter string="Mailing Date (month)" name="mailing_date_month"
-                            domain="[]" context="{'group_by':'mailing_date:month'}"/>
-                        <filter string="Mailing Date (year)"
-                            domain="[]" context="{'group_by':'mailing_date:year'}"/>
-                    </group>
-                </search>
-            </field>
-        </record>
-
-        <!-- Actions and Menuitems -->
-       <record id="action_mail_mass_mailing_report" model="ir.actions.act_window">
-           <field name="name">Mass Mailing Analysis</field>
-           <field name="res_model">mail.mass_mailing.report</field>
-           <field name="view_type">form</field>
-           <field name="view_mode">graph</field>
-           <field name="help">Mass Mailing Analysis allows you to check different mailing related information like the opened ratio or the mailing performances. You can sort out your analysis by different groups to get accurate grained analysis.</field>
-       </record>
-       <record id="action_mail_mass_mailing_report_graph" model="ir.actions.act_window.view">
-            <field name="view_mode">graph</field>
-            <field name="view_id" ref="view_mail_mass_mailing_report_graph"/>
-            <field name="act_window_id" ref="action_mail_mass_mailing_report"/>
-       </record>
-
-       <menuitem name="Mass Mailing Analysis" id="menu_mass_mailing_report" sequence="1"
-            parent="base.marketing_reporting_menu" action="action_mail_mass_mailing_report"/>
-
-    </data>
-</openerp>