From 0a4198718b77f89923349a788b026381880f2412 Mon Sep 17 00:00:00 2001
From: diptanilsaha <diptanil@frappe.io>
Date: Wed, 17 Dec 2025 12:39:34 +0530
Subject: [PATCH] fix: allow rename for market segment doctype

(cherry picked from commit f3142c4af608f893fa5b8adc4c54195c5c8074a8)

# Conflicts:
#	erpnext/crm/doctype/market_segment/market_segment.json
---
 .../market_segment/market_segment.json        | 38 ++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/erpnext/crm/doctype/market_segment/market_segment.json b/erpnext/crm/doctype/market_segment/market_segment.json
index 66cca0ed400..78ddf5722bf 100644
--- a/erpnext/crm/doctype/market_segment/market_segment.json
+++ b/erpnext/crm/doctype/market_segment/market_segment.json
@@ -1,4 +1,5 @@
 {
+<<<<<<< HEAD
  "allow_copy": 0, 
  "allow_events_in_timeline": 0, 
  "allow_guest_to_view": 0, 
@@ -13,6 +14,18 @@
  "document_type": "", 
  "editable_grid": 1, 
  "engine": "InnoDB", 
+=======
+ "actions": [],
+ "allow_rename": 1,
+ "autoname": "field:market_segment",
+ "creation": "2018-10-01 09:59:14.479509",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "market_segment"
+ ],
+>>>>>>> f3142c4af6 (fix: allow rename for market segment doctype)
  "fields": [
   {
    "allow_bulk_edit": 0, 
@@ -46,6 +59,7 @@
    "translatable": 0, 
    "unique": 1
   }
+<<<<<<< HEAD
  ], 
  "has_web_view": 0, 
  "hide_heading": 0, 
@@ -63,6 +77,16 @@
  "name": "Market Segment", 
  "name_case": "", 
  "owner": "Administrator", 
+=======
+ ],
+ "links": [],
+ "modified": "2025-12-17 12:09:34.687368",
+ "modified_by": "Administrator",
+ "module": "CRM",
+ "name": "Market Segment",
+ "naming_rule": "By fieldname",
+ "owner": "Administrator",
+>>>>>>> f3142c4af6 (fix: allow rename for market segment doctype)
  "permissions": [
   {
    "amend": 0, 
@@ -83,6 +107,7 @@
    "submit": 0, 
    "write": 1
   }
+<<<<<<< HEAD
  ], 
  "quick_entry": 1, 
  "read_only": 0, 
@@ -93,4 +118,15 @@
  "track_changes": 1, 
  "track_seen": 0, 
  "track_views": 0
-}
\ No newline at end of file
+}
+=======
+ ],
+ "quick_entry": 1,
+ "row_format": "Dynamic",
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": [],
+ "track_changes": 1,
+ "translated_doctype": 1
+}
+>>>>>>> f3142c4af6 (fix: allow rename for market segment doctype)