CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-05 19:42:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: GL Entries for AP/AR Summary without SQL join

Browse Source 
SQL query modified to fetch only those GL Entries for Accounts Payable Summary and Accounts Receivable Summary reports where the corresponding payment entry is not in cancelled state.
This commit is contained in:
UrvashiKishnani
2021-03-02 08:20:03 +04:00
committed by GitHub
parent 10e4b9d4e8
commit 810a36105c
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
erpnext/accounts/party.py
View File

@@ -606,20 +606,19 @@ def get_partywise_advanced_payment_amount(party_type, posting_date = None, futur
cond = "1=1"
if posting_date:
if future_payment:
cond = "gle.posting_date <= '{0}' OR DATE(creation) <= '{0}' """.format(posting_date)
cond = "posting_date <= '{0}' OR DATE(creation) <= '{0}' """.format(posting_date)
else:
cond = "gle.posting_date <= '{0}'".format(posting_date)
cond = "posting_date <= '{0}'".format(posting_date)
if company:
cond += "and gle.company = {0}".format(frappe.db.escape(company))
cond += "and company = {0}".format(frappe.db.escape(company))
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
data = frappe.db.sql(""" SELECT party, sum({0}) as amount
FROM `tabGL Entry`
WHERE
gle.party_type = %s and gle.against_voucher is null
and pe.docstatus = 1
and {1} GROUP BY gle.party"""
party_type = %s and against_voucher is null
and is_cancelled = 0
and {1} GROUP BY party"""
.format(("credit") if party_type == "Customer" else "debit", cond) , party_type)
if data: