vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fixes in outgoing mail

Browse source
This commit is contained in:
Anand Doshi 2014-03-03 20:41:41 +05:30
parent ebd825e0c7
commit cd18ce21ef
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
frappe/core/doctype/outgoing_email_settings/outgoing_email_settings.py
View file

@ -12,12 +12,12 @@ class DocType:
def validate(self):
self.doc.encode()
if self.doc.server:
if self.doc.mail_server:
from frappe.utils import cint
from frappe.utils.email_lib.smtp import SMTPServer
smtpserver = SMTPServer(login = self.doc.mail_login,
password = self.doc.mail_password,
server = self.doc.server,
server = self.doc.mail_server,
port = cint(self.doc.mail_port),
use_ssl = self.doc.use_ssl
)

2
frappe/utils/email_lib/smtp.py
View file

@ -49,7 +49,7 @@ class SMTPServer:
self.use_ssl = cint(use_ssl)
self.login = login
self.password = password
elif es and es.outgoing_mail_server:
elif es and es.mail_server:
self.server = es.mail_server
self.port = es.mail_port
self.use_ssl = cint(es.use_ssl)