From 50266d3b6bb899ec9536e6909972a42e164563f4 Mon Sep 17 00:00:00 2001 From: thomasantony12 Date: Sun, 12 Oct 2025 11:18:03 +0530 Subject: [PATCH 1/3] fix: Batch ordering based on the method mentioned in settings (cherry picked from commit 7fa800b87449fea05306f2ae31e8e03801e9ead8) --- erpnext/stock/doctype/batch/batch.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/erpnext/stock/doctype/batch/batch.py b/erpnext/stock/doctype/batch/batch.py index 37530682db4..e81e9a2ff5a 100644 --- a/erpnext/stock/doctype/batch/batch.py +++ b/erpnext/stock/doctype/batch/batch.py @@ -253,6 +253,7 @@ def get_batch_qty( get_auto_batch_nos, ) + stock_settings = frappe.get_cached_doc("Stock Settings") batchwise_qty = defaultdict(float) kwargs = frappe._dict( { @@ -262,6 +263,7 @@ def get_batch_qty( "posting_date": posting_date, "posting_time": posting_time, "batch_no": batch_no, + "based_on": stock_settings.pick_serial_and_batch_based_on, "ignore_voucher_nos": ignore_voucher_nos, "for_stock_levels": for_stock_levels, "consider_negative_batches": consider_negative_batches, From e23616f9ea0711137dd2ce3db054d317f266a6f9 Mon Sep 17 00:00:00 2001 From: thomasantony12 Date: Sun, 12 Oct 2025 18:05:29 +0530 Subject: [PATCH 2/3] chore: use get_single_value instead of get_cached_doc (cherry picked from commit fab7f9ee53ef1db331269c4ff087bced16820c3f) --- erpnext/stock/doctype/batch/batch.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/stock/doctype/batch/batch.py b/erpnext/stock/doctype/batch/batch.py index e81e9a2ff5a..6b3aa422772 100644 --- a/erpnext/stock/doctype/batch/batch.py +++ b/erpnext/stock/doctype/batch/batch.py @@ -253,7 +253,7 @@ def get_batch_qty( get_auto_batch_nos, ) - stock_settings = frappe.get_cached_doc("Stock Settings") + based_on = frappe.get_single_value("Stock Settings", "pick_serial_and_batch_based_on") batchwise_qty = defaultdict(float) kwargs = frappe._dict( { @@ -263,7 +263,7 @@ def get_batch_qty( "posting_date": posting_date, "posting_time": posting_time, "batch_no": batch_no, - "based_on": stock_settings.pick_serial_and_batch_based_on, + "based_on": based_on, "ignore_voucher_nos": ignore_voucher_nos, "for_stock_levels": for_stock_levels, "consider_negative_batches": consider_negative_batches, From 5603467cee69b51b3d8017cba95507afe833ec97 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Mon, 13 Oct 2025 19:26:34 +0530 Subject: [PATCH 3/3] refactor: move value inline (cherry picked from commit 1717a7c983d79602da02db5ad125288076400870) --- erpnext/stock/doctype/batch/batch.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/erpnext/stock/doctype/batch/batch.py b/erpnext/stock/doctype/batch/batch.py index 6b3aa422772..699b7a9562d 100644 --- a/erpnext/stock/doctype/batch/batch.py +++ b/erpnext/stock/doctype/batch/batch.py @@ -253,7 +253,6 @@ def get_batch_qty( get_auto_batch_nos, ) - based_on = frappe.get_single_value("Stock Settings", "pick_serial_and_batch_based_on") batchwise_qty = defaultdict(float) kwargs = frappe._dict( { @@ -263,7 +262,7 @@ def get_batch_qty( "posting_date": posting_date, "posting_time": posting_time, "batch_no": batch_no, - "based_on": based_on, + "based_on": frappe.get_single_value("Stock Settings", "pick_serial_and_batch_based_on"), "ignore_voucher_nos": ignore_voucher_nos, "for_stock_levels": for_stock_levels, "consider_negative_batches": consider_negative_batches,