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

fix: debit note not pulled on reconciliation tool

Browse Source 
(cherry picked from commit cf133b2f1c)
This commit is contained in:
ruthra kumar
2022-12-29 14:45:10 +05:30
committed by Mergify
parent 8d99763bea
commit e01ff0df40
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -149,14 +149,16 @@ class PaymentReconciliation(Document):
reconciled_dr_or_cr = ( reconciled_dr_or_cr = (
gl["debit_in_account_currency"] 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"] else gl["credit_in_account_currency"]
) )
having_clause = qb.Field("amount") > 0
if self.minimum_payment_amount: 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: 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 = ( sub_query = (
qb.from_(doc) qb.from_(doc)
@@ -188,7 +190,7 @@ class PaymentReconciliation(Document):
) )
.where(Criterion.all(conditions)) .where(Criterion.all(conditions))
.groupby(gl.against_voucher) .groupby(gl.against_voucher)
.having(qb.Field("amount") > 0) .having(having_clause)
) )
dr_cr_notes = query.run(as_dict=True) dr_cr_notes = query.run(as_dict=True)
return dr_cr_notes return dr_cr_notes