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

Merge pull request #23614 from aakvatech/patch-3

Browse Source 
feat: Add company and correct filter in bank reconciliation statement
This commit is contained in:
rohitwaghchaure 2020-10-13 19:59:31 +05:30 committed by GitHub
commit db0fefd92c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js
View File

@ -3,6 +3,14 @@
frappe.query_reports["Bank Reconciliation Statement"] = { frappe.query_reports["Bank Reconciliation Statement"] = {
"filters": [ "filters": [
{
"fieldname":"company",
"label": __("Company"),
"fieldtype": "Link",
"options": "Company",
"reqd": 1,
"default": frappe.defaults.get_user_default("Company")
},
{ {
"fieldname":"account", "fieldname":"account",
"label": __("Bank Account"), "label": __("Bank Account"),
@ -12,11 +20,14 @@ frappe.query_reports["Bank Reconciliation Statement"] = {
locals[":Company"][frappe.defaults.get_user_default("Company")]["default_bank_account"]: "", locals[":Company"][frappe.defaults.get_user_default("Company")]["default_bank_account"]: "",
"reqd": 1, "reqd": 1,
"get_query": function() { "get_query": function() {
var company = frappe.query_report.get_filter_value('company')
return { return {
"query": "erpnext.controllers.queries.get_account_list", "query": "erpnext.controllers.queries.get_account_list",
"filters": [ "filters": [
['Account', 'account_type', 'in', 'Bank, Cash'], ['Account', 'account_type', 'in', 'Bank, Cash'],
['Account', 'is_group', '=', 0], ['Account', 'is_group', '=', 0],
['Account', 'disabled', '=', 0],
['Account', 'company', '=', company],
] ]
} }
} }
@ -34,4 +45,4 @@ frappe.query_reports["Bank Reconciliation Statement"] = {
"fieldtype": "Check" "fieldtype": "Check"
}, },
] ]
} }