summaryrefslogtreecommitdiff
path: root/addons/mass_mailing/models
diff options
context:
space:
mode:
authorRobot Odoo <xmo+roboto@odoo.com>2019-07-17 14:17:57 +0200
committerGitHub <noreply@github.com>2019-07-17 14:17:57 +0200
commitcc62447a44c2cf4e2edaf8a1f6d94520e799ddd9 (patch)
treea45f0984af5db1723fec83741b285ea92ab63598 /addons/mass_mailing/models
parentf6fdde96bddfedf8764cd8a73089e44340d476ae (diff)
parenta8767716cfd14abc7f87204d4d180811f663b648 (diff)
[MERGE] api.py: remove calls to @api.multi and deprecate its explicit usage
depends on https://github.com/odoo/odoo/pull/34556 closes odoo/odoo#34775 Signed-off-by: Adrian Torres <Elkasitu@users.noreply.github.com>
Diffstat (limited to 'addons/mass_mailing/models')
-rw-r--r--addons/mass_mailing/models/mail_mail.py3
-rw-r--r--addons/mass_mailing/models/mail_thread.py2
-rw-r--r--addons/mass_mailing/models/mass_mailing.py13
3 files changed, 0 insertions, 18 deletions
diff --git a/addons/mass_mailing/models/mail_mail.py b/addons/mass_mailing/models/mail_mail.py
index 34ef0472c7e..a4de6be6972 100644
--- a/addons/mass_mailing/models/mail_mail.py
+++ b/addons/mass_mailing/models/mail_mail.py
@@ -52,7 +52,6 @@ class MailMail(models.Model):
)
return url
- @api.multi
def _send_prepare_body(self):
""" Override to add the tracking URL to the body and to add
Statistic_id in shorted urls """
@@ -80,7 +79,6 @@ class MailMail(models.Model):
return body
- @api.multi
def _send_prepare_values(self, partner=None):
# TDE: temporary addition (mail was parameter) due to semi-new-API
res = super(MailMail, self)._send_prepare_values(partner)
@@ -94,7 +92,6 @@ class MailMail(models.Model):
res['body'] = res['body'].replace(link_to_replace, unsubscribe_url if unsubscribe_url else '#')
return res
- @api.multi
def _postprocess_sent_message(self, success_pids, failure_reason=False, failure_type=None):
mail_sent = not failure_type # we consider that a recipient error is a failure with mass mailling and show them as failed
for mail in self:
diff --git a/addons/mass_mailing/models/mail_thread.py b/addons/mass_mailing/models/mail_thread.py
index 4797fdfbff1..5195672eead 100644
--- a/addons/mass_mailing/models/mail_thread.py
+++ b/addons/mass_mailing/models/mail_thread.py
@@ -43,7 +43,6 @@ class MailThread(models.AbstractModel):
self.env['mail.mail.statistics'].set_replied(mail_message_ids=message_ids)
return super(MailThread, self).message_route_process(message, message_dict, routes)
- @api.multi
def message_post_with_template(self, template_id, **kwargs):
# avoid having message send through `message_post*` methods being implicitly considered as
# mass-mailing
@@ -53,7 +52,6 @@ class MailThread(models.AbstractModel):
)
return super(MailThread, no_massmail).message_post_with_template(template_id, **kwargs)
- @api.multi
def _message_receive_bounce(self, email, partner, mail_id=None):
"""In addition, an auto blacklist rule check if the email can be blacklisted
to avoid sending mails indefinitely to this email address.
diff --git a/addons/mass_mailing/models/mass_mailing.py b/addons/mass_mailing/models/mass_mailing.py
index 4b049edd3b2..f4f598cf3c9 100644
--- a/addons/mass_mailing/models/mass_mailing.py
+++ b/addons/mass_mailing/models/mass_mailing.py
@@ -75,7 +75,6 @@ class MassMailingContactListRel(models.Model):
vals['unsubscription_date'] = vals['opt_out'] and fields.Datetime.now()
return super(MassMailingContactListRel, self).create(vals)
- @api.multi
def write(self, vals):
if 'opt_out' in vals:
vals['unsubscription_date'] = vals['opt_out'] and fields.Datetime.now()
@@ -133,11 +132,9 @@ class MassMailingList(models.Model):
for mailing_list in self:
mailing_list.contact_nbr = data.get(mailing_list.id, 0)
- @api.multi
def name_get(self):
return [(list.id, "%s (%s)" % (list.name, list.contact_nbr)) for list in self]
- @api.multi
def action_merge(self, src_lists, archive):
"""
Insert all the contact from the mailing lists 'src_lists' to the
@@ -200,7 +197,6 @@ class MassMailingList(models.Model):
if archive:
(src_lists - self).write({'active': False})
- @api.multi
def close_dialog(self):
return {'type': 'ir.actions.act_window_close'}
@@ -285,7 +281,6 @@ class MassMailingContact(models.Model):
contact = self.create({'name': name, 'email': email, 'list_ids': [(4, list_id)]})
return contact.name_get()[0]
- @api.multi
def _message_get_default_recipients(self):
return {r.id: {
'partner_ids': [],
@@ -578,7 +573,6 @@ class MassMailing(models.Model):
row['bounced_ratio'] = 100.0 * row['bounced'] / total
self.browse(row.pop('mailing_id')).update(row)
- @api.multi
def _unsubscribe_token(self, res_id, email):
"""Generate a secure hash for this mailing list and parameters.
@@ -654,7 +648,6 @@ class MassMailing(models.Model):
vals['subject'] = vals['name']
return super(MassMailing, self).create(vals)
- @api.multi
@api.returns('self', lambda value: value.id)
def copy(self, default=None):
self.ensure_one()
@@ -734,7 +727,6 @@ class MassMailing(models.Model):
# Views & Actions
#------------------------------------------------------
- @api.multi
def action_duplicate(self):
self.ensure_one()
mass_mailing_copy = self.copy()
@@ -750,7 +742,6 @@ class MassMailing(models.Model):
}
return False
- @api.multi
def action_test_mailing(self):
self.ensure_one()
ctx = dict(self.env.context, default_mass_mailing_id=self.id)
@@ -763,22 +754,18 @@ class MassMailing(models.Model):
'context': ctx,
}
- @api.multi
def action_schedule_date(self):
self.ensure_one()
action = self.env.ref('mass_mailing.mass_mailing_schedule_date_action').read()[0]
action['context'] = dict(self.env.context, default_mass_mailing_id=self.id)
return action
- @api.multi
def put_in_queue(self):
self.write({'state': 'in_queue'})
- @api.multi
def cancel_mass_mailing(self):
self.write({'state': 'draft', 'schedule_date': False})
- @api.multi
def retry_failed_mail(self):
failed_mails = self.env['mail.mail'].search([('mailing_id', 'in', self.ids), ('state', '=', 'exception')])
failed_mails.mapped('statistics_ids').unlink()