From 40abd82e2dd8308a686484b77deec714cea0d05a Mon Sep 17 00:00:00 2001
From: "Nihantra C. Patel" <141945075+Nihantra-Patel@users.noreply.github.com>
Date: Wed, 14 Aug 2024 16:11:50 +0530
Subject: [PATCH 1/2] fix: disable rename from warehouse

(cherry picked from commit c1812f74e8b4b4efe43e195d312064204d976732)

# Conflicts:
#	erpnext/stock/doctype/warehouse/warehouse.json
---
 erpnext/stock/doctype/warehouse/warehouse.json | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/erpnext/stock/doctype/warehouse/warehouse.json b/erpnext/stock/doctype/warehouse/warehouse.json
index 7b0cade3ca4..d9f591ac3f8 100644
--- a/erpnext/stock/doctype/warehouse/warehouse.json
+++ b/erpnext/stock/doctype/warehouse/warehouse.json
@@ -263,7 +263,11 @@
  "idx": 1,
  "is_tree": 1,
  "links": [],
+<<<<<<< HEAD
  "modified": "2024-01-24 16:27:28.299520",
+=======
+ "modified": "2024-08-14 16:08:15.733597",
+>>>>>>> c1812f74e8 (fix: disable rename from warehouse)
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Warehouse",
@@ -320,6 +324,5 @@
  "sort_field": "modified",
  "sort_order": "DESC",
  "states": [],
- "title_field": "warehouse_name",
  "track_changes": 1
-}
\ No newline at end of file
+}

From 3a1ad6e844e00f6ef12e56404c2efe1575add24b Mon Sep 17 00:00:00 2001
From: "Nihantra C. Patel" <141945075+Nihantra-Patel@users.noreply.github.com>
Date: Wed, 14 Aug 2024 16:37:36 +0530
Subject: [PATCH 2/2] fix: disable rename from warehouse

---
 erpnext/stock/doctype/warehouse/warehouse.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/erpnext/stock/doctype/warehouse/warehouse.json b/erpnext/stock/doctype/warehouse/warehouse.json
index d9f591ac3f8..f2d157b0ae4 100644
--- a/erpnext/stock/doctype/warehouse/warehouse.json
+++ b/erpnext/stock/doctype/warehouse/warehouse.json
@@ -263,11 +263,7 @@
  "idx": 1,
  "is_tree": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2024-01-24 16:27:28.299520",
-=======
  "modified": "2024-08-14 16:08:15.733597",
->>>>>>> c1812f74e8 (fix: disable rename from warehouse)
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Warehouse",