From df9516e9061994b0ee7b32d7c43bc274fd1f51f5 Mon Sep 17 00:00:00 2001 From: Shreya Date: Wed, 16 May 2018 17:30:35 +0530 Subject: [PATCH 1/2] Add Finance Book to route options --- erpnext/accounts/doctype/journal_entry/journal_entry.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.js b/erpnext/accounts/doctype/journal_entry/journal_entry.js index afa1ffed60..6ad1df52cd 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.js +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.js @@ -17,7 +17,8 @@ frappe.ui.form.on("Journal Entry", { "from_date": frm.doc.posting_date, "to_date": frm.doc.posting_date, "company": frm.doc.company, - group_by_voucher: 0 + "finance_book": frm.doc.finance_book, + "group_by_voucher": 0 }; frappe.set_route("query-report", "General Ledger"); }, "fa fa-table"); From 63d14cfac8f470811265e5e9c6fe5156f84893a4 Mon Sep 17 00:00:00 2001 From: Shreya Date: Wed, 16 May 2018 17:30:58 +0530 Subject: [PATCH 2/2] Instead of throwing error, just return --- erpnext/accounts/report/general_ledger/general_ledger.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/erpnext/accounts/report/general_ledger/general_ledger.js b/erpnext/accounts/report/general_ledger/general_ledger.js index 9a774ce6b9..e3d615121e 100644 --- a/erpnext/accounts/report/general_ledger/general_ledger.js +++ b/erpnext/accounts/report/general_ledger/general_ledger.js @@ -84,9 +84,7 @@ frappe.query_reports["General Ledger"] = { var party_type = frappe.query_report_filters_by_name.party_type.get_value(); var parties = frappe.query_report_filters_by_name.party.get_value(); - if(!party_type) { - frappe.throw(__("Please select Party Type first")); - } + if(!party_type) return; const values = parties.split(/\s*,\s*/).filter(d => d); const txt = parties.match(/[^,\s*]*$/)[0] || '';