Merge pull request #38261 from s-aga-r/FIX-STOCK-RESERVATION-DIALOG-BOX
fix(ux): Sales Order Stock Reservation Dialog
diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js
index 3ad18da..97b214e 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.js
+++ b/erpnext/selling/doctype/sales_order/sales_order.js
@@ -214,13 +214,12 @@
label: __("Items to Reserve"),
allow_bulk_edit: false,
cannot_add_rows: true,
- cannot_delete_rows: true,
data: [],
fields: [
{
- fieldname: "name",
+ fieldname: "sales_order_item",
fieldtype: "Data",
- label: __("Name"),
+ label: __("Sales Order Item"),
reqd: 1,
read_only: 1,
},
@@ -260,7 +259,7 @@
],
primary_action_label: __("Reserve Stock"),
primary_action: () => {
- var data = {items: dialog.fields_dict.items.grid.get_selected_children()};
+ var data = {items: dialog.fields_dict.items.grid.data};
if (data.items && data.items.length > 0) {
frappe.call({
@@ -278,9 +277,6 @@
}
});
}
- else {
- frappe.msgprint(__("Please select items to reserve."));
- }
dialog.hide();
},
@@ -292,7 +288,7 @@
if (unreserved_qty > 0) {
dialog.fields_dict.items.df.data.push({
- 'name': item.name,
+ 'sales_order_item': item.name,
'item_code': item.item_code,
'warehouse': item.warehouse,
'qty_to_reserve': (unreserved_qty / flt(item.conversion_factor))
@@ -308,7 +304,7 @@
cancel_stock_reservation_entries(frm) {
const dialog = new frappe.ui.Dialog({
title: __("Stock Unreservation"),
- size: "large",
+ size: "extra-large",
fields: [
{
fieldname: "sr_entries",
@@ -316,14 +312,13 @@
label: __("Reserved Stock"),
allow_bulk_edit: false,
cannot_add_rows: true,
- cannot_delete_rows: true,
in_place_edit: true,
data: [],
fields: [
{
- fieldname: "name",
+ fieldname: "sre",
fieldtype: "Link",
- label: __("SRE"),
+ label: __("Stock Reservation Entry"),
options: "Stock Reservation Entry",
reqd: 1,
read_only: 1,
@@ -360,14 +355,14 @@
],
primary_action_label: __("Unreserve Stock"),
primary_action: () => {
- var data = {sr_entries: dialog.fields_dict.sr_entries.grid.get_selected_children()};
+ var data = {sr_entries: dialog.fields_dict.sr_entries.grid.data};
if (data.sr_entries && data.sr_entries.length > 0) {
frappe.call({
doc: frm.doc,
method: "cancel_stock_reservation_entries",
args: {
- sre_list: data.sr_entries,
+ sre_list: data.sr_entries.map(item => item.sre),
},
freeze: true,
freeze_message: __('Unreserving Stock...'),
@@ -377,9 +372,6 @@
}
});
}
- else {
- frappe.msgprint(__("Please select items to unreserve."));
- }
dialog.hide();
},
@@ -396,7 +388,7 @@
r.message.forEach(sre => {
if (flt(sre.reserved_qty) > flt(sre.delivered_qty)) {
dialog.fields_dict.sr_entries.df.data.push({
- 'name': sre.name,
+ 'sre': sre.name,
'item_code': sre.item_code,
'warehouse': sre.warehouse,
'qty': (flt(sre.reserved_qty) - flt(sre.delivered_qty))
diff --git a/erpnext/stock/doctype/pick_list/pick_list.py b/erpnext/stock/doctype/pick_list/pick_list.py
index 644df3d..e7f6204 100644
--- a/erpnext/stock/doctype/pick_list/pick_list.py
+++ b/erpnext/stock/doctype/pick_list/pick_list.py
@@ -233,7 +233,7 @@
for location in self.locations:
if location.warehouse and location.sales_order and location.sales_order_item:
item_details = {
- "name": location.sales_order_item,
+ "sales_order_item": location.sales_order_item,
"item_code": location.item_code,
"warehouse": location.warehouse,
"qty_to_reserve": (flt(location.picked_qty) - flt(location.stock_reserved_qty)),
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
index a5940f0..a7aa7e2 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
@@ -781,7 +781,7 @@
for item in self.items:
if item.sales_order and item.sales_order_item:
item_details = {
- "name": item.sales_order_item,
+ "sales_order_item": item.sales_order_item,
"item_code": item.item_code,
"warehouse": item.warehouse,
"qty_to_reserve": item.stock_qty,
diff --git a/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py b/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py
index 0954282..cbfa4e0 100644
--- a/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py
+++ b/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py
@@ -869,7 +869,7 @@
items = []
if items_details:
for item in items_details:
- so_item = frappe.get_doc("Sales Order Item", item.get("name"))
+ so_item = frappe.get_doc("Sales Order Item", item.get("sales_order_item"))
so_item.warehouse = item.get("warehouse")
so_item.qty_to_reserve = (
flt(item.get("qty_to_reserve"))
@@ -1053,12 +1053,14 @@
from_voucher_type: Literal["Pick List", "Purchase Receipt"] = None,
from_voucher_no: str = None,
from_voucher_detail_no: str = None,
- sre_list: list[dict] = None,
+ sre_list: list = None,
notify: bool = True,
) -> None:
"""Cancel Stock Reservation Entries."""
if not sre_list:
+ sre_list = {}
+
if voucher_type and voucher_no:
sre_list = get_stock_reservation_entries_for_voucher(
voucher_type, voucher_no, voucher_detail_no, fields=["name"]
@@ -1082,9 +1084,11 @@
sre_list = query.run(as_dict=True)
+ sre_list = [d.name for d in sre_list]
+
if sre_list:
for sre in sre_list:
- frappe.get_doc("Stock Reservation Entry", sre["name"]).cancel()
+ frappe.get_doc("Stock Reservation Entry", sre).cancel()
if notify:
msg = _("Stock Reservation Entries Cancelled")