From 5cdc267aeeaa857546538adb7fc93e868377fd6c Mon Sep 17 00:00:00 2001 From: "Nihantra C. Patel" <99652762+nihantra@users.noreply.github.com> Date: Thu, 21 Jul 2022 18:29:06 +0530 Subject: [PATCH] fix: Route condition set with proper filter (#31556) * fix: Redirect to report with proper filter * Update member.js * fix: Route condition set with proper filter * fix: Route condition set with proper filter * fix: Route condition set with proper filter Co-authored-by: Marica --- erpnext/non_profit/doctype/member/member.js | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/erpnext/non_profit/doctype/member/member.js b/erpnext/non_profit/doctype/member/member.js index 40926c23633..6462939ead2 100644 --- a/erpnext/non_profit/doctype/member/member.js +++ b/erpnext/non_profit/doctype/member/member.js @@ -21,13 +21,18 @@ frappe.ui.form.on('Member', { // custom buttons frm.add_custom_button(__('Accounting Ledger'), function() { - frappe.set_route('query-report', 'General Ledger', - {party_type:'Member', party:frm.doc.name}); - }); - - frm.add_custom_button(__('Accounts Receivable'), function() { - frappe.set_route('query-report', 'Accounts Receivable', {member:frm.doc.name}); + if (frm.doc.customer) { + frappe.set_route('query-report', 'General Ledger', {party_type: 'Customer', party: frm.doc.customer}); + } else { + frappe.set_route('query-report', 'General Ledger', {party_type: 'Member', party: frm.doc.name}); + } }); + + if (frm.doc.customer) { + frm.add_custom_button(__('Accounts Receivable'), function() { + frappe.set_route('query-report', 'Accounts Receivable', {customer: frm.doc.customer}); + }); + } if (!frm.doc.customer) { frm.add_custom_button(__('Create Customer'), () => {