From 9e892f2f8cff2465937432b6262eed573c24be24 Mon Sep 17 00:00:00 2001 From: cubells Date: Mon, 9 Jan 2017 22:47:03 +0100 Subject: [PATCH] crm_deduplicate_filter module - Updated README - updated views - Fix dependence --- partner_deduplicate_filter/README.rst | 3 +- partner_deduplicate_filter/__openerp__.py | 4 +- partner_deduplicate_filter/i18n/de.po | 39 +++++++++++++++++++ partner_deduplicate_filter/i18n/es.po | 35 ++++++++++------- partner_deduplicate_filter/i18n/sk.po | 39 +++++++++++++++++++ partner_deduplicate_filter/i18n/sl.po | 23 ++++++----- partner_deduplicate_filter/i18n/tr.po | 39 +++++++++++++++++++ .../wizards/__init__.py | 2 +- .../wizards/partner_merge_view.xml | 7 ++-- 9 files changed, 161 insertions(+), 30 deletions(-) create mode 100644 partner_deduplicate_filter/i18n/de.po create mode 100644 partner_deduplicate_filter/i18n/sk.po create mode 100644 partner_deduplicate_filter/i18n/tr.po diff --git a/partner_deduplicate_filter/README.rst b/partner_deduplicate_filter/README.rst index 6aa5c85f8..4e60643f0 100644 --- a/partner_deduplicate_filter/README.rst +++ b/partner_deduplicate_filter/README.rst @@ -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/8.0 + :target: https://runbot.odoo-community.org/runbot/111/9.0 Bug Tracker =========== @@ -48,6 +48,7 @@ Contributors ------------ * Pedro M. Baeza +* Vicent Cubells Maintainer ---------- diff --git a/partner_deduplicate_filter/__openerp__.py b/partner_deduplicate_filter/__openerp__.py index d7c531952..b6eea5b8f 100644 --- a/partner_deduplicate_filter/__openerp__.py +++ b/partner_deduplicate_filter/__openerp__.py @@ -1,10 +1,11 @@ # -*- coding: utf-8 -*- # Copyright 2016 Pedro M. Baeza +# Copyright 2017 Vicent Cubells # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { "name": "Exclude records from the deduplication", - "version": "8.0.1.0.0", + "version": "9.0.1.0.0", "category": "Tools", "website": "https://www.tecnativa.com", "author": "Tecnativa, " @@ -13,6 +14,7 @@ "installable": True, "depends": [ "crm", + "crm_deduplicate_acl", ], "data": [ 'wizards/partner_merge_view.xml', diff --git a/partner_deduplicate_filter/i18n/de.po b/partner_deduplicate_filter/i18n/de.po new file mode 100644 index 000000000..8b09af55a --- /dev/null +++ b/partner_deduplicate_filter/i18n/de.po @@ -0,0 +1,39 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * crm_deduplicate_filter +# +# Translators: +# Rudolf Schnapka , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 9.0c\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: Rudolf Schnapka , 2017\n" +"Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: de\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 "'Ist Unternehmen'-Feld ausgewählt" + +#. 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 "Übergeordnetes Unternehmen nicht gepflegt" + +#. 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 "Übergeordnetes Unternehmen gesetzt (Kontakte)" + +#. 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/es.po b/partner_deduplicate_filter/i18n/es.po index 7ad3becf5..49b32b1ec 100644 --- a/partner_deduplicate_filter/i18n/es.po +++ b/partner_deduplicate_filter/i18n/es.po @@ -1,32 +1,39 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * crm_deduplicate_filter -# +# * crm_deduplicate_filter +# +# Translators: +# OCA Transbot , 2017 msgid "" msgstr "" -"Project-Id-Version: Odoo Server 8.0\n" +"Project-Id-Version: Odoo Server 9.0c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-12 19:57+0000\n" -"PO-Revision-Date: 2016-08-12 19:57+0000\n" -"Last-Translator: <>\n" -"Language-Team: \n" +"POT-Creation-Date: 2017-03-28 02:27+0000\n" +"PO-Revision-Date: 2017-03-28 02:27+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Plural-Forms: \n" +"Language: es\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: crm_deduplicate_filter -#: field:base.partner.merge.automatic.wizard,exclude_is_company:0 +#: 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 "El campo '¿Es una compañía?' seleccionado" #. module: crm_deduplicate_filter -#: field:base.partner.merge.automatic.wizard,exclude_parent:0 +#: model:ir.model.fields,field_description:crm_deduplicate_filter.field_base_partner_merge_automatic_wizard_exclude_not_parent +msgid "Parent company not set" +msgstr "La compañía padre no establecida" + +#. 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 "La compañía padre establecida (Contactos)" #. module: crm_deduplicate_filter -#: field:base.partner.merge.automatic.wizard,exclude_not_parent:0 -msgid "Parent company not set" -msgstr "La compañía padre no establecida" - +#: 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/sk.po b/partner_deduplicate_filter/i18n/sk.po new file mode 100644 index 000000000..ac85d84d0 --- /dev/null +++ b/partner_deduplicate_filter/i18n/sk.po @@ -0,0 +1,39 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * crm_deduplicate_filter +# +# Translators: +# gebri , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 9.0c\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: gebri , 2017\n" +"Language-Team: Slovak (https://www.transifex.com/oca/teams/23907/sk/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: sk\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 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/sl.po b/partner_deduplicate_filter/i18n/sl.po index b5e016439..da2787c18 100644 --- a/partner_deduplicate_filter/i18n/sl.po +++ b/partner_deduplicate_filter/i18n/sl.po @@ -3,15 +3,15 @@ # * crm_deduplicate_filter # # Translators: -# Matjaž Mozetič , 2016 +# OCA Transbot , 2017 msgid "" msgstr "" -"Project-Id-Version: crm (8.0)\n" +"Project-Id-Version: Odoo Server 9.0c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-11-02 14:15+0000\n" -"PO-Revision-Date: 2016-10-21 06:43+0000\n" -"Last-Translator: Matjaž Mozetič \n" -"Language-Team: Slovenian (http://www.transifex.com/oca/OCA-crm-8-0/language/sl/)\n" +"POT-Creation-Date: 2017-03-28 02:27+0000\n" +"PO-Revision-Date: 2017-03-28 02:27+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -19,16 +19,21 @@ msgstr "" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" #. module: crm_deduplicate_filter -#: field:base.partner.merge.automatic.wizard,exclude_is_company:0 +#: 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 "Polje 'Je pravna oseba' izbrano" #. module: crm_deduplicate_filter -#: field:base.partner.merge.automatic.wizard,exclude_not_parent:0 +#: model:ir.model.fields,field_description:crm_deduplicate_filter.field_base_partner_merge_automatic_wizard_exclude_not_parent msgid "Parent company not set" msgstr "Nadrejena družba ni nastavljena." #. module: crm_deduplicate_filter -#: field:base.partner.merge.automatic.wizard,exclude_parent:0 +#: model:ir.model.fields,field_description:crm_deduplicate_filter.field_base_partner_merge_automatic_wizard_exclude_parent msgid "Parent company set (Contacts)" msgstr "Nadrejena družba nastavljena (stiki)" + +#. module: crm_deduplicate_filter +#: model:ir.model,name:crm_deduplicate_filter.model_base_partner_merge_automatic_wizard +msgid "base.partner.merge.automatic.wizard" +msgstr "" diff --git a/partner_deduplicate_filter/i18n/tr.po b/partner_deduplicate_filter/i18n/tr.po new file mode 100644 index 000000000..d4617c46e --- /dev/null +++ b/partner_deduplicate_filter/i18n/tr.po @@ -0,0 +1,39 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * crm_deduplicate_filter +# +# Translators: +# Ahmet Altinisik , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 9.0c\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" +"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" +"Content-Transfer-Encoding: \n" +"Language: tr\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 "" + +#. 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/wizards/__init__.py b/partner_deduplicate_filter/wizards/__init__.py index c93eadfed..cc7f67425 100644 --- a/partner_deduplicate_filter/wizards/__init__.py +++ b/partner_deduplicate_filter/wizards/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# © 2016 Antiun Ingeniería S.L. - Jairo Llopis +# 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_view.xml b/partner_deduplicate_filter/wizards/partner_merge_view.xml index 26d0b5465..d70cd134b 100644 --- a/partner_deduplicate_filter/wizards/partner_merge_view.xml +++ b/partner_deduplicate_filter/wizards/partner_merge_view.xml @@ -1,9 +1,9 @@ - - + base.partner.merge.automatic.wizard @@ -17,5 +17,4 @@ - - +