From 7764a2e4a85c13e75aa3b2ea257c7bb5f6671d24 Mon Sep 17 00:00:00 2001 From: "mga@tinyerp.com" <> Date: Wed, 20 Aug 2008 16:48:04 +0530 Subject: [PATCH] Make the same changes in to the email_send like email_send_attach Make email send debug to False in Server Action bzr revid: mga@tinyerp.com-20080820111804-qcrvx2n3o94yhq4u --- bin/addons/base/ir/ir_actions.py | 2 +- bin/tools/misc.py | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py index 9684ff98816..806f129994f 100755 --- a/bin/addons/base/ir/ir_actions.py +++ b/bin/addons/base/ir/ir_actions.py @@ -420,7 +420,7 @@ class actions_server(osv.osv): body = action.message #TODO : Apply Mail merge in to the Content of the Email - if tools.email_send_attach(user, address, subject, body, debug=True) == True: + if tools.email_send_attach(user, address, subject, body, debug=False) == True: logger.notifyChannel('email', netsvc.LOG_INFO, 'Email successfully send to : %s' % (address)) else: logger.notifyChannel('email', netsvc.LOG_ERROR, 'Failed to send email to : %s' % (address)) diff --git a/bin/tools/misc.py b/bin/tools/misc.py index 4447fed5b01..e02785efa18 100644 --- a/bin/tools/misc.py +++ b/bin/tools/misc.py @@ -338,7 +338,15 @@ def email_send(email_from, email_to, subject, body, email_cc=None, email_bcc=Non msg['Message-Id'] = '<'+str(time.time())+'-tinycrm-'+str(tinycrm)+'@'+socket.gethostname()+'>' try: s = smtplib.SMTP() - s.connect(config['smtp_server']) + + if debug: + s.debuglevel = 5 + if ssl: + s.ehlo() + s.starttls() + s.ehlo() + + s.connect(config['smtp_server'], config['smtp_port']) if config['smtp_user'] or config['smtp_password']: s.login(config['smtp_user'], config['smtp_password']) s.sendmail(email_from, flatten([email_to, email_cc, email_bcc]), msg.as_string())