feat: Allowing closing individual items in sales order

Author: Nishka Gosalia

erpnext/manufacturing/doctype/production_plan/production_plan.py

@@ -368,6 +368,7 @@ def get_so_items(self):
 				(so_item.parent.isin(so_list))
 				& (so_item.docstatus == 1)
 				& ((so_item.stock_qty - so_item.stock_reserved_qty) > so_item.work_order_qty)
+				& ((so_item.is_closed == 0) | (so_item.is_closed.isnull()))
 			)
 		)
 
@@ -432,6 +433,7 @@ def get_so_items(self):
 						.where((bom.item == pi.item_code) & (bom.is_active == 1))
 					)
 				)
+				& ((so_item.is_closed == 0) | (so_item.is_closed.isnull()))
 			)
 		)
 
@@ -1542,6 +1544,7 @@ def get_sales_orders(self):
 			& (so.status.notin(["Stopped", "Closed"]))
 			& (so.company == self.company)
 			& (so_item.qty > so_item.production_plan_qty)
+			& ((so_item.is_closed == 0) | (so_item.is_closed.isnull()))
 		)
 	)
 

erpnext/manufacturing/doctype/work_order/work_order.py

@@ -2396,6 +2396,7 @@ def query_sales_order(doctype, txt, searchfield, start, page_len, filters) -> li
 		fields=["name"],
 		filters=[
 			["Sales Order", "docstatus", "=", 1],
+			["Sales Order", "status", "!=", "Closed"],
 		],
 		or_filters=[
 			["Sales Order Item", "item_code", "=", filters.get("production_item")],

erpnext/patches.txt

@@ -456,4 +456,5 @@ erpnext.patches.v16_0.update_tax_withholding_field_in_payment_entry
 erpnext.patches.v16_0.migrate_tax_withholding_data
 erpnext.patches.v16_0.update_corrected_cancelled_status
 erpnext.patches.v16_0.fix_barcode_typo
-erpnext.patches.v16_0.set_post_change_gl_entries_on_pos_settings
+erpnext.patches.v16_0.set_post_change_gl_entries_on_pos_settings
+erpnext.patches.v16_0.update_sales_order_item_status

erpnext/patches/v16_0/update_sales_order_item_status.py

@@ -0,0 +1,18 @@
+import frappe
+
+
+def execute():
+	frappe.db.auto_commit_on_many_writes = 1
+	sales_order = frappe.qb.DocType("Sales Order")
+	sales_order_item = frappe.qb.DocType("Sales Order Item")
+
+	try:
+		frappe.qb.update(sales_order_item).join(sales_order).on(
+			sales_order.name == sales_order_item.parent
+		).set(sales_order_item.is_closed, 1).where(
+			(sales_order.name == sales_order_item.parent)
+			& (sales_order.status == "Closed")
+			& (sales_order_item.is_closed == 0)
+		).run()
+	finally:
+		frappe.db.auto_commit_on_many_writes = 0

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 = [
 		{

erpnext/selling/doctype/sales_order/sales_order.js

@@ -28,6 +28,8 @@ frappe.ui.form.on("Sales Order", {
 				color = "yellow";
 			} else if (doc.stock_qty <= doc.delivered_qty) {
 				color = "green";
+			} else if (doc.is_closed) {
+				color = "grey";
 			} else {
 				color = "orange";
 			}
@@ -996,6 +998,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 +1723,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 +1793,178 @@ 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 Items"),
+			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"));
+					return;
+				}
+				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 Items"),
+			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"));
+					return;
+				}
+				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");
 	}