mirror of
https://github.com/frappe/erpnext.git
synced 2026-09-17 18:45:20 +00:00
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
This commit is contained in:
@@ -2283,7 +2283,7 @@ def get_potentially_billable_sales_orders(
|
|||||||
|
|
||||||
query = frappe.qb.get_query(
|
query = frappe.qb.get_query(
|
||||||
so,
|
so,
|
||||||
fields=[so.name, so.customer, so.transaction_date],
|
fields=[so.name, so.customer, so.transaction_date, so.creation],
|
||||||
filters=filters,
|
filters=filters,
|
||||||
or_filters=or_filters,
|
or_filters=or_filters,
|
||||||
ignore_permissions=False,
|
ignore_permissions=False,
|
||||||
@@ -2296,7 +2296,8 @@ def get_potentially_billable_sales_orders(
|
|||||||
.on(item.name == so_item.item_code)
|
.on(item.name == so_item.item_code)
|
||||||
.where(get_potentially_billable_item_criterion(so, so_item, item))
|
.where(get_potentially_billable_item_criterion(so, so_item, item))
|
||||||
.distinct()
|
.distinct()
|
||||||
.orderby(so.transaction_date, order=Order.desc)
|
.orderby(so.transaction_date, order=Order.asc)
|
||||||
|
.orderby(so.creation, order=Order.asc)
|
||||||
.limit(cint(page_len))
|
.limit(cint(page_len))
|
||||||
.offset(cint(start))
|
.offset(cint(start))
|
||||||
.run(as_dict=True)
|
.run(as_dict=True)
|
||||||
|
|||||||
Reference in New Issue
Block a user