From d6333c15621dc5d6912767a63325348f74caac0f Mon Sep 17 00:00:00 2001
From: Mihir Kandoi <kandoimihir@gmail.com>
Date: Tue, 17 Feb 2026 11:54:12 +0530
Subject: [PATCH 1/2] fix: do not allow plant floor company and warehouse to be
 updated

(cherry picked from commit fd721327430210f0048f29909d1dd884e0c6a9e3)

# Conflicts:
#	erpnext/manufacturing/doctype/plant_floor/plant_floor.json
---
 .../doctype/plant_floor/plant_floor.json          | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/erpnext/manufacturing/doctype/plant_floor/plant_floor.json b/erpnext/manufacturing/doctype/plant_floor/plant_floor.json
index c1c167c395b..311e4fd913b 100644
--- a/erpnext/manufacturing/doctype/plant_floor/plant_floor.json
+++ b/erpnext/manufacturing/doctype/plant_floor/plant_floor.json
@@ -49,7 +49,8 @@
    "fieldname": "warehouse",
    "fieldtype": "Link",
    "label": "Warehouse",
-   "options": "Warehouse"
+   "options": "Warehouse",
+   "set_only_once": 1
   },
   {
    "depends_on": "eval:!doc.__islocal && doc.warehouse",
@@ -66,13 +67,18 @@
    "fieldname": "company",
    "fieldtype": "Link",
    "label": "Company",
-   "options": "Company"
+   "options": "Company",
+   "set_only_once": 1
   }
  ],
  "hide_toolbar": 1,
  "index_web_pages_for_search": 1,
  "links": [],
+<<<<<<< HEAD
  "modified": "2024-09-19 19:06:36.481625",
+=======
+ "modified": "2026-02-17 11:53:17.940039",
+>>>>>>> fd72132743 (fix: do not allow plant floor company and warehouse to be updated)
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "Plant Floor",
@@ -92,7 +98,12 @@
    "write": 1
   }
  ],
+<<<<<<< HEAD
  "sort_field": "modified",
+=======
+ "row_format": "Dynamic",
+ "sort_field": "creation",
+>>>>>>> fd72132743 (fix: do not allow plant floor company and warehouse to be updated)
  "sort_order": "DESC",
  "states": []
 }

From e8b46d9815621568ab3a523058ad3a7fef80fb73 Mon Sep 17 00:00:00 2001
From: Mihir Kandoi <kandoimihir@gmail.com>
Date: Tue, 17 Feb 2026 12:13:33 +0530
Subject: [PATCH 2/2] chore: resolve conflicts

---
 .../manufacturing/doctype/plant_floor/plant_floor.json   | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/erpnext/manufacturing/doctype/plant_floor/plant_floor.json b/erpnext/manufacturing/doctype/plant_floor/plant_floor.json
index 311e4fd913b..556a0c33721 100644
--- a/erpnext/manufacturing/doctype/plant_floor/plant_floor.json
+++ b/erpnext/manufacturing/doctype/plant_floor/plant_floor.json
@@ -74,11 +74,7 @@
  "hide_toolbar": 1,
  "index_web_pages_for_search": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2024-09-19 19:06:36.481625",
-=======
  "modified": "2026-02-17 11:53:17.940039",
->>>>>>> fd72132743 (fix: do not allow plant floor company and warehouse to be updated)
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "Plant Floor",
@@ -98,12 +94,7 @@
    "write": 1
   }
  ],
-<<<<<<< HEAD
  "sort_field": "modified",
-=======
- "row_format": "Dynamic",
- "sort_field": "creation",
->>>>>>> fd72132743 (fix: do not allow plant floor company and warehouse to be updated)
  "sort_order": "DESC",
  "states": []
 }