From c238d5d6ed5c66015d1378204651125e8e2a346e Mon Sep 17 00:00:00 2001 From: Kevin Khao Date: Tue, 26 Nov 2019 11:53:09 +0100 Subject: [PATCH] [MIG] partner_deduplicate_acl: Migration to 13.0 --- partner_deduplicate_acl/README.rst | 11 ++-- partner_deduplicate_acl/__init__.py | 2 +- partner_deduplicate_acl/__manifest__.py | 4 +- .../i18n/partner_deduplicate_acl.pot | 7 ++- .../readme/CONTRIBUTORS.rst | 1 + .../partner_deduplicate_acl_security.xml | 22 +++----- .../static/description/index.html | 7 +-- .../tests/test_partner_deduplicate_acl.py | 4 +- .../views/base_partner_merge_view.xml | 21 +++++--- partner_deduplicate_acl/wizards/__init__.py | 2 +- .../wizards/partner_merge.py | 2 +- .../wizards/partner_merge_view.xml | 52 +++++++++++-------- 12 files changed, 73 insertions(+), 62 deletions(-) diff --git a/partner_deduplicate_acl/README.rst b/partner_deduplicate_acl/README.rst index efaf1dc76..a58a58fe0 100644 --- a/partner_deduplicate_acl/README.rst +++ b/partner_deduplicate_acl/README.rst @@ -14,13 +14,13 @@ Deduplicate Contacts ACL :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_acl + :target: https://github.com/OCA/partner-contact/tree/13.0/partner_deduplicate_acl :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_acl + :target: https://translation.odoo-community.org/projects/partner-contact-13-0/partner-contact-13-0-partner_deduplicate_acl :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| @@ -74,7 +74,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. @@ -95,6 +95,7 @@ Contributors * Pedro M. Baeza * Luis M. Ontalba * Victor M.M. Torres +* Kevin Khao Maintainers ~~~~~~~~~~~ @@ -109,6 +110,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_acl/__init__.py b/partner_deduplicate_acl/__init__.py index 2d2a05ce9..a18dad97f 100644 --- a/partner_deduplicate_acl/__init__.py +++ b/partner_deduplicate_acl/__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_acl/__manifest__.py b/partner_deduplicate_acl/__manifest__.py index 2f6a98212..3c904d21f 100644 --- a/partner_deduplicate_acl/__manifest__.py +++ b/partner_deduplicate_acl/__manifest__.py @@ -2,12 +2,12 @@ # Copyright 2016 Tecnativa - Vicent Cubells # Copyright 2017-2018 Tecnativa - Pedro M. Baeza # Copyright 2019 Tecnativa - Victor M.M. Torres -# 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). { "name": "Deduplicate Contacts ACL", "summary": "Contact deduplication with fine-grained permission control", - "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_acl/i18n/partner_deduplicate_acl.pot b/partner_deduplicate_acl/i18n/partner_deduplicate_acl.pot index 5ef06a116..b80718627 100644 --- a/partner_deduplicate_acl/i18n/partner_deduplicate_acl.pot +++ b/partner_deduplicate_acl/i18n/partner_deduplicate_acl.pot @@ -1,12 +1,12 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * partner_deduplicate_acl +# * partner_deduplicate_acl # 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" @@ -43,4 +43,3 @@ msgstr "" #: model:res.groups,name:partner_deduplicate_acl.group_unrestricted msgid "Without restrictions" msgstr "" - diff --git a/partner_deduplicate_acl/readme/CONTRIBUTORS.rst b/partner_deduplicate_acl/readme/CONTRIBUTORS.rst index 56751a869..9daccede0 100644 --- a/partner_deduplicate_acl/readme/CONTRIBUTORS.rst +++ b/partner_deduplicate_acl/readme/CONTRIBUTORS.rst @@ -4,3 +4,4 @@ * Pedro M. Baeza * Luis M. Ontalba * Victor M.M. Torres +* Kevin Khao diff --git a/partner_deduplicate_acl/security/partner_deduplicate_acl_security.xml b/partner_deduplicate_acl/security/partner_deduplicate_acl_security.xml index 40f6bcf20..b22261a0f 100644 --- a/partner_deduplicate_acl/security/partner_deduplicate_acl_security.xml +++ b/partner_deduplicate_acl/security/partner_deduplicate_acl_security.xml @@ -1,35 +1,29 @@ - + + License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). --> - Deduplicate Contacts - Manually - + - Automatically - - + + - Without restrictions - - + + - - + - diff --git a/partner_deduplicate_acl/static/description/index.html b/partner_deduplicate_acl/static/description/index.html index 2898f2f91..a76b21070 100644 --- a/partner_deduplicate_acl/static/description/index.html +++ b/partner_deduplicate_acl/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 functionality of the CRM contact deduplicator to add permission groups that allow the matching users to use those tools, not needing to be the sale settings manager.

