From e927224fbc45b54929825b015ad7da161bc984d9 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 4 Nov 2020 19:57:47 +0530
Subject: [PATCH 01/22] feat: update membership setting doctype

* rename enable_auto_invoicing to enable_invoicing
* add option to make_payment entry
---
 .../membership_settings.json                  | 42 +++++++++++++------
 .../membership_type/membership_type.js        |  4 +-
 2 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/erpnext/non_profit/doctype/membership_settings/membership_settings.json b/erpnext/non_profit/doctype/membership_settings/membership_settings.json
index 5b6bab5b0a..a70c3c4b8a 100644
--- a/erpnext/non_profit/doctype/membership_settings/membership_settings.json
+++ b/erpnext/non_profit/doctype/membership_settings/membership_settings.json
@@ -11,9 +11,11 @@
   "billing_frequency",
   "webhook_secret",
   "column_break_6",
-  "enable_auto_invoicing",
+  "enable_invoicing",
+  "make_payment_entry",
   "company",
   "debit_account",
+  "payment_account",
   "column_break_9",
   "send_email",
   "send_invoice",
@@ -58,14 +60,7 @@
    "label": "Invoicing"
   },
   {
-   "default": "0",
-   "fieldname": "enable_auto_invoicing",
-   "fieldtype": "Check",
-   "label": "Enable Auto Invoicing",
-   "mandatory_depends_on": "eval:doc.send_invoice"
-  },
-  {
-   "depends_on": "eval:doc.enable_auto_invoicing",
+   "depends_on": "eval:doc.enable_invoicing",
    "fieldname": "debit_account",
    "fieldtype": "Link",
    "label": "Debit Account",
@@ -77,7 +72,7 @@
    "fieldtype": "Column Break"
   },
   {
-   "depends_on": "eval:doc.enable_auto_invoicing",
+   "depends_on": "eval:doc.enable_invoicing",
    "fieldname": "company",
    "fieldtype": "Link",
    "label": "Company",
@@ -86,7 +81,7 @@
   },
   {
    "default": "0",
-   "depends_on": "eval:doc.enable_auto_invoicing && doc.send_email",
+   "depends_on": "eval:doc.enable_invoicing && doc.send_email",
    "fieldname": "send_invoice",
    "fieldtype": "Check",
    "label": "Send Invoice with Email"
@@ -119,11 +114,34 @@
    "label": "Email Template",
    "mandatory_depends_on": "eval:doc.send_email",
    "options": "Email Template"
+  },
+  {
+   "default": "0",
+   "fieldname": "enable_invoicing",
+   "fieldtype": "Check",
+   "label": "Enable Invoicing",
+   "mandatory_depends_on": "eval:doc.send_invoice || doc.make_payment_entry"
+  },
+  {
+   "default": "0",
+   "depends_on": "eval:doc.enable_invoicing",
+   "fieldname": "make_payment_entry",
+   "fieldtype": "Check",
+   "label": "Make Payment Entry"
+  },
+  {
+   "depends_on": "eval:doc.make_payment_entry",
+   "fieldname": "payment_account",
+   "fieldtype": "Link",
+   "label": "Payment To",
+   "mandatory_depends_on": "eval:doc.make_payment_entry",
+   "options": "Account"
   }
  ],
+ "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2020-08-05 17:26:37.287395",
+ "modified": "2020-11-04 19:51:21.990595",
  "modified_by": "Administrator",
  "module": "Non Profit",
  "name": "Membership Settings",
diff --git a/erpnext/non_profit/doctype/membership_type/membership_type.js b/erpnext/non_profit/doctype/membership_type/membership_type.js
index 43311a2c96..94ccdd8334 100644
--- a/erpnext/non_profit/doctype/membership_type/membership_type.js
+++ b/erpnext/non_profit/doctype/membership_type/membership_type.js
@@ -2,12 +2,12 @@
 // For license information, please see license.txt
 
 frappe.ui.form.on('Membership Type', {
-	refresh: function(frm) {
+	refresh: function (frm) {
 		frappe.db.get_single_value("Membership Settings", "enable_razorpay").then(val => {
 			if (val) frm.set_df_property('razorpay_plan_id', 'hidden', false);
 		});
 
-		frappe.db.get_single_value("Membership Settings", "enable_auto_invoicing").then(val => {
+		frappe.db.get_single_value("Membership Settings", "enable_invoicing").then(val => {
 			if (val) frm.set_df_property('linked_item', 'hidden', false);
 		});
 	}

From d75ff1a93e562ac5e22dc5afd2aef20fc8c62ab1 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 4 Nov 2020 20:17:33 +0530
Subject: [PATCH 02/22] feat: generate invoice on payment authorized

---
 erpnext/non_profit/doctype/membership/membership.py   | 11 ++++++++---
 .../membership_settings/membership_settings.json      | 10 +++++++++-
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/erpnext/non_profit/doctype/membership/membership.py b/erpnext/non_profit/doctype/membership/membership.py
index 4c85cb60e8..97de63b052 100644
--- a/erpnext/non_profit/doctype/membership/membership.py
+++ b/erpnext/non_profit/doctype/membership/membership.py
@@ -54,9 +54,14 @@ class Membership(Document):
 			self.to_date = add_months(self.from_date, 1)
 
 	def on_payment_authorized(self, status_changed_to=None):
-		if status_changed_to in ("Completed", "Authorized"):
-			self.load_from_db()
-			self.db_set('paid', 1)
+		if status_changed_to not in ("Completed", "Authorized"):
+			return
+		self.load_from_db()
+		self.db_set('paid', 1)
+		settings = frappe.get_doc("Membership Settings")
+		if settings.enable_invoicing and settings.create_for_web_forms:
+			self.generate_invoice(with_payment_entry=settings.make_payment_entry, save=True)
+
 
 	def generate_invoice(self, save=True):
 		if not (self.paid or self.currency or self.amount):
diff --git a/erpnext/non_profit/doctype/membership_settings/membership_settings.json b/erpnext/non_profit/doctype/membership_settings/membership_settings.json
index a70c3c4b8a..a25f5ffbc2 100644
--- a/erpnext/non_profit/doctype/membership_settings/membership_settings.json
+++ b/erpnext/non_profit/doctype/membership_settings/membership_settings.json
@@ -12,6 +12,7 @@
   "webhook_secret",
   "column_break_6",
   "enable_invoicing",
+  "create_for_web_forms",
   "make_payment_entry",
   "company",
   "debit_account",
@@ -136,12 +137,19 @@
    "label": "Payment To",
    "mandatory_depends_on": "eval:doc.make_payment_entry",
    "options": "Account"
+  },
+  {
+   "depends_on": "eval:doc.enable_invoicing",
+   "description": "Automatically create an invoice when payment is authorized from a web form entry",
+   "fieldname": "create_for_web_forms",
+   "fieldtype": "Data",
+   "label": "Auto Create Invoice for Web Forms"
   }
  ],
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2020-11-04 19:51:21.990595",
+ "modified": "2020-11-04 20:19:55.163749",
  "modified_by": "Administrator",
  "module": "Non Profit",
  "name": "Membership Settings",

From 9d9fa74e6b8dd5db1f89bc6bf92809c0fba29eda Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Mon, 9 Nov 2020 12:29:03 +0530
Subject: [PATCH 03/22] refactor(member): drop email column

* remove email column
* update controller methods
* add patch to add value from email to email_id
---
 erpnext/non_profit/doctype/member/member.json | 10 +---------
 .../doctype/membership/membership.py          |  8 ++++++--
 erpnext/patches.txt                           |  3 ++-
 .../v13_0/update_member_email_address.py      | 19 +++++++++++++++++++
 4 files changed, 28 insertions(+), 12 deletions(-)
 create mode 100644 erpnext/patches/v13_0/update_member_email_address.py

diff --git a/erpnext/non_profit/doctype/member/member.json b/erpnext/non_profit/doctype/member/member.json
index 992ef16d64..f190cfae75 100644
--- a/erpnext/non_profit/doctype/member/member.json
+++ b/erpnext/non_profit/doctype/member/member.json
@@ -12,7 +12,6 @@
   "membership_expiry_date",
   "column_break_5",
   "membership_type",
-  "email",
   "email_id",
   "image",
   "customer_section",
@@ -64,13 +63,6 @@
    "options": "Membership Type",
    "reqd": 1
   },
-  {
-   "fieldname": "email",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "User",
-   "options": "User"
-  },
   {
    "fieldname": "image",
    "fieldtype": "Attach Image",
@@ -178,7 +170,7 @@
  ],
  "image_field": "image",
  "links": [],
- "modified": "2020-09-16 23:44:13.596948",
+ "modified": "2020-11-09 12:12:10.174647",
  "modified_by": "Administrator",
  "module": "Non Profit",
  "name": "Member",
diff --git a/erpnext/non_profit/doctype/membership/membership.py b/erpnext/non_profit/doctype/membership/membership.py
index 97de63b052..36f68bc00c 100644
--- a/erpnext/non_profit/doctype/membership/membership.py
+++ b/erpnext/non_profit/doctype/membership/membership.py
@@ -24,7 +24,7 @@ class Membership(Document):
 				user = frappe.get_doc('User', frappe.session.user)
 				member = frappe.get_doc(dict(
 					doctype='Member',
-					email=frappe.session.user,
+					email_id=frappe.session.user,
 					membership_type=self.membership_type,
 					member_name=user.get_fullname()
 				)).insert(ignore_permissions=True)
@@ -97,8 +97,12 @@ class Membership(Document):
 			frappe.throw(_("You need to enable <b>Send Acknowledge Email</b> in Membership Settings"))
 
 		member = frappe.get_doc("Member", self.member)
+		
+		if not member.email_id:
+			frappe.throw(_("Email address of member {0} is missing").format(frappe.utils.get_link_to_form("Member", self.member)))
+
 		plan = frappe.get_doc("Membership Type", self.membership_type)
-		email = member.email_id if member.email_id else member.email
+		email = member.email_id
 		attachments = [frappe.attach_print("Membership", self.name, print_format=settings.membership_print_format)]
 
 		if self.invoice and settings.send_invoice:
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 34dbdd0bd5..a9cd25fd42 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -733,4 +733,5 @@ erpnext.patches.v13_0.print_uom_after_quantity_patch
 erpnext.patches.v13_0.set_payment_channel_in_payment_gateway_account
 erpnext.patches.v13_0.create_healthcare_custom_fields_in_stock_entry_detail
 erpnext.patches.v13_0.update_reason_for_resignation_in_employee
-execute:frappe.delete_doc("Report", "Quoted Item Comparison")
\ No newline at end of file
+execute:frappe.delete_doc("Report", "Quoted Item Comparison")
+erpnext.patches.v13_0.update_member_email_address
\ No newline at end of file
diff --git a/erpnext/patches/v13_0/update_member_email_address.py b/erpnext/patches/v13_0/update_member_email_address.py
new file mode 100644
index 0000000000..da7828adbc
--- /dev/null
+++ b/erpnext/patches/v13_0/update_member_email_address.py
@@ -0,0 +1,19 @@
+# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors
+# MIT License. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	"""add value to email_id column from email"""
+	
+	if frappe.db.has_column("Member", "email"):
+		# Get all members
+		for member in frappe.db.get_all("Member", pluck="name"):
+			# Check if email_id already exists
+			if not frappe.db.get_value("Member", member, "email_id"):
+				# fetch email id from the user linked field email
+				email = frappe.db.get_value("Member", member, "email")
+
+				# Set the value for it
+				frappe.db.set_value("Member", member, "email_id", email)

From e0f4dd0643a9ef59d81d70d35050f7e51cfcdc1d Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Mon, 9 Nov 2020 12:29:27 +0530
Subject: [PATCH 04/22] fix: fieldtype for auto_create_for_web_forms

---
 .../doctype/membership_settings/membership_settings.json     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/erpnext/non_profit/doctype/membership_settings/membership_settings.json b/erpnext/non_profit/doctype/membership_settings/membership_settings.json
index a25f5ffbc2..961a9b9b3b 100644
--- a/erpnext/non_profit/doctype/membership_settings/membership_settings.json
+++ b/erpnext/non_profit/doctype/membership_settings/membership_settings.json
@@ -139,17 +139,18 @@
    "options": "Account"
   },
   {
+   "default": "0",
    "depends_on": "eval:doc.enable_invoicing",
    "description": "Automatically create an invoice when payment is authorized from a web form entry",
    "fieldname": "create_for_web_forms",
-   "fieldtype": "Data",
+   "fieldtype": "Check",
    "label": "Auto Create Invoice for Web Forms"
   }
  ],
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2020-11-04 20:19:55.163749",
+ "modified": "2020-11-09 12:28:49.972434",
  "modified_by": "Administrator",
  "module": "Non Profit",
  "name": "Membership Settings",

