From 19aa442bd46cd458a85a09fd2235b4cf3a09e187 Mon Sep 17 00:00:00 2001 From: "Pinakin Nayi (OpenERP)" Date: Wed, 23 May 2012 11:15:03 +0530 Subject: [PATCH] [IMP] hr_holidays:improve leave report,mail_thread bzr revid: pna@tinyerp.com-20120523054503-y2s7ihicjmyr3we7 --- addons/mail/mail_thread.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py index 8cd8ef415c3..edc07817b26 100644 --- a/addons/mail/mail_thread.py +++ b/addons/mail/mail_thread.py @@ -293,8 +293,7 @@ class mail_thread(osv.osv): 'res_id': thread.id, } to_attach.append(ir_attachment.create(cr, uid, data_attach, context=context)) - - partner_id = hasattr(thread, 'partner_id') and (thread.partner_id and thread.partner_id.id or False) or False + partner_id = ('partner_id' in thread._columns.keys()) and (thread.partner_id and thread.partner_id.id or False) or False if not partner_id and thread._name == 'res.partner': partner_id = thread.id data = { @@ -313,7 +312,6 @@ class mail_thread(osv.osv): 'res_id': thread.id, 'partner_id': partner_id, } - if email_from or type == 'email': for param in (email_to, email_cc, email_bcc): if isinstance(param, list):