@@ -432,7 +432,7 @@ this permission for him.

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.

@@ -452,6 +452,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
  • Pedro M. Baeza <pedro.baeza@tecnativa.com>
  • Luis M. Ontalba <luis.martinez@tecnativa.com>
  • Victor M.M. Torres <victor.martin@tecnativa.com>
    • +
  • Kevin Khao <kevin.khao@gmail.com>
    • @@ -461,7 +462,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_acl/tests/test_partner_deduplicate_acl.py b/partner_deduplicate_acl/tests/test_partner_deduplicate_acl.py index 6fdf2d5ce..576c2f8d8 100644 --- a/partner_deduplicate_acl/tests/test_partner_deduplicate_acl.py +++ b/partner_deduplicate_acl/tests/test_partner_deduplicate_acl.py @@ -1,5 +1,5 @@ # Copyright 2017-2019 Tecnativa - Pedro M. Baeza -# 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 odoo import exceptions from odoo.tests import common @@ -31,7 +31,7 @@ class TestPartnerDeduplicateAcl(common.TransactionCase): ) self.wizard = ( self.env["base.partner.merge.automatic.wizard"] - .sudo(self.user) + .with_user(self.user) .create({"group_by_name": True}) ) diff --git a/partner_deduplicate_acl/views/base_partner_merge_view.xml b/partner_deduplicate_acl/views/base_partner_merge_view.xml index 1e6f147fd..f30b9e55a 100644 --- a/partner_deduplicate_acl/views/base_partner_merge_view.xml +++ b/partner_deduplicate_acl/views/base_partner_merge_view.xml @@ -1,15 +1,20 @@ - + + License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). --> - - + diff --git a/partner_deduplicate_acl/wizards/__init__.py b/partner_deduplicate_acl/wizards/__init__.py index fa92260c9..a8a03bc54 100644 --- a/partner_deduplicate_acl/wizards/__init__.py +++ b/partner_deduplicate_acl/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_acl/wizards/partner_merge.py b/partner_deduplicate_acl/wizards/partner_merge.py index adfb0545b..ffe28a2ce 100644 --- a/partner_deduplicate_acl/wizards/partner_merge.py +++ b/partner_deduplicate_acl/wizards/partner_merge.py @@ -1,7 +1,7 @@ # Copyright 2016 Tecnativa - Jairo Llopis # Copyright 2016 Tecnativa - Vicent Cubells # Copyright 2017-2019 Tecnativa - Pedro M. Baeza -# 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 odoo import models diff --git a/partner_deduplicate_acl/wizards/partner_merge_view.xml b/partner_deduplicate_acl/wizards/partner_merge_view.xml index 6005eb3b5..574f0a4c0 100644 --- a/partner_deduplicate_acl/wizards/partner_merge_view.xml +++ b/partner_deduplicate_acl/wizards/partner_merge_view.xml @@ -1,27 +1,37 @@ - + + License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). --> - - - Restrict automatic merge access - base.partner.merge.automatic.wizard - - - - partner_deduplicate_acl.group_automatically - - - partner_deduplicate_acl.group_automatically - - - - - - - - + + Restrict automatic merge access + base.partner.merge.automatic.wizard + + + + partner_deduplicate_acl.group_automatically + + + partner_deduplicate_acl.group_automatically + + + + + +