CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-13 15:27:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17004 from surajshetty3416/fix-bank-reconciliation-entries-hotfix

Browse Source 
fix: Show consolidated amount of payment entries in Bank reconciliation
This commit is contained in:
rohitwaghchaure
2019-03-25 14:11:47 +05:30
committed by GitHub
parent 689490e4de 67876d1026
commit 794b6b6c0d
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py
View File

@@ -79,8 +79,12 @@ class BankReconciliation(Document):
for d in entries:
row = self.append('payment_entries', {})
amount = d.debit if d.debit else d.credit
d.amount = fmt_money(amount, 2, d.account_currency) + " " + (_("Dr") if d.debit else _("Cr"))
amount = d.get('debit', 0) - d.get('credit', 0)
formatted_amount = fmt_money(abs(amount), 2, d.account_currency)
d.amount = formatted_amount + " " + (_("Dr") if amount > 0 else _("Cr"))
d.pop("credit")
d.pop("debit")
d.pop("account_currency")