From baa612bc72bf16969601c74b0cd113a62834d225 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Mon, 28 Jul 2025 12:52:48 +0530 Subject: [PATCH] fix: status in MR (material transfer) when using transit stock entries --- .../stock/doctype/material_request/material_request.json | 3 ++- erpnext/stock/doctype/material_request/material_request.py | 2 +- .../stock/doctype/material_request/material_request_list.js | 6 +++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/erpnext/stock/doctype/material_request/material_request.json b/erpnext/stock/doctype/material_request/material_request.json index dce68d6ecc6..cd7fedc499c 100644 --- a/erpnext/stock/doctype/material_request/material_request.json +++ b/erpnext/stock/doctype/material_request/material_request.json @@ -307,6 +307,7 @@ "fieldname": "transfer_status", "fieldtype": "Select", "label": "Transfer Status", + "no_copy": 1, "options": "\nNot Started\nIn Transit\nCompleted", "read_only": 1 }, @@ -364,7 +365,7 @@ "idx": 70, "is_submittable": 1, "links": [], - "modified": "2025-07-11 21:03:26.588307", + "modified": "2025-07-28 15:13:49.000037", "modified_by": "Administrator", "module": "Stock", "name": "Material Request", diff --git a/erpnext/stock/doctype/material_request/material_request.py b/erpnext/stock/doctype/material_request/material_request.py index 8c409fd7e7b..a67d44b3860 100644 --- a/erpnext/stock/doctype/material_request/material_request.py +++ b/erpnext/stock/doctype/material_request/material_request.py @@ -38,6 +38,7 @@ class MaterialRequest(BuyingController): from erpnext.stock.doctype.material_request_item.material_request_item import MaterialRequestItem amended_from: DF.Link | None + buying_price_list: DF.Link | None company: DF.Link customer: DF.Link | None items: DF.Table[MaterialRequestItem] @@ -54,7 +55,6 @@ class MaterialRequest(BuyingController): naming_series: DF.Literal["MAT-MR-.YYYY.-"] per_ordered: DF.Percent per_received: DF.Percent - price_list: DF.Link | None scan_barcode: DF.Data | None schedule_date: DF.Date | None select_print_heading: DF.Link | None diff --git a/erpnext/stock/doctype/material_request/material_request_list.js b/erpnext/stock/doctype/material_request/material_request_list.js index 2993d1587be..b2671b3207c 100644 --- a/erpnext/stock/doctype/material_request/material_request_list.js +++ b/erpnext/stock/doctype/material_request/material_request_list.js @@ -10,7 +10,11 @@ frappe.listview_settings["Material Request"] = { } else if (doc.transfer_status == "In Transit") { return [__("In Transit"), "yellow", "transfer_status,=,In Transit"]; } else if (doc.transfer_status == "Completed") { - return [__("Completed"), "green", "transfer_status,=,Completed"]; + if (doc.status == "Transferred") { + return [__("Completed"), "green", "transfer_status,=,Completed"]; + } else { + return [__("Partially Received"), "yellow", "per_ordered,<,100"]; + } } } else if (doc.docstatus == 1 && flt(doc.per_ordered, precision) == 0) { return [__("Pending"), "orange", "per_ordered,=,0|docstatus,=,1"];