Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(ux): Sales Order Stock Reservation Dialog #38261

Merged
merged 3 commits into from
Nov 26, 2023
Merged

fix(ux): Sales Order Stock Reservation Dialog #38261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9c889b3
fix(ux): no need to select rows to reserve the stock
s-aga-r Nov 20, 2023
73586fd
fix: use field `sales_order_item` instead `name`
s-aga-r Nov 22, 2023
2a41da9
fix(ux): no need to select rows to unreserve the stock
s-aga-r Nov 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 10 additions & 18 deletions erpnext/selling/doctype/sales_order/sales_order.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,13 +214,12 @@ frappe.ui.form.on("Sales Order", {
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,
},
Expand Down Expand Up @@ -260,7 +259,7 @@ frappe.ui.form.on("Sales Order", {
],
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({
Expand All @@ -278,9 +277,6 @@ frappe.ui.form.on("Sales Order", {
}
});
}
else {
frappe.msgprint(__("Please select items to reserve."));
}

dialog.hide();
},
Expand All @@ -292,7 +288,7 @@ frappe.ui.form.on("Sales Order", {

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))
Expand All @@ -308,22 +304,21 @@ frappe.ui.form.on("Sales Order", {
cancel_stock_reservation_entries(frm) {
const dialog = new frappe.ui.Dialog({
title: __("Stock Unreservation"),
size: "large",
size: "extra-large",
fields: [
{
fieldname: "sr_entries",
fieldtype: "Table",
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,
Expand Down Expand Up @@ -360,14 +355,14 @@ frappe.ui.form.on("Sales Order", {
],
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...'),
Expand All @@ -377,9 +372,6 @@ frappe.ui.form.on("Sales Order", {
}
});
}
else {
frappe.msgprint(__("Please select items to unreserve."));
}

dialog.hide();
},
Expand All @@ -396,7 +388,7 @@ frappe.ui.form.on("Sales Order", {
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))
Expand Down
2 changes: 1 addition & 1 deletion erpnext/stock/doctype/pick_list/pick_list.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ def create_stock_reservation_entries(self, notify=True) -> None:
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)),
Expand Down
2 changes: 1 addition & 1 deletion erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -775,7 +775,7 @@ def reserve_stock_for_sales_order(self):
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,
Expand Down
10 changes: 7 additions & 3 deletions erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -869,7 +869,7 @@ def create_stock_reservation_entries_for_so_items(
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"))
Expand Down Expand Up @@ -1053,12 +1053,14 @@ def cancel_stock_reservation_entries(
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"]
Expand All @@ -1082,9 +1084,11 @@ def cancel_stock_reservation_entries(

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")
Expand Down
Loading