Browse Source

[MIG] partner_deduplicate_filter: Migration to 13.0

Co-authored-by: João Marques <joao.marques@tecnativa.com>

[UPD] Update partner_deduplicate_filter.pot

[UPD] README.rst
14.0
Kevin Khao 5 years ago
committed by Víctor Martínez
parent
commit
b2194beb08
  1. 27
      partner_deduplicate_filter/README.rst
  2. 2
      partner_deduplicate_filter/__init__.py
  3. 10
      partner_deduplicate_filter/__manifest__.py
  4. 3
      partner_deduplicate_filter/i18n/de.po
  5. 3
      partner_deduplicate_filter/i18n/es.po
  6. 3
      partner_deduplicate_filter/i18n/hr.po
  7. 3
      partner_deduplicate_filter/i18n/nl_NL.po
  8. 7
      partner_deduplicate_filter/i18n/partner_deduplicate_filter.pot
  9. 3
      partner_deduplicate_filter/i18n/sk.po
  10. 3
      partner_deduplicate_filter/i18n/tr.po
  11. 13
      partner_deduplicate_filter/readme/CONTRIBUTORS.rst
  12. 4
      partner_deduplicate_filter/readme/USAGE.rst
  13. 21
      partner_deduplicate_filter/static/description/index.html
  14. 2
      partner_deduplicate_filter/tests/__init__.py
  15. 4
      partner_deduplicate_filter/tests/test_partner_deduplicate_filter.py
  16. 2
      partner_deduplicate_filter/wizards/__init__.py
  17. 5
      partner_deduplicate_filter/wizards/partner_merge.py
  18. 21
      partner_deduplicate_filter/wizards/partner_merge_view.xml

27
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 <https://github.com/OCA/partner-contact/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 <https://github.com/OCA/partner-contact/issues/new?body=module:%20partner_deduplicate_filter%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
`feedback <https://github.com/OCA/partner-contact/issues/new?body=module:%20partner_deduplicate_filter%0Aversion:%2013.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
Do not contact contributors directly about support or help with technical issues.
@ -68,10 +70,15 @@ Authors
Contributors
~~~~~~~~~~~~
* Pedro M. Baeza <pedro.baeza@tecnativa.com>
* Vicent Cubells <vicent.cubells@tecnativa.com>
* Luis M. Ontalba <luis.martinez@tecnativa.com>
* Victor M.M. Torres <victor.martin@tecnativa.com>
* `Tecnativa <https://www.tecnativa.com>`_:
* Pedro M. Baeza
* Vicent Cubells
* Luis M. Ontalba
* Victor M.M. Torres
* João Marques
* Kevin Khao <kevin.khao@gmail.com>
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 <https://github.com/OCA/partner-contact/tree/12.0/partner_deduplicate_filter>`_ project on GitHub.
This module is part of the `OCA/partner-contact <https://github.com/OCA/partner-contact/tree/13.0/partner_deduplicate_filter>`_ project on GitHub.
You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

2
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

10
partner_deduplicate_filter/__manifest__.py

@ -1,11 +1,11 @@
# Copyright 2016 Pedro M. Baeza <pedro.baeza@tecnativa.com>
# Copyright 2017 Vicent Cubells <vicent.cubells@tecnativa.com>
# Copyright 2019 Victor M.M Torres <victor.martin@tecnativa.com>
# 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)",

3
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"

3
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"

3
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"

3
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"

7
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 ""

3
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"

3
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"

13
partner_deduplicate_filter/readme/CONTRIBUTORS.rst

@ -1,4 +1,9 @@
* Pedro M. Baeza <pedro.baeza@tecnativa.com>
* Vicent Cubells <vicent.cubells@tecnativa.com>
* Luis M. Ontalba <luis.martinez@tecnativa.com>
* Victor M.M. Torres <victor.martin@tecnativa.com>
* `Tecnativa <https://www.tecnativa.com>`_:
* Pedro M. Baeza
* Vicent Cubells
* Luis M. Ontalba
* Victor M.M. Torres
* João Marques
* Kevin Khao <kevin.khao@gmail.com>

4
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

