do not force send email using conf.py configuration

This commit is contained in:
Anand Doshi 2012-07-10 15:15:46 +05:30
parent 7c0b893b1f
commit 090a12d167
2 changed files with 2 additions and 3 deletions

View File

@ -421,8 +421,7 @@ class DocType:
sender='notifications+email_digest@erpnext.com',
reply_to='support@erpnext.com',
subject=self.doc.frequency + ' Digest',
msg=email_body,
from_defs=1
msg=email_body
)
except Exception, e:
webnotes.msgprint('There was a problem in sending your email. Please contact support@erpnext.com')

View File

@ -167,7 +167,7 @@ def send_welcome_mail(email, args):
'Website Settings', 'subdomain') or ""
})
if not args.get('last_name'): args['last_name'] = ''
sendmail_md(pr.email, subject="Welcome to ERPNext", msg=welcome_txt % args, from_defs=1)
sendmail_md(pr.email, subject="Welcome to ERPNext", msg=welcome_txt % args)
#
# delete user