schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: only fetch membership expiry if not already set in member.js (#31259)

Browse Source
This commit is contained in:
Rucha Mahabal
2022-06-07 14:01:12 +05:30
committed by GitHub
parent 149c6031a1
commit d433784171
2 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/__init__.py
View File

@@ -149,6 +149,7 @@ def allow_regional(fn):
return caller return caller
@frappe.whitelist()
def get_last_membership(member): def get_last_membership(member):
"""Returns last membership if exists""" """Returns last membership if exists"""
last_membership = frappe.get_all( last_membership = frappe.get_all(

27
erpnext/non_profit/doctype/member/member.js
View File

@@ -44,21 +44,18 @@ frappe.ui.form.on('Member', {
frappe.contacts.clear_address_and_contact(frm); frappe.contacts.clear_address_and_contact(frm);
} }
frappe.call({ if (!frm.doc.membership_expiry_date && !frm.doc.__islocal) {
method:"frappe.client.get_value", frappe.call({
args:{ method: "erpnext.get_last_membership",
'doctype':"Membership", args: {
'filters':{'member': frm.doc.name}, member: frm.doc.member
'fieldname':[ },
'to_date' callback: function(data) {
] if (data.message) {
}, frappe.model.set_value(frm.doctype, frm.docname, "membership_expiry_date", data.message.to_date);
callback: function (data) { }
if(data.message) {
frappe.model.set_value(frm.doctype,frm.docname,
"membership_expiry_date", data.message.to_date);
} }
} });
}); }
} }
}); });