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

do not force send email using conf.py configuration

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/setup/doctype/email_digest/email_digest.py
View File

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

2
erpnext/utilities/page/users/users.py
View File

@ -167,7 +167,7 @@ def send_welcome_mail(email, args):
'Website Settings', 'subdomain') or "" 'Website Settings', 'subdomain') or ""
}) })
if not args.get('last_name'): args['last_name'] = '' 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 # delete user