Techsystech
/
social
mirror of https://github.com/OCA/social.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge PR #667 into 12.0 

Signed-off-by pedrobaeza
pull/689/head
OCA-git-bot 2021-02-11 11:11:28 +00:00
parent 09d53724f1 faad6cc453
commit 805db3be86
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mass_mailing_partner/models/mail_mass_mailing_contact.py
View File

@ -1,7 +1,8 @@
# Copyright 2015 Pedro M. Baeza <pedro.baeza@tecnativa.com> # Copyright 2015 Tecnativa - Pedro M. Baeza
# Copyright 2015 Antonio Espinosa <antonio.espinosa@tecnativa.com> # Copyright 2015 Antonio Espinosa <antonio.espinosa@tecnativa.com>
# Copyright 2015 Javier Iniesta <javieria@antiun.com> # Copyright 2015 Javier Iniesta <javieria@antiun.com>
# Copyright 2017 David Vidal <david.vidal@tecnativa.com> # Copyright 2017 Tecnativa - David Vidal
# Copyright 2021 Tecnativa - Víctor Martínez
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
from odoo import _, api, fields, models from odoo import _, api, fields, models
@ -72,7 +73,7 @@ class MailMassMailingContact(models.Model):
subscription_list_ids=vals.get('subscription_list_ids', False), subscription_list_ids=vals.get('subscription_list_ids', False),
list_ids=vals.get('list_ids', False) list_ids=vals.get('list_ids', False)
) )
super().write(new_vals) super(MailMassMailingContact, contact).write(new_vals)
return True return True
def _get_company(self): def _get_company(self):

22
mass_mailing_partner/tests/test_res_partner.py
View File

@ -1,6 +1,7 @@
# Copyright 2015 Pedro M. Baeza <pedro.baeza@tecnativa.com> # Copyright 2015 Tecnativa - Pedro M. Baeza
# Copyright 2015 Antonio Espinosa <antonio.espinosa@tecnativa.com> # Copyright 2015 Tecnativa - Antonio Espinosa
# Copyright 2015 Javier Iniesta <javieria@antiun.com> # Copyright 2015 Javier Iniesta <javieria@antiun.com>
# Copyright 2021 Tecnativa - Víctor Martínez
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
from . import base from . import base
@ -37,3 +38,20 @@ class ResPartnerCase(base.BaseCase):
self.check_mailing_contact_partner(contact) self.check_mailing_contact_partner(contact)
with self.assertRaises(ValidationError): with self.assertRaises(ValidationError):
self.partner.write({'email': False}) self.partner.write({'email': False})
def test_write_res_partner_multi(self):
self.assertEqual(len(self.partner.category_id.ids), 2)
partner2 = self.partner.copy({'name': 'Partner test 2'})
self.partner.write({'category_id': [(4, self.category_3.id)]})
self.assertEqual(len(self.partner.category_id.ids), 3)
self.assertEqual(len(partner2.category_id.ids), 2)
for partner in [self.partner, partner2]:
self.create_mailing_contact({
'partner_id': partner.id,
'list_ids': [[6, 0, [self.mailing_list.id]]]
})
self.env['res.partner'].search([
('id', 'in', (self.partner.id, partner2.id))
]).write({'category_id': [(4, self.category_3.id)]})
self.assertEqual(len(self.partner.category_id.ids), 3)
self.assertEqual(len(partner2.category_id.ids), 3)