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

Merge pull request #23498 from aakvatech/patch-3

Browse Source 
fix: get_outstanding_invoices not ignoring the cancelled transactions
This commit is contained in:
Deepesh Garg 2020-10-03 22:36:24 +05:30 committed by GitHub
commit f8bf139692
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/utils.py
View File

@ -683,6 +683,7 @@ def get_outstanding_invoices(party_type, party, account, condition=None, filters
where where
party_type = %(party_type)s and party = %(party)s party_type = %(party_type)s and party = %(party)s
and account = %(account)s and {dr_or_cr} > 0 and account = %(account)s and {dr_or_cr} > 0
and is_cancelled=0
{condition} {condition}
and ((voucher_type = 'Journal Entry' and ((voucher_type = 'Journal Entry'
and (against_voucher = '' or against_voucher is null)) and (against_voucher = '' or against_voucher is null))
@ -705,6 +706,7 @@ def get_outstanding_invoices(party_type, party, account, condition=None, filters
and account = %(account)s and account = %(account)s
and {payment_dr_or_cr} > 0 and {payment_dr_or_cr} > 0
and against_voucher is not null and against_voucher != '' and against_voucher is not null and against_voucher != ''
and is_cancelled=0
group by against_voucher_type, against_voucher group by against_voucher_type, against_voucher
""".format(payment_dr_or_cr=payment_dr_or_cr), { """.format(payment_dr_or_cr=payment_dr_or_cr), {
"party_type": party_type, "party_type": party_type,