From 2acfb25430683ef74007c5a70f3c051e2e766304 Mon Sep 17 00:00:00 2001 From: ernesto Date: Mon, 5 Nov 2018 15:31:05 -0500 Subject: [PATCH] [MIG] mail_tracking_mass_mailing: Migration to 12.0 --- mail_tracking_mass_mailing/README.rst | 23 +++++++++++-------- mail_tracking_mass_mailing/__manifest__.py | 2 +- .../models/mail_mail.py | 5 ++-- .../models/mail_mass_mailing_contact.py | 18 ++------------- .../readme/CONTRIBUTORS.rst | 11 +++++---- mail_tracking_mass_mailing/readme/USAGE.rst | 2 +- .../static/description/index.html | 20 +++++++++------- .../tests/test_mass_mailing.py | 5 ++-- .../views/mail_mail_statistics_view.xml | 2 +- .../views/mail_mass_mailing_contact_view.xml | 4 ++-- 10 files changed, 43 insertions(+), 49 deletions(-) diff --git a/mail_tracking_mass_mailing/README.rst b/mail_tracking_mass_mailing/README.rst index cbf726f6..444a0323 100644 --- a/mail_tracking_mass_mailing/README.rst +++ b/mail_tracking_mass_mailing/README.rst @@ -14,13 +14,13 @@ Mail tracking for mass mailing :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fsocial-lightgray.png?logo=github - :target: https://github.com/OCA/social/tree/11.0/mail_tracking_mass_mailing + :target: https://github.com/OCA/social/tree/12.0/mail_tracking_mass_mailing :alt: OCA/social .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/social-11-0/social-11-0-mail_tracking_mass_mailing + :target: https://translation.odoo-community.org/projects/social-12-0/social-12-0-mail_tracking_mass_mailing :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/205/11.0 + :target: https://runbot.odoo-community.org/runbot/205/12.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -50,7 +50,7 @@ From mass mailing contact, you can see: - Email score, in order to clean up your lists from bad score emails Mass mailing emails are sent only to recipients once. If you want to send -eamils again to all the recipients, you must duplicate mass mailing. +emails again to all the recipients, you must duplicate mass mailing. Bug Tracker =========== @@ -58,7 +58,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -73,10 +73,13 @@ Authors Contributors ~~~~~~~~~~~~ -* Pedro M. Baeza -* Antonio Espinosa -* Vicent Cubells -* David Vidal +* `Tecnativa `_: + + * Pedro M. Baeza + * Antonio Espinosa + * Vicent Cubells + * David Vidal + * Ernesto Tejeda Maintainers ~~~~~~~~~~~ @@ -91,6 +94,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -This module is part of the `OCA/social `_ project on GitHub. +This module is part of the `OCA/social `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/mail_tracking_mass_mailing/__manifest__.py b/mail_tracking_mass_mailing/__manifest__.py index 277a7663..eea6d172 100644 --- a/mail_tracking_mass_mailing/__manifest__.py +++ b/mail_tracking_mass_mailing/__manifest__.py @@ -7,7 +7,7 @@ { "name": "Mail tracking for mass mailing", "summary": "Improve mass mailing email tracking", - "version": "11.0.1.0.0", + "version": "12.0.1.0.0", "category": "Social Network", "website": "https://github.com/OCA/social", "author": "Tecnativa, " diff --git a/mail_tracking_mass_mailing/models/mail_mail.py b/mail_tracking_mass_mailing/models/mail_mail.py index 5eab2e81..b3aad63e 100644 --- a/mail_tracking_mass_mailing/models/mail_mail.py +++ b/mail_tracking_mass_mailing/models/mail_mail.py @@ -10,8 +10,7 @@ class MailMail(models.Model): @api.model def _tracking_email_prepare(self, partner, email): - res = super(MailMail, self)._tracking_email_prepare( - partner, email) + res = super(MailMail, self)._tracking_email_prepare(partner, email) res['mail_id_int'] = self.id res['mass_mailing_id'] = self.mailing_id.id res['mail_stats_id'] = self.statistics_ids[:1].id \ @@ -19,6 +18,6 @@ class MailMail(models.Model): return res @api.model - def _get_tracking_url(self, mail, partner=None): + def _get_tracking_url(self): # Invalid this tracking image, we have other to do the same return False diff --git a/mail_tracking_mass_mailing/models/mail_mass_mailing_contact.py b/mail_tracking_mass_mailing/models/mail_mass_mailing_contact.py index 268782ab..42a35c25 100644 --- a/mail_tracking_mass_mailing/models/mail_mass_mailing_contact.py +++ b/mail_tracking_mass_mailing/models/mail_mass_mailing_contact.py @@ -6,9 +6,9 @@ from odoo import models, api, fields class MailMassMailingContact(models.Model): - _inherit = 'mail.mass_mailing.contact' + _name = 'mail.mass_mailing.contact' + _inherit = ['mail.mass_mailing.contact', 'mail.bounced.mixin'] - email_bounced = fields.Boolean(string="Email bounced") email_score = fields.Float( string="Email score", readonly=True, store=False, compute='_compute_email_score') @@ -19,17 +19,3 @@ class MailMassMailingContact(models.Model): for contact in self.filtered('email'): contact.email_score = self.env['mail.tracking.email'].\ email_score_from_email(contact.email) - - @api.multi - def email_bounced_set(self, tracking_emails, reason, event=None): - contacts = self.filtered(lambda r: not r.email_bounced) - return contacts.write({'email_bounced': True}) - - @api.multi - def write(self, vals): - email = vals.get('email') - if email is not None: - vals['email_bounced'] = ( - bool(email) and - self.env['mail.tracking.email'].email_is_bounced(email)) - return super(MailMassMailingContact, self).write(vals) diff --git a/mail_tracking_mass_mailing/readme/CONTRIBUTORS.rst b/mail_tracking_mass_mailing/readme/CONTRIBUTORS.rst index a76453ab..15c6cef1 100644 --- a/mail_tracking_mass_mailing/readme/CONTRIBUTORS.rst +++ b/mail_tracking_mass_mailing/readme/CONTRIBUTORS.rst @@ -1,4 +1,7 @@ -* Pedro M. Baeza -* Antonio Espinosa -* Vicent Cubells -* David Vidal +* `Tecnativa `_: + + * Pedro M. Baeza + * Antonio Espinosa + * Vicent Cubells + * David Vidal + * Ernesto Tejeda diff --git a/mail_tracking_mass_mailing/readme/USAGE.rst b/mail_tracking_mass_mailing/readme/USAGE.rst index 916ea655..0a9dd2bc 100644 --- a/mail_tracking_mass_mailing/readme/USAGE.rst +++ b/mail_tracking_mass_mailing/readme/USAGE.rst @@ -7,4 +7,4 @@ From mass mailing contact, you can see: - Email score, in order to clean up your lists from bad score emails Mass mailing emails are sent only to recipients once. If you want to send -eamils again to all the recipients, you must duplicate mass mailing. +emails again to all the recipients, you must duplicate mass mailing. diff --git a/mail_tracking_mass_mailing/static/description/index.html b/mail_tracking_mass_mailing/static/description/index.html index 05c1308d..e663535d 100644 --- a/mail_tracking_mass_mailing/static/description/index.html +++ b/mail_tracking_mass_mailing/static/description/index.html @@ -367,7 +367,7 @@ ul.auto-toc { !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Beta License: AGPL-3 OCA/social Translate me on Weblate Try me on Runbot

