From 3a8d104b2f12a3ea67e6708a7c12c9ec14bbea1e Mon Sep 17 00:00:00 2001 From: Manuel Calero Date: Thu, 26 Mar 2020 13:42:58 +0100 Subject: [PATCH] [MIG] partner_deduplicate_by_ref: Migration to 13.0 --- partner_deduplicate_by_ref/README.rst | 15 ++++++++------- partner_deduplicate_by_ref/__manifest__.py | 9 +++++---- partner_deduplicate_by_ref/i18n/es.po | 4 ++-- .../readme/CONTRIBUTORS.rst | 5 +++-- partner_deduplicate_by_ref/readme/USAGE.rst | 2 +- .../static/description/index.html | 11 ++++++----- .../tests/test_partner_deduplicate_by_ref.py | 9 +++++---- .../wizards/partner_merge.py | 2 +- 8 files changed, 31 insertions(+), 26 deletions(-) diff --git a/partner_deduplicate_by_ref/README.rst b/partner_deduplicate_by_ref/README.rst index bffd5b4b4..3c77b95fd 100644 --- a/partner_deduplicate_by_ref/README.rst +++ b/partner_deduplicate_by_ref/README.rst @@ -14,13 +14,13 @@ Deduplicate Contacts by reference :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_by_ref + :target: https://github.com/OCA/partner-contact/tree/13.0/partner_deduplicate_by_ref :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_by_ref + :target: https://translation.odoo-community.org/projects/partner-contact-13-0/partner-contact-13-0-partner_deduplicate_by_ref :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| @@ -49,7 +49,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. @@ -66,8 +66,9 @@ Contributors * `Tecnativa `_: - * Pedro Baeza - * David Vidal + * Pedro M. Baeza + * David Vidal + * Manuel Calero Maintainers ~~~~~~~~~~~ @@ -82,6 +83,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_by_ref/__manifest__.py b/partner_deduplicate_by_ref/__manifest__.py index 8cca0bc8e..d1701fef3 100644 --- a/partner_deduplicate_by_ref/__manifest__.py +++ b/partner_deduplicate_by_ref/__manifest__.py @@ -1,13 +1,14 @@ # Copyright 2017 Pedro M. Baeza +# Copyright 2020 Manuel Calero - Tecnativa # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { "name": "Deduplicate Contacts by reference", - "version": "12.0.1.0.0", + "version": "13.0.1.0.0", "category": "Tools", "website": "https://www.github.com/OCA/partner-contact", - "author": "Tecnativa, " "Odoo Community Association (OCA)", + "author": "Tecnativa, Odoo Community Association (OCA)", "license": "AGPL-3", "installable": True, - "depends": ["partner_deduplicate_acl",], - "data": ["wizards/partner_merge_view.xml",], + "depends": ["partner_deduplicate_acl"], + "data": ["wizards/partner_merge_view.xml"], } diff --git a/partner_deduplicate_by_ref/i18n/es.po b/partner_deduplicate_by_ref/i18n/es.po index 1b3d2acc7..43a68f29a 100644 --- a/partner_deduplicate_by_ref/i18n/es.po +++ b/partner_deduplicate_by_ref/i18n/es.po @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 9.0c\n" +"Project-Id-Version: Odoo Server 13.0c\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-01 21:29+0000\n" "PO-Revision-Date: 2017-03-01 21:29+0000\n" @@ -19,7 +19,7 @@ msgstr "" #. module: partner_deduplicate_by_ref #: model:ir.model,name:partner_deduplicate_by_ref.model_base_partner_merge_automatic_wizard msgid "Merge Partner Wizard" -msgstr "" +msgstr "Asistente para fusionar contactos" #. module: partner_deduplicate_by_ref #: model:ir.model.fields,field_description:partner_deduplicate_by_ref.field_base_partner_merge_automatic_wizard__group_by_ref diff --git a/partner_deduplicate_by_ref/readme/CONTRIBUTORS.rst b/partner_deduplicate_by_ref/readme/CONTRIBUTORS.rst index 758e01f87..6e4792475 100644 --- a/partner_deduplicate_by_ref/readme/CONTRIBUTORS.rst +++ b/partner_deduplicate_by_ref/readme/CONTRIBUTORS.rst @@ -1,4 +1,5 @@ * `Tecnativa `_: - * Pedro Baeza - * David Vidal + * Pedro M. Baeza + * David Vidal + * Manuel Calero diff --git a/partner_deduplicate_by_ref/readme/USAGE.rst b/partner_deduplicate_by_ref/readme/USAGE.rst index 803988f0e..08514ecf7 100644 --- a/partner_deduplicate_by_ref/readme/USAGE.rst +++ b/partner_deduplicate_by_ref/readme/USAGE.rst @@ -1,6 +1,6 @@ To use this module, you need to: -#. Go to *Sales > Tools > Deduplicate Contacts*. +#. Go to *Contacts > Tools > Deduplicate Contacts*. #. Mark "Reference" in the section "Search duplicates based on duplicated data in". #. This criteria will be used for deduplicating. diff --git a/partner_deduplicate_by_ref/static/description/index.html b/partner_deduplicate_by_ref/static/description/index.html index 20cffd962..c46e05fbd 100644 --- a/partner_deduplicate_by_ref/static/description/index.html +++ b/partner_deduplicate_by_ref/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 criteria to match duplicated contacts using the field reference.

