diff --git a/addons/mass_mailing/models/mailing_contact.py b/addons/mass_mailing/models/mailing_contact.py index e50b36534e4..ea25ce31936 100644 --- a/addons/mass_mailing/models/mailing_contact.py +++ b/addons/mass_mailing/models/mailing_contact.py @@ -48,7 +48,6 @@ class MassMailingContact(models.Model): _inherit = ['mail.thread.blacklist'] _description = 'Mass Mailing Contact' _order = 'email' - _rec_name = 'email' name = fields.Char() company_name = fields.Char(string='Company Name') diff --git a/addons/sms/models/sms_sms.py b/addons/sms/models/sms_sms.py index 9ea635b2070..8bf9c8c2924 100644 --- a/addons/sms/models/sms_sms.py +++ b/addons/sms/models/sms_sms.py @@ -56,6 +56,9 @@ class SmsSms(models.Model): if auto_commit is True and not getattr(threading.currentThread(), 'testing', False): self._cr.commit() + def cancel(self): + self.state = 'canceled' + @api.model def _process_queue(self, ids=None): """ Send immediately queued messages, committing after each message is sent. diff --git a/addons/sms/views/res_partner_views.xml b/addons/sms/views/res_partner_views.xml index c696531fc3b..455571be093 100644 --- a/addons/sms/views/res_partner_views.xml +++ b/addons/sms/views/res_partner_views.xml @@ -27,7 +27,7 @@ - -