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

fix: resolve conflicts

Browse Source
This commit is contained in:
vishakhdesai
2024-12-30 12:27:14 +05:30
parent 498abf7c83
commit 443a0b81f9
2 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -456,25 +456,16 @@ def subtract_allocations(gl_account, vouchers):
"Look up & subtract any existing Bank Transaction allocations" "Look up & subtract any existing Bank Transaction allocations"
copied = [] copied = []
voucher_docs = [(voucher.get("doctype"), voucher.get("name")) for voucher in vouchers] voucher_docs = [(voucher[1], voucher[2]) for voucher in 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 rows = voucher_allocated_amounts.get((voucher[1], voucher[2])) or []
<<<<<<< HEAD
rows = get_total_allocated_amount(voucher[1], voucher[2])
amount = None amount = None
for row in rows: for row in rows:
if row["gl_account"] == gl_account: if row["gl_account"] == gl_account:
amount = row["total"] amount = row["total"]
break break
=======
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))
>>>>>>> 6b847cdb62 (fix: refactor query in get_total_allocated_amount in bank_transaction)
if amount: if amount:
l = list(voucher) l = list(voucher)

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

@@ -93,13 +93,9 @@ class BankTransaction(StatusUpdater):
- clear means: set the latest transaction date as clearance date - clear means: set the latest transaction date as clearance date
""" """
remaining_amount = self.unallocated_amount remaining_amount = self.unallocated_amount
<<<<<<< HEAD
=======
to_remove = []
payment_entry_docs = [(pe.payment_document, pe.payment_entry) for pe in self.payment_entries] payment_entry_docs = [(pe.payment_document, pe.payment_entry) for pe in self.payment_entries]
pe_bt_allocations = get_total_allocated_amount(payment_entry_docs) pe_bt_allocations = get_total_allocated_amount(payment_entry_docs)
>>>>>>> 6b847cdb62 (fix: refactor query in get_total_allocated_amount in bank_transaction)
for payment_entry in self.payment_entries: for payment_entry in self.payment_entries:
if payment_entry.allocated_amount == 0.0: if payment_entry.allocated_amount == 0.0:
unallocated_amount, should_clear, latest_transaction = get_clearance_details( unallocated_amount, should_clear, latest_transaction = get_clearance_details(