From b2194beb08a33e3da923a1be9be701af51a52f47 Mon Sep 17 00:00:00 2001 From: Kevin Khao Date: Thu, 28 Nov 2019 00:10:45 +0100 Subject: [PATCH] [MIG] partner_deduplicate_filter: Migration to 13.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: João Marques [UPD] Update partner_deduplicate_filter.pot [UPD] README.rst --- partner_deduplicate_filter/README.rst | 27 ++++++++++++------- partner_deduplicate_filter/__init__.py | 2 +- partner_deduplicate_filter/__manifest__.py | 10 +++---- partner_deduplicate_filter/i18n/de.po | 3 --- partner_deduplicate_filter/i18n/es.po | 3 --- partner_deduplicate_filter/i18n/hr.po | 3 --- partner_deduplicate_filter/i18n/nl_NL.po | 3 --- .../i18n/partner_deduplicate_filter.pot | 7 +++-- partner_deduplicate_filter/i18n/sk.po | 3 --- partner_deduplicate_filter/i18n/tr.po | 3 --- .../readme/CONTRIBUTORS.rst | 13 ++++++--- partner_deduplicate_filter/readme/USAGE.rst | 4 ++- .../static/description/index.html | 21 +++++++++------ partner_deduplicate_filter/tests/__init__.py | 2 +- .../tests/test_partner_deduplicate_filter.py | 4 +-- .../wizards/__init__.py | 2 +- .../wizards/partner_merge.py | 5 ++-- .../wizards/partner_merge_view.xml | 21 +++++++-------- 18 files changed, 66 insertions(+), 70 deletions(-) diff --git a/partner_deduplicate_filter/README.rst b/partner_deduplicate_filter/README.rst index 80a21c595..6324a96ae 100644 --- a/partner_deduplicate_filter/README.rst +++ b/partner_deduplicate_filter/README.rst @@ -14,13 +14,13 @@ Exclude records from the deduplication :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fpartner--contact-lightgray.png?logo=github - :target: https://github.com/OCA/partner-contact/tree/12.0/partner_deduplicate_filter + :target: https://github.com/OCA/partner-contact/tree/13.0/partner_deduplicate_filter :alt: OCA/partner-contact .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/partner-contact-12-0/partner-contact-12-0-partner_deduplicate_filter + :target: https://translation.odoo-community.org/projects/partner-contact-13-0/partner-contact-13-0-partner_deduplicate_filter :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/134/12.0 + :target: https://runbot.odoo-community.org/runbot/134/13.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -41,7 +41,9 @@ Usage To use this module, you need to: -#. Go to *CRM/Sales > Tools > Deduplicate Contacts*. +#. Follow the instructions in the partner_deduplicate_acl addon to set up the + correct user permissions. +#. Go to *Contacts > Tools > Deduplicate Contacts*. #. Mark "'Is a company?' field selected", "Parent company not set" or "Parent company set (Contacts)" in the section 'Exclude contacts having'. #. This criteria will be used for excluding in the deduplication the selected @@ -53,7 +55,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. @@ -68,10 +70,15 @@ Authors Contributors ~~~~~~~~~~~~ -* Pedro M. Baeza -* Vicent Cubells -* Luis M. Ontalba -* Victor M.M. Torres + +* `Tecnativa `_: + * Pedro M. Baeza + * Vicent Cubells + * Luis M. Ontalba + * Victor M.M. Torres + * João Marques + +* Kevin Khao Maintainers ~~~~~~~~~~~ @@ -86,6 +93,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/partner-contact `_ project on GitHub. +This module is part of the `OCA/partner-contact `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/partner_deduplicate_filter/__init__.py b/partner_deduplicate_filter/__init__.py index 2d2a05ce9..a18dad97f 100644 --- a/partner_deduplicate_filter/__init__.py +++ b/partner_deduplicate_filter/__init__.py @@ -1,3 +1,3 @@ -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). from . import wizards diff --git a/partner_deduplicate_filter/__manifest__.py b/partner_deduplicate_filter/__manifest__.py index 39d1dd814..d0da2e2b4 100644 --- a/partner_deduplicate_filter/__manifest__.py +++ b/partner_deduplicate_filter/__manifest__.py @@ -1,11 +1,11 @@ -# Copyright 2016 Pedro M. Baeza -# Copyright 2017 Vicent Cubells -# Copyright 2019 Victor M.M Torres -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +# Copyright 2016 Tecnativa - Pedro M. Baeza +# Copyright 2017 Tecnativa - Vicent Cubells +# Copyright 2019 Tecnativa - Victor M.M Torres +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). { "name": "Exclude records from the deduplication", - "version": "12.0.1.0.0", + "version": "13.0.1.0.0", "category": "Tools", "website": "https://github.com/OCA/partner-contact", "author": "Tecnativa, " "Odoo Community Association (OCA)", diff --git a/partner_deduplicate_filter/i18n/de.po b/partner_deduplicate_filter/i18n/de.po index 3570eb35f..8bcd1e5c9 100644 --- a/partner_deduplicate_filter/i18n/de.po +++ b/partner_deduplicate_filter/i18n/de.po @@ -37,6 +37,3 @@ msgstr "Übergeordnetes Unternehmen nicht gepflegt" #: model:ir.model.fields,field_description:partner_deduplicate_filter.field_base_partner_merge_automatic_wizard__exclude_parent msgid "Parent company set (Contacts)" msgstr "Übergeordnetes Unternehmen gesetzt (Kontakte)" - -#~ msgid "base.partner.merge.automatic.wizard" -#~ msgstr "base.partner.merge.automatic.wizard" diff --git a/partner_deduplicate_filter/i18n/es.po b/partner_deduplicate_filter/i18n/es.po index 4b0a5dbb7..20db28c53 100644 --- a/partner_deduplicate_filter/i18n/es.po +++ b/partner_deduplicate_filter/i18n/es.po @@ -37,6 +37,3 @@ msgstr "La compañía padre no establecida" #: model:ir.model.fields,field_description:partner_deduplicate_filter.field_base_partner_merge_automatic_wizard__exclude_parent msgid "Parent company set (Contacts)" msgstr "La compañía padre establecida (Contactos)" - -#~ msgid "base.partner.merge.automatic.wizard" -#~ msgstr "base.partner.merge.automatic.wizard" diff --git a/partner_deduplicate_filter/i18n/hr.po b/partner_deduplicate_filter/i18n/hr.po index c38847537..bc00f8ba2 100644 --- a/partner_deduplicate_filter/i18n/hr.po +++ b/partner_deduplicate_filter/i18n/hr.po @@ -38,6 +38,3 @@ msgstr "" #: model:ir.model.fields,field_description:partner_deduplicate_filter.field_base_partner_merge_automatic_wizard__exclude_parent msgid "Parent company set (Contacts)" msgstr "" - -#~ msgid "base.partner.merge.automatic.wizard" -#~ msgstr "base.partner.merge.automatic.wizard" diff --git a/partner_deduplicate_filter/i18n/nl_NL.po b/partner_deduplicate_filter/i18n/nl_NL.po index 392a94976..a1bb05454 100644 --- a/partner_deduplicate_filter/i18n/nl_NL.po +++ b/partner_deduplicate_filter/i18n/nl_NL.po @@ -38,6 +38,3 @@ msgstr "Moederbedrijf niet ingesteld" #: model:ir.model.fields,field_description:partner_deduplicate_filter.field_base_partner_merge_automatic_wizard__exclude_parent msgid "Parent company set (Contacts)" msgstr "" - -#~ msgid "base.partner.merge.automatic.wizard" -#~ msgstr "base.partner.merge.automatic.wizard" diff --git a/partner_deduplicate_filter/i18n/partner_deduplicate_filter.pot b/partner_deduplicate_filter/i18n/partner_deduplicate_filter.pot index e66935768..639c90cad 100644 --- a/partner_deduplicate_filter/i18n/partner_deduplicate_filter.pot +++ b/partner_deduplicate_filter/i18n/partner_deduplicate_filter.pot @@ -1,12 +1,12 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * partner_deduplicate_filter +# * partner_deduplicate_filter # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 12.0\n" +"Project-Id-Version: Odoo Server 13.0\n" "Report-Msgid-Bugs-To: \n" -"Last-Translator: <>\n" +"Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,4 +32,3 @@ msgstr "" #: model:ir.model.fields,field_description:partner_deduplicate_filter.field_base_partner_merge_automatic_wizard__exclude_parent msgid "Parent company set (Contacts)" msgstr "" - diff --git a/partner_deduplicate_filter/i18n/sk.po b/partner_deduplicate_filter/i18n/sk.po index 26a344d6d..874012e0b 100644 --- a/partner_deduplicate_filter/i18n/sk.po +++ b/partner_deduplicate_filter/i18n/sk.po @@ -37,6 +37,3 @@ msgstr "" #: model:ir.model.fields,field_description:partner_deduplicate_filter.field_base_partner_merge_automatic_wizard__exclude_parent msgid "Parent company set (Contacts)" msgstr "" - -#~ msgid "base.partner.merge.automatic.wizard" -#~ msgstr "base.partner.merge.automatic.wizard" diff --git a/partner_deduplicate_filter/i18n/tr.po b/partner_deduplicate_filter/i18n/tr.po index 6491b913d..e85ac02ac 100644 --- a/partner_deduplicate_filter/i18n/tr.po +++ b/partner_deduplicate_filter/i18n/tr.po @@ -38,6 +38,3 @@ msgstr "Üst firma Ayarlanmamışsa" #: model:ir.model.fields,field_description:partner_deduplicate_filter.field_base_partner_merge_automatic_wizard__exclude_parent msgid "Parent company set (Contacts)" msgstr "" - -#~ msgid "base.partner.merge.automatic.wizard" -#~ msgstr "base.partner.merge.automatic.wizard" diff --git a/partner_deduplicate_filter/readme/CONTRIBUTORS.rst b/partner_deduplicate_filter/readme/CONTRIBUTORS.rst index 2b4f7c7a9..54f7b2a65 100644 --- a/partner_deduplicate_filter/readme/CONTRIBUTORS.rst +++ b/partner_deduplicate_filter/readme/CONTRIBUTORS.rst @@ -1,4 +1,9 @@ -* Pedro M. Baeza -* Vicent Cubells -* Luis M. Ontalba -* Victor M.M. Torres + +* `Tecnativa `_: + * Pedro M. Baeza + * Vicent Cubells + * Luis M. Ontalba + * Victor M.M. Torres + * João Marques + +* Kevin Khao diff --git a/partner_deduplicate_filter/readme/USAGE.rst b/partner_deduplicate_filter/readme/USAGE.rst index 3e9f84b9c..be7322640 100644 --- a/partner_deduplicate_filter/readme/USAGE.rst +++ b/partner_deduplicate_filter/readme/USAGE.rst @@ -1,6 +1,8 @@ To use this module, you need to: -#. Go to *CRM/Sales > Tools > Deduplicate Contacts*. +#. Follow the instructions in the partner_deduplicate_acl addon to set up the + correct user permissions. +#. Go to *Contacts > Tools > Deduplicate Contacts*. #. Mark "'Is a company?' field selected", "Parent company not set" or "Parent company set (Contacts)" in the section 'Exclude contacts having'. #. This criteria will be used for excluding in the deduplication the selected diff --git a/partner_deduplicate_filter/static/description/index.html b/partner_deduplicate_filter/static/description/index.html index 729b87df1..d357453d7 100644 --- a/partner_deduplicate_filter/static/description/index.html +++ b/partner_deduplicate_filter/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/partner-contact Translate me on Weblate Try me on Runbot

