nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-24 15:39:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: exclude cancelled gl entries for opening balance

Browse Source
This commit is contained in:
Gursheen Anand
2023-07-21 10:57:55 +05:30
parent 2f7b112736
commit 33f8f7d7b3
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
erpnext/accounts/report/utils.py
View File

@@ -256,7 +256,7 @@ def get_journal_entries(filters, args):
) )
.orderby(je.posting_date, je.name, order=Order.desc) .orderby(je.posting_date, je.name, order=Order.desc)
) )
query = get_conditions(filters, query, [je], payments=True) query = get_conditions(filters, query, doctype="Journal Entry", payments=True)
journal_entries = query.run(as_dict=True) journal_entries = query.run(as_dict=True)
return journal_entries return journal_entries
@@ -282,21 +282,21 @@ def get_payment_entries(filters, args):
.where((pe.party == filters.get(args.party)) & (pe.paid_to.isin(args.party_account))) .where((pe.party == filters.get(args.party)) & (pe.paid_to.isin(args.party_account)))
.orderby(pe.posting_date, pe.name, order=Order.desc) .orderby(pe.posting_date, pe.name, order=Order.desc)
) )
query = get_conditions(filters, query, [pe], payments=True) query = get_conditions(filters, query, doctype="Payment Entry", payments=True)
payment_entries = query.run(as_dict=True) payment_entries = query.run(as_dict=True)
return payment_entries return payment_entries
def get_conditions(filters, query, docs, payments=False): def get_conditions(filters, query, doctype, child_doctype=None, payments=False):
parent_doc = docs[0] parent_doc = frappe.qb.DocType(doctype)
if not payments: if child_doctype:
child_doc = docs[1] child_doc = frappe.qb.DocType(child_doctype)
if parent_doc.get_table_name() == "tabSales Invoice": if parent_doc.get_table_name() == "tabSales Invoice":
if filters.get("owner"): if filters.get("owner"):
query = query.where(parent_doc.owner == filters.owner) query = query.where(parent_doc.owner == filters.owner)
if filters.get("mode_of_payment"): if filters.get("mode_of_payment"):
payment_doc = docs[2] payment_doc = frappe.qb.DocType("Sales Invoice Payment")
query = query.where(payment_doc.mode_of_payment == filters.mode_of_payment) query = query.where(payment_doc.mode_of_payment == filters.mode_of_payment)
if not payments: if not payments:
if filters.get("brand"): if filters.get("brand"):
@@ -375,5 +375,10 @@ def get_opening_row(party_type, party, from_date, company):
Sum(gle.credit).as_("credit"), Sum(gle.credit).as_("credit"),
(Sum(gle.debit) - Sum(gle.credit)).as_("balance"), (Sum(gle.debit) - Sum(gle.credit)).as_("balance"),
) )
.where((gle.account.isin(party_account)) & (gle.party == party) & (gle.posting_date < from_date)) .where(
(gle.account.isin(party_account))
& (gle.party == party)
& (gle.posting_date < from_date)
& (gle.docstatus == 1)
)
).run(as_dict=True) ).run(as_dict=True)