diff --git a/mass_mailing_resend/README.rst b/mass_mailing_resend/README.rst index 0f98264e6..b86b726f9 100644 --- a/mass_mailing_resend/README.rst +++ b/mass_mailing_resend/README.rst @@ -7,20 +7,20 @@ Resend mass mailings !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png +.. |badge1| image:: https://img.shields.io/badge/maturity-Mature-brightgreen.png :target: https://odoo-community.org/page/development-status - :alt: Beta + :alt: Mature .. |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/12.0/mass_mailing_resend + :target: https://github.com/OCA/social/tree/13.0/mass_mailing_resend :alt: OCA/social .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/social-12-0/social-12-0-mass_mailing_resend + :target: https://translation.odoo-community.org/projects/social-13-0/social-13-0-mass_mailing_resend :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/12.0 + :target: https://runbot.odoo-community.org/runbot/205/13.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -49,7 +49,7 @@ the mailing. Usage ===== -* Go to *Email marketing > Mailings > Mass Mailings*. +* Go to *Email marketing > Mailings*. * Click on one record that is done or create a new one and send it. * You will see a button called "Resend". * If you click on it, mass mailing will be set to Draft again. @@ -67,7 +67,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. @@ -100,6 +100,14 @@ 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. +.. |maintainer-pedrobaeza| image:: https://github.com/pedrobaeza.png?size=40px + :target: https://github.com/pedrobaeza + :alt: pedrobaeza + +Current `maintainer `__: + +|maintainer-pedrobaeza| + +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/mass_mailing_resend/__manifest__.py b/mass_mailing_resend/__manifest__.py index fc1d1c64c..87b46a764 100644 --- a/mass_mailing_resend/__manifest__.py +++ b/mass_mailing_resend/__manifest__.py @@ -1,10 +1,10 @@ -# Copyright 2017-2018 Tecnativa - Pedro M. Baeza +# Copyright 2017-2020 Tecnativa - Pedro M. Baeza # Copyright 2018 Tecnativa - Ernesto Tejeda # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { "name": "Resend mass mailings", - "version": "12.0.1.0.0", + "version": "13.0.1.0.0", "category": "Marketing", "website": "https://github.com/OCA/social", "author": "Tecnativa, " "Odoo Community Association (OCA)", @@ -12,5 +12,7 @@ "application": False, "installable": True, "depends": ["mass_mailing"], - "data": ["views/mass_mailing_views.xml"], + "data": ["views/mailing_mailing_views.xml"], + "maintainers": ["pedrobaeza"], + "development_status": "Mature", } diff --git a/mass_mailing_resend/models/__init__.py b/mass_mailing_resend/models/__init__.py index 57344fa08..5786c97c3 100644 --- a/mass_mailing_resend/models/__init__.py +++ b/mass_mailing_resend/models/__init__.py @@ -1,3 +1,3 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from . import mass_mailing +from . import mailing_mailing diff --git a/mass_mailing_resend/models/mass_mailing.py b/mass_mailing_resend/models/mailing_mailing.py similarity index 81% rename from mass_mailing_resend/models/mass_mailing.py rename to mass_mailing_resend/models/mailing_mailing.py index 8a9e49d48..f9697604a 100644 --- a/mass_mailing_resend/models/mass_mailing.py +++ b/mass_mailing_resend/models/mailing_mailing.py @@ -1,12 +1,12 @@ -# Copyright 2017 Tecnativa - Pedro M. Baeza +# Copyright 2017-2020 Tecnativa - Pedro M. Baeza # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from odoo import _, exceptions, models -class MailMassMailingList(models.Model): - _inherit = "mail.mass_mailing" +class MailingMailing(models.Model): + _inherit = "mailing.mailing" def button_draft(self): """Return to draft state for resending the mass mailing.""" diff --git a/mass_mailing_resend/readme/USAGE.rst b/mass_mailing_resend/readme/USAGE.rst index a41cdf18a..e5666cab5 100644 --- a/mass_mailing_resend/readme/USAGE.rst +++ b/mass_mailing_resend/readme/USAGE.rst @@ -1,4 +1,4 @@ -* Go to *Email marketing > Mailings > Mass Mailings*. +* Go to *Email marketing > Mailings*. * Click on one record that is done or create a new one and send it. * You will see a button called "Resend". * If you click on it, mass mailing will be set to Draft again. diff --git a/mass_mailing_resend/static/description/index.html b/mass_mailing_resend/static/description/index.html index ab298fe53..50fa6c139 100644 --- a/mass_mailing_resend/static/description/index.html +++ b/mass_mailing_resend/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

+

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

A frequent need for users of mass mailings is to resend one mailing that has already been sent in the past to new recipients that haven’t received yet that mail. But the problem is to know which are the applicable ones.

@@ -397,7 +397,7 @@ the mailing.

Usage

    -
  • Go to Email marketing > Mailings > Mass Mailings.
    • +
  • Go to Email marketing > Mailings.
  • Click on one record that is done or create a new one and send it.
  • You will see a button called “Resend”.
  • If you click on it, mass mailing will be set to Draft again.
    • @@ -416,7 +416,7 @@ resending (through get_remaining_recipients method).

    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.

@@ -444,7 +444,9 @@ 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.

+

Current maintainer:

+

pedrobaeza

+

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/mass_mailing_resend/tests/test_mass_mailing_resend.py b/mass_mailing_resend/tests/test_mass_mailing_resend.py index 02bd692c6..d495c6b96 100644 --- a/mass_mailing_resend/tests/test_mass_mailing_resend.py +++ b/mass_mailing_resend/tests/test_mass_mailing_resend.py @@ -1,4 +1,4 @@ -# Copyright 2017-2018 Tecnativa - Pedro M. Baeza +# Copyright 2017-2020 Tecnativa - Pedro M. Baeza # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from odoo import exceptions @@ -9,18 +9,17 @@ class TestMassMailingResend(common.SavepointCase): @classmethod def setUpClass(cls): super(TestMassMailingResend, cls).setUpClass() - cls.list = cls.env["mail.mass_mailing.list"].create({"name": "Test list"}) - cls.contact1 = cls.env["mail.mass_mailing.contact"].create( + cls.list = cls.env["mailing.list"].create({"name": "Test list"}) + cls.contact1 = cls.env["mailing.contact"].create( {"name": "Contact 1", "email": "email1@test.com"} ) - cls.mass_mailing = cls.env["mail.mass_mailing"].create( + cls.mass_mailing = cls.env["mailing.mailing"].create( { "name": "Test mass mailing", "email_from": "test@example.org", - "mailing_model_id": cls.env.ref( - "mass_mailing.model_mail_mass_mailing_contact" - ).id, + "mailing_model_id": cls.env.ref("mass_mailing.model_mailing_list").id, "contact_list_ids": [(6, 0, cls.list.ids)], + "subject": "Mailing test", "reply_to_mode": "thread", } ) diff --git a/mass_mailing_resend/views/mass_mailing_views.xml b/mass_mailing_resend/views/mailing_mailing_views.xml similarity index 95% rename from mass_mailing_resend/views/mass_mailing_views.xml rename to mass_mailing_resend/views/mailing_mailing_views.xml index 32c52ce41..ace264952 100644 --- a/mass_mailing_resend/views/mass_mailing_views.xml +++ b/mass_mailing_resend/views/mailing_mailing_views.xml @@ -2,7 +2,7 @@ - mail.mass_mailing + mailing.mailing