diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index 916cc4bc562..80346b124f0 100755 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -2283,7 +2283,7 @@ def get_potentially_billable_sales_orders( query = frappe.qb.get_query( so, - fields=[so.name, so.customer, so.transaction_date], + fields=[so.name, so.customer, so.transaction_date, so.creation], filters=filters, or_filters=or_filters, ignore_permissions=False, @@ -2296,7 +2296,8 @@ def get_potentially_billable_sales_orders( .on(item.name == so_item.item_code) .where(get_potentially_billable_item_criterion(so, so_item, item)) .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)) .offset(cint(start)) .run(as_dict=True)