pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] mail,event: typos

Browse Source 
bzr revid: odo@openerp.com-20110907202702-owsbk24fn3osgllc
This commit is contained in:
Olivier Dony
2011-09-07 22:27:02 +02:00
parent 90621d90b4
commit 58392ca9ad
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/event/event.py
+1 -1
View File
@@ -530,7 +530,7 @@ class event_registration(osv.osv):
email_to = []
email_cc = []
if registration.email_from:
email_to = registration.email_from
email_to = [registration.email_from]
if registration.email_cc:
email_cc += [registration.email_cc]
if not (email_to or email_cc):
addons/mail/mail_thread.py
+3 -3
View File
@@ -69,7 +69,7 @@ class mail_thread(osv.osv):
for thread in self.browse(cr, uid, ids, context=context):
l = set()
for message in thread.message_ids:
l.add((message.user_id and message.user_id.email) or '')
l.add((message.user_id and message.user_id.user_email) or '')
l.add(message.email_from or '')
l.add(message.email_cc or '')
res[thread.id] = filter(None, l)
@@ -409,9 +409,9 @@ class mail_thread(osv.osv):
del msg['reply-to']
msg['reply-to'] = res.section_id.reply_to
smtp_from = to_email(msg['from'])
smtp_from, = to_email(msg['from'])
msg['from'] = smtp_from
msg['to'] = forward_to
msg['to'] = ", ".join(forward_to)
msg['message-id'] = tools.generate_tracking_message_id(res.id)
if not smtp_server_obj.send_email(cr, uid, msg) and email_error:
subj = msg['subject']