nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-07 15:25:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: failing tests fixed

Browse Source 
(cherry picked from commit 2ce07865d3)

# Conflicts:
#	erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py
This commit is contained in:
vishakhdesai
2024-12-19 12:55:11 +05:30
committed by Mergify
parent cc0a478559
commit 498abf7c83
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py
View File

@@ -460,6 +460,7 @@ def subtract_allocations(gl_account, vouchers):
voucher_allocated_amounts = get_total_allocated_amount(voucher_docs) voucher_allocated_amounts = get_total_allocated_amount(voucher_docs)
for voucher in vouchers: for voucher in vouchers:
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
rows = get_total_allocated_amount(voucher[1], voucher[2]) rows = get_total_allocated_amount(voucher[1], voucher[2])
amount = None amount = None
@@ -469,6 +470,9 @@ def subtract_allocations(gl_account, vouchers):
break break
======= =======
rows = voucher_allocated_amounts.get((voucher.get("doctype"), voucher.get("name"))) rows = voucher_allocated_amounts.get((voucher.get("doctype"), voucher.get("name")))
=======
rows = voucher_allocated_amounts.get((voucher.get("doctype"), voucher.get("name"))) or []
>>>>>>> 2ce07865d3 (fix: failing tests fixed)
filtered_row = list(filter(lambda row: row.get("gl_account") == gl_account, rows)) filtered_row = list(filter(lambda row: row.get("gl_account") == gl_account, rows))
>>>>>>> 6b847cdb62 (fix: refactor query in get_total_allocated_amount in bank_transaction) >>>>>>> 6b847cdb62 (fix: refactor query in get_total_allocated_amount in bank_transaction)