nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-12 17:51:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: filter on advance payments

Browse Source 
(cherry picked from commit 86bac2cf52)

# Conflicts:
#	erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
#	erpnext/controllers/accounts_controller.py
This commit is contained in:
ruthra kumar
2023-07-04 09:02:05 +05:30
committed by Mergify
parent a8c53eeb93
commit c5080abd46
2 changed files with 56 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,7 +58,25 @@ class PaymentReconciliation(Document):
def get_payment_entries(self): def get_payment_entries(self):
order_doctype = "Sales Order" if self.party_type == "Customer" else "Purchase Order" order_doctype = "Sales Order" if self.party_type == "Customer" else "Purchase Order"
<<<<<<< HEAD
condition = self.get_conditions(get_payments=True) condition = self.get_conditions(get_payments=True)
=======
condition = frappe._dict(
{
"company": self.get("company"),
"get_payments": True,
"cost_center": self.get("cost_center"),
"from_payment_date": self.get("from_payment_date"),
"to_payment_date": self.get("to_payment_date"),
"maximum_payment_amount": self.get("maximum_payment_amount"),
"minimum_payment_amount": self.get("minimum_payment_amount"),
}
)
if self.payment_name:
condition.update({"name": self.payment_name})
>>>>>>> 86bac2cf52 (refactor: filter on advance payments)
payment_entries = get_advance_payment_entries( payment_entries = get_advance_payment_entries(
self.party_type, self.party_type,
self.party, self.party,

38
erpnext/controllers/accounts_controller.py
View File

@@ -2320,10 +2320,48 @@ def get_advance_payment_entries(
payment_entries_against_order, unallocated_payment_entries = [], [] payment_entries_against_order, unallocated_payment_entries = [], []
limit_cond = "limit %s" % limit if limit else "" limit_cond = "limit %s" % limit if limit else ""
<<<<<<< HEAD
if order_list or against_all_orders: if order_list or against_all_orders:
if order_list: if order_list:
reference_condition = " and t2.reference_name in ({0})".format( reference_condition = " and t2.reference_name in ({0})".format(
", ".join(["%s"] * len(order_list)) ", ".join(["%s"] * len(order_list))
=======
if payment_type == "Receive":
q = q.select((payment_entry.source_exchange_rate).as_("exchange_rate"))
else:
q = q.select((payment_entry.target_exchange_rate).as_("exchange_rate"))
if condition:
if condition.get("name", None):
q = q.where(payment_entry.name.like(f"%{condition.get('name')}%"))
q = q.where(payment_entry.company == condition["company"])
q = (
q.where(payment_entry.posting_date >= condition["from_payment_date"])
if condition.get("from_payment_date")
else q
)
q = (
q.where(payment_entry.posting_date <= condition["to_payment_date"])
if condition.get("to_payment_date")
else q
)
if condition.get("get_payments") == True:
q = (
q.where(payment_entry.cost_center == condition["cost_center"])
if condition.get("cost_center")
else q
)
q = (
q.where(payment_entry.unallocated_amount >= condition["minimum_payment_amount"])
if condition.get("minimum_payment_amount")
else q
)
q = (
q.where(payment_entry.unallocated_amount <= condition["maximum_payment_amount"])
if condition.get("maximum_payment_amount")
else q
>>>>>>> 86bac2cf52 (refactor: filter on advance payments)
) )
else: else:
reference_condition = "" reference_condition = ""