Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Nabin Hait 2012-07-11 18:41:20 +05:30
commit 4b8b19a281
1 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
erpnext/setup/doctype/email_settings/email_settings.py
View File

@ -54,24 +54,13 @@ class DocType:
webnotes.msgprint(err_msg)
raise e
# exceptions are handled in smtp_connect
sess = out_email.smtp_connect()
try:
sess = out_email.smtp_connect()
try:
sess.quit()
except:
pass
except _socket.error, e:
# Invalid mail server -- due to refusing connection
webnotes.msgprint('Invalid Outgoing Mail Server or Port. Please rectify and try again.')
raise e
except smtplib.SMTPAuthenticationError, e:
webnotes.msgprint('Invalid Login Id or Mail Password. Please rectify and try again.')
raise e
except smtplib.SMTPException, e:
webnotes.msgprint('There is something wrong with your Outgoing Mail Settings. \
Please contact us at support@erpnext.com')
raise e
sess.quit()
except:
pass
def validate_incoming(self):