From 090a12d1675fa8786bdd58efb7f35a60324c7dba Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 10 Jul 2012 15:15:46 +0530 Subject: [PATCH] do not force send email using conf.py configuration --- erpnext/setup/doctype/email_digest/email_digest.py | 3 +-- erpnext/utilities/page/users/users.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/erpnext/setup/doctype/email_digest/email_digest.py b/erpnext/setup/doctype/email_digest/email_digest.py index aff79f608ab..1e382d198da 100644 --- a/erpnext/setup/doctype/email_digest/email_digest.py +++ b/erpnext/setup/doctype/email_digest/email_digest.py @@ -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') diff --git a/erpnext/utilities/page/users/users.py b/erpnext/utilities/page/users/users.py index 347c9b2f26b..07504a80779 100644 --- a/erpnext/utilities/page/users/users.py +++ b/erpnext/utilities/page/users/users.py @@ -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