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

[MERGE] Merged SKH's branch to fix the format of Email in base_action_rule. Email always has to given in double quotes (). (Case:6122) 

bzr revid: pso@tinyerp.com-20110715122155-iyl7fx0p6gi45524
This commit is contained in:
pso (OpenERP) 2011-07-15 17:51:55 +05:30
parent cd90f718ea b0936e9a8b
commit 7806d2e3aa
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
addons/base_action_rule/base_action_rule.py
View File

@ -418,12 +418,22 @@ the rule to mark CC(mail to any other person defined in actions)."),
}
if action.act_email_to:
emails.append(safe_eval(action.act_email_to, {}, locals_for_emails))
email_to = tools.ustr(action.act_email_to)
try:
email_to = safe_eval(tools.ustr(action.act_email_to), {}, locals_for_emails)
except:
pass
emails.append(email_to)
emails = filter(None, emails)
if len(emails) and action.act_mail_body:
emails = list(set(emails))
email_from = safe_eval(action.act_email_from, {}, locals_for_emails)
from_email= tools.ustr(action.act_email_from)
try:
from_email= safe_eval(tools.ustr(action.act_email_from), {}, locals_for_emails)
except:
pass
email_from = from_email
def to_email(text):
return re.findall(r'([^ ,<@]+@[^> ,]+)', text or '')