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

Merge pull request #33491 from frappe/mergify/bp/version-13/pr-33483

Browse Source 
fix: debit note not pulled on reconciliation tool (#33483)
This commit is contained in:
Deepesh Garg
2022-12-30 20:49:48 +05:30
committed by GitHub
parent 8d99763bea e01ff0df40
commit b16bfa541d
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 = (
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