From 23ee44861d9957993c5f5db031a6e54b0d99a30d Mon Sep 17 00:00:00 2001 From: Areeb Siddiqi Date: Thu, 27 May 2021 14:37:58 -0400 Subject: [PATCH] [MIG] mass_mailing_partner: Migration to 14.0 [FIX] super(Class, self) changed to super() in mass_mailing_partners --- mass_mailing_partner/README.rst | 10 +++++----- mass_mailing_partner/__manifest__.py | 3 ++- .../i18n/mass_mailing_partner.pot | 20 ++++++++++++++++++- .../models/mailing_contact.py | 2 +- mass_mailing_partner/models/mailing_trace.py | 2 +- mass_mailing_partner/models/res_partner.py | 2 +- .../security/ir.model.access.csv | 2 ++ .../static/description/index.html | 6 +++--- .../views/mailing_contact_view.xml | 15 +++----------- .../views/res_partner_view.xml | 4 ++-- .../wizard/partner_mail_list_wizard.xml | 16 +++++++-------- 11 files changed, 47 insertions(+), 35 deletions(-) create mode 100644 mass_mailing_partner/security/ir.model.access.csv diff --git a/mass_mailing_partner/README.rst b/mass_mailing_partner/README.rst index 24a191a03..189f04489 100644 --- a/mass_mailing_partner/README.rst +++ b/mass_mailing_partner/README.rst @@ -14,13 +14,13 @@ Link partners with 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/13.0/mass_mailing_partner + :target: https://github.com/OCA/social/tree/14.0/mass_mailing_partner :alt: OCA/social .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/social-13-0/social-13-0-mass_mailing_partner + :target: https://translation.odoo-community.org/projects/social-14-0/social-14-0-mass_mailing_partner :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/13.0 + :target: https://runbot.odoo-community.org/runbot/205/14.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -61,7 +61,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. @@ -104,6 +104,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/mass_mailing_partner/__manifest__.py b/mass_mailing_partner/__manifest__.py index 9833937a5..8bbe533c5 100644 --- a/mass_mailing_partner/__manifest__.py +++ b/mass_mailing_partner/__manifest__.py @@ -6,7 +6,7 @@ { "name": "Link partners with mass-mailing", - "version": "14.0.1.1.0", + "version": "14.0.1.0.0", "author": "Tecnativa, " "Odoo Community Association (OCA)", "website": "https://github.com/OCA/social", "license": "AGPL-3", @@ -14,6 +14,7 @@ "depends": ["mass_mailing"], "post_init_hook": "post_init_hook", "data": [ + "security/ir.model.access.csv", "views/mailing_trace_view.xml", "views/mailing_contact_view.xml", "views/mailing_view.xml", diff --git a/mass_mailing_partner/i18n/mass_mailing_partner.pot b/mass_mailing_partner/i18n/mass_mailing_partner.pot index c2ce63c2e..d5853b232 100644 --- a/mass_mailing_partner/i18n/mass_mailing_partner.pot +++ b/mass_mailing_partner/i18n/mass_mailing_partner.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 13.0\n" +"Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: \n" "Language-Team: \n" @@ -57,17 +57,35 @@ msgid "Created on" msgstr "" #. module: mass_mailing_partner +#: model:ir.model.fields,field_description:mass_mailing_partner.field_base_partner_merge_automatic_wizard__display_name +#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__display_name +#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact_subscription__display_name +#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__display_name +#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__display_name #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__display_name +#: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__display_name msgid "Display Name" msgstr "" #. module: mass_mailing_partner +#: model:ir.model.fields,field_description:mass_mailing_partner.field_base_partner_merge_automatic_wizard__id +#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact__id +#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact_subscription__id +#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list__id +#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace__id #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard__id +#: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__id msgid "ID" msgstr "" #. module: mass_mailing_partner +#: model:ir.model.fields,field_description:mass_mailing_partner.field_base_partner_merge_automatic_wizard____last_update +#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact____last_update +#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_contact_subscription____last_update +#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_list____last_update +#: model:ir.model.fields,field_description:mass_mailing_partner.field_mailing_trace____last_update #: model:ir.model.fields,field_description:mass_mailing_partner.field_partner_mail_list_wizard____last_update +#: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner____last_update msgid "Last Modified on" msgstr "" diff --git a/mass_mailing_partner/models/mailing_contact.py b/mass_mailing_partner/models/mailing_contact.py index e92a91665..cd059a336 100644 --- a/mass_mailing_partner/models/mailing_contact.py +++ b/mass_mailing_partner/models/mailing_contact.py @@ -56,7 +56,7 @@ class MailingContact(models.Model): subscription_list_ids=vals.get("subscription_list_ids", []), list_ids=vals.get("list_ids", []), ) - return super(MailingContact, self).create(new_vals) + return super().create(new_vals) def write(self, vals): for contact in self: diff --git a/mass_mailing_partner/models/mailing_trace.py b/mass_mailing_partner/models/mailing_trace.py index f41b0bd60..57fd606c7 100644 --- a/mass_mailing_partner/models/mailing_trace.py +++ b/mass_mailing_partner/models/mailing_trace.py @@ -32,6 +32,6 @@ class MailingTrace(models.Model): @api.model def create(self, vals): - stat = super(MailingTrace, self).create(vals) + stat = super().create(vals) stat.partner_link() return stat diff --git a/mass_mailing_partner/models/res_partner.py b/mass_mailing_partner/models/res_partner.py index 9c46b1993..12c243756 100644 --- a/mass_mailing_partner/models/res_partner.py +++ b/mass_mailing_partner/models/res_partner.py @@ -71,7 +71,7 @@ class ResPartner(models.Model): partner.mass_mailing_stats_count = mapped_data.get(partner.id, 0) def write(self, vals): - res = super(ResPartner, self).write(vals) + res = super().write(vals) mm_vals = {} if vals.get("name"): mm_vals["name"] = vals["name"] diff --git a/mass_mailing_partner/security/ir.model.access.csv b/mass_mailing_partner/security/ir.model.access.csv new file mode 100644 index 000000000..4a7fbc67c --- /dev/null +++ b/mass_mailing_partner/security/ir.model.access.csv @@ -0,0 +1,2 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_partner_mail_list_wizard,access_partner_mail_list_wizard,model_partner_mail_list_wizard,base.group_user,1,1,1,0 diff --git a/mass_mailing_partner/static/description/index.html b/mass_mailing_partner/static/description/index.html index ad4260b99..6c7f9a0be 100644 --- a/mass_mailing_partner/static/description/index.html +++ b/mass_mailing_partner/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

