fix: warehouse issue in pick list (#39826)
diff --git a/erpnext/stock/doctype/pick_list/pick_list.js b/erpnext/stock/doctype/pick_list/pick_list.js
index aa0e125..3cc2956 100644
--- a/erpnext/stock/doctype/pick_list/pick_list.js
+++ b/erpnext/stock/doctype/pick_list/pick_list.js
@@ -77,6 +77,9 @@
},
freeze: 1,
freeze_message: __("Setting Item Locations..."),
+ callback(r) {
+ refresh_field("locations");
+ }
});
}
},
diff --git a/erpnext/stock/doctype/pick_list/pick_list.py b/erpnext/stock/doctype/pick_list/pick_list.py
index 98ed569..0e1f8d7 100644
--- a/erpnext/stock/doctype/pick_list/pick_list.py
+++ b/erpnext/stock/doctype/pick_list/pick_list.py
@@ -348,9 +348,9 @@
picked_items_details = self.get_picked_items_details(items)
self.item_location_map = frappe._dict()
- from_warehouses = None
+ from_warehouses = [self.parent_warehouse] if self.parent_warehouse else []
if self.parent_warehouse:
- from_warehouses = get_descendants_of("Warehouse", self.parent_warehouse)
+ from_warehouses.extend(get_descendants_of("Warehouse", self.parent_warehouse))
# Create replica before resetting, to handle empty table on update after submit.
locations_replica = self.get("locations")