CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-29 09:01:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17646 from rohitwaghchaure/fixed_bank_reco_internal_transfer

Browse Source 
fix: bank reconciliation for internal transfer is not working
This commit is contained in:
rohitwaghchaure
2019-05-17 11:20:43 +05:30
committed by GitHub
parent 0a22aab6bb c1e00f4daa
commit 094dc1dee6
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/page/bank_reconciliation/bank_reconciliation.py
View File

@@ -77,7 +77,7 @@ def check_matching_amount(bank_account, company, transaction):
payment_entries = frappe.get_all("Payment Entry", fields=["'Payment Entry' as doctype", "name", "paid_amount", "payment_type", "reference_no", "reference_date",
"party", "party_type", "posting_date", "{0}".format(currency_field)], filters=[["paid_amount", "like", "{0}%".format(amount)],
["docstatus", "=", "1"], ["payment_type", "=", payment_type], ["ifnull(clearance_date, '')", "=", ""], ["{0}".format(account_from_to), "=", "{0}".format(bank_account)]])
["docstatus", "=", "1"], ["payment_type", "=", [payment_type, "Internal Transfer"]], ["ifnull(clearance_date, '')", "=", ""], ["{0}".format(account_from_to), "=", "{0}".format(bank_account)]])
if transaction.credit > 0:
journal_entries = frappe.db.sql("""