From f6edd5aa7dd31a3db3ff0775413f3fc522c1f7f2 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Mon, 21 Apr 2025 19:05:16 +0530 Subject: [PATCH] fix: backslash in url (cherry picked from commit ecf15130bad830e603c3778408e8770fce651783) # Conflicts: # erpnext/stock/doctype/material_request/material_request.json --- .../doctype/production_plan/production_plan.py | 4 +++- .../doctype/material_request/material_request.json | 10 ++++++++-- .../stock/doctype/material_request/material_request.py | 8 +++++--- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/erpnext/manufacturing/doctype/production_plan/production_plan.py b/erpnext/manufacturing/doctype/production_plan/production_plan.py index 2e89a191f66..ad5bf5be7d4 100644 --- a/erpnext/manufacturing/doctype/production_plan/production_plan.py +++ b/erpnext/manufacturing/doctype/production_plan/production_plan.py @@ -912,9 +912,11 @@ class ProductionPlan(Document): frappe.flags.mute_messages = False + from urllib.parse import quote_plus + if material_request_list: material_request_list = [ - f"""{m.name}""" + f"""{m.name}""" for m in material_request_list ] msgprint(_("{0} created").format(comma_and(material_request_list))) diff --git a/erpnext/stock/doctype/material_request/material_request.json b/erpnext/stock/doctype/material_request/material_request.json index 25c765bbced..b8ca285c19f 100644 --- a/erpnext/stock/doctype/material_request/material_request.json +++ b/erpnext/stock/doctype/material_request/material_request.json @@ -53,13 +53,14 @@ "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.-", + "options": "MAT-MR-.YYYY.-\nMAT/MR/.YYYY.-", "print_hide": 1, "reqd": 1, "set_only_once": 1 @@ -357,7 +358,11 @@ "idx": 70, "is_submittable": 1, "links": [], +<<<<<<< HEAD "modified": "2023-09-15 12:07:24.789471", +======= + "modified": "2025-04-21 18:36:04.827917", +>>>>>>> ecf15130ba (fix: backslash in url) "modified_by": "Administrator", "module": "Stock", "name": "Material Request", @@ -425,10 +430,11 @@ } ], "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 54b3e17641e..c206c232431 100644 --- a/erpnext/stock/doctype/material_request/material_request.py +++ b/erpnext/stock/doctype/material_request/material_request.py @@ -24,14 +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 frappe.types import DF - from erpnext.stock.doctype.material_request_item.material_request_item import MaterialRequestItem + from frappe.types import DF amended_from: DF.Link | None company: DF.Link @@ -42,7 +43,7 @@ class MaterialRequest(BuyingController): material_request_type: DF.Literal[ "Purchase", "Material Transfer", "Material Issue", "Manufacture", "Customer Provided" ] - naming_series: DF.Literal["MAT-MR-.YYYY.-"] + naming_series: DF.Literal["MAT-MR-.YYYY.-", "MAT/MR/.YYYY.-"] per_ordered: DF.Percent per_received: DF.Percent scan_barcode: DF.Data | None @@ -70,6 +71,7 @@ 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):