merged master

This commit is contained in:
Anand Doshi 2012-08-16 17:10:39 +05:30
parent 1467a059ed
commit 7b20428976

View File

@ -35,8 +35,8 @@ class DocType:
if self.doc.outgoing_mail_server:
from webnotes.utils import cint
from webnotes.utils.email_lib.smtp import SMTPServer
smtpserver = SMTPServer(login = self.doc.mail_login.encode("utf-8"),
password = self.doc.mail_password.encode("utf-8"),
smtpserver = SMTPServer(login = self.doc.mail_login,
password = self.doc.mail_password,
server = self.doc.outgoing_mail_server,
port = cint(self.doc.mail_port),
use_ssl = self.doc.use_ssl