Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui

erpnext/non_profit/doctype/member/member.py

@@ -59,7 +59,7 @@ class Member(Document):
 			frappe.msgprint(_("A customer is already linked to this Member"))
 		cust = create_customer(frappe._dict({
 			'fullname': self.member_name,
-			'email': self.email_id or self.user,
+			'email': self.email_id or self.email,
 			'phone': None
 		}))
 
@@ -177,4 +177,4 @@ def register_member(fullname, email, rzpay_plan_id, subscription_id, pan=None, m
 			mobile=mobile
 		))
 
-		return member.name
+		return member.name