nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 16:34:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-11-18 18:04:29 +05:30
committed by GitHub
parent 85c0c16964
commit 36e9aae9d0
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1135,17 +1135,9 @@ 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()
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( elif not row.serial_and_batch_bundle and frappe.get_single_value(
"Stock Settings", "auto_create_serial_and_batch_bundle_for_outward" "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,