mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-29 18:04:46 +00:00
chore: fix conflicts
This commit is contained in:
@@ -1135,6 +1135,7 @@ 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,
|
||||||
}
|
}
|
||||||
|
).update_serial_and_batch_entries()
|
||||||
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"
|
||||||
):
|
):
|
||||||
|
|||||||
Reference in New Issue
Block a user