nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-22 06:29:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source 
Removed logic for handling reserved stock when calculating batch quantity.
This commit is contained in:
rohitwaghchaure
2025-12-19 18:07:42 +05:30
committed by GitHub
parent b20405dbf2
commit 9ade0725e8
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py
View File

@@ -2332,12 +2332,6 @@ def get_auto_batch_nos(kwargs):
sre_reserved_batches = frappe._dict() sre_reserved_batches = frappe._dict()
if not kwargs.ignore_reserved_stock: if not kwargs.ignore_reserved_stock:
sre_reserved_batches = get_reserved_batches_for_sre(kwargs) 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() picked_batches = frappe._dict()
if kwargs.get("is_pick_list"): if kwargs.get("is_pick_list"):