feat: Allowing closing individual items in sales order

Author: Nishka Gosalia

erpnext/public/js/utils.js

@@ -610,23 +610,31 @@ erpnext.utils.update_child_items = function (opts) {
 	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) => {
-		return {
-			docname: d.name,
-			name: d.name,
-			item_code: d.item_code,
-			item_name: d.item_name,
-			delivery_date: d.delivery_date,
-			schedule_date: d.schedule_date,
-			conversion_factor: d.conversion_factor,
-			qty: d.qty,
-			rate: d.rate,
-			uom: d.uom,
-			fg_item: d.fg_item,
-			fg_item_qty: d.fg_item_qty,
-			description: d.description,
-		};
-	});
+	const is_sales_order = frm.doc.doctype === "Sales Order";
+	this.data = frm.doc[opts.child_docname]
+		.filter((d) => {
+			if (is_sales_order) {
+				return !d.is_closed;
+			}
+			return true;
+		})
+		.map((d) => {
+			return {
+				docname: d.name,
+				name: d.name,
+				item_code: d.item_code,
+				item_name: d.item_name,
+				delivery_date: d.delivery_date,
+				schedule_date: d.schedule_date,
+				conversion_factor: d.conversion_factor,
+				qty: d.qty,
+				rate: d.rate,
+				uom: d.uom,
+				fg_item: d.fg_item,
+				fg_item_qty: d.fg_item_qty,
+				description: d.description,
+			};
+		});
 
 	const fields = [
 		{
@@ -898,6 +906,9 @@ erpnext.utils.update_child_items = function (opts) {
 		primary_action_label: __("Update"),
 	});
 
+	dialog.fields_list[2].grid.grid_pagination.page_length = 10;
+	dialog.fields_list[2].grid.grid_pagination.setup_pagination();
+
 	dialog.show();
 };
 

erpnext/selling/doctype/sales_order/sales_order.js

@@ -996,6 +996,18 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex
 								() => this.close_sales_order(),
 								__("Status")
 							);
+
+							this.frm.add_custom_button(
+								__("Close selected items"),
+								() => this.close_selected_items(),
+								__("Status")
+							);
+
+							this.frm.add_custom_button(
+								__("Re-open selected items"),
+								() => this.reopen_selected_items(),
+								__("Status")
+							);
 						}
 					}
 
@@ -1709,7 +1721,7 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex
 			me.frm.doc.items.forEach((d) => {
 				let ordered_qty = me.get_ordered_qty(d, me.frm.doc);
 				let pending_qty = (flt(d.stock_qty) - ordered_qty) / flt(d.conversion_factor);
-				if (pending_qty > 0) {
+				if (pending_qty > 0 && !d.is_closed) {
 					po_items.push({
 						name: d.name,
 						item_name: d.item_name,
@@ -1779,6 +1791,176 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex
 		});
 		d.show();
 	}
+	reopen_selected_items() {
+		var me = this;
+		this.data = this.frm.doc.items
+			.filter((d) => d.is_closed)
+			.map((d) => {
+				return {
+					docname: d.name,
+					item_code: d.item_code,
+					qty: d.qty,
+					is_close: d.is_closed,
+					delivered_qty: d.delivered_qty,
+				};
+			});
+		const reopen_item_fields = [
+			{
+				fieldtype: "Link",
+				fieldname: "item_code",
+				options: "Item",
+				in_list_view: 1,
+				read_only: 1,
+			},
+			{
+				fieldtype: "Float",
+				fieldname: "qty",
+				read_only: 1,
+				in_list_view: 1,
+				label: __("Qty"),
+			},
+		];
+		var d = new frappe.ui.Dialog({
+			title: "Re-open Selected Order",
+			size: "large",
+			fields: [
+				{
+					fieldname: "reopen_items",
+					fieldtype: "Table",
+					label: "Items",
+					cannot_add_rows: true,
+					in_place_edit: true,
+					fields: reopen_item_fields,
+					data: this.data,
+					get_data: () => {
+						return this.data;
+					},
+				},
+			],
+			primary_action_label: __("Re-open"),
+			primary_action: function () {
+				let values = d.get_values();
+
+				let selected_items = (values.reopen_items || []).filter((row) => row.__checked);
+				if (!selected_items.length) {
+					frappe.msgprint(__("Please select one item to re-open"));
+				}
+				frappe.call({
+					method: "erpnext.selling.doctype.sales_order.sales_order.close_or_reopen_selected_items",
+					args: { sales_order: me.frm.doc.name, selected_items: selected_items, status: "Re-open" },
+					callback: (r) => {
+						if (!r.exc) {
+							d.hide();
+							me.frm.reload_doc();
+							frappe.show_alert({
+								message: __("Selected items re-opened"),
+								indicator: "green",
+							});
+						}
+					},
+				});
+			},
+		});
+
+		d.show();
+	}
+
+	close_selected_items() {
+		var me = this;
+		this.data = this.frm.doc.items
+			.filter((d) => d.qty > flt(d.delivered_qty) && !d.is_closed)
+			.map((d) => {
+				return {
+					docname: d.name,
+					item_code: d.item_code,
+					qty: d.qty,
+					is_close: d.is_closed,
+					delivered_qty: d.delivered_qty,
+				};
+			});
+		const close_item_fields = [
+			{
+				fieldtype: "Link",
+				fieldname: "item_code",
+				options: "Item",
+				in_list_view: 1,
+				read_only: 1,
+			},
+			{
+				fieldtype: "Float",
+				fieldname: "qty",
+				read_only: 1,
+				in_list_view: 1,
+				label: __("Qty"),
+			},
+		];
+		var d = new frappe.ui.Dialog({
+			title: "Close Selected Order",
+			size: "large",
+			fields: [
+				{
+					fieldname: "select_all",
+					fieldtype: "Check",
+					label: "Select all items",
+					default: 1,
+					onchange: function () {
+						const table_field = d.get_field("close_items");
+						table_field.df.hidden = this.get_value();
+						table_field.refresh();
+					},
+				},
+				{
+					fieldname: "close_items",
+					fieldtype: "Table",
+					label: "Items",
+					cannot_add_rows: true,
+					in_place_edit: true,
+					fields: close_item_fields,
+					data: this.data,
+					hidden: true,
+					get_data: () => {
+						return this.data;
+					},
+				},
+			],
+			primary_action_label: __("Close"),
+			primary_action: function () {
+				let values = d.get_values();
+
+				if (values.select_all) {
+					me.close_sales_order();
+					d.hide();
+					return;
+				}
+				let selected_items = (values.close_items || []).filter((row) => row.__checked);
+				if (selected_items.length == me.data.length) {
+					me.close_sales_order();
+					d.hide();
+					return;
+				}
+				if (!selected_items.length) {
+					frappe.msgprint(__("Please select one item to close"));
+				}
+				frappe.call({
+					method: "erpnext.selling.doctype.sales_order.sales_order.close_or_reopen_selected_items",
+					args: { sales_order: me.frm.doc.name, selected_items: selected_items, status: "Close" },
+					callback: (r) => {
+						if (!r.exc) {
+							d.hide();
+							me.frm.reload_doc();
+							frappe.show_alert({
+								message: __("Selected items closed"),
+								indicator: "green",
+							});
+						}
+					},
+				});
+			},
+		});
+
+		d.show();
+	}
+
 	close_sales_order() {
 		this.frm.cscript.update_status("Close", "Closed");
 	}

erpnext/selling/doctype/sales_order/sales_order.py

@@ -1072,7 +1072,8 @@ def update_item(source, target, source_parent):
 				"condition": lambda item: not frappe.db.exists(
 					"Product Bundle", {"name": item.item_code, "disabled": 0}
 				)
-				and get_remaining_qty(item) > 0,
+				and get_remaining_qty(item) > 0
+				and not item.is_closed,
 				"postprocess": update_item,
 			},
 		},
@@ -1188,8 +1189,10 @@ def condition(doc):
 				return False
 
 		return (
-			(abs(doc.delivered_qty) < abs(doc.qty)) or is_unit_price_row(doc)
-		) and doc.delivered_by_supplier != 1
+			((abs(doc.delivered_qty) < abs(doc.qty)) or is_unit_price_row(doc))
+			and doc.delivered_by_supplier != 1
+			and not doc.is_closed
+		)
 
 	def update_item(source, target, source_parent):
 		target.base_amount = (flt(source.qty) - flt(source.delivered_qty)) * flt(source.base_rate)
