From aa27e19a58bce878b4b34a74bd679bfebbd6b236 Mon Sep 17 00:00:00 2001 From: Aayush Dalal Date: Tue, 4 Feb 2025 17:14:01 +0530 Subject: [PATCH] fix: handling company in bank reconciliation tool (#45582) Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com> (cherry picked from commit d1c927530edff40763c78d81579bb83a60a7a00c) --- .../bank_reconciliation_tool.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 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 7a653e12c72..d0910a8e68c 100644 --- a/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js +++ b/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js @@ -19,10 +19,15 @@ frappe.ui.form.on("Bank Reconciliation Tool", { }, onload: function (frm) { + if (!frm.doc.company) { + frm.set_value("company", frappe.defaults.get_default("company")); + } + // Set default filter dates let today = frappe.datetime.get_today(); frm.doc.bank_statement_from_date = frappe.datetime.add_months(today, -1); frm.doc.bank_statement_to_date = today; + frm.trigger("bank_account"); }, @@ -98,7 +103,7 @@ frappe.ui.form.on("Bank Reconciliation Tool", { make_reconciliation_tool(frm) { frm.get_field("reconciliation_tool_cards").$wrapper.empty(); - if (frm.doc.bank_account && frm.doc.bank_statement_to_date) { + if (frm.doc.company && frm.doc.bank_account && frm.doc.bank_statement_to_date) { frm.trigger("get_cleared_balance").then(() => { if ( frm.doc.bank_account && @@ -114,7 +119,7 @@ frappe.ui.form.on("Bank Reconciliation Tool", { }, get_account_opening_balance(frm) { - if (frm.doc.bank_account && frm.doc.bank_statement_from_date) { + if (frm.doc.company && frm.doc.bank_account && frm.doc.bank_statement_from_date) { frappe.call({ method: "erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.get_account_balance", args: { @@ -130,7 +135,7 @@ frappe.ui.form.on("Bank Reconciliation Tool", { }, get_cleared_balance(frm) { - if (frm.doc.bank_account && frm.doc.bank_statement_to_date) { + if (frm.doc.company && frm.doc.bank_account && frm.doc.bank_statement_to_date) { return frappe.call({ method: "erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.get_account_balance", args: {