From 4a4e165f853604d4ad9d5418dcd73e6e62e753b6 Mon Sep 17 00:00:00 2001 From: hrishikesh Date: Tue, 28 Jan 2025 11:53:45 +0530 Subject: [PATCH] fix: index error --- .../bank_reconciliation_tool_erpnext.js | 4 ++-- .../bank_reconciliation_tool_erpnext.py | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/erpnext/accounts/doctype/bank_reconciliation_tool_erpnext/bank_reconciliation_tool_erpnext.js b/erpnext/accounts/doctype/bank_reconciliation_tool_erpnext/bank_reconciliation_tool_erpnext.js index 0630f19c7577..f3d9431595c8 100644 --- a/erpnext/accounts/doctype/bank_reconciliation_tool_erpnext/bank_reconciliation_tool_erpnext.js +++ b/erpnext/accounts/doctype/bank_reconciliation_tool_erpnext/bank_reconciliation_tool_erpnext.js @@ -521,10 +521,10 @@ frappe.ui.form.on("Bank Reconciliation Tool ERPNext", { }, }); setTimeout(() => { - if (!(frm.doc.bank_statement.length) && !(frm.doc.erp_transaction.length)){ + if (!(frm.doc.bank_statement.length) && !(frm.doc.erp_transaction.length)) { frappe.throw("No records found") } - }, 500); + }, 700); }, update_bal(frm) { diff --git a/erpnext/accounts/doctype/bank_reconciliation_tool_erpnext/bank_reconciliation_tool_erpnext.py b/erpnext/accounts/doctype/bank_reconciliation_tool_erpnext/bank_reconciliation_tool_erpnext.py index e470dc8966cb..e77d90c5253b 100644 --- a/erpnext/accounts/doctype/bank_reconciliation_tool_erpnext/bank_reconciliation_tool_erpnext.py +++ b/erpnext/accounts/doctype/bank_reconciliation_tool_erpnext/bank_reconciliation_tool_erpnext.py @@ -271,14 +271,16 @@ def get_erp_transaction(bank_account, company, from_statement_date=None, to_stat """, (company, from_statement_date, to_statement_date, account,), as_dict=True) or '' if not unlinked_journal_entries: print(f"No unlinked journal entries found for account: {account}") - print(unlinked_journal_entries) + # print(unlinked_journal_entries) + if unlinked_journal_entries: + result.extend(unlinked_journal_entries) except Exception as e: print(f"Error occurred: {e}") if unlinked_payment_entries: result.extend(unlinked_payment_entries) - elif unlinked_journal_entries: - result.extend(unlinked_journal_entries) + # elif unlinked_journal_entries: + # result.extend(unlinked_journal_entries) for payment in result: if payment['doctype'] == "Journal Entry":