From 956a606cbf77b1b59a6b1af1f137891df5a53146 Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Fri, 2 Feb 2018 10:29:11 +0100 Subject: [PATCH] [FIX+IMP] mass_mailing_list_dynamic: tests, icons, filters... (#211) * [FIX+IMP] mass_mailing_list_dynamic: tests, icons, filters... * Brand new icon * Added feature of loading an existing filter as criteria * Tests as SavepointCase for optimizing times * Tests in post-install for avoiding errors on res.partner not null constraints when several modules added them. * Updated documentation. * Fix mock in test for not commiting test data. * [FIX] mass_mailing_list_dynamic: Wasn't able to create contacts in fully synced lists Syncing context was being set in the wrong object. Added to test too. * [FIX] mass_mailing_list_dynamic: Allow to write back vals from res.partner Module mass_mailing_partner writes back certain values from partner to mass_mailing_contact. Module should allow that write operation. --- mass_mailing_list_dynamic/README.rst | 24 ++++- mass_mailing_list_dynamic/__init__.py | 1 + mass_mailing_list_dynamic/__manifest__.py | 4 +- mass_mailing_list_dynamic/i18n/es.po | 90 +++++++++++++---- mass_mailing_list_dynamic/models/__init__.py | 1 + .../models/mail_mass_mailing_list.py | 6 +- .../models/res_partner.py | 13 +++ .../static/description/icon.png | Bin 9455 -> 5462 bytes .../static/description/icon.svg | 94 ++++++++++++++++++ .../tests/test_dynamic_lists.py | 65 ++++++++---- .../views/mail_mass_mailing_list_view.xml | 7 ++ mass_mailing_list_dynamic/wizards/__init__.py | 4 + .../wizards/mail_mass_mailing_load_filter.py | 23 +++++ .../mail_mass_mailing_load_filter_views.xml | 34 +++++++ mass_mailing_partner/models/res_partner.py | 2 +- 15 files changed, 326 insertions(+), 42 deletions(-) create mode 100644 mass_mailing_list_dynamic/models/res_partner.py create mode 100644 mass_mailing_list_dynamic/static/description/icon.svg create mode 100644 mass_mailing_list_dynamic/wizards/__init__.py create mode 100644 mass_mailing_list_dynamic/wizards/mail_mass_mailing_load_filter.py create mode 100644 mass_mailing_list_dynamic/wizards/mail_mass_mailing_load_filter_views.xml diff --git a/mass_mailing_list_dynamic/README.rst b/mass_mailing_list_dynamic/README.rst index 31207bb6..2fd418e9 100644 --- a/mass_mailing_list_dynamic/README.rst +++ b/mass_mailing_list_dynamic/README.rst @@ -18,7 +18,7 @@ Configuration To create a dynamic mailing list, you need to: -#. Go to *Mass Mailing > Mailings > Mailing Lists > Create*. +#. Go to *Mass Mailing > Mailings > Mailing Lists* and create one. #. Check the *Dynamic* box. #. Choose a *Sync method*: - Leave empty to use as a manual mailing list, the normal behavior. @@ -27,10 +27,26 @@ To create a dynamic mailing list, you need to: - *Add and remove records as needed* to make the list be fully synchronized with the *Synchronization critera*, even if that means removing contacts from it. -#. Define a *Synchronization critera* that will be used to match the partners +#. Define a *Synchronization criteria* that will be used to match the partners that should go into the list as contacts. Only partners with emails will be selected. +You can also load an existing filter over contacts: + +#. Click on "Load filter" button below criteria. +#. Select one of the existing filters. +#. Click on "Load filter" and you will have that filter as criteria. + +Usage +===== + +#. Go to *Mass Mailing > Mailings > Mass Mailings*, and create one. +#. Select as recipients a mailing list. +#. On "Select mailing lists:", choose one mailing list with dynamic flag + checked. +#. Before sending the mass mailing, the list will be synced for having latest + changes. + Usage ===== @@ -65,13 +81,15 @@ Credits Images ------ -* Odoo Community Association: `Icon `_. +* Odoo. +* FontAwesome (http://fontawesome.io). Contributors ------------ * `Tecnativa `_: * Jairo Llopis + * Pedro M. Baeza Do not contact contributors directly about support or help with technical issues. diff --git a/mass_mailing_list_dynamic/__init__.py b/mass_mailing_list_dynamic/__init__.py index b44d7659..2966b917 100644 --- a/mass_mailing_list_dynamic/__init__.py +++ b/mass_mailing_list_dynamic/__init__.py @@ -2,3 +2,4 @@ # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). from . import models +from . import wizards diff --git a/mass_mailing_list_dynamic/__manifest__.py b/mass_mailing_list_dynamic/__manifest__.py index 86f405d2..6f4cd76e 100644 --- a/mass_mailing_list_dynamic/__manifest__.py +++ b/mass_mailing_list_dynamic/__manifest__.py @@ -4,7 +4,7 @@ { "name": "Dynamic Mass Mailing Lists", "summary": "Mass mailing lists that get autopopulated", - "version": "10.0.1.0.0", + "version": "10.0.1.1.0", "category": "Marketing", "website": "https://github.com/OCA/social", "author": "Tecnativa, Odoo Community Association (OCA)", @@ -15,6 +15,8 @@ "mass_mailing_partner", ], "data": [ + # This should go first + "wizards/mail_mass_mailing_load_filter_views.xml", "views/mail_mass_mailing_list_view.xml", ], } diff --git a/mass_mailing_list_dynamic/i18n/es.po b/mass_mailing_list_dynamic/i18n/es.po index 8300d9ad..82b1d405 100644 --- a/mass_mailing_list_dynamic/i18n/es.po +++ b/mass_mailing_list_dynamic/i18n/es.po @@ -4,6 +4,8 @@ # # Translators: # OCA Transbot , 2017 +# * mass_mailing_list_dynamic +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" @@ -20,37 +22,49 @@ msgstr "" #. module: mass_mailing_list_dynamic #: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form -msgid "" -" If you want to remove contacts from a " -"dynamic list, just set them as Opt Out." -msgstr "" +msgid " If you want to remove contacts from a dynamic list, just set them as Opt Out." +msgstr " Si quiere eliminar contactos de una lista dinámica, simplemente márquelos como Envío no deseado." #. module: mass_mailing_list_dynamic #: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form -msgid "" -" You cannot make manual editions of contacts" -" in fully synchronized lists." -msgstr "" +msgid " You cannot make manual editions of contacts in fully synchronized lists." +msgstr " No puede editar manualmente los contactos en las listas que están completamente sincronizadas." #. module: mass_mailing_list_dynamic #: selection:mail.mass_mailing.list,sync_method:0 msgid "Add and remove records as needed" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form +msgid "Cancel" +msgstr "Cancelar" + #. module: mass_mailing_list_dynamic #: code:addons/mass_mailing_list_dynamic/models/mail_mass_mailing_contact.py:18 #, python-format -msgid "" -"Cannot edit manually contacts in a fully synchronized list. Change its sync " -"method or execute a manual sync instead." -msgstr "" +msgid "Cannot edit manually contacts in a fully synchronized list. Change its sync method or execute a manual sync instead." +msgstr "No se pueden editar manualmente los contactos de una lista que está completamente sincronizada. En vez de eso, cambie su método de sincronización o ejecute una sincronización manual." #. module: mass_mailing_list_dynamic #: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method -msgid "" -"Choose the syncronization method for this list if you want to make it " -"dynamic" -msgstr "" +msgid "Choose the syncronization method for this list if you want to make it dynamic" +msgstr "Escoja el método de sincronización para esta lista si quiere hacerla dinámica" + +#. module: mass_mailing_list_dynamic +#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid +msgid "Created by" +msgstr "Creado por" + +#. module: mass_mailing_list_dynamic +#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date +msgid "Created on" +msgstr "Creado el" + +#. module: mass_mailing_list_dynamic +#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name +msgid "Display Name" +msgstr "Nombre a mostrar" #. module: mass_mailing_list_dynamic #: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic @@ -67,6 +81,38 @@ msgstr "" msgid "Filter partners to sync in this list" msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id +msgid "Filter to load" +msgstr "Filtro a cargar" + +#. module: mass_mailing_list_dynamic +#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id +msgid "ID" +msgstr "ID" + +#. module: mass_mailing_list_dynamic +#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update +msgid "Last Modified on" +msgstr "Última modificación en" + +#. module: mass_mailing_list_dynamic +#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid +msgid "Last Updated by" +msgstr "Última actualización por" + +#. module: mass_mailing_list_dynamic +#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date +msgid "Last Updated on" +msgstr "Última actualización el" + +#. module: mass_mailing_list_dynamic +#: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter +#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form +#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form +msgid "Load filter" +msgstr "Cargar filtro" + #. module: mass_mailing_list_dynamic #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list msgid "Mailing List" @@ -94,6 +140,11 @@ msgid "" "given criteria." msgstr "" +#. module: mass_mailing_list_dynamic +#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic +msgid "Set this list as dynamic, to make it autosynchronized with partners from a given criteria." +msgstr "Establezca esta lista como dinámica, para hacerla autosincronizada con los contactos dado un criterio." + #. module: mass_mailing_list_dynamic #: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method msgid "Sync method" @@ -107,4 +158,9 @@ msgstr "" #. module: mass_mailing_list_dynamic #: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain msgid "Synchronization critera" -msgstr "" +msgstr "Criterios de sincronización" + +#. module: mass_mailing_list_dynamic +#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter +msgid "mail.mass_mailing.load.filter" +msgstr "mail.mass_mailing.load.filter" diff --git a/mass_mailing_list_dynamic/models/__init__.py b/mass_mailing_list_dynamic/models/__init__.py index 3735786a..2e3ac3d4 100644 --- a/mass_mailing_list_dynamic/models/__init__.py +++ b/mass_mailing_list_dynamic/models/__init__.py @@ -4,3 +4,4 @@ from . import mail_mass_mailing from . import mail_mass_mailing_contact from . import mail_mass_mailing_list +from . import res_partner diff --git a/mass_mailing_list_dynamic/models/mail_mass_mailing_list.py b/mass_mailing_list_dynamic/models/mail_mass_mailing_list.py index 8cd7ea6a..93a4fe67 100644 --- a/mass_mailing_list_dynamic/models/mail_mass_mailing_list.py +++ b/mass_mailing_list_dynamic/models/mail_mass_mailing_list.py @@ -32,10 +32,12 @@ class MassMailingList(models.Model): def action_sync(self): """Sync contacts in dynamic lists.""" - Contact = self.env["mail.mass_mailing.contact"] + Contact = self.env["mail.mass_mailing.contact"].with_context( + syncing=True, + ) Partner = self.env["res.partner"] # Skip non-dynamic lists - dynamic = self.filtered("dynamic").with_context(syncing=True) + dynamic = self.filtered("dynamic") for one in dynamic: sync_domain = safe_eval(one.sync_domain) + [("email", "!=", False)] desired_partners = Partner.search(sync_domain) diff --git a/mass_mailing_list_dynamic/models/res_partner.py b/mass_mailing_list_dynamic/models/res_partner.py new file mode 100644 index 00000000..465f5304 --- /dev/null +++ b/mass_mailing_list_dynamic/models/res_partner.py @@ -0,0 +1,13 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 Tecnativa - Pedro M. Baeza +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo import models + + +class ResPartner(models.Model): + _inherit = 'res.partner' + + def write(self, vals): + """Allow to write values in mass mailing contact.""" + return super(ResPartner, self.with_context(syncing=True)).write(vals) diff --git a/mass_mailing_list_dynamic/static/description/icon.png b/mass_mailing_list_dynamic/static/description/icon.png index 3a0328b516c4980e8e44cdb63fd945757ddd132d..f6e9e06d516f380566fcad4ebdd0b623a89a90d8 100644 GIT binary patch delta 5417 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 literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I diff --git a/mass_mailing_list_dynamic/static/description/icon.svg b/mass_mailing_list_dynamic/static/description/icon.svg new file mode 100644 index 00000000..c2ca5951 --- /dev/null +++ b/mass_mailing_list_dynamic/static/description/icon.svg @@ -0,0 +1,94 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/mass_mailing_list_dynamic/tests/test_dynamic_lists.py b/mass_mailing_list_dynamic/tests/test_dynamic_lists.py index 14799de6..1f49c967 100644 --- a/mass_mailing_list_dynamic/tests/test_dynamic_lists.py +++ b/mass_mailing_list_dynamic/tests/test_dynamic_lists.py @@ -4,32 +4,35 @@ from mock import patch from odoo.exceptions import ValidationError -from odoo.tests.common import TransactionCase +from odoo.tests import common -class DynamicListCase(TransactionCase): - def setUp(self): - super(DynamicListCase, self).setUp() - self.tag = self.env["res.partner.category"].create({ +@common.at_install(False) +@common.post_install(True) +class DynamicListCase(common.SavepointCase): + @classmethod + def setUpClass(cls): + super(DynamicListCase, cls).setUpClass() + cls.tag = cls.env["res.partner.category"].create({ "name": "testing tag", }) - self.partners = self.env["res.partner"] + cls.partners = cls.env["res.partner"] for number in range(5): - self.partners |= self.partners.create({ + cls.partners |= cls.partners.create({ "name": "partner %d" % number, - "category_id": [(4, self.tag.id, False)], + "category_id": [(4, cls.tag.id, False)], "email": "%d@example.com" % number, }) - self.list = self.env["mail.mass_mailing.list"].create({ + cls.list = cls.env["mail.mass_mailing.list"].create({ "name": "test list", "dynamic": True, - "sync_domain": repr([("category_id", "in", self.tag.ids)]), + "sync_domain": repr([("category_id", "in", cls.tag.ids)]), }) - self.mail = self.env["mail.mass_mailing"].create({ + cls.mail = cls.env["mail.mass_mailing"].create({ "name": "test mass mailing", - "contact_list_ids": [(4, self.list.id, False)], + "contact_list_ids": [(4, cls.list.id, False)], }) - self.mail._onchange_model_and_list() + cls.mail._onchange_model_and_list() def test_list_sync(self): """List is synced correctly.""" @@ -53,6 +56,10 @@ class DynamicListCase(TransactionCase): self.assertTrue(contact0.exists()) # Set list as full-synced self.list.sync_method = "full" + Contact.search([ + ("list_id", "=", self.list.id), + ("partner_id", "=", self.partners[2].id), + ]).unlink() self.list.action_sync() self.assertEqual(self.list.contact_nbr, 3) self.assertFalse(contact0.exists()) @@ -73,7 +80,7 @@ class DynamicListCase(TransactionCase): contact1.partner_id = self.partners[0] def test_sync_when_sending_mail(self): - """Dynamic list is synced before mailing to it.""" + """Check that list in synced when sending a mass mailing.""" self.list.action_sync() self.assertEqual(self.list.contact_nbr, 5) # Create a new partner @@ -82,9 +89,31 @@ class DynamicListCase(TransactionCase): "category_id": [(4, self.tag.id, False)], "email": "extra@example.com", }) - # Before sending the mail, the list is updated - with patch("odoo.addons.base.ir.ir_mail_server" - ".IrMailServer.send_email") as send_email: + # Mock sending low level method, because an auto-commit happens there + with patch("odoo.addons.mail.models.mail_mail.MailMail.send") as s: self.mail.send_mail() - self.assertEqual(6, send_email.call_count) + self.assertEqual(1, s.call_count) self.assertEqual(6, self.list.contact_nbr) + + def test_load_filter(self): + domain = "[('id', '=', 1)]" + ir_filter = self.env['ir.filters'].create({ + 'name': 'Test filter', + 'model_id': 'res.partner', + 'domain': domain, + }) + wizard = self.env['mail.mass_mailing.load.filter'].with_context( + active_id=self.list.id, + ).create({ + 'filter_id': ir_filter.id, + }) + wizard.load_filter() + self.assertEqual(self.list.sync_domain, domain) + + def test_change_partner(self): + self.list.sync_method = 'full' + self.list.action_sync() + # This shouldn't fail + self.partners[:1].write({ + 'email': 'test_mass_mailing_list_dynamic@example.org', + }) diff --git a/mass_mailing_list_dynamic/views/mail_mass_mailing_list_view.xml b/mass_mailing_list_dynamic/views/mail_mass_mailing_list_view.xml index 9c73eed3..10046ef4 100644 --- a/mass_mailing_list_dynamic/views/mail_mass_mailing_list_view.xml +++ b/mass_mailing_list_dynamic/views/mail_mass_mailing_list_view.xml @@ -52,6 +52,13 @@ options='{"model": "res.partner"}' /> +