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

Merge PR #579 into 12.0 

Signed-off-by rafaelbn
pull/586/head
OCA-git-bot 2020-07-30 01:33:59 +00:00
parent 24bebb73c8 ed77b7944c
commit f3a0e34869
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
mass_mailing_partner/models/mail_mass_mailing_contact.py
View File

@ -38,18 +38,25 @@ class MailMassMailingContact(models.Model):
if category_ids: if category_ids:
self.tag_ids = category_ids self.tag_ids = category_ids
@api.model @api.model_create_multi
def create(self, vals): def create(self, vals_list):
record = self.new(vals) new_vals_list = []
for vals in vals_list:
# Ensure that defaults are loaded (e.g.: import csv or xls)
values_w_defaults = self.default_get(self._fields.keys())
values_w_defaults.update(vals)
record = self.new(values_w_defaults)
if not record.partner_id: if not record.partner_id:
record._set_partner() record._set_partner()
record._onchange_partner_mass_mailing_partner() record._onchange_partner_mass_mailing_partner()
new_vals = record._convert_to_write(record._cache) new_vals = record._convert_to_write(record._cache)
new_vals.update( new_vals.update(
subscription_list_ids=vals.get('subscription_list_ids', False), subscription_list_ids=values_w_defaults.get(
list_ids=vals.get('list_ids', False) 'subscription_list_ids', False),
list_ids=values_w_defaults.get('list_ids', False)
) )
return super(MailMassMailingContact, self).create(new_vals) new_vals_list.append(new_vals)
return super().create(new_vals_list)
def write(self, vals): def write(self, vals):
for contact in self: for contact in self:
@ -63,7 +70,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(MailMassMailingContact, contact).write(new_vals) super().write(new_vals)
return True return True
def _get_company(self): def _get_company(self):