From 286ec04197e6cad7aac9a95d9c8996bc44006252 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Mon, 9 Nov 2020 12:53:00 +0530
Subject: [PATCH 05/22] test(membership): setup test defaults

---
 .../doctype/membership/membership.py          |  2 +
 .../doctype/membership/test_membership.py     | 47 ++++++++++++++++++-
 2 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/erpnext/non_profit/doctype/membership/membership.py b/erpnext/non_profit/doctype/membership/membership.py
index 36f68bc00c..ae4df4a374 100644
--- a/erpnext/non_profit/doctype/membership/membership.py
+++ b/erpnext/non_profit/doctype/membership/membership.py
@@ -162,6 +162,8 @@ def get_member_based_on_subscription(subscription_id, email):
 		return None
 
 def verify_signature(data):
+	if frappe.flags.in_test:
+		return True
 	signature = frappe.request.headers.get('X-Razorpay-Signature')
 
 	settings = frappe.get_doc("Membership Settings")
diff --git a/erpnext/non_profit/doctype/membership/test_membership.py b/erpnext/non_profit/doctype/membership/test_membership.py
index b23f4062a9..b62f19bd0d 100644
--- a/erpnext/non_profit/doctype/membership/test_membership.py
+++ b/erpnext/non_profit/doctype/membership/test_membership.py
@@ -2,8 +2,51 @@
 # Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
 from __future__ import unicode_literals
-
 import unittest
+from erpnext.non_profit.doctype.member.member import create_member
+from erpnext.stock.doctype.item.test_item import create_item
 
 class TestMembership(unittest.TestCase):
-	pass
+	def setUp(self):
+		# Get default company
+		company = frappe.get_doc("Company", erpnext.get_default_company())
+		
+		# update membership settings
+		settings = frappe.get_doc("Membership Settings")
+		# Enable razorpay
+		settings.enable_razorpay = 1
+		settings.billing_cycle = "Monthly"
+		settings.billing_frequency = 24
+		# Enable invoicing
+		settings.enable_invoicing = 1
+		settings.make_payment_entry = 1
+		settings.company = company.name
+		settings.payment_to = company.default_cash_account
+		settings.debit_account = company.default_receivable_account
+		settings.save()
+
+		# make test plan
+		plan = frappe.new_doc("Membership Type")
+		plan.amount = 100
+		plan.razorpay_plan_id = "_rzpy_test_milythm"
+		plan.linked_item = create_item("_Test Item for Non Profit Membership")
+		plan.insert()
+
+		# make test member
+		self.member_doc = create_member(frappe._dict({
+				'fullname': "_Test_Member",
+				'email': "_test_member_erpnext@example.com",
+				'plan_id': plan.name
+		}))
+
+	def test_auto_generate_invoice_and_payment_entry(self):
+		pass
+
+	def test_renew within_30_days(self):
+		pass
+
+	def test_from_to_dates(self):
+		pass
+
+	def test_razorpay_webook(self):
+		pass

From c04321e64586ec7f466bb848530712320f4bfbe8 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Mon, 9 Nov 2020 13:29:46 +0530
Subject: [PATCH 06/22] test(membership): add test for invoicing and validation

---
 .../doctype/membership/membership.py          | 16 +++-
 .../doctype/membership/test_membership.py     | 78 ++++++++++++++++---
 2 files changed, 84 insertions(+), 10 deletions(-)