@@ -1428,7 +1431,11 @@ def add_self_rm(doclist):
 				"condition": lambda doc: (
 					True
 					if is_unit_price_row(doc)
-					else (doc.qty and (doc.base_amount == 0 or abs(doc.billed_amt) < abs(doc.amount)))
+					else (
+						doc.qty
+						and (doc.base_amount == 0 or abs(doc.billed_amt) < abs(doc.amount))
+						and not doc.is_closed
+					)
 				)
 				and select_item(doc),
 			},
@@ -1875,6 +1882,7 @@ def should_pick_order_item(item) -> bool:
 			abs(item.delivered_qty) < abs(item.qty)
 			and item.delivered_by_supplier != 1
 			and not is_product_bundle(item.item_code)
+			and not item.is_closed
 		)
 
 	# Don't allow a Pick List to be created against a Sales Order that has reserved stock.
@@ -1951,6 +1959,7 @@ def get_work_order_items(sales_order, for_raw_material_request=0):
 			)
 		]
 
+		so.items = so.get("items", {"is_closed": 0})
 		for table in [so.items, so.packed_items]:
 			for i in table:
 				bom = get_default_bom(i.item_code)
@@ -2062,3 +2071,35 @@ def post_process(source_doc, target_doc):
 	)
 
 	return target_doc
+
+
+@frappe.whitelist()
+def close_or_reopen_selected_items(sales_order, selected_items, status):
+	so = frappe.get_doc("Sales Order", sales_order)
+	selected_items = parse_json(selected_items)
+	items = {i["docname"] for i in selected_items}
+	for row in so.items:
+		if row.name not in items:
+			continue
+
+		if status == "Close":
+			if row.delivered_qty and row.qty == row.delivered_qty:
+				frappe.throw(_("Item cannot be closed as it is already delivered"))
+
+			row.is_closed = 1
+		else:
+			if so.docstatus == 1:
+				so.check_credit_limit()
+			row.is_closed = 0
+
+	so.save()
+	so.update_reserved_qty(items)
+	if so.is_subcontracted:
+		# for now just adding validation this needs to be handled properly
+		frappe.throw(_("Cannot close items in a subcontracted Sales Order"))
+		# update_subcontracting_order_status - need to call this otherwise subcontracting inward order will remain open
+
+	if all(d.is_closed for d in so.items):
+		so.status = "Closed"
+		so.update_status("Closed")
+	return True