diff --git a/erpnext/accounts/dashboard_chart_source/bank_statement_balance/bank_statement_balance.js b/erpnext/accounts/dashboard_chart_source/bank_statement_balance/bank_statement_balance.js index 5b4a1711e8ab55782b03ac45cd2de4a15e33f62c..989aeae1624d5fd23e8598f73bb2b356e83f5c01 100644 --- a/erpnext/accounts/dashboard_chart_source/bank_statement_balance/bank_statement_balance.js +++ b/erpnext/accounts/dashboard_chart_source/bank_statement_balance/bank_statement_balance.js @@ -12,6 +12,7 @@ frappe.dashboards.chart_sources["Bank Statement Balance"] = { label: __("Company"), fieldtype: "Link", options: "Company", + reqd: 1, default: frappe.defaults.get_user_default("Company"), }, { @@ -19,6 +20,15 @@ frappe.dashboards.chart_sources["Bank Statement Balance"] = { label: __("Bank Account"), fieldtype: "Link", options: "Bank Account", + reqd: 1, + get_query: function() { + return { + filters: { + 'company': this.dialog.get_value("company"), + 'is_company_account': 1 + } + } + } }, { fieldname: "range", diff --git a/erpnext/accounts/dashboard_chart_source/bank_statement_balance/bank_statement_balance.py b/erpnext/accounts/dashboard_chart_source/bank_statement_balance/bank_statement_balance.py index 7ac1e23900baa1ad48990637d308f5c147436caa..65290294567bdc398f71fa847c5921345ecde751 100644 --- a/erpnext/accounts/dashboard_chart_source/bank_statement_balance/bank_statement_balance.py +++ b/erpnext/accounts/dashboard_chart_source/bank_statement_balance/bank_statement_balance.py @@ -50,6 +50,7 @@ def get( "date": ("between", [filters.get("from_date"), filters.get("to_date")]), "docstatus": 1, } + if filters.get("bank_account"): query_filters["bank_account"] = filters.get("bank_account")