nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-14 20:35:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: revert unintended changes

Browse Source 
(cherry picked from commit eaaf34cda6)

# Conflicts:
#	erpnext/stock/doctype/material_request/material_request.json
This commit is contained in:
Mihir Kandoi
2025-04-22 15:27:09 +05:30
committed by Mergify
parent ad35021666
commit a09ab902e5
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/stock/doctype/material_request/material_request.json
View File

@@ -53,14 +53,13 @@
"options": "fa fa-pushpin" "options": "fa fa-pushpin"
}, },
{ {
"default": "MAT/MR/.YYYY.-",
"fieldname": "naming_series", "fieldname": "naming_series",
"fieldtype": "Select", "fieldtype": "Select",
"label": "Series", "label": "Series",
"no_copy": 1, "no_copy": 1,
"oldfieldname": "naming_series", "oldfieldname": "naming_series",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "MAT-MR-.YYYY.-\nMAT/MR/.YYYY.-", "options": "MAT-MR-.YYYY.-",
"print_hide": 1, "print_hide": 1,
"reqd": 1, "reqd": 1,
"set_only_once": 1 "set_only_once": 1
@@ -358,11 +357,15 @@
"idx": 70, "idx": 70,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
"modified": "2023-09-15 12:07:24.789471", "modified": "2023-09-15 12:07:24.789471",
======= =======
"modified": "2025-04-21 18:36:04.827917", "modified": "2025-04-21 18:36:04.827917",
>>>>>>> ecf15130ba (fix: backslash in url) >>>>>>> ecf15130ba (fix: backslash in url)
=======
"modified": "2024-12-16 12:46:02.262167",
>>>>>>> eaaf34cda6 (fix: revert unintended changes)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Material Request", "name": "Material Request",
@@ -430,7 +433,6 @@
} }
], ],
"quick_entry": 1, "quick_entry": 1,
"row_format": "Dynamic",
"search_fields": "status,transaction_date", "search_fields": "status,transaction_date",
"show_name_in_global_search": 1, "show_name_in_global_search": 1,
"sort_field": "modified", "sort_field": "modified",

8
erpnext/stock/doctype/material_request/material_request.py
View File

@@ -24,16 +24,15 @@ form_grid_templates = {"items": "templates/form_grid/material_request_grid.html"
class MaterialRequest(BuyingController): class MaterialRequest(BuyingController):
# begin: auto-generated types # begin: auto-generated types
# ruff: noqa
# This code is auto-generated. Do not modify anything in this block. # This code is auto-generated. Do not modify anything in this block.
from typing import TYPE_CHECKING from typing import TYPE_CHECKING
if TYPE_CHECKING: if TYPE_CHECKING:
from erpnext.stock.doctype.material_request_item.material_request_item import MaterialRequestItem
from frappe.types import DF from frappe.types import DF
from erpnext.stock.doctype.material_request_item.material_request_item import MaterialRequestItem
amended_from: DF.Link | None amended_from: DF.Link | None
company: DF.Link company: DF.Link
customer: DF.Link | None customer: DF.Link | None
@@ -43,7 +42,7 @@ class MaterialRequest(BuyingController):
material_request_type: DF.Literal[ material_request_type: DF.Literal[
"Purchase", "Material Transfer", "Material Issue", "Manufacture", "Customer Provided" "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_ordered: DF.Percent
per_received: DF.Percent per_received: DF.Percent
scan_barcode: DF.Data | None scan_barcode: DF.Data | None
@@ -71,7 +70,6 @@ class MaterialRequest(BuyingController):
transaction_date: DF.Date transaction_date: DF.Date
transfer_status: DF.Literal["", "Not Started", "In Transit", "Completed"] transfer_status: DF.Literal["", "Not Started", "In Transit", "Completed"]
work_order: DF.Link | None work_order: DF.Link | None
# ruff: noqa
# end: auto-generated types # end: auto-generated types
def check_if_already_pulled(self): def check_if_already_pulled(self):