diff --git a/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py b/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py index 7e70a7d141f..65158fcf6d8 100644 --- a/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py +++ b/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py @@ -9,7 +9,6 @@ from frappe import _ from frappe.model.document import Document from frappe.query_builder.custom import ConstantColumn from frappe.utils import cint, flt -from pypika.terms import Parameter from erpnext import get_default_cost_center from erpnext.accounts.doctype.bank_transaction.bank_transaction import get_total_allocated_amount @@ -822,11 +821,11 @@ def get_si_matching_query(exact_match, currency, common_filters): si = frappe.qb.DocType("Sales Invoice") sip = frappe.qb.DocType("Sales Invoice Payment") - amount_equality = sip.amount == Parameter("%(amount)s") + amount_equality = sip.amount == common_filters.amount amount_rank = frappe.qb.terms.Case().when(amount_equality, 1).else_(0) amount_condition = amount_equality if exact_match else sip.amount > 0.0 - party_condition = si.customer == Parameter("%(party)s") + party_condition = si.customer == common_filters.party party_rank = frappe.qb.terms.Case().when(party_condition, 1).else_(0) query = ( @@ -859,11 +858,11 @@ def get_pi_matching_query(exact_match, currency, common_filters): # get matching purchase invoice query when they are also used as payment entries (is_paid) purchase_invoice = frappe.qb.DocType("Purchase Invoice") - amount_equality = purchase_invoice.paid_amount == Parameter("%(amount)s") + amount_equality = purchase_invoice.paid_amount == common_filters.amount amount_rank = frappe.qb.terms.Case().when(amount_equality, 1).else_(0) amount_condition = amount_equality if exact_match else purchase_invoice.paid_amount > 0.0 - party_condition = purchase_invoice.supplier == Parameter("%(party)s") + party_condition = purchase_invoice.supplier == common_filters.party party_rank = frappe.qb.terms.Case().when(party_condition, 1).else_(0) query = (