feat: Serial and Batch reservation

erpnext/controllers/accounts_controller.py

@@ -3095,7 +3095,9 @@ def validate_fg_item_for_subcontracting(new_data, is_new):
 
 		if has_reserved_stock(parent.doctype, parent.name):
 			cancel_stock_reservation_entries(parent.doctype, parent.name)
-			parent.create_stock_reservation_entries()
+
+			if parent.per_picked == 0:
+				parent.create_stock_reservation_entries()
 
 
 @erpnext.allow_regional

erpnext/erpnext_integrations/connectors/woocommerce_connection.py

@@ -43,7 +43,7 @@ def _order(*args, **kwargs):
 		event = "created"
 	# Ignore the test ping issued during WooCommerce webhook configuration
 	# Ref: https://github.com/woocommerce/woocommerce/issues/15642
-	if frappe.request.data.decode('utf-8').startswith('webhook_id='):
+	if frappe.request.data.decode("utf-8").startswith("webhook_id="):
 		return "success"
 	elif frappe.request and frappe.request.data:
 		verify_request()

erpnext/public/js/utils.js

@@ -571,6 +571,7 @@ erpnext.utils.update_child_items = function(opts) {
 	const cannot_add_row = (typeof opts.cannot_add_row === 'undefined') ? true : opts.cannot_add_row;
 	const child_docname = (typeof opts.cannot_add_row === 'undefined') ? "items" : opts.child_docname;
 	const child_meta = frappe.get_meta(`${frm.doc.doctype} Item`);
+	const has_reserved_stock = opts.has_reserved_stock ? true : false;
 	const get_precision = (fieldname) => child_meta.fields.find(f => f.fieldname == fieldname).precision;
 
 	this.data = frm.doc[opts.child_docname].map((d) => {
@@ -734,6 +735,17 @@ erpnext.utils.update_child_items = function(opts) {
 			},
 		],
 		primary_action: function() {
+			if (frm.doctype == "Sales Order" && has_reserved_stock) {
+				this.hide();
+				frappe.confirm(
+					__('The reserved stock will be released when you update items. Are you certain you wish to proceed?'),
+					() => this.update_items(),
+				)
+			} else {
+				this.update_items();
+			}
+		},
+		update_items: function() {
 			const trans_items = this.get_values()["trans_items"].filter((item) => !!item.item_code);
 			frappe.call({
 				method: 'erpnext.controllers.accounts_controller.update_child_qty_rate',
@@ -823,6 +835,8 @@ erpnext.utils.map_current_doc = function(opts) {
 				"target_doc": cur_frm.doc,
 				"args": opts.args
 			},
+			freeze: true,
+			freeze_message: __("Mapping {0} ...", [opts.source_doctype]),
 			callback: function(r) {
 				if(!r.exc) {
 					var doc = frappe.model.sync(r.message);