From a09ab902e5b64b396e455d2a6ed2add7a6892419 Mon Sep 17 00:00:00 2001
From: Mihir Kandoi <kandoimihir@gmail.com>
Date: Tue, 22 Apr 2025 15:27:09 +0530
Subject: [PATCH] fix: revert unintended changes

(cherry picked from commit eaaf34cda659f61a13d1fe9f15cb71bc91ba10c0)

# Conflicts:
#	erpnext/stock/doctype/material_request/material_request.json
---
 .../doctype/material_request/material_request.json     | 10 ++++++----
 .../stock/doctype/material_request/material_request.py |  8 +++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/erpnext/stock/doctype/material_request/material_request.json b/erpnext/stock/doctype/material_request/material_request.json
index b8ca285c19f..88344bad8a7 100644
--- a/erpnext/stock/doctype/material_request/material_request.json
+++ b/erpnext/stock/doctype/material_request/material_request.json
@@ -53,14 +53,13 @@
    "options": "fa fa-pushpin"
   },
   {
-   "default": "MAT/MR/.YYYY.-",
    "fieldname": "naming_series",
    "fieldtype": "Select",
    "label": "Series",
    "no_copy": 1,
    "oldfieldname": "naming_series",
    "oldfieldtype": "Select",
-   "options": "MAT-MR-.YYYY.-\nMAT/MR/.YYYY.-",
+   "options": "MAT-MR-.YYYY.-",
    "print_hide": 1,
    "reqd": 1,
    "set_only_once": 1
@@ -358,11 +357,15 @@
  "idx": 70,
  "is_submittable": 1,
  "links": [],
+<<<<<<< HEAD
 <<<<<<< HEAD
  "modified": "2023-09-15 12:07:24.789471",
 =======
  "modified": "2025-04-21 18:36:04.827917",
 >>>>>>> ecf15130ba (fix: backslash in url)
+=======
+ "modified": "2024-12-16 12:46:02.262167",
+>>>>>>> eaaf34cda6 (fix: revert unintended changes)
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Material Request",
@@ -430,11 +433,10 @@
   }
  ],
  "quick_entry": 1,
- "row_format": "Dynamic",
  "search_fields": "status,transaction_date",
  "show_name_in_global_search": 1,
  "sort_field": "modified",
  "sort_order": "DESC",
  "states": [],
  "title_field": "title"
-}
+}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/material_request/material_request.py b/erpnext/stock/doctype/material_request/material_request.py
index c206c232431..54b3e17641e 100644
--- a/erpnext/stock/doctype/material_request/material_request.py
+++ b/erpnext/stock/doctype/material_request/material_request.py
@@ -24,16 +24,15 @@ form_grid_templates = {"items": "templates/form_grid/material_request_grid.html"
 
 class MaterialRequest(BuyingController):
 	# begin: auto-generated types
-	# ruff: noqa
-
 	# This code is auto-generated. Do not modify anything in this block.
 
 	from typing import TYPE_CHECKING
 
 	if TYPE_CHECKING:
-		from erpnext.stock.doctype.material_request_item.material_request_item import MaterialRequestItem
 		from frappe.types import DF
 
+		from erpnext.stock.doctype.material_request_item.material_request_item import MaterialRequestItem
+
 		amended_from: DF.Link | None
 		company: DF.Link
 		customer: DF.Link | None
@@ -43,7 +42,7 @@ class MaterialRequest(BuyingController):
 		material_request_type: DF.Literal[
 			"Purchase", "Material Transfer", "Material Issue", "Manufacture", "Customer Provided"
 		]
-		naming_series: DF.Literal["MAT-MR-.YYYY.-", "MAT/MR/.YYYY.-"]
+		naming_series: DF.Literal["MAT-MR-.YYYY.-"]
 		per_ordered: DF.Percent
 		per_received: DF.Percent
 		scan_barcode: DF.Data | None
@@ -71,7 +70,6 @@ class MaterialRequest(BuyingController):
 		transaction_date: DF.Date
 		transfer_status: DF.Literal["", "Not Started", "In Transit", "Completed"]
 		work_order: DF.Link | None
-	# ruff: noqa
 	# end: auto-generated types
 
 	def check_if_already_pulled(self):