From ec3cd7e09c0ccb36d9a4c044e1146f964c870cba Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Tue, 9 Dec 2025 16:15:58 +0530 Subject: [PATCH] feat: add return status --- .../subcontracting_inward_order.json | 4 ++-- .../subcontracting_inward_order.py | 6 +++++- .../subcontracting_inward_order_list.js | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.json b/erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.json index a3b6b10a012..95ac21ac71b 100644 --- a/erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.json +++ b/erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.json @@ -181,7 +181,7 @@ "in_standard_filter": 1, "label": "Status", "no_copy": 1, - "options": "Draft\nOpen\nOngoing\nProduced\nDelivered\nCancelled\nClosed", + "options": "Draft\nOpen\nOngoing\nProduced\nDelivered\nReturned\nCancelled\nClosed", "print_hide": 1, "read_only": 1, "reqd": 1, @@ -306,7 +306,7 @@ "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], - "modified": "2025-09-05 14:41:46.859510", + "modified": "2025-12-09 15:52:55.781346", "modified_by": "Administrator", "module": "Subcontracting", "name": "Subcontracting Inward Order", diff --git a/erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.py b/erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.py index f79ee9f8b37..b516518bfcb 100644 --- a/erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.py +++ b/erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.py @@ -51,7 +51,9 @@ class SubcontractingInwardOrder(SubcontractingController): scrap_items: DF.Table[SubcontractingInwardOrderScrapItem] service_items: DF.Table[SubcontractingInwardOrderServiceItem] set_delivery_warehouse: DF.Link | None - status: DF.Literal["Draft", "Open", "Ongoing", "Produced", "Delivered", "Cancelled", "Closed"] + status: DF.Literal[ + "Draft", "Open", "Ongoing", "Produced", "Delivered", "Returned", "Cancelled", "Closed" + ] title: DF.Data | None transaction_date: DF.Date # end: auto-generated types @@ -111,6 +113,8 @@ class SubcontractingInwardOrder(SubcontractingController): if self.docstatus == 1: if self.status == "Draft": status = "Open" + elif self.per_returned == 100: + status = "Returned" elif self.per_delivered == 100: status = "Delivered" elif self.per_produced == 100: diff --git a/erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order_list.js b/erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order_list.js index 37f61fc5da0..566fbe0755e 100644 --- a/erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order_list.js +++ b/erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order_list.js @@ -9,6 +9,7 @@ frappe.listview_settings["Subcontracting Inward Order"] = { Ongoing: "yellow", Produced: "blue", Delivered: "green", + Returned: "grey", Closed: "grey", Cancelled: "red", };