fix: GL Entries for AP/AR Summary
SQL query modified to fetch only those GL Entries for Accounts Payable Summary and Accounts Receivable Summary reports where the corresponding payment entry is in submitted state.
diff --git a/erpnext/accounts/party.py b/erpnext/accounts/party.py
index 38b2284..7d53db2 100644
--- a/erpnext/accounts/party.py
+++ b/erpnext/accounts/party.py
@@ -606,18 +606,20 @@
cond = "1=1"
if posting_date:
if future_payment:
- cond = "posting_date <= '{0}' OR DATE(creation) <= '{0}' """.format(posting_date)
+ cond = "gle.posting_date <= '{0}' OR DATE(creation) <= '{0}' """.format(posting_date)
else:
- cond = "posting_date <= '{0}'".format(posting_date)
+ cond = "gle.posting_date <= '{0}'".format(posting_date)
if company:
- cond += "and company = {0}".format(frappe.db.escape(company))
+ cond += "and gle.company = {0}".format(frappe.db.escape(company))
- data = frappe.db.sql(""" SELECT party, sum({0}) as amount
- FROM `tabGL Entry`
+ data = frappe.db.sql(""" SELECT gle.party, sum(gle.{0}) as amount
+ FROM `tabGL Entry` gle
+ INNER JOIN `tabPayment Entry` pe ON pe.name = gle.voucher_no
WHERE
- party_type = %s and against_voucher is null
- and {1} GROUP BY party"""
+ gle.party_type = %s and gle.against_voucher is null
+ and pe.docstatus = 1
+ and {1} GROUP BY gle.party"""
.format(("credit") if party_type == "Customer" else "debit", cond) , party_type)
if data: