odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] mail_thread: continuing to translate hasattr to something else. 

bzr revid: tde@openerp.com-20120813103038-4o1xwtsmjnvjj0b4
This commit is contained in:
Thibault Delavallée 2012-08-13 12:30:38 +02:00
parent fd471af0d8
commit b479fbf64a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/mail/mail_thread.py
View File

@ -330,7 +330,7 @@ class mail_thread(osv.Model):
data = {
'subject': subject,
'body_text': body_text or (hasattr(thread, 'description') and thread.description or ''),
'body_text': body_text or thread._model._columns.get('description') and thread.description or ''),
'body_html': body_html or '',
'parent_id': parent_id,
'date': email_date or fields.datetime.now(),
@ -353,7 +353,7 @@ class mail_thread(osv.Model):
data.update({
'email_to': email_to,
'email_from': email_from or \
(hasattr(thread, 'user_id') and thread.user_id and thread.user_id.user_email),
thread._model._columns.get('user_id') and thread.user_id and thread.user_id.user_email),
'email_cc': email_cc,
'email_bcc': email_bcc,
'references': references,