Merge branch 'version-13-hotfix' into emp-adv-status-v13

erpnext/non_profit/doctype/donation/donation.py

@@ -100,7 +100,9 @@ def capture_razorpay_donations(*args, **kwargs):
 			return
 
 		# to avoid capturing subscription payments as donations
-		if payment.description and "subscription" in str(payment.description).lower():
+		if payment.invoice_id or (
+			payment.description and "subscription" in str(payment.description).lower()
+		):
 			return
 
 		donor = get_donor(payment.email)

erpnext/non_profit/doctype/membership/membership.py

@@ -61,10 +61,6 @@ class Membership(Document):
 				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":
-			self.from_date = self.from_date
-		else:
-			self.from_date = nowdate()
 
 		if frappe.db.get_single_value("Non Profit Settings", "billing_cycle") == "Yearly":
 			self.to_date = add_years(self.from_date, 1)

erpnext/stock/doctype/material_request/material_request.py

@@ -24,7 +24,7 @@ form_grid_templates = {"items": "templates/form_grid/material_request_grid.html"
 
 class MaterialRequest(BuyingController):
 	def get_feed(self):
-		return _("{0}: {1}").format(self.status, self.material_request_type)
+		return
 
 	def check_if_already_pulled(self):
 		pass