+

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

This module extends the possibilities of the contact deduplication allowing to filter the applicable set according to several criteria.

For now, only the filter for restricting the deduplication to only companies or @@ -389,7 +389,9 @@ only contacts is implemented.

Usage

To use this module, you need to:

    -
  1. Go to CRM/Sales > Tools > Deduplicate Contacts.
    2. +
  2. Follow the instructions in the partner_deduplicate_acl addon to set up the +correct user permissions.
    3. +
  3. Go to Contacts > Tools > Deduplicate Contacts.
  4. Mark “‘Is a company?’ field selected”, “Parent company not set” or “Parent company set (Contacts)” in the section ‘Exclude contacts having’.
  5. This criteria will be used for excluding in the deduplication the selected @@ -401,7 +403,7 @@ kind of records.

    6. 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.

    @@ -415,10 +417,13 @@ If you spotted it first, help us smashing it by providing a detailed and welcome

    Contributors

    @@ -428,7 +433,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/partner-contact project on GitHub.

    +

    This module is part of the OCA/partner-contact project on GitHub.

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

    diff --git a/partner_deduplicate_filter/tests/__init__.py b/partner_deduplicate_filter/tests/__init__.py index 074c33e2e..62942e752 100644 --- a/partner_deduplicate_filter/tests/__init__.py +++ b/partner_deduplicate_filter/tests/__init__.py @@ -1,3 +1,3 @@ -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). from . import test_partner_deduplicate_filter diff --git a/partner_deduplicate_filter/tests/test_partner_deduplicate_filter.py b/partner_deduplicate_filter/tests/test_partner_deduplicate_filter.py index 24e556a0c..72678019f 100644 --- a/partner_deduplicate_filter/tests/test_partner_deduplicate_filter.py +++ b/partner_deduplicate_filter/tests/test_partner_deduplicate_filter.py @@ -1,5 +1,5 @@ -# Copyright 2016 Pedro M. Baeza -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +# Copyright 2016 Tecnativa - Pedro M. Baeza +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). from odoo.tests import common from odoo.tools.safe_eval import safe_eval diff --git a/partner_deduplicate_filter/wizards/__init__.py b/partner_deduplicate_filter/wizards/__init__.py index fa92260c9..a8a03bc54 100644 --- a/partner_deduplicate_filter/wizards/__init__.py +++ b/partner_deduplicate_filter/wizards/__init__.py @@ -1,3 +1,3 @@ -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). from . import partner_merge diff --git a/partner_deduplicate_filter/wizards/partner_merge.py b/partner_deduplicate_filter/wizards/partner_merge.py index d5fa70a26..170d1df32 100644 --- a/partner_deduplicate_filter/wizards/partner_merge.py +++ b/partner_deduplicate_filter/wizards/partner_merge.py @@ -1,5 +1,5 @@ -# Copyright 2016 Pedro M. Baeza -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +# Copyright 2016 Tecnativa - Pedro M. Baeza +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). from odoo import fields, models @@ -11,7 +11,6 @@ class BasePartnerMergeAutomaticWizard(models.TransientModel): exclude_not_parent = fields.Boolean("Parent company not set") exclude_parent = fields.Boolean("Parent company set (Contacts)") - @api.multi def _process_query(self, query): if any([self.exclude_is_company, self.exclude_not_parent, self.exclude_parent]): filters = [] diff --git a/partner_deduplicate_filter/wizards/partner_merge_view.xml b/partner_deduplicate_filter/wizards/partner_merge_view.xml index 7d05cfcfb..d4fce2da2 100644 --- a/partner_deduplicate_filter/wizards/partner_merge_view.xml +++ b/partner_deduplicate_filter/wizards/partner_merge_view.xml @@ -1,21 +1,18 @@ - - - + + - base.partner.merge.automatic.wizard - + - - - + + + -