nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-21 07:38:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: validate sabb autocreation when disabled

Browse Source 
(cherry picked from commit 3ca1940881)

# Conflicts:
#	erpnext/stock/doctype/stock_entry/stock_entry.py
This commit is contained in:
Kavin
2025-11-12 11:32:41 +05:30
committed by Mergify
parent 6a46045804
commit 85c0c16964
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/stock/doctype/stock_entry/stock_entry.py
View File

@@ -1135,8 +1135,17 @@ class StockEntry(StockController):
"ignore_serial_nos": already_picked_serial_nos, "ignore_serial_nos": already_picked_serial_nos,
"qty": row.transfer_qty * -1, "qty": row.transfer_qty * -1,
} }
<<<<<<< HEAD
).update_serial_and_batch_entries() ).update_serial_and_batch_entries()
elif not row.serial_and_batch_bundle: elif not row.serial_and_batch_bundle:
=======
).update_serial_and_batch_entries(
serial_nos=serial_nos.get(row.name), batch_nos=batch_nos.get(row.name)
)
elif not row.serial_and_batch_bundle and frappe.get_single_value(
"Stock Settings", "auto_create_serial_and_batch_bundle_for_outward"
):
>>>>>>> 3ca1940881 (fix: validate sabb autocreation when disabled)
bundle_doc = SerialBatchCreation( bundle_doc = SerialBatchCreation(
{ {
"item_code": row.item_code, "item_code": row.item_code,

2
erpnext/stock/serial_batch_bundle.py
View File

@@ -259,7 +259,7 @@ class SerialBatchBundle:
and not self.sle.serial_and_batch_bundle and not self.sle.serial_and_batch_bundle
and self.item_details.has_batch_no == 1 and self.item_details.has_batch_no == 1
and ( and (
self.item_details.create_new_batch (self.item_details.create_new_batch and self.sle.actual_qty > 0)
or ( or (
frappe.db.get_single_value( frappe.db.get_single_value(
"Stock Settings", "auto_create_serial_and_batch_bundle_for_outward" "Stock Settings", "auto_create_serial_and_batch_bundle_for_outward"