nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-15 04:45:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: build payment entry query separately

Browse Source
This commit is contained in:
ruthra kumar
2024-01-29 14:44:16 +05:30
parent 2c431f394e
commit ea779fcad9
1 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -112,7 +112,7 @@ class PaymentReconciliation(Document):
def get_payment_entries(self):
order_doctype = "Sales Order" if self.party_type == "Customer" else "Purchase Order"
condition = self.get_conditions(get_payments=True)
condition = self.get_payment_entry_conditions()
# pass dynamic dimension filter values to query builder
dimensions = {}
@@ -652,6 +652,29 @@ class PaymentReconciliation(Document):
self.build_dimensions_filter_conditions()
def get_payment_entry_conditions(self):
condition = " and company = '{0}' ".format(self.company)
if self.get("cost_center"):
condition = " and cost_center = '{0}' ".format(self.cost_center)
condition += (
" and posting_date >= {0}".format(frappe.db.escape(self.from_payment_date))
if self.from_payment_date
else ""
)
condition += (
" and posting_date <= {0}".format(frappe.db.escape(self.to_payment_date))
if self.to_payment_date
else ""
)
if self.minimum_payment_amount:
condition += " and unallocated_amount >= {0}".format(flt(self.minimum_payment_amount))
if self.maximum_payment_amount:
condition += " and unallocated_amount <= {0}".format(flt(self.maximum_payment_amount))
return condition
def get_journal_filter_conditions(self):
conditions = []
je = qb.DocType("Journal Entry")