diff --git a/mail_tracking_mass_mailing/README.rst b/mail_tracking_mass_mailing/README.rst index a6ac98a8..cbf726f6 100644 --- a/mail_tracking_mass_mailing/README.rst +++ b/mail_tracking_mass_mailing/README.rst @@ -1,20 +1,42 @@ -.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg - :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html - :alt: License: AGPL-3 - ============================== Mail tracking for mass mailing ============================== +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :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 + :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 + :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 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + Links mail statistics objects with mail tracking objects. +**Table of contents** + +.. contents:: + :local: Installation ============ This addon will be automatically installed when 'mail_tracking' and -'mass_mailing' are both installed - +'mass_mailing' are both installed. Usage ===== @@ -30,47 +52,45 @@ From mass mailing contact, you can see: 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. - -.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas - :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/205/10.0 - - 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. +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 `_. + +Do not contact contributors directly about support or help with technical issues. Credits ======= -Images ------- +Authors +~~~~~~~ -* Odoo Community Association: `Icon `_. +* Tecnativa Contributors ------------- +~~~~~~~~~~~~ * Pedro M. Baeza * Antonio Espinosa * Vicent Cubells * David Vidal -Maintainer ----------- +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. .. image:: https://odoo-community.org/logo.png :alt: Odoo Community Association :target: https://odoo-community.org -This module is maintained by the OCA. - 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. -To contribute to this module, please visit https://odoo-community.org. +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/__init__.py b/mail_tracking_mass_mailing/__init__.py index 24202da2..8ad4d127 100644 --- a/mail_tracking_mass_mailing/__init__.py +++ b/mail_tracking_mass_mailing/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2016 Antonio Espinosa - # Copyright 2017 Vicent Cubells - # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). diff --git a/mail_tracking_mass_mailing/__manifest__.py b/mail_tracking_mass_mailing/__manifest__.py index d50c91dc..277a7663 100644 --- a/mail_tracking_mass_mailing/__manifest__.py +++ b/mail_tracking_mass_mailing/__manifest__.py @@ -1,13 +1,13 @@ -# -*- coding: utf-8 -*- # Copyright 2016 Antonio Espinosa - # Copyright 2017 Vicent Cubells - # Copyright 2017 David Vidal - +# Copyright 2018 Tecnativa - Pedro M. Baeza # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { "name": "Mail tracking for mass mailing", "summary": "Improve mass mailing email tracking", - "version": "10.0.1.0.1", + "version": "11.0.1.0.0", "category": "Social Network", "website": "https://github.com/OCA/social", "author": "Tecnativa, " diff --git a/mail_tracking_mass_mailing/hooks.py b/mail_tracking_mass_mailing/hooks.py index 4fd5a95c..c1553ca3 100644 --- a/mail_tracking_mass_mailing/hooks.py +++ b/mail_tracking_mass_mailing/hooks.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2016 Antonio Espinosa - # Copyright 2017 Vicent Cubells - # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). diff --git a/mail_tracking_mass_mailing/models/__init__.py b/mail_tracking_mass_mailing/models/__init__.py index 4b0c3183..12739f3e 100644 --- a/mail_tracking_mass_mailing/models/__init__.py +++ b/mail_tracking_mass_mailing/models/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2016 Antonio Espinosa - # Copyright 2017 Vicent Cubells - # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). diff --git a/mail_tracking_mass_mailing/models/mail_mail.py b/mail_tracking_mass_mailing/models/mail_mail.py index 539947c5..5eab2e81 100644 --- a/mail_tracking_mass_mailing/models/mail_mail.py +++ b/mail_tracking_mass_mailing/models/mail_mail.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2016 Antonio Espinosa - # Copyright 2017 Vicent Cubells - # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). diff --git a/mail_tracking_mass_mailing/models/mail_mail_statistics.py b/mail_tracking_mass_mailing/models/mail_mail_statistics.py index e15ec8e4..d418c5e3 100644 --- a/mail_tracking_mass_mailing/models/mail_mail_statistics.py +++ b/mail_tracking_mass_mailing/models/mail_mail_statistics.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2016 Antonio Espinosa - # Copyright 2017 Vicent Cubells - # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). 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 1555347e..268782ab 100644 --- a/mail_tracking_mass_mailing/models/mail_mass_mailing_contact.py +++ b/mail_tracking_mass_mailing/models/mail_mass_mailing_contact.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2016 Antonio Espinosa - # Copyright 2017 Vicent Cubells - # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). diff --git a/mail_tracking_mass_mailing/models/mail_tracking_email.py b/mail_tracking_mass_mailing/models/mail_tracking_email.py index ca449ecb..953d832e 100644 --- a/mail_tracking_mass_mailing/models/mail_tracking_email.py +++ b/mail_tracking_mass_mailing/models/mail_tracking_email.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2016 Antonio Espinosa - # Copyright 2017 Vicent Cubells - # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). diff --git a/mail_tracking_mass_mailing/models/mail_tracking_event.py b/mail_tracking_mass_mailing/models/mail_tracking_event.py index 36be6c4a..41c1a384 100644 --- a/mail_tracking_mass_mailing/models/mail_tracking_event.py +++ b/mail_tracking_mass_mailing/models/mail_tracking_event.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2016 Antonio Espinosa - # Copyright 2017 Vicent Cubells - # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). diff --git a/mail_tracking_mass_mailing/readme/CONTRIBUTORS.rst b/mail_tracking_mass_mailing/readme/CONTRIBUTORS.rst new file mode 100644 index 00000000..a76453ab --- /dev/null +++ b/mail_tracking_mass_mailing/readme/CONTRIBUTORS.rst @@ -0,0 +1,4 @@ +* Pedro M. Baeza +* Antonio Espinosa +* Vicent Cubells +* David Vidal diff --git a/mail_tracking_mass_mailing/readme/DESCRIPTION.rst b/mail_tracking_mass_mailing/readme/DESCRIPTION.rst new file mode 100644 index 00000000..7f3e8d1e --- /dev/null +++ b/mail_tracking_mass_mailing/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +Links mail statistics objects with mail tracking objects. diff --git a/mail_tracking_mass_mailing/readme/INSTALL.rst b/mail_tracking_mass_mailing/readme/INSTALL.rst new file mode 100644 index 00000000..81ef00a5 --- /dev/null +++ b/mail_tracking_mass_mailing/readme/INSTALL.rst @@ -0,0 +1,2 @@ +This addon will be automatically installed when 'mail_tracking' and +'mass_mailing' are both installed. diff --git a/mail_tracking_mass_mailing/readme/USAGE.rst b/mail_tracking_mass_mailing/readme/USAGE.rst new file mode 100644 index 00000000..916ea655 --- /dev/null +++ b/mail_tracking_mass_mailing/readme/USAGE.rst @@ -0,0 +1,10 @@ +From mail statistic object, you can see: +- Email tracking state +- Email related tracking object +- Email related tracking events + +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. diff --git a/mail_tracking_mass_mailing/tests/__init__.py b/mail_tracking_mass_mailing/tests/__init__.py index bdcac9c1..28766585 100644 --- a/mail_tracking_mass_mailing/tests/__init__.py +++ b/mail_tracking_mass_mailing/tests/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2016 Antonio Espinosa - # Copyright 2017 Vicent Cubells - # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). diff --git a/mail_tracking_mass_mailing/tests/test_mass_mailing.py b/mail_tracking_mass_mailing/tests/test_mass_mailing.py index 15a633ca..aa2907e5 100644 --- a/mail_tracking_mass_mailing/tests/test_mass_mailing.py +++ b/mail_tracking_mass_mailing/tests/test_mass_mailing.py @@ -1,7 +1,7 @@ -# -*- coding: utf-8 -*- # Copyright 2016 Antonio Espinosa - # Copyright 2017 Vicent Cubells - # Copyright 2017 David Vidal - +# Copyright 2018 Tecnativa - Pedro M. Baeza # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). import mock @@ -22,15 +22,17 @@ class TestMassMailing(TransactionCase): }) self.list.name = '%s #%s' % (self.list.name, self.list.id) self.contact_a = self.env['mail.mass_mailing.contact'].create({ - 'list_id': self.list.id, + 'list_ids': [(6, 0, self.list.ids)], 'name': 'Test contact A', 'email': 'contact_a@example.com', }) self.mailing = self.env['mail.mass_mailing'].create({ 'name': 'Test subject', 'email_from': 'from@example.com', - 'mailing_model': 'mail.mass_mailing.contact', - 'mailing_domain': "[('list_id', 'in', [%d]), " + '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, 'contact_list_ids': [(6, False, [self.list.id])], 'body_html': '

Test email body

',