From 9ade0725e8eb5f3ecdbc9cc7d6f5f6af6fd1748c Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Fri, 19 Dec 2025 18:07:42 +0530 Subject: [PATCH] chore: fix conflicts Removed logic for handling reserved stock when calculating batch quantity. --- .../serial_and_batch_bundle/serial_and_batch_bundle.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py b/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py index 238d6600830..e20363cec3a 100644 --- a/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py +++ b/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py @@ -2332,12 +2332,6 @@ def get_auto_batch_nos(kwargs): sre_reserved_batches = frappe._dict() if not kwargs.ignore_reserved_stock: sre_reserved_batches = get_reserved_batches_for_sre(kwargs) -<<<<<<< HEAD -======= - - if kwargs.against_sales_order and only_consider_batches: - kwargs.batch_no = kwargs.warehouse = None ->>>>>>> b23c6e2687 (fix(stock): ignore reserved stock while calculating batch qty) picked_batches = frappe._dict() if kwargs.get("is_pick_list"):