nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-28 17:34:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Rucha Mahabal
2022-05-25 10:46:25 +05:30
committed by GitHub
parent ab9744fe97 a071095886
commit 7ac0624f68
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -100,7 +100,9 @@ def capture_razorpay_donations(*args, **kwargs):
return return
# to avoid capturing subscription payments as donations # 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 return
donor = get_donor(payment.email) donor = get_donor(payment.email)

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

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

2
erpnext/stock/doctype/material_request/material_request.py
View File

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