This module links mass-mailing contacts with partners.

Features

@@ -404,7 +404,7 @@ as mailing list contacts.

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.

@@ -447,7 +447,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/mass_mailing_partner/views/mailing_contact_view.xml b/mass_mailing_partner/views/mailing_contact_view.xml index 91b42b916..0b2e8c31e 100644 --- a/mass_mailing_partner/views/mailing_contact_view.xml +++ b/mass_mailing_partner/views/mailing_contact_view.xml @@ -10,10 +10,7 @@ mailing.contact.tree.inherit mailing.contact - + @@ -24,10 +21,7 @@ mailing.contact.form.partner mailing.contact - + @@ -68,10 +62,7 @@ Add partner search field and group by mailing.contact - + diff --git a/mass_mailing_partner/views/res_partner_view.xml b/mass_mailing_partner/views/res_partner_view.xml index 21afbfd30..967f9e4b6 100644 --- a/mass_mailing_partner/views/res_partner_view.xml +++ b/mass_mailing_partner/views/res_partner_view.xml @@ -22,7 +22,7 @@ context="{'search_default_partner_id': active_id, 'default_partner_id': active_id}" type="action" - class="oe_stat_button" + class="oe_stat_button oe_inline" icon="fa-envelope-o" > - + + Add to mailing list + partner.mail.list.wizard + new + form + + list + partner.mail.list.form