From bf6cba8a1ea22790e4d935a60942cd0985c5cbfe Mon Sep 17 00:00:00 2001 From: "Harry (OpenERP)" Date: Fri, 20 May 2011 11:22:38 +0530 Subject: [PATCH] [IMP] mail_server: smtp_ssl should be readonly if smtplib is not support SMTP_SSL and improve tooltip bzr revid: hmo@tinyerp.com-20110520055238-qad1x5stnwucv04i --- openerp/addons/base/ir/ir_mail_server.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/openerp/addons/base/ir/ir_mail_server.py b/openerp/addons/base/ir/ir_mail_server.py index 0c183c5df3a..b185690d266 100644 --- a/openerp/addons/base/ir/ir_mail_server.py +++ b/openerp/addons/base/ir/ir_mail_server.py @@ -88,11 +88,12 @@ class ir_mail_server(osv.osv): size=120, required=False, help="Password for SMTP authentication"), 'smtp_tls': fields.boolean('TLS', help="If True, TLS encryption will be requested at \ - beginning of SMTP transactions. Do not use if SSL is \ - enabled, or if the server does not support it."), - 'smtp_ssl':fields.boolean('SSL/TLS', help="If True, SMTPS (Secure SMTP over SSL encryption) \ - will be used. When selected, change smtp_port to 465. \ - Do not use with TLS or if the server does not support it."), +beginning of SMTP transactions. \nDo not use if SSL is \ +enabled, or if the server does not support it."), + 'smtp_ssl':fields.boolean('SSL/TLS', readonly='SMTP_SSL' not in smtplib.__all__, help="If True, SMTPS (Secure SMTP over SSL encryption) will be used. \ +When selected, change smtp_port to 465. \ +\nDo not use with TLS or if the server does not support it. \ +%s" %('SMTP_SSL' not in smtplib.__all__ and '\nNote: This is a Readonly. You should Install Python2.6 if need Secure SMTP' or '')), 'priority': fields.integer('Priority', help="If no specific \ server is requested for a mail, the highest priority one \ is used. Default priority is 10"),