diff --git a/erpnext/non_profit/doctype/membership/membership.py b/erpnext/non_profit/doctype/membership/membership.py
index ae4df4a374..ac3b89a8d0 100644
--- a/erpnext/non_profit/doctype/membership/membership.py
+++ b/erpnext/non_profit/doctype/membership/membership.py
@@ -86,6 +86,20 @@ class Membership(Document):
 		invoice = make_invoice(self, member, plan, settings)
 		self.invoice = invoice.name
 
+		if with_payment_entry:
+			if not settings.payment_account:
+				frappe.throw(_("You need to set <b>Payment Account</b> in Membership Settings"))
+
+			from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry
+			frappe.flags.ignore_account_permission=True
+			pe = get_payment_entry(dt='Sales Invoice', dn=invoice.name, bank_amount=invoice.grand_total)
+			frappe.flags.ignore_account_permission=False
+			pe.paid_to = settings.payment_account
+			pe.reference_no = self.name
+			pe.reference_date = getdate()
+			pe.save(ignore_permissions=True)
+			pe.submit()
+
 		if save:
 			self.save()
 
@@ -97,7 +111,7 @@ class Membership(Document):
 			frappe.throw(_("You need to enable <b>Send Acknowledge Email</b> in Membership Settings"))
 
 		member = frappe.get_doc("Member", self.member)
-		
+
 		if not member.email_id:
 			frappe.throw(_("Email address of member {0} is missing").format(frappe.utils.get_link_to_form("Member", self.member)))
 
diff --git a/erpnext/non_profit/doctype/membership/test_membership.py b/erpnext/non_profit/doctype/membership/test_membership.py
index b62f19bd0d..6e4885d013 100644
--- a/erpnext/non_profit/doctype/membership/test_membership.py
+++ b/erpnext/non_profit/doctype/membership/test_membership.py
@@ -3,7 +3,10 @@
 # See license.txt
 from __future__ import unicode_literals
 import unittest
+import frappe
+import erpnext
 from erpnext.non_profit.doctype.member.member import create_member
+from frappe.utils import nowdate, getdate, add_months
 from erpnext.stock.doctype.item.test_item import create_item
 
 class TestMembership(unittest.TestCase):
@@ -21,15 +24,16 @@ class TestMembership(unittest.TestCase):
 		settings.enable_invoicing = 1
 		settings.make_payment_entry = 1
 		settings.company = company.name
-		settings.payment_to = company.default_cash_account
+		settings.payment_account = company.default_cash_account
 		settings.debit_account = company.default_receivable_account
 		settings.save()
 
 		# make test plan
 		plan = frappe.new_doc("Membership Type")
+		plan.membership_type = "_rzpy_test_milythm"
 		plan.amount = 100
 		plan.razorpay_plan_id = "_rzpy_test_milythm"
-		plan.linked_item = create_item("_Test Item for Non Profit Membership")
+		plan.linked_item = create_item("_Test Item for Non Profit Membership").name
 		plan.insert()
 
 		# make test member
@@ -38,15 +42,71 @@ class TestMembership(unittest.TestCase):
 				'email': "_test_member_erpnext@example.com",
 				'plan_id': plan.name
 		}))
+		self.member_doc.make_customer_and_link()
+		self.member = "self.member_doc.name"
 
 	def test_auto_generate_invoice_and_payment_entry(self):
-		pass
+		entry = make_membership(self.member)
 
-	def test_renew within_30_days(self):
-		pass
+		# Naive test to see if at all invoice was generated and attached to member
+		# In any case if details were missing, the invoicing would throw an error
+		invoice = entry.generate_invoice(save=True)
+		self.assertEqual(invoice.name, entry.invoice)
+		# entry.delete()
 
-	def test_from_to_dates(self):
-		pass
+		# # Remove customer
+		# old_customer = self.member_doc.customer
+		# self.member_doc.customer = None
+		# self.member_doc.save()
 
-	def test_razorpay_webook(self):
-		pass
+		# entry = make_membership(self.member)
+		# self.assertRaises(frappe.ValidationError, entry.generate_invoice)
+		
+		# # Add customer value back
+		# self.member_doc.customer = old_customer
+		# self.member_doc.save()
+
+		# # Remove company
+		# set_config(company, None)
+		# self.assertRaises(frappe.ValidationError, entry.generate_invoice)
+
+	def test_renew_within_30_days(self):
+		# create a membership for two months
+		# Should work fine
+		make_membership(self.member, { "from_date": nowdate() })
+		make_membership(self.member, { "from_date": add_months(nowdate(), 1) })
+		
+		from frappe.utils.user import add_role
+		add_role("test@example.com", "Non Profit Manager")
+		frappe.set_user("test@example.com")
+		
+		# create next membership with expiry not within 30 days
+		self.assertRaises(frappe.ValidationError, make_membership, self.member, {
+			"from_date": add_months(nowdate(), 2),
+		})
+
+		frappe.set_user("Administrator")
+		# create the same membership but as administrator
+		new_entry = make_membership(self.member, {
+			"from_date": add_months(nowdate(), 2),
+			"to_date": add_months(nowdate(), 3),
+		})
+
+def set_config(key, value):
+	frappe.db.set_value("Membership Settings", None, key, value)
+
+def make_membership(member, payload={}):
+	data = {
+		"doctype": "Membership",
+		"member": member,
+		"membership_status": "Current",
+		"membership_type": "_rzpy_test_milythm",
+		"currency": "INR",
+		"paid": 1,
+		"from_date": nowdate(),
+		"amount": 100
+	}
+	data.update(payload)
+	membership = frappe.get_doc(data)
+	membership.insert(ignore_permissions=True, ignore_if_duplicate=True)
+	return membership
\ No newline at end of file

From 7e1cdf9b978ffdb6713a2e2cade4ac7307b73533 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Mon, 9 Nov 2020 14:01:11 +0530
Subject: [PATCH 07/22] feat(breaking): update get_last_membership to fetch
 correct details

---
 erpnext/__init__.py                                | 14 ++++----------
 .../non_profit/doctype/membership/membership.py    |  2 +-
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index 38d8a62f07..5a5c448026 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -132,16 +132,10 @@ def allow_regional(fn):
 
 	return caller
 
-def get_last_membership():
+def get_last_membership(member):
 	'''Returns last membership if exists'''
 	last_membership = frappe.get_all('Membership', 'name,to_date,membership_type',
-		dict(member=frappe.session.user, paid=1), order_by='to_date desc', limit=1)
+		dict(member=member, paid=1), order_by='to_date desc', limit=1)
 
-	return last_membership and last_membership[0]
-
-def is_member():
-	'''Returns true if the user is still a member'''
-	last_membership = get_last_membership()
-	if last_membership and getdate(last_membership.to_date) > getdate():
-		return True
-	return False
+	if last_membership:
+		return last_membership[0]
diff --git a/erpnext/non_profit/doctype/membership/membership.py b/erpnext/non_profit/doctype/membership/membership.py
index ac3b89a8d0..7c83a4e0da 100644
--- a/erpnext/non_profit/doctype/membership/membership.py
+++ b/erpnext/non_profit/doctype/membership/membership.py
@@ -34,7 +34,7 @@ class Membership(Document):
 				self.member = member_name
 
 		# get last membership (if active)
-		last_membership = erpnext.get_last_membership()
+		last_membership = erpnext.get_last_membership(self.member)
 
 		# if person applied for offline membership
 		if last_membership and not frappe.session.user == "Administrator":

From 12fafa3e7a20bb8a2ad54ea43f8e3d2146bd30b5 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Mon, 9 Nov 2020 14:01:22 +0530
Subject: [PATCH 08/22] chore: remove validation for old member field

---
 erpnext/non_profit/doctype/member/member.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/erpnext/non_profit/doctype/member/member.py b/erpnext/non_profit/doctype/member/member.py
index 44b975e9e9..7fc4f225aa 100644
--- a/erpnext/non_profit/doctype/member/member.py
+++ b/erpnext/non_profit/doctype/member/member.py
@@ -18,8 +18,6 @@ class Member(Document):
 
 
 	def validate(self):
-		if self.email:
-			self.validate_email_type(self.email)
 		if self.email_id:
 			self.validate_email_type(self.email_id)
 

From 723e220a3409150de11c4b74a7bbb5911060382b Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Mon, 9 Nov 2020 14:01:52 +0530
Subject: [PATCH 09/22] chore: remove commented code

