mirror of https://github.com/OCA/social.git
[FIX] mass_mailing_list_dynamic, mass_mailing_partner: allow bouncing synced contacts
The previous implementation in `mass_mailing_partner` overwrote `create()` and `write()` in a way that always updated all fields. However, `mass_mailing_list_dynamic` added a constraint on 4 fields, called `_check_no_manual_edits_on_fully_synced_lists()`. The combination of these 2 things made that constraint to be checked *always*, regardless on which fields were being updated. Thus, when sending a mass mailing based on a fully synced list, and processing bounces, we would get errors always. Even when the `message_bounce` field shouldn't be constrained. @moduon MT-8513pull/1529/head
Jairo Llopis
parent
ddf6d2ef9e
commit
8ac9269860
|
|
@ -126,6 +126,10 @@ Contributors
|
|||
|
||||
* Nguyễn Minh Chiến <chien@trobz.com>
|
||||
|
||||
* `Moduon <https://www.moduon.team>`_:
|
||||
|
||||
* Jairo Llopis
|
||||
|
||||
Other credits
|
||||
~~~~~~~~~~~~~
|
||||
|
||||
|
|
|
|||
|
|
@ -17,3 +17,7 @@
|
|||
* `Trobz <https://trobz.com>`_:
|
||||
|
||||
* Nguyễn Minh Chiến <chien@trobz.com>
|
||||
|
||||
* `Moduon <https://www.moduon.team>`_:
|
||||
|
||||
* Jairo Llopis
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
|
||||
<head>
|
||||
|
|
@ -9,10 +8,11 @@
|
|||
|
||||
/*
|
||||
:Author: David Goodger (goodger@python.org)
|
||||
:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
|
||||
:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
|
||||
:Copyright: This stylesheet has been placed in the public domain.
|
||||
|
||||
Default cascading style sheet for the HTML output of Docutils.
|
||||
Despite the name, some widely supported CSS2 features are used.
|
||||
|
||||
See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
|
||||
customize this style sheet.
|
||||
|
|
@ -275,7 +275,7 @@ pre.literal-block, pre.doctest-block, pre.math, pre.code {
|
|||
margin-left: 2em ;
|
||||
margin-right: 2em }
|
||||
|
||||
pre.code .ln { color: grey; } /* line numbers */
|
||||
pre.code .ln { color: gray; } /* line numbers */
|
||||
pre.code, code { background-color: #eeeeee }
|
||||
pre.code .comment, code .comment { color: #5C6576 }
|
||||
pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
|
||||
|
|
@ -301,7 +301,7 @@ span.option {
|
|||
span.pre {
|
||||
white-space: pre }
|
||||
|
||||
span.problematic {
|
||||
span.problematic, pre.problematic {
|
||||
color: red }
|
||||
|
||||
span.section-subtitle {
|
||||
|
|
@ -479,6 +479,13 @@ If you spotted it first, help us to smash it by providing a detailed and welcome
|
|||
</ul>
|
||||
</blockquote>
|
||||
</li>
|
||||
<li><p class="first"><a class="reference external" href="https://www.moduon.team">Moduon</a>:</p>
|
||||
<blockquote>
|
||||
<ul class="simple">
|
||||
<li>Jairo Llopis</li>
|
||||
</ul>
|
||||
</blockquote>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="section" id="other-credits">
|
||||
|
|
@ -488,7 +495,9 @@ If you spotted it first, help us to smash it by providing a detailed and welcome
|
|||
<div class="section" id="maintainers">
|
||||
<h2><a class="toc-backref" href="#toc-entry-8">Maintainers</a></h2>
|
||||
<p>This module is maintained by the OCA.</p>
|
||||
<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
|
||||
<a class="reference external image-reference" href="https://odoo-community.org">
|
||||
<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
|
||||
</a>
|
||||
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
|
||||
mission is to support the collaborative development of Odoo features and
|
||||
promote its widespread use.</p>
|
||||
|
|
|
|||
|
|
@ -14,15 +14,16 @@ class DynamicListCase(common.TransactionCase):
|
|||
def setUpClass(cls):
|
||||
super().setUpClass()
|
||||
cls.tag = cls.env["res.partner.category"].create({"name": "testing tag"})
|
||||
cls.partners = cls.env["res.partner"]
|
||||
for number in range(5):
|
||||
cls.partners |= cls.partners.create(
|
||||
cls.partners = cls.env["res.partner"].create(
|
||||
[
|
||||
{
|
||||
"name": "partner %d" % number,
|
||||
"category_id": [(4, cls.tag.id, False)],
|
||||
"email": "%d@example.com" % number,
|
||||
}
|
||||
)
|
||||
for number in range(5)
|
||||
]
|
||||
)
|
||||
cls.list = cls.env["mailing.list"].create(
|
||||
{
|
||||
"name": "test list",
|
||||
|
|
@ -180,3 +181,17 @@ class DynamicListCase(common.TransactionCase):
|
|||
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)
|
||||
|
||||
def test_synced_contacts_can_be_bounced(self):
|
||||
self.list.sync_method = "full"
|
||||
self.list.action_sync()
|
||||
contact = self.env["mailing.contact"].search(
|
||||
[
|
||||
("list_ids", "in", self.list.ids),
|
||||
("partner_id", "=", self.partners[0].id),
|
||||
]
|
||||
)
|
||||
# A bounce arrives through fetchmail
|
||||
contact._message_receive_bounce(contact.email, contact.partner_id)
|
||||
# The contact is marked as bounced
|
||||
self.assertEqual(contact.message_bounce, 1)
|
||||
|
|
|
|||
|
|
@ -98,6 +98,10 @@ Contributors
|
|||
|
||||
* Nguyễn Minh Chiến <chien@trobz.com>
|
||||
|
||||
* `Moduon <https://www.moduon.team>`_:
|
||||
|
||||
* Jairo Llopis
|
||||
|
||||
Other credits
|
||||
~~~~~~~~~~~~~
|
||||
|
||||
|
|
|
|||
|
|
@ -53,37 +53,30 @@ class MailingContact(models.Model):
|
|||
)
|
||||
self.country_id = self.partner_id.country_id
|
||||
|
||||
@api.model
|
||||
def _get_contact_vals(self, origin_vals):
|
||||
record = self.new(origin_vals)
|
||||
if not record.partner_id:
|
||||
record._set_partner()
|
||||
record._onchange_partner_mass_mailing_partner()
|
||||
new_vals = record._convert_to_write(record._cache)
|
||||
new_vals.update(
|
||||
subscription_list_ids=origin_vals.get("subscription_list_ids", []),
|
||||
list_ids=origin_vals.get("list_ids", []),
|
||||
)
|
||||
if new_vals.get("partner_id") and "tag_ids" in new_vals:
|
||||
# When there is a partner, tag_ids must get value from the compute function
|
||||
# otherwise, its values will be different from partner
|
||||
del new_vals["tag_ids"]
|
||||
return new_vals
|
||||
def _overwrite_partner(self, vals, creating=False):
|
||||
"""Overwrite partner and update contact data if needed."""
|
||||
self.ensure_one()
|
||||
if self.env.context.get("mass_mailing_partner_writing"):
|
||||
return
|
||||
_self = self.with_context(mass_mailing_partner_writing=True)
|
||||
prev_partner = _self.partner_id
|
||||
if "partner_id" not in vals:
|
||||
_self._set_partner()
|
||||
if creating or prev_partner != _self.partner_id:
|
||||
_self._onchange_partner_mass_mailing_partner()
|
||||
|
||||
@api.model_create_multi
|
||||
def create(self, vals_list):
|
||||
new_vals_list = []
|
||||
for vals in vals_list:
|
||||
new_vals = self._get_contact_vals(vals)
|
||||
new_vals_list.append(new_vals)
|
||||
return super().create(new_vals_list)
|
||||
result = super().create(vals_list)
|
||||
for contact, vals in zip(result, vals_list):
|
||||
contact._overwrite_partner(vals, True)
|
||||
return result
|
||||
|
||||
def write(self, vals):
|
||||
result = super().write(vals)
|
||||
for contact in self:
|
||||
origin_vals = contact.copy_data(vals)[0]
|
||||
new_vals = self._get_contact_vals(origin_vals)
|
||||
super(MailingContact, contact).write(new_vals)
|
||||
return True
|
||||
contact._overwrite_partner(vals)
|
||||
return result
|
||||
|
||||
def _get_categories(self):
|
||||
ca_ids = (
|
||||
|
|
@ -113,6 +106,8 @@ class MailingContact(models.Model):
|
|||
email = self.email.strip()
|
||||
partner = m_partner.search([("email", "=ilike", email)], limit=1)
|
||||
if partner:
|
||||
if partner == self.partner_id:
|
||||
return
|
||||
# Partner found
|
||||
self.partner_id = partner
|
||||
else:
|
||||
|
|
|
|||
|
|
@ -16,3 +16,7 @@
|
|||
* `Trobz <https://trobz.com>`_:
|
||||
|
||||
* Nguyễn Minh Chiến <chien@trobz.com>
|
||||
|
||||
* `Moduon <https://www.moduon.team>`_:
|
||||
|
||||
* Jairo Llopis
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
|
||||
<head>
|
||||
|
|
@ -9,10 +8,11 @@
|
|||
|
||||
/*
|
||||
:Author: David Goodger (goodger@python.org)
|
||||
:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
|
||||
:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
|
||||
:Copyright: This stylesheet has been placed in the public domain.
|
||||
|
||||
Default cascading style sheet for the HTML output of Docutils.
|
||||
Despite the name, some widely supported CSS2 features are used.
|
||||
|
||||
See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
|
||||
customize this style sheet.
|
||||
|
|
@ -275,7 +275,7 @@ pre.literal-block, pre.doctest-block, pre.math, pre.code {
|
|||
margin-left: 2em ;
|
||||
margin-right: 2em }
|
||||
|
||||
pre.code .ln { color: grey; } /* line numbers */
|
||||
pre.code .ln { color: gray; } /* line numbers */
|
||||
pre.code, code { background-color: #eeeeee }
|
||||
pre.code .comment, code .comment { color: #5C6576 }
|
||||
pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
|
||||
|
|
@ -301,7 +301,7 @@ span.option {
|
|||
span.pre {
|
||||
white-space: pre }
|
||||
|
||||
span.problematic {
|
||||
span.problematic, pre.problematic {
|
||||
color: red }
|
||||
|
||||
span.section-subtitle {
|
||||
|
|
@ -447,6 +447,13 @@ If you spotted it first, help us to smash it by providing a detailed and welcome
|
|||
</ul>
|
||||
</blockquote>
|
||||
</li>
|
||||
<li><p class="first"><a class="reference external" href="https://www.moduon.team">Moduon</a>:</p>
|
||||
<blockquote>
|
||||
<ul class="simple">
|
||||
<li>Jairo Llopis</li>
|
||||
</ul>
|
||||
</blockquote>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="section" id="other-credits">
|
||||
|
|
@ -456,7 +463,9 @@ If you spotted it first, help us to smash it by providing a detailed and welcome
|
|||
<div class="section" id="maintainers">
|
||||
<h1>Maintainers</h1>
|
||||
<p>This module is maintained by the OCA.</p>
|
||||
<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
|
||||
<a class="reference external image-reference" href="https://odoo-community.org">
|
||||
<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
|
||||
</a>
|
||||
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
|
||||
mission is to support the collaborative development of Odoo features and
|
||||
promote its widespread use.</p>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ class PartnerMailListWizardCase(base.BaseCase):
|
|||
wizard = self.env["partner.mail.list.wizard"].create(
|
||||
{"mail_list_id": self.mailing_list.id}
|
||||
)
|
||||
wizard.partner_ids = [self.partner.id]
|
||||
wizard.partner_ids = self.partner
|
||||
wizard.add_to_mail_list()
|
||||
contacts = self.env["mailing.contact"].search(
|
||||
[("partner_id", "=", self.partner.id)]
|
||||
|
|
|
|||
|
|
@ -36,8 +36,8 @@ class PartnerMailListWizard(models.TransientModel):
|
|||
contact_vals = {
|
||||
"partner_id": partner.id,
|
||||
"list_ids": [(4, self.mail_list_id.id)],
|
||||
"title_id": partner.title or False,
|
||||
"title_id": partner.title.id or False,
|
||||
"company_name": partner.company_id.name or False,
|
||||
"country_id": partner.country_id or False,
|
||||
"country_id": partner.country_id.id or False,
|
||||
}
|
||||
contact_obj.create(contact_vals)
|
||||
|
|
|
|||
Loading…
Reference in New Issue