+

Beta License: AGPL-3 OCA/social Translate me on Weblate Try me on Runbot

Links mail statistics objects with mail tracking objects.

Table of contents

@@ -397,14 +397,14 @@ ul.auto-toc {

From mass mailing contact, you can see: - Email score, in order to clean up your lists from bad score emails

Mass mailing emails are sent only to recipients once. If you want to send -eamils again to all the recipients, you must duplicate mass mailing.

+emails again to all the recipients, you must duplicate mass mailing.

Bug Tracker

Bugs are tracked on GitHub Issues. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed -feedback.

+feedback.

Do not contact contributors directly about support or help with technical issues.

@@ -418,10 +418,14 @@ If you spotted it first, help us smashing it by providing a detailed and welcome

Contributors

@@ -431,7 +435,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome

OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use.

-

This module is part of the OCA/social project on GitHub.

+

This module is part of the OCA/social project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

diff --git a/mail_tracking_mass_mailing/tests/test_mass_mailing.py b/mail_tracking_mass_mailing/tests/test_mass_mailing.py index aa2907e5..43fc02b4 100644 --- a/mail_tracking_mass_mailing/tests/test_mass_mailing.py +++ b/mail_tracking_mass_mailing/tests/test_mass_mailing.py @@ -8,7 +8,7 @@ import mock from odoo.tools import mute_logger from odoo.tests.common import at_install, post_install, TransactionCase -mock_send_email = ('odoo.addons.base.ir.ir_mail_server.' +mock_send_email = ('odoo.addons.base.models.ir_mail_server.' 'IrMailServer.send_email') @@ -32,8 +32,7 @@ class TestMassMailing(TransactionCase): 'mailing_model_id': self.env.ref( 'mass_mailing.model_mail_mass_mailing_contact' ).id, - 'mailing_domain': "[('list_ids', '=', %d), " - "('opt_out', '=', False)]" % self.list.id, + 'mailing_domain': "[('list_ids', 'in', %d)]" % self.list.id, 'contact_list_ids': [(6, False, [self.list.id])], 'body_html': '

Test email body

', 'reply_to_mode': 'email', diff --git a/mail_tracking_mass_mailing/views/mail_mail_statistics_view.xml b/mail_tracking_mass_mailing/views/mail_mail_statistics_view.xml index 331ab066..0ec98caf 100644 --- a/mail_tracking_mass_mailing/views/mail_mail_statistics_view.xml +++ b/mail_tracking_mass_mailing/views/mail_mail_statistics_view.xml @@ -9,7 +9,7 @@ mail.mail.statistics - + diff --git a/mail_tracking_mass_mailing/views/mail_mass_mailing_contact_view.xml b/mail_tracking_mass_mailing/views/mail_mass_mailing_contact_view.xml index ea6b2fdc..4c572d89 100644 --- a/mail_tracking_mass_mailing/views/mail_mass_mailing_contact_view.xml +++ b/mail_tracking_mass_mailing/views/mail_mass_mailing_contact_view.xml @@ -9,7 +9,7 @@ mail.mass_mailing.contact - + @@ -21,7 +21,7 @@ mail.mass_mailing.contact - +