---
 .../doctype/membership/test_membership.py       | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/erpnext/non_profit/doctype/membership/test_membership.py b/erpnext/non_profit/doctype/membership/test_membership.py
index 6e4885d013..ce31b91956 100644
--- a/erpnext/non_profit/doctype/membership/test_membership.py
+++ b/erpnext/non_profit/doctype/membership/test_membership.py
@@ -52,23 +52,6 @@ class TestMembership(unittest.TestCase):
 		# In any case if details were missing, the invoicing would throw an error
 		invoice = entry.generate_invoice(save=True)
 		self.assertEqual(invoice.name, entry.invoice)
-		# entry.delete()
-
-		# # Remove customer
-		# old_customer = self.member_doc.customer
-		# self.member_doc.customer = None
-		# self.member_doc.save()
-
-		# entry = make_membership(self.member)
-		# self.assertRaises(frappe.ValidationError, entry.generate_invoice)
-		
-		# # Add customer value back
-		# self.member_doc.customer = old_customer
-		# self.member_doc.save()
-
-		# # Remove company
-		# set_config(company, None)
-		# self.assertRaises(frappe.ValidationError, entry.generate_invoice)
 
 	def test_renew_within_30_days(self):
 		# create a membership for two months

From 3575939386154a78bc58334383703def9e00bd88 Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Wed, 20 Jan 2021 20:48:51 +0530
Subject: [PATCH 10/22] fix: sider issues

---
 erpnext/non_profit/doctype/membership/membership.py    |  4 ++--
 .../non_profit/doctype/membership/test_membership.py   | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/erpnext/non_profit/doctype/membership/membership.py b/erpnext/non_profit/doctype/membership/membership.py
index 853d7f51f8..5c32c81242 100644
--- a/erpnext/non_profit/doctype/membership/membership.py
+++ b/erpnext/non_profit/doctype/membership/membership.py
@@ -63,7 +63,7 @@ class Membership(Document):
 			self.generate_invoice(with_payment_entry=settings.make_payment_entry, save=True)
 
 
-	def generate_invoice(self, save=True):
+	def generate_invoice(self, save=True, with_payment_entry=False):
 		if not (self.paid or self.currency or self.amount):
 			frappe.throw(_("The payment for this membership is not paid. To generate invoice fill the payment details"))
 
@@ -140,7 +140,7 @@ class Membership(Document):
 			frappe.sendmail(**email_args)
 
 	def generate_and_send_invoice(self):
-		invoice = self.generate_invoice(False)
+		invoice = self.generate_invoice(save=False)
 		self.send_acknowlement()
 
 def make_invoice(membership, member, plan, settings):
diff --git a/erpnext/non_profit/doctype/membership/test_membership.py b/erpnext/non_profit/doctype/membership/test_membership.py
index ce31b91956..a7fad9debe 100644
--- a/erpnext/non_profit/doctype/membership/test_membership.py
+++ b/erpnext/non_profit/doctype/membership/test_membership.py
@@ -6,14 +6,14 @@ import unittest
 import frappe
 import erpnext
 from erpnext.non_profit.doctype.member.member import create_member
-from frappe.utils import nowdate, getdate, add_months
+from frappe.utils import nowdate, add_months
 from erpnext.stock.doctype.item.test_item import create_item
 
 class TestMembership(unittest.TestCase):
 	def setUp(self):
 		# Get default company
 		company = frappe.get_doc("Company", erpnext.get_default_company())
-		
+
 		# update membership settings
 		settings = frappe.get_doc("Membership Settings")
 		# Enable razorpay
@@ -58,11 +58,11 @@ class TestMembership(unittest.TestCase):
 		# Should work fine
 		make_membership(self.member, { "from_date": nowdate() })
 		make_membership(self.member, { "from_date": add_months(nowdate(), 1) })
-		
+
 		from frappe.utils.user import add_role
 		add_role("test@example.com", "Non Profit Manager")
 		frappe.set_user("test@example.com")
