Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14089 from shreyashah115/fixes

Browse Source 
[Fix] General Ledger report filters error
This commit is contained in:
rohitwaghchaure 2018-05-16 17:41:19 +05:30 committed by GitHub
commit 19a2260ce7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/accounts/doctype/journal_entry/journal_entry.js
View File

@ -17,7 +17,8 @@ frappe.ui.form.on("Journal Entry", {
"from_date": frm.doc.posting_date, "from_date": frm.doc.posting_date,
"to_date": frm.doc.posting_date, "to_date": frm.doc.posting_date,
"company": frm.doc.company, "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"); frappe.set_route("query-report", "General Ledger");
}, "fa fa-table"); }, "fa fa-table");

4
erpnext/accounts/report/general_ledger/general_ledger.js
View File

@ -84,9 +84,7 @@ frappe.query_reports["General Ledger"] = {
var party_type = frappe.query_report_filters_by_name.party_type.get_value(); var party_type = frappe.query_report_filters_by_name.party_type.get_value();
var parties = frappe.query_report_filters_by_name.party.get_value(); var parties = frappe.query_report_filters_by_name.party.get_value();
if(!party_type) { if(!party_type) return;
frappe.throw(__("Please select Party Type first"));
}
const values = parties.split(/\s*,\s*/).filter(d => d); const values = parties.split(/\s*,\s*/).filter(d => d);
const txt = parties.match(/[^,\s*]*$/)[0] || ''; const txt = parties.match(/[^,\s*]*$/)[0] || '';