Table of contents

@@ -398,7 +398,7 @@ in”.

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.

@@ -413,8 +413,9 @@ If you spotted it first, help us smashing it by providing a detailed and welcome

Contributors

@@ -426,7 +427,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_by_ref/tests/test_partner_deduplicate_by_ref.py b/partner_deduplicate_by_ref/tests/test_partner_deduplicate_by_ref.py index 961808765..7257ac6ad 100644 --- a/partner_deduplicate_by_ref/tests/test_partner_deduplicate_by_ref.py +++ b/partner_deduplicate_by_ref/tests/test_partner_deduplicate_by_ref.py @@ -1,4 +1,5 @@ # Copyright 2017 Pedro M. Baeza +# Copyright 2020 Manuel Calero - Tecnativa # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from odoo.tests import common @@ -9,15 +10,15 @@ class TestDeduplicateByRef(common.TransactionCase): def setUp(self): super().setUp() self.partner_1 = self.env["res.partner"].create( - {"name": "Partner 1", "ref": "123456", "email": "test@deduplicate.com",} + {"name": "Partner 1", "ref": "123456", "email": "test@deduplicate.com"} ) self.partner_2 = self.env["res.partner"].create( - {"name": "Partner 2", "ref": "123456", "email": "test@deduplicate.com",} + {"name": "Partner 2", "ref": "123456", "email": "test@deduplicate.com"} ) def test_deduplicate_by_ref(self): wizard = self.env["base.partner.merge.automatic.wizard"].create( - {"group_by_ref": True,} + {"group_by_ref": True} ) wizard.action_start_manual_process() found_match = False @@ -30,7 +31,7 @@ class TestDeduplicateByRef(common.TransactionCase): def test_deduplicate_by_ref_and_is_company(self): wizard = self.env["base.partner.merge.automatic.wizard"].create( - {"group_by_ref": True, "group_by_email": True,} + {"group_by_ref": True, "group_by_email": True} ) wizard.action_start_manual_process() found_match = False diff --git a/partner_deduplicate_by_ref/wizards/partner_merge.py b/partner_deduplicate_by_ref/wizards/partner_merge.py index 500c58a81..fc7d9c961 100644 --- a/partner_deduplicate_by_ref/wizards/partner_merge.py +++ b/partner_deduplicate_by_ref/wizards/partner_merge.py @@ -1,7 +1,7 @@ # Copyright 2016 Pedro M. Baeza # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from openerp import fields, models +from odoo import fields, models class BasePartnerMergeAutomaticWizard(models.TransientModel):