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 @@ First Newsletter done - + + Second Newsletter test - + 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 @@ - + Mailing List Subscribers mail.mass_mailing.contact form @@ -55,7 +55,7 @@ {'search_default_not_opt_out': 1} - + Recipients mail.mass_mailing.contact form @@ -118,7 +118,7 @@ - + Contact Lists mail.mass_mailing.list form @@ -194,21 +194,21 @@ - - - - @@ -216,11 +216,11 @@ - - @@ -456,17 +456,17 @@ - Received - Opened - Replied 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 @@ - - - - - - mail.mass_mailing.report.graph - mail.mass_mailing.report - - - - - - - - - mail.mass_mailing.report.search - mail.mass_mailing.report - - - - - - - - - - - - - - - - - - - - - Mass Mailing Analysis - mail.mass_mailing.report - form - graph - 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. - - - graph - - - - - - - -