Merge branch 'master' of github.com:webnotes/erpnext

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')

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