schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: reconciled credit notes being fetched again in Payment Reconciliation tool (#33471)

Browse Source 
fix: reconciled cr note showing up as Payments
This commit is contained in:
ruthra kumar
2022-12-29 10:31:06 +05:30
committed by GitHub
parent 334219e36a
commit 5ec11bad4f
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
View File

@@ -172,22 +172,22 @@ class PaymentReconciliation(Document):
query = ( query = (
qb.from_(gl) qb.from_(gl)
.select( .select(
gl.voucher_type.as_("reference_type"), gl.against_voucher_type.as_("reference_type"),
gl.voucher_no.as_("reference_name"), gl.against_voucher.as_("reference_name"),
(Sum(dr_or_cr) - Sum(reconciled_dr_or_cr)).as_("amount"), (Sum(dr_or_cr) - Sum(reconciled_dr_or_cr)).as_("amount"),
gl.posting_date, gl.posting_date,
gl.account_currency.as_("currency"), gl.account_currency.as_("currency"),
) )
.where( .where(
(gl.voucher_type == voucher_type) (gl.against_voucher.isin(sub_query))
& (gl.voucher_no.isin(sub_query)) & (gl.against_voucher_type == voucher_type)
& (gl.is_cancelled == 0) & (gl.is_cancelled == 0)
& (gl.account == self.receivable_payable_account) & (gl.account == self.receivable_payable_account)
& (gl.party_type == self.party_type) & (gl.party_type == self.party_type)
& (gl.party == self.party) & (gl.party == self.party)
) )
.where(Criterion.all(conditions)) .where(Criterion.all(conditions))
.groupby(gl.voucher_no) .groupby(gl.against_voucher)
.having(qb.Field("amount") > 0) .having(qb.Field("amount") > 0)
) )
dr_cr_notes = query.run(as_dict=True) dr_cr_notes = query.run(as_dict=True)