commit 21cbbae88fc1154ba0937e672d185b215edef1de
author rohitwaghchaure <rohitw1991@gmail.com> Thu Nov 16 14:05:57 2017 +0530
committer Nabin Hait <nabinhait@gmail.com> Thu Nov 16 14:05:57 2017 +0530
tree 5241c6055fd22080811bfceea64d3d318fbc448d
parent 94704beba378804b4acffb57133e943dff818195

[fix] Payment reconcillation showing linked journal entries (#11611)

erpnext/accounts/utils.py

diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py
index f7aa341..bcce6a1 100644
--- a/erpnext/accounts/utils.py
+++ b/erpnext/accounts/utils.py
@@ -593,7 +593,9 @@
 				select ifnull(sum({payment_dr_or_cr}), 0)
 				from `tabGL Entry` payment_gl_entry
 				where payment_gl_entry.against_voucher_type = invoice_gl_entry.voucher_type
-					and payment_gl_entry.against_voucher = invoice_gl_entry.against_voucher
+					and if(invoice_gl_entry.voucher_type='Journal Entry',
+						payment_gl_entry.against_voucher = invoice_gl_entry.voucher_no,
+						payment_gl_entry.against_voucher = invoice_gl_entry.against_voucher)
 					and payment_gl_entry.party_type = invoice_gl_entry.party_type
 					and payment_gl_entry.party = invoice_gl_entry.party
 					and payment_gl_entry.account = invoice_gl_entry.account