nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 11:19:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into membership-enhancements-2

Browse Source
This commit is contained in:
Rucha Mahabal
2021-01-20 12:49:37 +05:30
committed by GitHub
parent 93bb7b0000 0ff9acfc9f
commit bd02a42904
515 changed files with 18996 additions and 5200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/non_profit/doctype/member/member.py
View File

@@ -57,7 +57,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
}))
@@ -175,4 +175,4 @@ def register_member(fullname, email, rzpay_plan_id, subscription_id, pan=None, m
mobile=mobile
))
return member.name
return member.name