From aad1d9788b60f49732353835c6d661e6f4aaac22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Mart=C3=ADnez?= Date: Thu, 18 Mar 2021 08:18:05 +0100 Subject: [PATCH] [FIX] mass_mailing_list_dynamic: Prevent ValidationError when merge contacts wizard related to dynamic and full sync list [UPD] Update mass_mailing_list_dynamic.pot [UPD] README.rst mass_mailing_list_dynamic 13.0.1.0.1 Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: social-13.0/social-13.0-mass_mailing_list_dynamic Translate-URL: https://translation.odoo-community.org/projects/social-13-0/social-13-0-mass_mailing_list_dynamic/ --- mass_mailing_list_dynamic/README.rst | 9 ++-- mass_mailing_list_dynamic/__manifest__.py | 2 +- mass_mailing_list_dynamic/i18n/am.po | 5 +++ mass_mailing_list_dynamic/i18n/ar.po | 5 +++ mass_mailing_list_dynamic/i18n/bg.po | 5 +++ mass_mailing_list_dynamic/i18n/bs.po | 5 +++ mass_mailing_list_dynamic/i18n/ca.po | 5 +++ mass_mailing_list_dynamic/i18n/cs.po | 5 +++ mass_mailing_list_dynamic/i18n/da.po | 5 +++ mass_mailing_list_dynamic/i18n/de.po | 5 +++ mass_mailing_list_dynamic/i18n/el_GR.po | 5 +++ mass_mailing_list_dynamic/i18n/en_GB.po | 5 +++ mass_mailing_list_dynamic/i18n/es.po | 5 +++ mass_mailing_list_dynamic/i18n/es_AR.po | 5 +++ mass_mailing_list_dynamic/i18n/es_CL.po | 5 +++ mass_mailing_list_dynamic/i18n/es_CO.po | 5 +++ mass_mailing_list_dynamic/i18n/es_CR.po | 5 +++ mass_mailing_list_dynamic/i18n/es_DO.po | 5 +++ mass_mailing_list_dynamic/i18n/es_EC.po | 5 +++ mass_mailing_list_dynamic/i18n/es_ES.po | 5 +++ mass_mailing_list_dynamic/i18n/es_MX.po | 5 +++ mass_mailing_list_dynamic/i18n/es_PE.po | 5 +++ mass_mailing_list_dynamic/i18n/es_PY.po | 5 +++ mass_mailing_list_dynamic/i18n/es_VE.po | 5 +++ mass_mailing_list_dynamic/i18n/et.po | 5 +++ mass_mailing_list_dynamic/i18n/eu.po | 5 +++ mass_mailing_list_dynamic/i18n/fa.po | 5 +++ mass_mailing_list_dynamic/i18n/fi.po | 5 +++ mass_mailing_list_dynamic/i18n/fr.po | 5 +++ mass_mailing_list_dynamic/i18n/fr_CA.po | 5 +++ mass_mailing_list_dynamic/i18n/fr_CH.po | 5 +++ mass_mailing_list_dynamic/i18n/gl.po | 5 +++ mass_mailing_list_dynamic/i18n/gl_ES.po | 5 +++ mass_mailing_list_dynamic/i18n/he.po | 5 +++ mass_mailing_list_dynamic/i18n/hr.po | 5 +++ mass_mailing_list_dynamic/i18n/hr_HR.po | 5 +++ mass_mailing_list_dynamic/i18n/hu.po | 5 +++ mass_mailing_list_dynamic/i18n/id.po | 5 +++ mass_mailing_list_dynamic/i18n/it.po | 5 +++ mass_mailing_list_dynamic/i18n/ja.po | 5 +++ mass_mailing_list_dynamic/i18n/ko.po | 5 +++ mass_mailing_list_dynamic/i18n/lt.po | 5 +++ mass_mailing_list_dynamic/i18n/lt_LT.po | 5 +++ mass_mailing_list_dynamic/i18n/lv.po | 5 +++ .../i18n/mass_mailing_list_dynamic.pot | 5 +++ mass_mailing_list_dynamic/i18n/mk.po | 5 +++ mass_mailing_list_dynamic/i18n/mn.po | 5 +++ mass_mailing_list_dynamic/i18n/nb.po | 5 +++ mass_mailing_list_dynamic/i18n/nb_NO.po | 5 +++ mass_mailing_list_dynamic/i18n/nl.po | 5 +++ mass_mailing_list_dynamic/i18n/nl_BE.po | 5 +++ mass_mailing_list_dynamic/i18n/nl_NL.po | 5 +++ mass_mailing_list_dynamic/i18n/pl.po | 5 +++ mass_mailing_list_dynamic/i18n/pt.po | 5 +++ mass_mailing_list_dynamic/i18n/pt_BR.po | 5 +++ mass_mailing_list_dynamic/i18n/pt_PT.po | 5 +++ mass_mailing_list_dynamic/i18n/ro.po | 5 +++ mass_mailing_list_dynamic/i18n/ru.po | 5 +++ mass_mailing_list_dynamic/i18n/sk.po | 5 +++ mass_mailing_list_dynamic/i18n/sl.po | 5 +++ mass_mailing_list_dynamic/i18n/sr.po | 5 +++ mass_mailing_list_dynamic/i18n/sr@latin.po | 5 +++ mass_mailing_list_dynamic/i18n/sv.po | 5 +++ mass_mailing_list_dynamic/i18n/th.po | 5 +++ mass_mailing_list_dynamic/i18n/tr.po | 5 +++ mass_mailing_list_dynamic/i18n/tr_TR.po | 5 +++ mass_mailing_list_dynamic/i18n/uk.po | 5 +++ mass_mailing_list_dynamic/i18n/vi.po | 5 +++ mass_mailing_list_dynamic/i18n/vi_VN.po | 5 +++ mass_mailing_list_dynamic/i18n/zh_CN.po | 5 +++ mass_mailing_list_dynamic/i18n/zh_TW.po | 5 +++ .../readme/CONTRIBUTORS.rst | 9 ++-- .../static/description/index.html | 9 ++-- .../tests/test_dynamic_lists.py | 42 +++++++++++++++++++ mass_mailing_list_dynamic/wizards/__init__.py | 1 + .../wizards/partner_merge.py | 15 +++++++ 76 files changed, 419 insertions(+), 13 deletions(-) create mode 100644 mass_mailing_list_dynamic/wizards/partner_merge.py diff --git a/mass_mailing_list_dynamic/README.rst b/mass_mailing_list_dynamic/README.rst index eccbed686..650ff3a44 100644 --- a/mass_mailing_list_dynamic/README.rst +++ b/mass_mailing_list_dynamic/README.rst @@ -105,10 +105,11 @@ Contributors * `Tecnativa `_: - * Jairo Llopis - * Pedro M. Baeza - * David Vidal - * Victor M.M. Torres + * Jairo Llopis + * Pedro M. Baeza + * David Vidal + * Victor M.M. Torres + * Víctor Martínez * `Hibou Corp. `_: diff --git a/mass_mailing_list_dynamic/__manifest__.py b/mass_mailing_list_dynamic/__manifest__.py index 3698777b5..0d20bd297 100644 --- a/mass_mailing_list_dynamic/__manifest__.py +++ b/mass_mailing_list_dynamic/__manifest__.py @@ -5,7 +5,7 @@ { "name": "Dynamic Mass Mailing Lists", "summary": "Mass mailing lists that get autopopulated", - "version": "13.0.1.0.0", + "version": "13.0.1.0.1", "category": "Marketing", "website": "https://github.com/OCA/social", "author": "Tecnativa, Odoo Community Association (OCA)", diff --git a/mass_mailing_list_dynamic/i18n/am.po b/mass_mailing_list_dynamic/i18n/am.po index ca65e7287..5e818d9ab 100644 --- a/mass_mailing_list_dynamic/i18n/am.po +++ b/mass_mailing_list_dynamic/i18n/am.po @@ -153,6 +153,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/ar.po b/mass_mailing_list_dynamic/i18n/ar.po index fb36b5287..8187ac6a1 100644 --- a/mass_mailing_list_dynamic/i18n/ar.po +++ b/mass_mailing_list_dynamic/i18n/ar.po @@ -154,6 +154,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/bg.po b/mass_mailing_list_dynamic/i18n/bg.po index 3c0fc67d1..bc8394b1d 100644 --- a/mass_mailing_list_dynamic/i18n/bg.po +++ b/mass_mailing_list_dynamic/i18n/bg.po @@ -153,6 +153,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/bs.po b/mass_mailing_list_dynamic/i18n/bs.po index b0777e9a8..36d7fe6b7 100644 --- a/mass_mailing_list_dynamic/i18n/bs.po +++ b/mass_mailing_list_dynamic/i18n/bs.po @@ -154,6 +154,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/ca.po b/mass_mailing_list_dynamic/i18n/ca.po index 71ef9ff36..6a5bdb35b 100644 --- a/mass_mailing_list_dynamic/i18n/ca.po +++ b/mass_mailing_list_dynamic/i18n/ca.po @@ -155,6 +155,11 @@ msgstr "Correu massiu" msgid "Mass Mailing Load Filter" msgstr "Contactes del correu massiu" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/cs.po b/mass_mailing_list_dynamic/i18n/cs.po index e33dda36e..60508dd4c 100644 --- a/mass_mailing_list_dynamic/i18n/cs.po +++ b/mass_mailing_list_dynamic/i18n/cs.po @@ -153,6 +153,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/da.po b/mass_mailing_list_dynamic/i18n/da.po index 9c9dea96d..5ef35ac45 100644 --- a/mass_mailing_list_dynamic/i18n/da.po +++ b/mass_mailing_list_dynamic/i18n/da.po @@ -153,6 +153,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/de.po b/mass_mailing_list_dynamic/i18n/de.po index bfdc68409..2df66e8c5 100644 --- a/mass_mailing_list_dynamic/i18n/de.po +++ b/mass_mailing_list_dynamic/i18n/de.po @@ -155,6 +155,11 @@ msgstr "Massenmailing" msgid "Mass Mailing Load Filter" msgstr "Massenmail-Kontakt" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/el_GR.po b/mass_mailing_list_dynamic/i18n/el_GR.po index 6fecf9a18..4debacba3 100644 --- a/mass_mailing_list_dynamic/i18n/el_GR.po +++ b/mass_mailing_list_dynamic/i18n/el_GR.po @@ -154,6 +154,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/en_GB.po b/mass_mailing_list_dynamic/i18n/en_GB.po index 7813acd20..3b32b98d8 100644 --- a/mass_mailing_list_dynamic/i18n/en_GB.po +++ b/mass_mailing_list_dynamic/i18n/en_GB.po @@ -154,6 +154,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/es.po b/mass_mailing_list_dynamic/i18n/es.po index f0084e21a..b9ca6846d 100644 --- a/mass_mailing_list_dynamic/i18n/es.po +++ b/mass_mailing_list_dynamic/i18n/es.po @@ -157,6 +157,11 @@ msgstr "Envío masivo" msgid "Mass Mailing Load Filter" msgstr "mail.mass_mailing.load.filter" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/es_AR.po b/mass_mailing_list_dynamic/i18n/es_AR.po index db65efe59..ebf5a714b 100644 --- a/mass_mailing_list_dynamic/i18n/es_AR.po +++ b/mass_mailing_list_dynamic/i18n/es_AR.po @@ -154,6 +154,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/es_CL.po b/mass_mailing_list_dynamic/i18n/es_CL.po index 9a50b06e5..afb9a8704 100644 --- a/mass_mailing_list_dynamic/i18n/es_CL.po +++ b/mass_mailing_list_dynamic/i18n/es_CL.po @@ -154,6 +154,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/es_CO.po b/mass_mailing_list_dynamic/i18n/es_CO.po index b053fa581..e576c773c 100644 --- a/mass_mailing_list_dynamic/i18n/es_CO.po +++ b/mass_mailing_list_dynamic/i18n/es_CO.po @@ -154,6 +154,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/es_CR.po b/mass_mailing_list_dynamic/i18n/es_CR.po index b2279952e..cb3d04806 100644 --- a/mass_mailing_list_dynamic/i18n/es_CR.po +++ b/mass_mailing_list_dynamic/i18n/es_CR.po @@ -154,6 +154,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/es_DO.po b/mass_mailing_list_dynamic/i18n/es_DO.po index 2e701294e..3b53ee1aa 100644 --- a/mass_mailing_list_dynamic/i18n/es_DO.po +++ b/mass_mailing_list_dynamic/i18n/es_DO.po @@ -154,6 +154,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/es_EC.po b/mass_mailing_list_dynamic/i18n/es_EC.po index 200510c66..a64097af8 100644 --- a/mass_mailing_list_dynamic/i18n/es_EC.po +++ b/mass_mailing_list_dynamic/i18n/es_EC.po @@ -154,6 +154,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/es_ES.po b/mass_mailing_list_dynamic/i18n/es_ES.po index b8073f564..dafe451b3 100644 --- a/mass_mailing_list_dynamic/i18n/es_ES.po +++ b/mass_mailing_list_dynamic/i18n/es_ES.po @@ -154,6 +154,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/es_MX.po b/mass_mailing_list_dynamic/i18n/es_MX.po index 5d99e0387..9e470ccd3 100644 --- a/mass_mailing_list_dynamic/i18n/es_MX.po +++ b/mass_mailing_list_dynamic/i18n/es_MX.po @@ -154,6 +154,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/es_PE.po b/mass_mailing_list_dynamic/i18n/es_PE.po index b9f36689f..be3e01765 100644 --- a/mass_mailing_list_dynamic/i18n/es_PE.po +++ b/mass_mailing_list_dynamic/i18n/es_PE.po @@ -154,6 +154,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/es_PY.po b/mass_mailing_list_dynamic/i18n/es_PY.po index a1a0337a1..0aeab2c8d 100644 --- a/mass_mailing_list_dynamic/i18n/es_PY.po +++ b/mass_mailing_list_dynamic/i18n/es_PY.po @@ -154,6 +154,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/es_VE.po b/mass_mailing_list_dynamic/i18n/es_VE.po index d95af83c2..da95e7480 100644 --- a/mass_mailing_list_dynamic/i18n/es_VE.po +++ b/mass_mailing_list_dynamic/i18n/es_VE.po @@ -154,6 +154,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/et.po b/mass_mailing_list_dynamic/i18n/et.po index b14d673b7..60dc8a769 100644 --- a/mass_mailing_list_dynamic/i18n/et.po +++ b/mass_mailing_list_dynamic/i18n/et.po @@ -153,6 +153,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/eu.po b/mass_mailing_list_dynamic/i18n/eu.po index 52ce4a566..9f4013b29 100644 --- a/mass_mailing_list_dynamic/i18n/eu.po +++ b/mass_mailing_list_dynamic/i18n/eu.po @@ -153,6 +153,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/fa.po b/mass_mailing_list_dynamic/i18n/fa.po index f77364483..b5ca64de6 100644 --- a/mass_mailing_list_dynamic/i18n/fa.po +++ b/mass_mailing_list_dynamic/i18n/fa.po @@ -153,6 +153,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/fi.po b/mass_mailing_list_dynamic/i18n/fi.po index 23342279f..7cb40408a 100644 --- a/mass_mailing_list_dynamic/i18n/fi.po +++ b/mass_mailing_list_dynamic/i18n/fi.po @@ -153,6 +153,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/fr.po b/mass_mailing_list_dynamic/i18n/fr.po index 6f0021915..38c4aeb17 100644 --- a/mass_mailing_list_dynamic/i18n/fr.po +++ b/mass_mailing_list_dynamic/i18n/fr.po @@ -155,6 +155,11 @@ msgstr "Publipostage" msgid "Mass Mailing Load Filter" msgstr "Contact de la liste de diffusion" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/fr_CA.po b/mass_mailing_list_dynamic/i18n/fr_CA.po index e1021df44..8516d83bb 100644 --- a/mass_mailing_list_dynamic/i18n/fr_CA.po +++ b/mass_mailing_list_dynamic/i18n/fr_CA.po @@ -154,6 +154,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/fr_CH.po b/mass_mailing_list_dynamic/i18n/fr_CH.po index 92540a6bb..2bcc10487 100644 --- a/mass_mailing_list_dynamic/i18n/fr_CH.po +++ b/mass_mailing_list_dynamic/i18n/fr_CH.po @@ -154,6 +154,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/gl.po b/mass_mailing_list_dynamic/i18n/gl.po index 5bcbd0986..a4f50e05e 100644 --- a/mass_mailing_list_dynamic/i18n/gl.po +++ b/mass_mailing_list_dynamic/i18n/gl.po @@ -153,6 +153,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/gl_ES.po b/mass_mailing_list_dynamic/i18n/gl_ES.po index 7fa340715..f14bab4a5 100644 --- a/mass_mailing_list_dynamic/i18n/gl_ES.po +++ b/mass_mailing_list_dynamic/i18n/gl_ES.po @@ -154,6 +154,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/he.po b/mass_mailing_list_dynamic/i18n/he.po index 0b8f1af7f..41e7699c2 100644 --- a/mass_mailing_list_dynamic/i18n/he.po +++ b/mass_mailing_list_dynamic/i18n/he.po @@ -153,6 +153,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/hr.po b/mass_mailing_list_dynamic/i18n/hr.po index 0b5072fa2..8fffa6255 100644 --- a/mass_mailing_list_dynamic/i18n/hr.po +++ b/mass_mailing_list_dynamic/i18n/hr.po @@ -156,6 +156,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "Kontakti za masovno slanje" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/hr_HR.po b/mass_mailing_list_dynamic/i18n/hr_HR.po index 61ba23194..a5029b6d5 100644 --- a/mass_mailing_list_dynamic/i18n/hr_HR.po +++ b/mass_mailing_list_dynamic/i18n/hr_HR.po @@ -155,6 +155,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/hu.po b/mass_mailing_list_dynamic/i18n/hu.po index 70bda5574..c1a71235d 100644 --- a/mass_mailing_list_dynamic/i18n/hu.po +++ b/mass_mailing_list_dynamic/i18n/hu.po @@ -153,6 +153,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/id.po b/mass_mailing_list_dynamic/i18n/id.po index 3b19f98cf..40075f8ee 100644 --- a/mass_mailing_list_dynamic/i18n/id.po +++ b/mass_mailing_list_dynamic/i18n/id.po @@ -153,6 +153,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/it.po b/mass_mailing_list_dynamic/i18n/it.po index 63d7c1524..02dc1fead 100644 --- a/mass_mailing_list_dynamic/i18n/it.po +++ b/mass_mailing_list_dynamic/i18n/it.po @@ -155,6 +155,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "Contatto Mass Mailing" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/ja.po b/mass_mailing_list_dynamic/i18n/ja.po index 921dcb4d7..6ebc59363 100644 --- a/mass_mailing_list_dynamic/i18n/ja.po +++ b/mass_mailing_list_dynamic/i18n/ja.po @@ -153,6 +153,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/ko.po b/mass_mailing_list_dynamic/i18n/ko.po index 8a71c1d4d..789ad6b04 100644 --- a/mass_mailing_list_dynamic/i18n/ko.po +++ b/mass_mailing_list_dynamic/i18n/ko.po @@ -153,6 +153,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/lt.po b/mass_mailing_list_dynamic/i18n/lt.po index ad0fbf329..6444ca967 100644 --- a/mass_mailing_list_dynamic/i18n/lt.po +++ b/mass_mailing_list_dynamic/i18n/lt.po @@ -154,6 +154,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/lt_LT.po b/mass_mailing_list_dynamic/i18n/lt_LT.po index 9408f4062..fcc2228b3 100644 --- a/mass_mailing_list_dynamic/i18n/lt_LT.po +++ b/mass_mailing_list_dynamic/i18n/lt_LT.po @@ -155,6 +155,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/lv.po b/mass_mailing_list_dynamic/i18n/lv.po index c8af88409..502ffd851 100644 --- a/mass_mailing_list_dynamic/i18n/lv.po +++ b/mass_mailing_list_dynamic/i18n/lv.po @@ -154,6 +154,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/mass_mailing_list_dynamic.pot b/mass_mailing_list_dynamic/i18n/mass_mailing_list_dynamic.pot index 70897fea0..f5ce1411f 100644 --- a/mass_mailing_list_dynamic/i18n/mass_mailing_list_dynamic.pot +++ b/mass_mailing_list_dynamic/i18n/mass_mailing_list_dynamic.pot @@ -149,6 +149,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/mk.po b/mass_mailing_list_dynamic/i18n/mk.po index ad01e2e53..d70be32eb 100644 --- a/mass_mailing_list_dynamic/i18n/mk.po +++ b/mass_mailing_list_dynamic/i18n/mk.po @@ -153,6 +153,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/mn.po b/mass_mailing_list_dynamic/i18n/mn.po index 41c873058..3a05ad16f 100644 --- a/mass_mailing_list_dynamic/i18n/mn.po +++ b/mass_mailing_list_dynamic/i18n/mn.po @@ -153,6 +153,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/nb.po b/mass_mailing_list_dynamic/i18n/nb.po index 406c4c544..e63147cc8 100644 --- a/mass_mailing_list_dynamic/i18n/nb.po +++ b/mass_mailing_list_dynamic/i18n/nb.po @@ -154,6 +154,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/nb_NO.po b/mass_mailing_list_dynamic/i18n/nb_NO.po index fc20c167a..87f41ef3e 100644 --- a/mass_mailing_list_dynamic/i18n/nb_NO.po +++ b/mass_mailing_list_dynamic/i18n/nb_NO.po @@ -154,6 +154,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/nl.po b/mass_mailing_list_dynamic/i18n/nl.po index e78952c46..b223b946f 100644 --- a/mass_mailing_list_dynamic/i18n/nl.po +++ b/mass_mailing_list_dynamic/i18n/nl.po @@ -153,6 +153,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/nl_BE.po b/mass_mailing_list_dynamic/i18n/nl_BE.po index a19c1b0c9..cdd6519e8 100644 --- a/mass_mailing_list_dynamic/i18n/nl_BE.po +++ b/mass_mailing_list_dynamic/i18n/nl_BE.po @@ -154,6 +154,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/nl_NL.po b/mass_mailing_list_dynamic/i18n/nl_NL.po index a0d3da0c0..e4a195041 100644 --- a/mass_mailing_list_dynamic/i18n/nl_NL.po +++ b/mass_mailing_list_dynamic/i18n/nl_NL.po @@ -155,6 +155,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/pl.po b/mass_mailing_list_dynamic/i18n/pl.po index 6f0f8543f..2c2308b05 100644 --- a/mass_mailing_list_dynamic/i18n/pl.po +++ b/mass_mailing_list_dynamic/i18n/pl.po @@ -155,6 +155,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/pt.po b/mass_mailing_list_dynamic/i18n/pt.po index 92e21361d..3793810dc 100644 --- a/mass_mailing_list_dynamic/i18n/pt.po +++ b/mass_mailing_list_dynamic/i18n/pt.po @@ -156,6 +156,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "Contacto do email em massa" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/pt_BR.po b/mass_mailing_list_dynamic/i18n/pt_BR.po index b425b2347..d16bfcc4a 100644 --- a/mass_mailing_list_dynamic/i18n/pt_BR.po +++ b/mass_mailing_list_dynamic/i18n/pt_BR.po @@ -154,6 +154,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/pt_PT.po b/mass_mailing_list_dynamic/i18n/pt_PT.po index d913ab139..ac68fb601 100644 --- a/mass_mailing_list_dynamic/i18n/pt_PT.po +++ b/mass_mailing_list_dynamic/i18n/pt_PT.po @@ -154,6 +154,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/ro.po b/mass_mailing_list_dynamic/i18n/ro.po index 5eeaaa5a5..7472f5d0d 100644 --- a/mass_mailing_list_dynamic/i18n/ro.po +++ b/mass_mailing_list_dynamic/i18n/ro.po @@ -154,6 +154,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/ru.po b/mass_mailing_list_dynamic/i18n/ru.po index b10185dc6..a77efcc9c 100644 --- a/mass_mailing_list_dynamic/i18n/ru.po +++ b/mass_mailing_list_dynamic/i18n/ru.po @@ -155,6 +155,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/sk.po b/mass_mailing_list_dynamic/i18n/sk.po index 62eddfb52..829841208 100644 --- a/mass_mailing_list_dynamic/i18n/sk.po +++ b/mass_mailing_list_dynamic/i18n/sk.po @@ -153,6 +153,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/sl.po b/mass_mailing_list_dynamic/i18n/sl.po index 833be4a70..fba98dee3 100644 --- a/mass_mailing_list_dynamic/i18n/sl.po +++ b/mass_mailing_list_dynamic/i18n/sl.po @@ -156,6 +156,11 @@ msgstr "Masovno razpošiljanje" msgid "Mass Mailing Load Filter" msgstr "Stik masovne pošte" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/sr.po b/mass_mailing_list_dynamic/i18n/sr.po index 629148e2a..45eee311e 100644 --- a/mass_mailing_list_dynamic/i18n/sr.po +++ b/mass_mailing_list_dynamic/i18n/sr.po @@ -154,6 +154,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/sr@latin.po b/mass_mailing_list_dynamic/i18n/sr@latin.po index b3aead155..beb08f442 100644 --- a/mass_mailing_list_dynamic/i18n/sr@latin.po +++ b/mass_mailing_list_dynamic/i18n/sr@latin.po @@ -155,6 +155,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/sv.po b/mass_mailing_list_dynamic/i18n/sv.po index bea88723f..8cee94549 100644 --- a/mass_mailing_list_dynamic/i18n/sv.po +++ b/mass_mailing_list_dynamic/i18n/sv.po @@ -153,6 +153,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/th.po b/mass_mailing_list_dynamic/i18n/th.po index 03df2a3fd..b05883046 100644 --- a/mass_mailing_list_dynamic/i18n/th.po +++ b/mass_mailing_list_dynamic/i18n/th.po @@ -153,6 +153,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/tr.po b/mass_mailing_list_dynamic/i18n/tr.po index d26710a8e..f0d7087dd 100644 --- a/mass_mailing_list_dynamic/i18n/tr.po +++ b/mass_mailing_list_dynamic/i18n/tr.po @@ -153,6 +153,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/tr_TR.po b/mass_mailing_list_dynamic/i18n/tr_TR.po index c96164d4a..6920e43d7 100644 --- a/mass_mailing_list_dynamic/i18n/tr_TR.po +++ b/mass_mailing_list_dynamic/i18n/tr_TR.po @@ -154,6 +154,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/uk.po b/mass_mailing_list_dynamic/i18n/uk.po index d6197a682..683c7d370 100644 --- a/mass_mailing_list_dynamic/i18n/uk.po +++ b/mass_mailing_list_dynamic/i18n/uk.po @@ -154,6 +154,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/vi.po b/mass_mailing_list_dynamic/i18n/vi.po index f43f35100..11bba8e58 100644 --- a/mass_mailing_list_dynamic/i18n/vi.po +++ b/mass_mailing_list_dynamic/i18n/vi.po @@ -153,6 +153,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/vi_VN.po b/mass_mailing_list_dynamic/i18n/vi_VN.po index efca42a9f..7499f3710 100644 --- a/mass_mailing_list_dynamic/i18n/vi_VN.po +++ b/mass_mailing_list_dynamic/i18n/vi_VN.po @@ -154,6 +154,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/zh_CN.po b/mass_mailing_list_dynamic/i18n/zh_CN.po index 475df5e33..e042a2701 100644 --- a/mass_mailing_list_dynamic/i18n/zh_CN.po +++ b/mass_mailing_list_dynamic/i18n/zh_CN.po @@ -154,6 +154,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/i18n/zh_TW.po b/mass_mailing_list_dynamic/i18n/zh_TW.po index cafd0d937..cb803dc1e 100644 --- a/mass_mailing_list_dynamic/i18n/zh_TW.po +++ b/mass_mailing_list_dynamic/i18n/zh_TW.po @@ -154,6 +154,11 @@ msgstr "" msgid "Mass Mailing Load Filter" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_base_partner_merge_automatic_wizard +msgid "Merge Partner Wizard" +msgstr "" + #. module: mass_mailing_list_dynamic #: model:ir.model.fields.selection,name:mass_mailing_list_dynamic.selection__mailing_list__sync_method__add msgid "Only add new records" diff --git a/mass_mailing_list_dynamic/readme/CONTRIBUTORS.rst b/mass_mailing_list_dynamic/readme/CONTRIBUTORS.rst index 597a133d8..c7c190287 100644 --- a/mass_mailing_list_dynamic/readme/CONTRIBUTORS.rst +++ b/mass_mailing_list_dynamic/readme/CONTRIBUTORS.rst @@ -1,9 +1,10 @@ * `Tecnativa `_: - * Jairo Llopis - * Pedro M. Baeza - * David Vidal - * Victor M.M. Torres + * Jairo Llopis + * Pedro M. Baeza + * David Vidal + * Victor M.M. Torres + * Víctor Martínez * `Hibou Corp. `_: diff --git a/mass_mailing_list_dynamic/static/description/index.html b/mass_mailing_list_dynamic/static/description/index.html index 23fc51e91..82120db24 100644 --- a/mass_mailing_list_dynamic/static/description/index.html +++ b/mass_mailing_list_dynamic/static/description/index.html @@ -451,10 +451,11 @@ If you spotted it first, help us smashing it by providing a detailed and welcome

