From 5fd486d989bb84c70bb5196662827dfb5496cb33 Mon Sep 17 00:00:00 2001
From: Corentin Forler <8860073-cforler_dokos@users.noreply.gitlab.com>
Date: Thu, 29 Feb 2024 18:46:50 +0100
Subject: [PATCH 1/2] fix(accounts): Fix cost center merging

---
 erpnext/accounts/utils.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py
index 937758f8c37..0f4be003f43 100644
--- a/erpnext/accounts/utils.py
+++ b/erpnext/accounts/utils.py
@@ -1210,7 +1210,8 @@ def update_cost_center(docname, cost_center_name, cost_center_number, company, m
 	Renames the document by adding the number as a prefix to the current name and updates
 	all transaction where it was present.
 	"""
-	validate_field_number("Cost Center", docname, cost_center_number, company, "cost_center_number")
+	if not merge:
+		validate_field_number("Cost Center", docname, cost_center_number, company, "cost_center_number")
 
 	if cost_center_number:
 		frappe.db.set_value("Cost Center", docname, "cost_center_number", cost_center_number.strip())
-- 
GitLab


From bbc9b52eba45d4a2f1a0b27198de3f92d90f3d12 Mon Sep 17 00:00:00 2001
From: Corentin Forler <8860073-cforler_dokos@users.noreply.gitlab.com>
Date: Thu, 29 Feb 2024 18:51:54 +0100
Subject: [PATCH 2/2] fix(accounts): Allow setting Number of new Cost Center

---
 erpnext/accounts/doctype/cost_center/cost_center.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/erpnext/accounts/doctype/cost_center/cost_center.json b/erpnext/accounts/doctype/cost_center/cost_center.json
index 092f701332b..1a267bab8a0 100644
--- a/erpnext/accounts/doctype/cost_center/cost_center.json
+++ b/erpnext/accounts/doctype/cost_center/cost_center.json
@@ -41,7 +41,7 @@
       "in_list_view": 1,
       "in_standard_filter": 1,
       "label": "Cost Center Number",
-      "read_only": 1
+      "read_only_depends_on": "eval:!doc.__islocal"
      },
      {
       "fieldname": "parent_cost_center",
-- 
GitLab