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

Merge pull request #22231 from deepeshgarg007/financila_satement_immutable

Browse Source 
fix: Handle cancelled entries in financial statements
This commit is contained in:
Deepesh Garg 2020-06-13 21:19:20 +05:30 committed by GitHub
commit 5f4330621c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/report/financial_statements.py
View File

@ -405,6 +405,7 @@ def set_gl_entries_by_account(
FROM `tabDistributed Cost Center` FROM `tabDistributed Cost Center`
WHERE cost_center IN %(cost_center)s WHERE cost_center IN %(cost_center)s
AND parent NOT IN %(cost_center)s AND parent NOT IN %(cost_center)s
AND is_cancelled = 0
GROUP BY parent GROUP BY parent
) as DCC_allocation ) as DCC_allocation
WHERE company=%(company)s WHERE company=%(company)s
@ -417,6 +418,7 @@ def set_gl_entries_by_account(
where company=%(company)s where company=%(company)s
{additional_conditions} {additional_conditions}
and posting_date <= %(to_date)s and posting_date <= %(to_date)s
and is_cancelled = 0
{distributed_cost_center_query} {distributed_cost_center_query}
order by account, posting_date""".format( order by account, posting_date""".format(
additional_conditions=additional_conditions, additional_conditions=additional_conditions,