diff --git a/partner_deduplicate_filter/README.rst b/partner_deduplicate_filter/README.rst index 4e60643f0..46dd836cf 100644 --- a/partner_deduplicate_filter/README.rst +++ b/partner_deduplicate_filter/README.rst @@ -17,7 +17,7 @@ Usage To use this module, you need to: -#. Go to *Sales > Tools > Deduplicate Contacts*. +#. Go to *CRM/Sales > 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 @@ -25,7 +25,7 @@ To use this module, you need to: .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/111/9.0 + :target: https://runbot.odoo-community.org/runbot/111/10.0 Bug Tracker =========== @@ -41,6 +41,7 @@ Credits Images ------ +* Odoo Community Association: `Icon `_. * `Funnel `_. * `Arrow `_. @@ -49,6 +50,7 @@ Contributors * Pedro M. Baeza * Vicent Cubells +* Luis M. Ontalba Maintainer ---------- diff --git a/partner_deduplicate_filter/__openerp__.py b/partner_deduplicate_filter/__manifest__.py similarity index 95% rename from partner_deduplicate_filter/__openerp__.py rename to partner_deduplicate_filter/__manifest__.py index b6eea5b8f..99d751aff 100644 --- a/partner_deduplicate_filter/__openerp__.py +++ b/partner_deduplicate_filter/__manifest__.py @@ -5,7 +5,7 @@ { "name": "Exclude records from the deduplication", - "version": "9.0.1.0.0", + "version": "10.0.1.0.0", "category": "Tools", "website": "https://www.tecnativa.com", "author": "Tecnativa, " diff --git a/partner_deduplicate_filter/i18n/hr.po b/partner_deduplicate_filter/i18n/hr.po new file mode 100644 index 000000000..21755ae6c --- /dev/null +++ b/partner_deduplicate_filter/i18n/hr.po @@ -0,0 +1,39 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * crm_deduplicate_filter +# +# Translators: +# Bole , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-07-08 01:22+0000\n" +"PO-Revision-Date: 2017-07-08 01:22+0000\n" +"Last-Translator: Bole , 2017\n" +"Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hr\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. module: crm_deduplicate_filter +#: model:ir.model.fields,field_description:crm_deduplicate_filter.field_base_partner_merge_automatic_wizard_exclude_is_company +msgid "'Is a company?' field selected" +msgstr "" + +#. module: crm_deduplicate_filter +#: model:ir.model.fields,field_description:crm_deduplicate_filter.field_base_partner_merge_automatic_wizard_exclude_not_parent +msgid "Parent company not set" +msgstr "" + +#. module: crm_deduplicate_filter +#: model:ir.model.fields,field_description:crm_deduplicate_filter.field_base_partner_merge_automatic_wizard_exclude_parent +msgid "Parent company set (Contacts)" +msgstr "" + +#. module: crm_deduplicate_filter +#: model:ir.model,name:crm_deduplicate_filter.model_base_partner_merge_automatic_wizard +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 new file mode 100644 index 000000000..64bd82fb1 --- /dev/null +++ b/partner_deduplicate_filter/i18n/nl_NL.po @@ -0,0 +1,39 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * crm_deduplicate_filter +# +# Translators: +# Peter Hageman , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-06-09 08:00+0000\n" +"PO-Revision-Date: 2017-06-09 08:00+0000\n" +"Last-Translator: Peter Hageman , 2017\n" +"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/teams/23907/nl_NL/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: nl_NL\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: crm_deduplicate_filter +#: model:ir.model.fields,field_description:crm_deduplicate_filter.field_base_partner_merge_automatic_wizard_exclude_is_company +msgid "'Is a company?' field selected" +msgstr "'Is een bedrijf?' veld geselecteerd" + +#. module: crm_deduplicate_filter +#: model:ir.model.fields,field_description:crm_deduplicate_filter.field_base_partner_merge_automatic_wizard_exclude_not_parent +msgid "Parent company not set" +msgstr "Moederbedrijf niet ingesteld" + +#. module: crm_deduplicate_filter +#: model:ir.model.fields,field_description:crm_deduplicate_filter.field_base_partner_merge_automatic_wizard_exclude_parent +msgid "Parent company set (Contacts)" +msgstr "" + +#. module: crm_deduplicate_filter +#: model:ir.model,name:crm_deduplicate_filter.model_base_partner_merge_automatic_wizard +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 d4617c46e..08d2f5c06 100644 --- a/partner_deduplicate_filter/i18n/tr.po +++ b/partner_deduplicate_filter/i18n/tr.po @@ -3,14 +3,15 @@ # * crm_deduplicate_filter # # Translators: -# Ahmet Altinisik , 2017 +# OCA Transbot , 2017 +# Ediz Duman , 2017 msgid "" msgstr "" -"Project-Id-Version: Odoo Server 9.0c\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-28 02:27+0000\n" -"PO-Revision-Date: 2017-03-28 02:27+0000\n" -"Last-Translator: Ahmet Altinisik , 2017\n" +"POT-Creation-Date: 2017-06-10 03:36+0000\n" +"PO-Revision-Date: 2017-06-10 03:36+0000\n" +"Last-Translator: Ediz Duman , 2017\n" "Language-Team: Turkish (https://www.transifex.com/oca/teams/23907/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,12 +22,12 @@ msgstr "" #. module: crm_deduplicate_filter #: model:ir.model.fields,field_description:crm_deduplicate_filter.field_base_partner_merge_automatic_wizard_exclude_is_company msgid "'Is a company?' field selected" -msgstr "" +msgstr "' Bu bir şirket mi? ' Alanı seçili ise" #. module: crm_deduplicate_filter #: model:ir.model.fields,field_description:crm_deduplicate_filter.field_base_partner_merge_automatic_wizard_exclude_not_parent msgid "Parent company not set" -msgstr "" +msgstr "Üst firma Ayarlanmamışsa" #. module: crm_deduplicate_filter #: model:ir.model.fields,field_description:crm_deduplicate_filter.field_base_partner_merge_automatic_wizard_exclude_parent diff --git a/partner_deduplicate_filter/tests/test_crm_deduplicate_filter.py b/partner_deduplicate_filter/tests/test_crm_deduplicate_filter.py index b6777fa56..3c360d8d6 100644 --- a/partner_deduplicate_filter/tests/test_crm_deduplicate_filter.py +++ b/partner_deduplicate_filter/tests/test_crm_deduplicate_filter.py @@ -2,8 +2,8 @@ # Copyright 2016 Pedro M. Baeza # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from openerp.tests import common -from openerp.tools.safe_eval import safe_eval +from odoo.tests import common +from odoo.tools.safe_eval import safe_eval class TestDeduplicateFilter(common.TransactionCase): @@ -36,7 +36,7 @@ class TestDeduplicateFilter(common.TransactionCase): def test_deduplicate_exclude_is_company(self): self.wizard.exclude_is_company = True - self.wizard.start_process_cb() + self.wizard.action_start_manual_process() matched_founds = 0 for line in self.wizard.line_ids: match_ids = safe_eval(line.aggr_ids) @@ -50,7 +50,7 @@ class TestDeduplicateFilter(common.TransactionCase): def test_deduplicate_exclude_not_parent(self): self.wizard.exclude_not_parent = True - self.wizard.start_process_cb() + self.wizard.action_start_manual_process() matched_founds = 0 for line in self.wizard.line_ids: match_ids = safe_eval(line.aggr_ids) @@ -64,7 +64,7 @@ class TestDeduplicateFilter(common.TransactionCase): def test_deduplicate_exclude_parent(self): self.wizard.exclude_parent = True - self.wizard.start_process_cb() + self.wizard.action_start_manual_process() matched_founds = 0 for line in self.wizard.line_ids: match_ids = safe_eval(line.aggr_ids) diff --git a/partner_deduplicate_filter/wizards/__init__.py b/partner_deduplicate_filter/wizards/__init__.py index cc7f67425..31a70707d 100644 --- a/partner_deduplicate_filter/wizards/__init__.py +++ b/partner_deduplicate_filter/wizards/__init__.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -# Copyright 2016 Antiun Ingeniería S.L. - Jairo Llopis # License AGPL-3.0 or later (http://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 26381b791..d07140e99 100644 --- a/partner_deduplicate_filter/wizards/partner_merge.py +++ b/partner_deduplicate_filter/wizards/partner_merge.py @@ -2,7 +2,7 @@ # Copyright 2016 Pedro M. Baeza # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from openerp import api, fields, models +from odoo import api, fields, models class BasePartnerMergeAutomaticWizard(models.TransientModel):