commit 4ff70db668f8a883a4ff41d2867676d6d89d1ead
author Anand Baburajan <anandbaburajan@gmail.com> Tue Dec 27 14:59:53 2022 +0530
committer GitHub <noreply@github.com> Tue Dec 27 14:59:53 2022 +0530
tree e77a2bd6719c73e1d01aa4981b9a41fa79d9d081
parent 482116db9f926ff88d9a874302b96c8591d8e2e4
parent 8263bf9a9a716f7651386633fd6f26686f2008bd

Merge branch 'develop' into asset_depreciation_schedule

erpnext/stock/doctype/pick_list/pick_list.py

diff --git a/erpnext/stock/doctype/pick_list/pick_list.py b/erpnext/stock/doctype/pick_list/pick_list.py
index aff5e05..8704b67 100644
--- a/erpnext/stock/doctype/pick_list/pick_list.py
+++ b/erpnext/stock/doctype/pick_list/pick_list.py
@@ -441,7 +441,7 @@
 			sle.`batch_no`,
 			sle.`item_code`
 		HAVING `qty` > 0
-		ORDER BY IFNULL(batch.`expiry_date`, '2200-01-01'), batch.`creation`
+		ORDER BY IFNULL(batch.`expiry_date`, '2200-01-01'), batch.`creation`, sle.`batch_no`, sle.`warehouse`
 	""".format(
 			warehouse_condition=warehouse_condition
 		),