From ddaac15f489d63110be089a5d2090a79fe60198c Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Tue, 10 Jun 2014 16:48:19 +0200 Subject: [FIX] website_mail: backport of master fix a54caabbcb10a7db02f872ef5097ac379db5445f --- addons/website_mail/models/mail_thread.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/website_mail/models/mail_thread.py') diff --git a/addons/website_mail/models/mail_thread.py b/addons/website_mail/models/mail_thread.py index d7f750872ca..d4a37924b79 100644 --- a/addons/website_mail/models/mail_thread.py +++ b/addons/website_mail/models/mail_thread.py @@ -22,7 +22,7 @@ from openerp.osv import osv, fields # TODO for trunk, remove me -class MailThread(osv.Model): +class MailThread(osv.AbstractModel): _inherit = 'mail.thread' _columns = { -- cgit v1.2.3 From de9654deec5afa7aa135ff45a4943e4421ff6efa Mon Sep 17 00:00:00 2001 From: Jonathan Nemry Date: Tue, 10 Jun 2014 16:57:54 +0200 Subject: [FIX] website_mail: default could be None --- addons/website_mail/models/mail_thread.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'addons/website_mail/models/mail_thread.py') diff --git a/addons/website_mail/models/mail_thread.py b/addons/website_mail/models/mail_thread.py index d4a37924b79..bea9178a335 100644 --- a/addons/website_mail/models/mail_thread.py +++ b/addons/website_mail/models/mail_thread.py @@ -37,5 +37,7 @@ class MailThread(osv.AbstractModel): } def copy(self, cr, uid, id, default=None, context=None): + if default is None: + default = {} default['website_message_ids'] = [] return super(MailThread, self).copy(cr, uid, id, default=default, context=context) \ No newline at end of file -- cgit v1.2.3