diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py
index 69e5e1d..ba9f87f 100644
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -1321,7 +1321,7 @@
 	date_fieldname = "delivery_date" if child_doctype == "Sales Order Item" else "schedule_date"
 	child_item.update({date_fieldname: trans_item.get(date_fieldname) or p_doc.get(date_fieldname)})
 	child_item.uom = trans_item.get("uom") or item.stock_uom
-	child_item.warehouse = p_doc.set_warehouse
+	child_item.warehouse = get_item_warehouse(item, p_doc, overwrite_warehouse=True)
 	conversion_factor = flt(get_conversion_factor(item.item_code, child_item.uom).get("conversion_factor"))
 	child_item.conversion_factor = flt(trans_item.get('conversion_factor')) or conversion_factor
 	if child_doctype == "Purchase Order Item":
@@ -1361,9 +1361,9 @@
 		d.cancel()
 		d.delete()
 		
-		from erpnext.stock.stock_balance import update_bin_qty, get_ordered_qty
-		frappe.errprint(f"Item Code: {d.item_code}, Warehouse: {d.warehouse}")
+		from erpnext.stock.stock_balance import update_bin_qty, get_reserved_qty, get_ordered_qty
 		update_bin_qty(d.item_code, d.warehouse, {
+			"reserved_qty": get_reserved_qty(d.item_code, d.warehouse),
 			"ordered_qty": get_ordered_qty(d.item_code, d.warehouse)
 		})
 
