nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-03 21:48:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Merge Conflicts

Browse Source
This commit is contained in:
marination
2025-01-23 13:28:21 +01:00
parent b6b453ca5d
commit 35f801feda
1 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
erpnext/accounts/doctype/bank_transaction/auto_match_party.py
View File

@@ -74,25 +74,8 @@ class AutoMatchbyAccountIBAN:
): ):
return ("Employee", employee_result[0]) 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: def get_or_filters(self, party: str | None = None) -> dict:
"""Return OR filters for Bank Account and IBAN""" """Return OR filters for Bank Account and IBAN"""
>>>>>>> 8521796811 (fix: Wrong `bank_ac_no` filter + simplify convoluted logic)
or_filters = {} or_filters = {}
if self.bank_party_account_number: if self.bank_party_account_number:
bank_ac_field = "bank_ac_no" if party == "Employee" else "bank_account_no" bank_ac_field = "bank_ac_no" if party == "Employee" else "bank_account_no"