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

refactor: pass orders name in a separate criterion

Browse Source
This commit is contained in:
ruthra kumar
2024-01-29 21:05:21 +05:30
parent c054316127
commit 1966ea15ba
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/controllers/accounts_controller.py
View File

@@ -2564,15 +2564,16 @@ def get_advance_payment_entries(
condition.append(pe.name.like(f"%%{payment_name}%%")) condition.append(pe.name.like(f"%%{payment_name}%%"))
if order_list or against_all_orders: if order_list or against_all_orders:
orders_condition = []
if order_list: if order_list:
condition.append(per.reference_name.isin(order_list)) orders_condition.append(per.reference_name.isin(order_list))
payment_entries_query = ( payment_entries_query = (
qb.from_(pe) qb.from_(pe)
.inner_join(per) .inner_join(per)
.on(pe.name == per.parent) .on(pe.name == per.parent)
.select( .select(
ConstantColumn("Payment Entry").as_("reference_type"), ConstantColumn("Payment Entry").as_("reference_type"),
pe.name, pe.name.as_("reference_name"),
pe.remarks, pe.remarks,
per.allocated_amount.as_("amount"), per.allocated_amount.as_("amount"),
per.name.as_("reference_row"), per.name.as_("reference_row"),
@@ -2590,6 +2591,7 @@ def get_advance_payment_entries(
& (per.reference_doctype == order_doctype) & (per.reference_doctype == order_doctype)
) )
.where(Criterion.all(condition)) .where(Criterion.all(condition))
.where(Criterion.all(orders_condition))
.orderby(pe.posting_date) .orderby(pe.posting_date)
) )