From f24d61daea2ef4fca22b5737bfc66472c8f6ddc8 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 20 May 2024 17:57:33 +0530 Subject: [PATCH] fix: Auto reconcile only after selecting bank account (#41489) --- .../bank_reconciliation_tool.js | 4 ++ .../bank_reconciliation_tool.py | 46 +++++++++---------- 2 files changed, 27 insertions(+), 23 deletions(-) diff --git a/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js b/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js index a1de91faad2..b15745d834c 100644 --- a/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js +++ b/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js @@ -59,6 +59,10 @@ frappe.ui.form.on("Bank Reconciliation Tool", { ); frm.add_custom_button(__("Auto Reconcile"), function () { + if (!frm.doc.bank_account) { + frappe.msgprint(__("Please select Bank Account")); + return; + } frappe.call({ method: "erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.auto_reconcile_vouchers", args: { diff --git a/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py b/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py index 05787665a76..42b1a54dea6 100644 --- a/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py +++ b/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py @@ -495,12 +495,12 @@ def check_matching( bank_account, company, transaction, - document_types, - from_date, - to_date, - filter_by_reference_date, - from_reference_date, - to_reference_date, + document_types=None, + from_date=None, + to_date=None, + filter_by_reference_date=None, + from_reference_date=None, + to_reference_date=None, ): exact_match = True if "exact_match" in document_types else False @@ -540,14 +540,14 @@ def get_queries( bank_account, company, transaction, - document_types, - from_date, - to_date, - filter_by_reference_date, - from_reference_date, - to_reference_date, - exact_match, - common_filters, + document_types=None, + from_date=None, + to_date=None, + filter_by_reference_date=None, + from_reference_date=None, + to_reference_date=None, + exact_match=None, + common_filters=None, ): # get queries to get matching vouchers account_from_to = "paid_to" if transaction.deposit > 0.0 else "paid_from" @@ -580,15 +580,15 @@ def get_matching_queries( bank_account, company, transaction, - document_types, - exact_match, - account_from_to, - from_date, - to_date, - filter_by_reference_date, - from_reference_date, - to_reference_date, - common_filters, + document_types=None, + exact_match=None, + account_from_to=None, + from_date=None, + to_date=None, + filter_by_reference_date=None, + from_reference_date=None, + to_reference_date=None, + common_filters=None, ): queries = [] currency = get_account_currency(bank_account)