From e01ff0df404160d96627d2bea0b6275c88facf87 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Thu, 29 Dec 2022 14:45:10 +0530 Subject: [PATCH] fix: debit note not pulled on reconciliation tool (cherry picked from commit cf133b2f1ce0a66164144071bd9cb300648ddf8f) --- .../payment_reconciliation/payment_reconciliation.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py index f42583cb34c..1e75471c848 100644 --- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py @@ -149,14 +149,16 @@ class PaymentReconciliation(Document): reconciled_dr_or_cr = ( gl["debit_in_account_currency"] - if dr_or_cr == gl["credit_in_account_currency"] + if dr_or_cr.name == "credit_in_account_currency" else gl["credit_in_account_currency"] ) + having_clause = qb.Field("amount") > 0 + if self.minimum_payment_amount: - conditions.append(dr_or_cr.gte(self.minimum_payment_amount)) + having_clause = qb.Field("amount") >= self.minimum_payment_amount if self.maximum_payment_amount: - conditions.append(dr_or_cr.lte(self.maximum_payment_amount)) + having_clause = having_clause & qb.Field("amount") <= self.maximum_payment_amount sub_query = ( qb.from_(doc) @@ -188,7 +190,7 @@ class PaymentReconciliation(Document): ) .where(Criterion.all(conditions)) .groupby(gl.against_voucher) - .having(qb.Field("amount") > 0) + .having(having_clause) ) dr_cr_notes = query.run(as_dict=True) return dr_cr_notes