From 35f801feda2e082a5a8fb741e99c85073ced4b52 Mon Sep 17 00:00:00 2001 From: marination Date: Thu, 23 Jan 2025 13:28:21 +0100 Subject: [PATCH] fix: Merge Conflicts --- .../bank_transaction/auto_match_party.py | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/erpnext/accounts/doctype/bank_transaction/auto_match_party.py b/erpnext/accounts/doctype/bank_transaction/auto_match_party.py index e9a912b57ab..66aab9d62dd 100644 --- a/erpnext/accounts/doctype/bank_transaction/auto_match_party.py +++ b/erpnext/accounts/doctype/bank_transaction/auto_match_party.py @@ -74,25 +74,8 @@ class AutoMatchbyAccountIBAN: ): return ("Employee", employee_result[0]) -<<<<<<< HEAD - party_result = frappe.db.get_all( - party, or_filters=or_filters, pluck="name", limit_page_length=1 - ) - - if party_result: - result = ( - party, - party_result[0], - ) - break - - return result - - def get_or_filters(self) -> dict: -======= def get_or_filters(self, party: str | None = None) -> dict: """Return OR filters for Bank Account and IBAN""" ->>>>>>> 8521796811 (fix: Wrong `bank_ac_no` filter + simplify convoluted logic) or_filters = {} if self.bank_party_account_number: bank_ac_field = "bank_ac_no" if party == "Employee" else "bank_account_no"