-		
+
 		# create next membership with expiry not within 30 days
 		self.assertRaises(frappe.ValidationError, make_membership, self.member, {
 			"from_date": add_months(nowdate(), 2),
@@ -70,7 +70,7 @@ class TestMembership(unittest.TestCase):
 
 		frappe.set_user("Administrator")
 		# create the same membership but as administrator
-		new_entry = make_membership(self.member, {
+		make_membership(self.member, {
 			"from_date": add_months(nowdate(), 2),
 			"to_date": add_months(nowdate(), 3),
 		})

From fa4b3ba505b45c5f99de77ebf0ffe36d40360887 Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Wed, 20 Jan 2021 21:59:27 +0530
Subject: [PATCH 11/22] fix: basic validations for Membership Type Linked Item

---
 .../doctype/membership_type/membership_type.js       | 12 ++++++++++--
 .../doctype/membership_type/membership_type.py       |  6 +++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/erpnext/non_profit/doctype/membership_type/membership_type.js b/erpnext/non_profit/doctype/membership_type/membership_type.js
index 94ccdd8334..5bd8a6cf6e 100644
--- a/erpnext/non_profit/doctype/membership_type/membership_type.js
+++ b/erpnext/non_profit/doctype/membership_type/membership_type.js
@@ -3,12 +3,20 @@
 
 frappe.ui.form.on('Membership Type', {
 	refresh: function (frm) {
-		frappe.db.get_single_value("Membership Settings", "enable_razorpay").then(val => {
+		frappe.db.get_single_value('Membership Settings', 'enable_razorpay').then(val => {
 			if (val) frm.set_df_property('razorpay_plan_id', 'hidden', false);
 		});
 
-		frappe.db.get_single_value("Membership Settings", "enable_invoicing").then(val => {
+		frappe.db.get_single_value('Membership Settings', 'enable_invoicing').then(val => {
 			if (val) frm.set_df_property('linked_item', 'hidden', false);
 		});
+
+		frm.set_query('linked_item', () => {
+			return {
+				filters: {
+					is_stock_item: 0
+				}
+			}
+		})
 	}
 });
diff --git a/erpnext/non_profit/doctype/membership_type/membership_type.py b/erpnext/non_profit/doctype/membership_type/membership_type.py
index b95b04316f..38e6f65556 100644
--- a/erpnext/non_profit/doctype/membership_type/membership_type.py
+++ b/erpnext/non_profit/doctype/membership_type/membership_type.py
@@ -7,7 +7,11 @@ from frappe.model.document import Document
 import frappe
 
 class MembershipType(Document):
-	pass
+	def validate(self):
+		if self.linked_item:
+			is_stock_item = frappe.db.get_value("Item", self.linked_item, "is_stock_item")
+			if is_stock_item:
+				frappe.throw(_("The Linked Item should be a service item"))
 
 def get_membership_type(razorpay_id):
 	return frappe.db.exists("Membership Type", {"razorpay_plan_id": razorpay_id})
\ No newline at end of file

From bc49815d546719f13b1513822d5aee5b6c1e7022 Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Wed, 20 Jan 2021 23:14:27 +0530
Subject: [PATCH 12/22] refactor: missing validations, code clean-up

---
 erpnext/non_profit/doctype/member/member.py   |   8 +-
 .../doctype/membership/membership.js          |  18 +-
 .../doctype/membership/membership.py          | 167 ++++++++++--------
 .../membership_settings.js                    |  23 ++-
 4 files changed, 131 insertions(+), 85 deletions(-)

diff --git a/erpnext/non_profit/doctype/member/member.py b/erpnext/non_profit/doctype/member/member.py
index f40f278fed..04b99f93f2 100644
--- a/erpnext/non_profit/doctype/member/member.py
+++ b/erpnext/non_profit/doctype/member/member.py
@@ -55,14 +55,16 @@ class Member(Document):
 	def make_customer_and_link(self):
 		if self.customer:
 			frappe.msgprint(_("A customer is already linked to this Member"))
-		cust = create_customer(frappe._dict({
+
+		customer = create_customer(frappe._dict({
 			'fullname': self.member_name,
-			'email': self.email_id or self.email,
+			'email': self.email_id,
 			'phone': None
 		}))
 
-		self.customer = cust
+		self.customer = customer
 		self.save()
+		frappe.msgprint(_("Customer {0} has been created succesfully.").format(self.customer))
 
 
 def get_or_create_member(user_details):
diff --git a/erpnext/non_profit/doctype/membership/membership.js b/erpnext/non_profit/doctype/membership/membership.js
index ee8a8c0a7b..99aabf3926 100644
--- a/erpnext/non_profit/doctype/membership/membership.js
+++ b/erpnext/non_profit/doctype/membership/membership.js
@@ -4,16 +4,22 @@
 frappe.ui.form.on('Membership', {
 	setup: function(frm) {
 		frappe.db.get_single_value("Membership Settings", "enable_razorpay").then(val => {
-			if (val) frm.set_df_property('razorpay_details_section', 'hidden', false);
+			if (val) frm.set_df_property("razorpay_details_section", "hidden", false);
 		})
 	},
 
 	refresh: function(frm) {
 		!frm.doc.invoice && frm.add_custom_button("Generate Invoice", () => {
-			frm.call("generate_invoice", {
-				save: true
-			}).then(() => {
-				frm.reload_doc();
+			frm.call({
+				doc: frm.doc,
+				method: "generate_invoice",
+				args: {save: true},
+				freeze: true,
+				freeze_message: __("Creating Membership Invoice"),
+				callback: function(r) {
+					if (r.invoice)
+						frm.reload_doc();
+				}
 			});
 		});
 
@@ -27,6 +33,6 @@ frappe.ui.form.on('Membership', {
 	},
 
 	onload: function(frm) {
-		frm.add_fetch('membership_type', 'amount', 'amount');
+		frm.add_fetch("membership_type", "amount", "amount");
 	}
 });
diff --git a/erpnext/non_profit/doctype/membership/membership.py b/erpnext/non_profit/doctype/membership/membership.py
index 5c32c81242..5f9a98cd1c 100644
--- a/erpnext/non_profit/doctype/membership/membership.py
+++ b/erpnext/non_profit/doctype/membership/membership.py
@@ -14,25 +14,31 @@ from erpnext.non_profit.doctype.member.member import create_member
 from frappe import _
 import erpnext
 
-
 class Membership(Document):
 	def validate(self):
 		if not self.member or not frappe.db.exists("Member", self.member):
-			member_name = frappe.get_value('Member', dict(email=frappe.session.user))
+			# for web forms
+			self.create_member_from_website_user()
 
-			if not member_name:
-				user = frappe.get_doc('User', frappe.session.user)
-				member = frappe.get_doc(dict(
-					doctype='Member',
-					email_id=frappe.session.user,
-					membership_type=self.membership_type,
-					member_name=user.get_fullname()
-				)).insert(ignore_permissions=True)
-				member_name = member.name
+		self.validate_membership_period()
 
-			if self.get("__islocal"):
-				self.member = member_name
+	def create_member_from_website_user(self):
+		member_name = frappe.get_value("Member", dict(email_id=frappe.session.user))
 
+		if not member_name:
+			user = frappe.get_doc("User", frappe.session.user)
+			member = frappe.get_doc(dict(
+				doctype="Member",
+				email_id=frappe.session.user,
+				membership_type=self.membership_type,
+				member_name=user.get_fullname()
+			)).insert(ignore_permissions=True)
+			member_name = member.name
+
+		if self.get("__islocal"):
+			self.member = member_name
+
+	def validate_membership_period(self):
 		# get last membership (if active)
 		last_membership = erpnext.get_last_membership(self.member)
 
@@ -40,7 +46,7 @@ class Membership(Document):
 		if last_membership and not frappe.session.user == "Administrator":
 			# if last membership does not expire in 30 days, then do not allow to renew
 			if getdate(add_days(last_membership.to_date, -30)) > getdate(nowdate()) :
-				frappe.throw(_('You can only renew if your membership expires within 30 days'))
+				frappe.throw(_("You can only renew if your membership expires within 30 days"))
 
 			self.from_date = add_days(last_membership.to_date, 1)
 		elif frappe.session.user == "Administrator":
@@ -57,7 +63,7 @@ class Membership(Document):
 		if status_changed_to not in ("Completed", "Authorized"):
 			return
 		self.load_from_db()
-		self.db_set('paid', 1)
+		self.db_set("paid", 1)
 		settings = frappe.get_doc("Membership Settings")
 		if settings.enable_invoicing and settings.create_for_web_forms:
 			self.generate_invoice(with_payment_entry=settings.make_payment_entry, save=True)
@@ -71,47 +77,59 @@ class Membership(Document):
 			frappe.throw(_("An invoice is already linked to this document"))
 
 		member = frappe.get_doc("Member", self.member)
-		plan = frappe.get_doc("Membership Type", self.membership_type)
-		settings = frappe.get_doc("Membership Settings")
-
 		if not member.customer:
 			frappe.throw(_("No customer linked to member {0}").format(frappe.bold(self.member)))
 
-		if not settings.debit_account:
-			frappe.throw(_("You need to set <b>Debit Account</b> in Membership Settings"))
-
-		if not settings.company:
-			frappe.throw(_("You need to set <b>Default Company</b> for invoicing in Membership Settings"))
+		plan = frappe.get_doc("Membership Type", self.membership_type)
+		settings = frappe.get_doc("Membership Settings")
+		self.validate_membership_type_and_settings(plan, settings)
 
 		invoice = make_invoice(self, member, plan, settings)
 		self.invoice = invoice.name
 
 		if with_payment_entry:
-			if not settings.payment_account:
-				frappe.throw(_("You need to set <b>Payment Account</b> in Membership Settings"))
-
-			from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry
-			frappe.flags.ignore_account_permission=True
-			pe = get_payment_entry(dt='Sales Invoice', dn=invoice.name, bank_amount=invoice.grand_total)
-			frappe.flags.ignore_account_permission=False
-			pe.paid_to = settings.payment_account
-			pe.reference_no = self.name
-			pe.reference_date = getdate()
-			pe.save(ignore_permissions=True)
-			pe.submit()
+			self.make_payment_entry(settings, invoice)
 
 		if save:
 			self.save()
 
 		return invoice
 
+	def validate_membership_type_and_settings(self, plan, settings):
+		settings_link = get_link_to_form("Membership Type", self.membership_type)
+
+		if not settings.debit_account:
+			frappe.throw(_("You need to set <b>Debit Account</b> in {0}").format(settings_link))
+
+		if not settings.company:
+			frappe.throw(_("You need to set <b>Default Company</b> for invoicing in {0}").format(settings_link))
+
+		if not plan.linked_item:
+			frappe.throw(_("Please set a Linked Item for the Membership Type {0}").format(
+				get_link_to_form("Membership Type", self.membership_type)))
+
+	def make_payment_entry(self, settings, invoice):
+		if not settings.payment_account:
+			frappe.throw(_("You need to set <b>Payment Account</b> in {0}").format(
+				get_link_to_form("Membership Type", self.membership_type)))
+
+		from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry
+		frappe.flags.ignore_account_permission = True
+		pe = get_payment_entry(dt="Sales Invoice", dn=invoice.name, bank_amount=invoice.grand_total)
+		frappe.flags.ignore_account_permission=False
+		pe.paid_to = settings.payment_account
+		pe.reference_no = self.name
+		pe.reference_date = getdate()
+		pe.save(ignore_permissions=True)
+		pe.submit()
+
 	def send_acknowlement(self):
 		settings = frappe.get_doc("Membership Settings")
 		if not settings.send_email:
-			frappe.throw(_("You need to enable <b>Send Acknowledge Email</b> in Membership Settings"))
+			frappe.throw(_("You need to enable <b>Send Acknowledge Email</b> in {0}").format(
+				get_link_to_form("Membership Settings", "Membership Settings")))
 
 		member = frappe.get_doc("Member", self.member)
-
 		if not member.email_id:
 			frappe.throw(_("Email address of member {0} is missing").format(frappe.utils.get_link_to_form("Member", self.member)))
 
@@ -135,50 +153,56 @@ class Membership(Document):
 		}
 
 		if not frappe.flags.in_test:
-			frappe.enqueue(method=frappe.sendmail, queue='short', timeout=300, is_async=True, **email_args)
+			frappe.enqueue(method=frappe.sendmail, queue="short", timeout=300, is_async=True, **email_args)
 		else:
 			frappe.sendmail(**email_args)
 
 	def generate_and_send_invoice(self):
-		invoice = self.generate_invoice(save=False)
+		self.generate_invoice(save=False)
 		self.send_acknowlement()
 
+
 def make_invoice(membership, member, plan, settings):
 	invoice = frappe.get_doc({
-		'doctype': 'Sales Invoice',
-		'customer': member.customer,
-		'debit_to': settings.debit_account,
-		'currency': membership.currency,
-		'is_pos': 0,
-		'items': [
+		"doctype": "Sales Invoice",
+		"customer": member.customer,
+		"debit_to": settings.debit_account,
+		"currency": membership.currency,
+		"company": settings.company,
+		"is_pos": 0,
+		"items": [
 			{
-				'item_code': plan.linked_item,
-				'rate': membership.amount,
-				'qty': 1
+				"item_code": plan.linked_item,
+				"rate": membership.amount,
+				"qty": 1
 			}
 		]
 	})
-
+	invoice.set_missing_values()
 	invoice.insert(ignore_permissions=True)
 	invoice.submit()
 
+	frappe.msgprint(_("Sales Invoice created successfully"))
+
 	return invoice
 
+
 def get_member_based_on_subscription(subscription_id, email):
 	members = frappe.get_all("Member", filters={
-					'subscription_id': subscription_id,
-					'email_id': email
+					"subscription_id": subscription_id,
+					"email_id": email
 				}, order_by="creation desc")
 
 	try:
-		return frappe.get_doc("Member", members[0]['name'])
+		return frappe.get_doc("Member", members[0]["name"])
 	except:
 		return None
 
+
 def verify_signature(data):
 	if frappe.flags.in_test:
 		return True
-	signature = frappe.request.headers.get('X-Razorpay-Signature')
+	signature = frappe.request.headers.get("X-Razorpay-Signature")
 
 	settings = frappe.get_doc("Membership Settings")
 	key = settings.get_webhook_secret()
@@ -187,6 +211,7 @@ def verify_signature(data):
 
 	controller.verify_signature(data, signature, key)
 
+
 @frappe.whitelist(allow_guest=True)
 def trigger_razorpay_subscription(*args, **kwargs):
 	data = frappe.request.get_data(as_text=True)
@@ -195,16 +220,16 @@ def trigger_razorpay_subscription(*args, **kwargs):
 	except Exception as e:
 		log = frappe.log_error(e, "Webhook Verification Error")
 		notify_failure(log)
-		return { 'status': 'Failed', 'reason': e}
+		return { "status": "Failed", "reason": e}
 
 	if isinstance(data, six.string_types):
 		data = json.loads(data)
 	data = frappe._dict(data)
 
-	subscription = data.payload.get("subscription", {}).get('entity', {})
+	subscription = data.payload.get("subscription", {}).get("entity", {})
 	subscription = frappe._dict(subscription)
 
-	payment = data.payload.get("payment", {}).get('entity', {})
+	payment = data.payload.get("payment", {}).get("entity", {})
 	payment = frappe._dict(payment)
 
 	try:
@@ -214,15 +239,15 @@ def trigger_razorpay_subscription(*args, **kwargs):
 		member = get_member_based_on_subscription(subscription.id, payment.email)
 		if not member:
 			member = create_member(frappe._dict({
-				'fullname': payment.email,
-				'email': payment.email,
-				'plan_id': get_plan_from_razorpay_id(subscription.plan_id)
+				"fullname": payment.email,
+				"email": payment.email,
+				"plan_id": get_plan_from_razorpay_id(subscription.plan_id)
 			}))
 
 			member.subscription_id = subscription.id
 			member.customer_id = payment.customer_id
 			if subscription.notes and type(subscription.notes) == dict:
-				notes = '\n'.join("{}: {}".format(k, v) for k, v in subscription.notes.items())
+				notes = "\n".join("{}: {}".format(k, v) for k, v in subscription.notes.items())
 				member.add_comment("Comment", notes)
 			elif subscription.notes and type(subscription.notes) == str:
 				member.add_comment("Comment", subscription.notes)
@@ -252,28 +277,30 @@ def trigger_razorpay_subscription(*args, **kwargs):
 		message = "{0}\n\n{1}\n\n{2}: {3}".format(e, frappe.get_traceback(), __("Payment ID"), payment.id)
 		log = frappe.log_error(message, _("Error creating membership entry for {0}").format(member.name))
 		notify_failure(log)
-		return { 'status': 'Failed', 'reason': e}
+		return { "status": "Failed", "reason": e}
 
-	return { 'status': 'Success' }
+	return { "status": "Success" }
 
 
 def notify_failure(log):
 	try:
-		content = """Dear System Manager,
-Razorpay webhook for creating renewing membership subscription failed due to some reason. Please check the following error log linked below
+		content = _("""
+			Dear System Manager,
+			Razorpay webhook for creating renewing membership subscription failed due to some reason.
+			Please check the following error log linked below
+			Error Log: {0}
+			Regards, Administrator
+		""").format(get_link_to_form("Error Log", log.name))
 
-Error Log: {0}
-
-Regards,
-Administrator""".format(get_link_to_form("Error Log", log.name))
 		sendmail_to_system_managers("[Important] [ERPNext] Razorpay membership webhook failed , please check.", content)
 	except:
 		pass
 
+
 def get_plan_from_razorpay_id(plan_id):
-	plan = frappe.get_all("Membership Type", filters={'razorpay_plan_id': plan_id}, order_by="creation desc")
+	plan = frappe.get_all("Membership Type", filters={"razorpay_plan_id": plan_id}, order_by="creation desc")
 
 	try:
-		return plan[0]['name']
+		return plan[0]["name"]
 	except:
 		return None
diff --git a/erpnext/non_profit/doctype/membership_settings/membership_settings.js b/erpnext/non_profit/doctype/membership_settings/membership_settings.js
index 1d894027b0..c95aab2a7a 100644
--- a/erpnext/non_profit/doctype/membership_settings/membership_settings.js
+++ b/erpnext/non_profit/doctype/membership_settings/membership_settings.js
@@ -11,7 +11,7 @@ frappe.ui.form.on("Membership Settings", {
 			});
 		}
 
-		frm.set_query('inv_print_format', function(doc) {
+		frm.set_query("inv_print_format", function() {
 			return {
 				filters: {
 					"doc_type": "Sales Invoice"
@@ -19,7 +19,7 @@ frappe.ui.form.on("Membership Settings", {
 			};
 		});
 
-		frm.set_query('membership_print_format', function(doc) {
+		frm.set_query("membership_print_format", function() {
 			return {
 				filters: {
 					"doc_type": "Membership"
@@ -27,12 +27,23 @@ frappe.ui.form.on("Membership Settings", {
 			};
 		});
 
-		frm.set_query('debit_account', function(doc) {
+		frm.set_query("debit_account", function() {
 			return {
 				filters: {
-					'account_type': 'Receivable',
-					'is_group': 0,
-					'company': frm.doc.company
+					"account_type": "Receivable",
+					"is_group": 0,
+					"company": frm.doc.company
+				}
+			};
+		});
+
+		frm.set_query("payment_account", function () {
+			var account_types = ["Bank", "Cash"];
+			return {
+				filters: {
+					"account_type": ["in", account_types],
+					"is_group": 0,
+					"company": frm.doc.company
 				}
 			};
 		});

From 53d0eebbe850bc98ed3b84824239af9bd96d1b57 Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Wed, 20 Jan 2021 23:22:08 +0530
Subject: [PATCH 13/22] fix: patch for renaming field in Membership Settings

---
 erpnext/non_profit/doctype/membership/membership.py  | 4 ++--
 erpnext/patches/v13_0/update_member_email_address.py | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/erpnext/non_profit/doctype/membership/membership.py b/erpnext/non_profit/doctype/membership/membership.py
index 5f9a98cd1c..db4481e40d 100644
--- a/erpnext/non_profit/doctype/membership/membership.py
+++ b/erpnext/non_profit/doctype/membership/membership.py
@@ -284,13 +284,13 @@ def trigger_razorpay_subscription(*args, **kwargs):
 
 def notify_failure(log):
 	try:
-		content = _("""
+		content = """
 			Dear System Manager,
 			Razorpay webhook for creating renewing membership subscription failed due to some reason.
 			Please check the following error log linked below
 			Error Log: {0}
 			Regards, Administrator
-		""").format(get_link_to_form("Error Log", log.name))
+		""".format(get_link_to_form("Error Log", log.name))
 
 		sendmail_to_system_managers("[Important] [ERPNext] Razorpay membership webhook failed , please check.", content)
 	except:
diff --git a/erpnext/patches/v13_0/update_member_email_address.py b/erpnext/patches/v13_0/update_member_email_address.py
index da7828adbc..38843e31bf 100644
--- a/erpnext/patches/v13_0/update_member_email_address.py
+++ b/erpnext/patches/v13_0/update_member_email_address.py
@@ -3,10 +3,11 @@
 
 from __future__ import unicode_literals
 import frappe
+from frappe.model.utils.rename_field import rename_field
 
 def execute():
 	"""add value to email_id column from email"""
-	
+
 	if frappe.db.has_column("Member", "email"):
 		# Get all members
 		for member in frappe.db.get_all("Member", pluck="name"):
@@ -17,3 +18,5 @@ def execute():
 
 				# Set the value for it
 				frappe.db.set_value("Member", member, "email_id", email)
+
+	rename_field("Membership Settings", "enable_auto_invoicing", "enable_invoicing")

From 4284ad880bd46fb2c061085a5b8a73229a87e513 Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Thu, 21 Jan 2021 11:54:14 +0530
Subject: [PATCH 14/22] fix: create member from membership for website users
 only

---
 erpnext/non_profit/doctype/membership/membership.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/erpnext/non_profit/doctype/membership/membership.py b/erpnext/non_profit/doctype/membership/membership.py
index db4481e40d..c58e35a73e 100644
--- a/erpnext/non_profit/doctype/membership/membership.py
+++ b/erpnext/non_profit/doctype/membership/membership.py
@@ -18,7 +18,11 @@ class Membership(Document):
 	def validate(self):
 		if not self.member or not frappe.db.exists("Member", self.member):
 			# for web forms
-			self.create_member_from_website_user()
+			user_type = frappe.db.get_value("User", frappe.session.user, "user_type")
+			if user_type == "Website User":
+				self.create_member_from_website_user()
+			else:
+				frappe.throw(_("Please select a Member"))
 
 		self.validate_membership_period()
 

From 3af46cc6cccc100906d975a1babcfb46e89577cf Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Thu, 21 Jan 2021 11:59:34 +0530
Subject: [PATCH 15/22] fix: show custom buttons after save

---
 erpnext/non_profit/doctype/membership/membership.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/erpnext/non_profit/doctype/membership/membership.js b/erpnext/non_profit/doctype/membership/membership.js
index 99aabf3926..573ac3319a 100644
--- a/erpnext/non_profit/doctype/membership/membership.js
+++ b/erpnext/non_profit/doctype/membership/membership.js
@@ -9,6 +9,9 @@ frappe.ui.form.on('Membership', {
 	},
 
 	refresh: function(frm) {
+		if (frm.doc.__islocal)
+			return;
+
 		!frm.doc.invoice && frm.add_custom_button("Generate Invoice", () => {
 			frm.call({
 				doc: frm.doc,

From b48eab972ed42e7b4594d0110673d08a8ce56bae Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Thu, 21 Jan 2021 13:00:10 +0530
Subject: [PATCH 16/22] fix: sider issues

---
 erpnext/non_profit/doctype/membership_type/membership_type.js | 4 ++--
 erpnext/non_profit/doctype/membership_type/membership_type.py | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/erpnext/non_profit/doctype/membership_type/membership_type.js b/erpnext/non_profit/doctype/membership_type/membership_type.js
index 5bd8a6cf6e..91a5cb74ba 100644
--- a/erpnext/non_profit/doctype/membership_type/membership_type.js
+++ b/erpnext/non_profit/doctype/membership_type/membership_type.js
@@ -16,7 +16,7 @@ frappe.ui.form.on('Membership Type', {
 				filters: {
 					is_stock_item: 0
 				}
-			}
-		})
+			};
+		});
 	}
 });
diff --git a/erpnext/non_profit/doctype/membership_type/membership_type.py b/erpnext/non_profit/doctype/membership_type/membership_type.py
index 38e6f65556..022829bd3a 100644
--- a/erpnext/non_profit/doctype/membership_type/membership_type.py
+++ b/erpnext/non_profit/doctype/membership_type/membership_type.py
@@ -5,6 +5,7 @@
 from __future__ import unicode_literals
 from frappe.model.document import Document
 import frappe
+from frappe import _
 
 class MembershipType(Document):
 	def validate(self):

From d98b5064784b6d3696d2685839d5fe8ef72106db Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Thu, 21 Jan 2021 13:23:59 +0530
Subject: [PATCH 17/22] fix: patch

---
 erpnext/patches/v13_0/update_member_email_address.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/erpnext/patches/v13_0/update_member_email_address.py b/erpnext/patches/v13_0/update_member_email_address.py
index 38843e31bf..4056f84069 100644
--- a/erpnext/patches/v13_0/update_member_email_address.py
+++ b/erpnext/patches/v13_0/update_member_email_address.py
@@ -19,4 +19,5 @@ def execute():
 				# Set the value for it
 				frappe.db.set_value("Member", member, "email_id", email)
 
-	rename_field("Membership Settings", "enable_auto_invoicing", "enable_invoicing")
+	if frappe.db.exists("DocType", "Membership Settings"):
+		rename_field("Membership Settings", "enable_auto_invoicing", "enable_invoicing")

From b9781a46759dea0cf80bc1b2395f9c951fb88c70 Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Thu, 21 Jan 2021 15:13:29 +0530
Subject: [PATCH 18/22] fix: membership test cases

---
 erpnext/non_profit/doctype/membership/test_membership.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/erpnext/non_profit/doctype/membership/test_membership.py b/erpnext/non_profit/doctype/membership/test_membership.py
index a7fad9debe..db56527024 100644
--- a/erpnext/non_profit/doctype/membership/test_membership.py
+++ b/erpnext/non_profit/doctype/membership/test_membership.py
@@ -33,7 +33,7 @@ class TestMembership(unittest.TestCase):
 		plan.membership_type = "_rzpy_test_milythm"
 		plan.amount = 100
 		plan.razorpay_plan_id = "_rzpy_test_milythm"
-		plan.linked_item = create_item("_Test Item for Non Profit Membership").name
+		plan.linked_item = create_item("_Test Item for Non Profit Membership", is_stock_item=0).name
 		plan.insert()
 
 		# make test member

From f1cca59d80ff447cb360780a18b34f2af1f8c90e Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Thu, 21 Jan 2021 16:36:15 +0530
Subject: [PATCH 19/22] feat: update expiry for memberships

---
 erpnext/hooks.py                                 |  3 ++-
 .../doctype/membership/membership.json           | 16 ++++++++++++++--
 .../non_profit/doctype/membership/membership.py  |  9 +++++++++
 .../doctype/membership/membership_list.js        | 15 +++++++++++++++
 4 files changed, 40 insertions(+), 3 deletions(-)
 create mode 100644 erpnext/non_profit/doctype/membership/membership_list.js

diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index a2d9d861bb..f7ec1c1b6e 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -341,7 +341,8 @@ scheduler_events = {
 		"erpnext.selling.doctype.quotation.quotation.set_expired_status",
 		"erpnext.healthcare.doctype.patient_appointment.patient_appointment.update_appointment_status",
 		"erpnext.buying.doctype.supplier_quotation.supplier_quotation.set_expired_status",
-		"erpnext.accounts.doctype.process_statement_of_accounts.process_statement_of_accounts.send_auto_email"
+		"erpnext.accounts.doctype.process_statement_of_accounts.process_statement_of_accounts.send_auto_email",
+		"erpnext.non_profit.doctype.membership.membership.set_expired_status"
 	],
 	"daily_long": [
 		"erpnext.setup.doctype.email_digest.email_digest.send",
diff --git a/erpnext/non_profit/doctype/membership/membership.json b/erpnext/non_profit/doctype/membership/membership.json
index 7f218966a0..6da053f9fc 100644
--- a/erpnext/non_profit/doctype/membership/membership.json
+++ b/erpnext/non_profit/doctype/membership/membership.json
@@ -7,6 +7,7 @@
  "engine": "InnoDB",
  "field_order": [
   "member",
+  "member_name",
   "membership_type",
   "column_break_3",
   "membership_status",
@@ -46,6 +47,8 @@
   {
    "fieldname": "membership_status",
    "fieldtype": "Select",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
    "label": "Membership Status",
    "options": "New\nCurrent\nExpired\nPending\nCancelled"
   },
@@ -122,11 +125,18 @@
    "fieldtype": "Link",
    "label": "Invoice",
    "options": "Sales Invoice"
+  },
+  {
+   "fetch_from": "member.member_name",
+   "fieldname": "member_name",
+   "fieldtype": "Data",
+   "label": "Member Name",
+   "read_only": 1
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2020-09-19 14:28:11.532696",
+ "modified": "2021-01-21 16:31:20.032656",
  "modified_by": "Administrator",
  "module": "Non Profit",
  "name": "Membership",
@@ -158,7 +168,9 @@
   }
  ],
  "restrict_to_domain": "Non Profit",
+ "search_fields": "member, member_name",
  "sort_field": "modified",
  "sort_order": "DESC",
+ "title_field": "member_name",
  "track_changes": 1
-}
+}
\ No newline at end of file
diff --git a/erpnext/non_profit/doctype/membership/membership.py b/erpnext/non_profit/doctype/membership/membership.py
index c58e35a73e..c113b80d56 100644
--- a/erpnext/non_profit/doctype/membership/membership.py
+++ b/erpnext/non_profit/doctype/membership/membership.py
@@ -308,3 +308,12 @@ def get_plan_from_razorpay_id(plan_id):
 		return plan[0]["name"]
 	except:
 		return None
+
+
+def set_expired_status():
+	frappe.db.sql("""
+		UPDATE
+			`tabMembership` SET `status` = 'Expired'
+		WHERE
+			`status` not in ('Cancelled') AND `to_date` < %s
+		""", (nowdate()))
\ No newline at end of file
diff --git a/erpnext/non_profit/doctype/membership/membership_list.js b/erpnext/non_profit/doctype/membership/membership_list.js
new file mode 100644
index 0000000000..a959159899
--- /dev/null
+++ b/erpnext/non_profit/doctype/membership/membership_list.js
@@ -0,0 +1,15 @@
+frappe.listview_settings['Membership'] = {
+	get_indicator: function(doc) {
+		if (doc.membership_status == 'New') {
+			return [__('New'), 'blue', 'membership_status,=,New'];
+		} else if (doc.membership_status === 'Current') {
+			return [__('Current'), 'green', 'membership_status,=,Current'];
+		} else if (doc.membership_status === 'Pending') {
+			return [__('Pending'), 'yellow', 'membership_status,=,Pending'];
+		} else if (doc.membership_status === 'Expired') {
+			return [__('Expired'), 'grey', 'membership_status,=,Expired'];
+		} else {
+			return [__('Cancelled'), 'red', 'membership_status,=,Cancelled'];
+		}
+	}
+};

From eee71f37d80d45a172effdada150d91c0d227f5f Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Thu, 21 Jan 2021 17:47:20 +0530
Subject: [PATCH 20/22] fix: test

---
 .../doctype/membership/test_membership.py     | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/erpnext/non_profit/doctype/membership/test_membership.py b/erpnext/non_profit/doctype/membership/test_membership.py
index db56527024..2d9b336f8c 100644
--- a/erpnext/non_profit/doctype/membership/test_membership.py
+++ b/erpnext/non_profit/doctype/membership/test_membership.py
@@ -7,7 +7,6 @@ import frappe
 import erpnext
 from erpnext.non_profit.doctype.member.member import create_member
 from frappe.utils import nowdate, add_months
-from erpnext.stock.doctype.item.test_item import create_item
 
 class TestMembership(unittest.TestCase):
 	def setUp(self):
@@ -33,7 +32,7 @@ class TestMembership(unittest.TestCase):
 		plan.membership_type = "_rzpy_test_milythm"
 		plan.amount = 100
 		plan.razorpay_plan_id = "_rzpy_test_milythm"
-		plan.linked_item = create_item("_Test Item for Non Profit Membership", is_stock_item=0).name
+		plan.linked_item = create_item("_Test Item for Non Profit Membership").name
 		plan.insert()
 
 		# make test member
@@ -92,4 +91,18 @@ def make_membership(member, payload={}):
 	data.update(payload)
 	membership = frappe.get_doc(data)
 	membership.insert(ignore_permissions=True, ignore_if_duplicate=True)
-	return membership
\ No newline at end of file
+	return membership
+
+def create_item(item_code):
+	if not frappe.db.exists("Item", item_code):
+		item = frappe.new_doc("Item")
+		item.item_code = item_code
+		item.item_name = item_code
+		item.stock_uom = "Nos"
+		item.description = item_code
+		item.item_group = "All Item Groups"
+		item.is_stock_item = 0
+		item.save()
+	else:
+		item = frappe.get_doc("Item", item_code)
+	return item

From bcc0674d37655206cc3cb00900978db10fd40131 Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Thu, 21 Jan 2021 19:52:13 +0530
Subject: [PATCH 21/22] fix: test

---
 .../doctype/membership/test_membership.py       | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/erpnext/non_profit/doctype/membership/test_membership.py b/erpnext/non_profit/doctype/membership/test_membership.py
index 2d9b336f8c..ff7e6c473c 100644
--- a/erpnext/non_profit/doctype/membership/test_membership.py
+++ b/erpnext/non_profit/doctype/membership/test_membership.py
@@ -28,12 +28,15 @@ class TestMembership(unittest.TestCase):
 		settings.save()
 
 		# make test plan
-		plan = frappe.new_doc("Membership Type")
-		plan.membership_type = "_rzpy_test_milythm"
-		plan.amount = 100
-		plan.razorpay_plan_id = "_rzpy_test_milythm"
-		plan.linked_item = create_item("_Test Item for Non Profit Membership").name
-		plan.insert()
+		if not frappe.db.exists("Membership Type", "_rzpy_test_milythm"):
+			plan = frappe.new_doc("Membership Type")
+			plan.membership_type = "_rzpy_test_milythm"
+			plan.amount = 100
+			plan.razorpay_plan_id = "_rzpy_test_milythm"
+			plan.linked_item = create_item("_Test Item for Non Profit Membership").name
+			plan.insert()
+		else:
+			plan = frappe.get_doc("Membership Type", "_rzpy_test_milythm")
 
 		# make test member
 		self.member_doc = create_member(frappe._dict({
@@ -42,7 +45,7 @@ class TestMembership(unittest.TestCase):
 				'plan_id': plan.name
 		}))
 		self.member_doc.make_customer_and_link()
-		self.member = "self.member_doc.name"
+		self.member = self.member_doc.name
 
 	def test_auto_generate_invoice_and_payment_entry(self):
 		entry = make_membership(self.member)

From 02e424fae27f20a5d6375b436adce257d01fb328 Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Thu, 21 Jan 2021 20:16:17 +0530
Subject: [PATCH 22/22] chore: Add description for settings

---
 .../doctype/membership_settings/membership_settings.json       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/erpnext/non_profit/doctype/membership_settings/membership_settings.json b/erpnext/non_profit/doctype/membership_settings/membership_settings.json
index 961a9b9b3b..3887b0a2be 100644
--- a/erpnext/non_profit/doctype/membership_settings/membership_settings.json
+++ b/erpnext/non_profit/doctype/membership_settings/membership_settings.json
@@ -126,6 +126,7 @@
   {
    "default": "0",
    "depends_on": "eval:doc.enable_invoicing",
+   "description": "Auto creates Payment Entry for Sales Invoices created for Membership from web forms.",
    "fieldname": "make_payment_entry",
    "fieldtype": "Check",
    "label": "Make Payment Entry"
@@ -150,7 +151,7 @@
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2020-11-09 12:28:49.972434",
+ "modified": "2021-01-21 19:57:53.213286",
  "modified_by": "Administrator",
  "module": "Non Profit",
  "name": "Membership Settings",