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

[FIX] mail_server: correct docstring of method: pack_message and send_email 

bzr revid: hmo@tinyerp.com-20110406050503-2dxlv1xrj4qxrb56
This commit is contained in:
Harry (OpenERP) 2011-04-06 10:35:03 +05:30
parent 6f3e5d049b
commit 4b2b063aaf
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openerp/addons/base/ir/ir_mail_server.py
View File

@ -171,7 +171,7 @@ class ir_mail_server(osv.osv):
""" """
Pack all message attributes into one object. Pack all message attributes into one object.
Return email.message object after packed all email attribure. Return email.message.Message object after packed all email attribure.
""" """
if not (email_from or config.get('email_from', False)): if not (email_from or config.get('email_from', False)):
@ -241,7 +241,7 @@ class ir_mail_server(osv.osv):
smtp_user=None, smtp_password=None, ssl=False, tls=True, debug=False): smtp_user=None, smtp_password=None, ssl=False, tls=True, debug=False):
"""Send an email. """Send an email.
@message : The Object of 'email.mime.base.MIMEBase' Class @message : The Object of 'email.message.Message' Class
If the mail_server_id is provided, send using this mail server, ignoring other smtp_* arguments. If the mail_server_id is provided, send using this mail server, ignoring other smtp_* arguments.
If mail_server_id == None and smtp_server == None, use the default mail server (highest priority). If mail_server_id == None and smtp_server == None, use the default mail server (highest priority).
If mail_server_id == None and smtp_server is not None, use the provided smtp_* arguments. If mail_server_id == None and smtp_server is not None, use the provided smtp_* arguments.