Contributors

  • Tecnativa:
  • Hibou Corp.:
      diff --git a/mass_mailing_list_dynamic/tests/test_dynamic_lists.py b/mass_mailing_list_dynamic/tests/test_dynamic_lists.py index 263baaa53..5e88f7738 100644 --- a/mass_mailing_list_dynamic/tests/test_dynamic_lists.py +++ b/mass_mailing_list_dynamic/tests/test_dynamic_lists.py @@ -1,5 +1,6 @@ # Copyright 2017 Tecnativa - Jairo Llopis # Copyright 2020 Hibou Corp. - Jared Kipe +# Copyright 2021 Tecnativa - Víctor Martínez # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). from mock import patch @@ -141,3 +142,44 @@ class DynamicListCase(common.SavepointCase): self.assertFalse(self.list.is_synced) self.list.action_sync() self.assertTrue(self.list.is_synced) + + def test_partners_merge(self): + tag2 = self.tag.copy({"name": "Tag 2"}) + self.list.sync_method = "full" + list2 = self.list.copy( + { + "name": "test list 2", + "sync_domain": repr([("category_id", "in", tag2.ids)]), + } + ) + partner_1 = self.partners.create( + { + "name": "Demo 1", + "email": "demo1@demo.com", + "category_id": [(4, self.tag.id, False)], + } + ) + partner_2 = self.partners.create( + { + "name": "Demo 2", + "email": "demo2@demo.com", + "category_id": [(4, self.tag.id, False), (4, tag2.id, False)], + } + ) + self.list.action_sync() + list2.action_sync() + self.assertTrue(partner_1.id in self.list.contact_ids.mapped("partner_id").ids) + self.assertTrue(partner_2.id in self.list.contact_ids.mapped("partner_id").ids) + self.assertFalse(partner_1.id in list2.contact_ids.mapped("partner_id").ids) + self.assertTrue(partner_2.id in list2.contact_ids.mapped("partner_id").ids) + # Wizard partner merge (partner_1 + partner_2) in partner_i1 + wizard = self.env["base.partner.merge.automatic.wizard"].create( + { + "state": "option", + "dst_partner_id": partner_1.id, + "partner_ids": [(4, partner_1.id), (4, partner_2.id)], + } + ) + wizard.action_merge() + self.assertTrue(partner_1.id in self.list.contact_ids.mapped("partner_id").ids) + self.assertTrue(partner_1.id in list2.contact_ids.mapped("partner_id").ids) diff --git a/mass_mailing_list_dynamic/wizards/__init__.py b/mass_mailing_list_dynamic/wizards/__init__.py index bb92e4609..66c072183 100644 --- a/mass_mailing_list_dynamic/wizards/__init__.py +++ b/mass_mailing_list_dynamic/wizards/__init__.py @@ -1,3 +1,4 @@ # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). from . import mailing_load_filter +from . import partner_merge diff --git a/mass_mailing_list_dynamic/wizards/partner_merge.py b/mass_mailing_list_dynamic/wizards/partner_merge.py new file mode 100644 index 000000000..263399e7a --- /dev/null +++ b/mass_mailing_list_dynamic/wizards/partner_merge.py @@ -0,0 +1,15 @@ +# Copyright 2021 Tecnativa - Víctor Martínez +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo import models + + +class BasePartnerMergeAutomaticWizard(models.TransientModel): + _inherit = "base.partner.merge.automatic.wizard" + + def _merge(self, partner_ids, dst_partner=None, extra_checks=True): + return super( + BasePartnerMergeAutomaticWizard, self.with_context(syncing=True) + )._merge( + partner_ids=partner_ids, dst_partner=dst_partner, extra_checks=extra_checks, + )