Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #25580 from ceefour/ceefour/period-closing-voucher-25572

Browse Source 
fix(accounts): Get balance for Profit and Loss accounts, only including valid transactions (not cancelled)
This commit is contained in:
Deepesh Garg 2021-05-04 22:19:45 +05:30 committed by GitHub
commit 71c9c4f48f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py
View File

@ -102,14 +102,14 @@ class PeriodClosingVoucher(AccountsController):
make_gl_entries(gl_entries)
def get_pl_balances(self, dimension_fields):
"""Get balance for pl accounts"""
"""Get balance for Profit and Loss accounts, only including valid transactions (not cancelled)"""
return frappe.db.sql("""
select
t1.account, t2.account_currency, {dimension_fields},
sum(t1.debit_in_account_currency) - sum(t1.credit_in_account_currency) as balance_in_account_currency,
sum(t1.debit) - sum(t1.credit) as balance_in_company_currency
from `tabGL Entry` t1, `tabAccount` t2
where t1.account = t2.name and t2.report_type = 'Profit and Loss'
where t1.is_cancelled = 0 and t1.account = t2.name and t2.report_type = 'Profit and Loss'
and t2.docstatus < 2 and t2.company = %s
and t1.posting_date between %s and %s
group by t1.account, {dimension_fields}