21
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. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/partner-contact/tree/12.0/partner_deduplicate_filter"><img alt="OCA/partner-contact" src="https://img.shields.io/badge/github-OCA%2Fpartner--contact-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/partner-contact-12-0/partner-contact-12-0-partner_deduplicate_filter"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/134/12.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/partner-contact/tree/13.0/partner_deduplicate_filter"><img alt="OCA/partner-contact" src="https://img.shields.io/badge/github-OCA%2Fpartner--contact-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/partner-contact-13-0/partner-contact-13-0-partner_deduplicate_filter"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/134/13.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
<p>This module extends the possibilities of the contact deduplication allowing
to filter the applicable set according to several criteria.</p>
<p>For now, only the filter for restricting the deduplication to only companies or
@ -389,7 +389,9 @@ only contacts is implemented.</p>
<h1><a class="toc-backref" href="#id1">Usage</a></h1>
<p>To use this module, you need to:</p>
<ol class="arabic simple">
<li>Go to <em>CRM/Sales &gt; Tools &gt; Deduplicate Contacts</em>.</li>
<li>Follow the instructions in the partner_deduplicate_acl addon to set up the
correct user permissions.</li>
<li>Go to <em>Contacts &gt; Tools &gt; Deduplicate Contacts</em>.</li>
<li>Mark “‘Is a company?’ field selected”, “Parent company not set” or
“Parent company set (Contacts)” in the section ‘Exclude contacts having’.</li>
<li>This criteria will be used for excluding in the deduplication the selected
@ -401,7 +403,7 @@ kind of records.</li>
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/partner-contact/issues">GitHub Issues</a>.
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
<a class="reference external" href="https://github.com/OCA/partner-contact/issues/new?body=module:%20partner_deduplicate_filter%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
<a class="reference external" href="https://github.com/OCA/partner-contact/issues/new?body=module:%20partner_deduplicate_filter%0Aversion:%2013.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
<p>Do not contact contributors directly about support or help with technical issues.</p>
</div>
<div class="section" id="credits">
@ -415,10 +417,13 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
<div class="section" id="contributors">
<h2><a class="toc-backref" href="#id5">Contributors</a></h2>
<ul class="simple">
<li>Pedro M. Baeza &lt;<a class="reference external" href="mailto:pedro.baeza&#64;tecnativa.com">pedro.baeza&#64;tecnativa.com</a>&gt;</li>
<li>Vicent Cubells &lt;<a class="reference external" href="mailto:vicent.cubells&#64;tecnativa.com">vicent.cubells&#64;tecnativa.com</a>&gt;</li>
<li>Luis M. Ontalba &lt;<a class="reference external" href="mailto:luis.martinez&#64;tecnativa.com">luis.martinez&#64;tecnativa.com</a>&gt;</li>
<li>Victor M.M. Torres &lt;<a class="reference external" href="mailto:victor.martin&#64;tecnativa.com">victor.martin&#64;tecnativa.com</a>&gt;</li>
<li><a class="reference external" href="https://www.tecnativa.com">Tecnativa</a>:
* Pedro M. Baeza
* Vicent Cubells
* Luis M. Ontalba
* Victor M.M. Torres
* João Marques</li>
<li>Kevin Khao &lt;<a class="reference external" href="mailto:kevin.khao&#64;gmail.com">kevin.khao&#64;gmail.com</a>&gt;</li>
</ul>
</div>
<div class="section" id="maintainers">
@ -428,7 +433,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
<p>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.</p>
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/partner-contact/tree/12.0/partner_deduplicate_filter">OCA/partner-contact</a> project on GitHub.</p>
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/partner-contact/tree/13.0/partner_deduplicate_filter">OCA/partner-contact</a> project on GitHub.</p>
<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
</div>
</div>

2
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

4
partner_deduplicate_filter/tests/test_partner_deduplicate_filter.py

@ -1,5 +1,5 @@
# Copyright 2016 Pedro M. Baeza <pedro.baeza@tecnativa.com>
# 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

2
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

5
partner_deduplicate_filter/wizards/partner_merge.py

@ -1,5 +1,5 @@
# Copyright 2016 Pedro M. Baeza <pedro.baeza@tecnativa.com>
# 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 = []

21
partner_deduplicate_filter/wizards/partner_merge_view.xml

@ -1,21 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2016 Pedro M. Baeza <pedro.baeza@tecnativa.com>
Copyright 2017 Vicent Cubells <vicent.cubells@tecnativa.com>
Copyright 2019 Victor M.M Torres <victor.martin@tecnativa.com>
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -->
<?xml version="1.0" encoding="utf-8" ?>
<!-- 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). -->
<odoo>
<record id="base_partner_merge_automatic_wizard_form" model="ir.ui.view">
<field name="model">base.partner.merge.automatic.wizard</field>
<field name="inherit_id" ref="base.base_partner_merge_automatic_wizard_form"/>
<field name="inherit_id" ref="base.base_partner_merge_automatic_wizard_form" />
<field name="arch" type="xml">
<field name='exclude_contact' position="before">
<field name="exclude_is_company"/>
<field name="exclude_not_parent"/>
<field name="exclude_parent"/>
<field name="exclude_is_company" />
<field name="exclude_not_parent" />
<field name="exclude_parent" />
</field>
</field>
</record>
</odoo>
Loading…
Cancel
Save