From de46165768c46724a58a0fe4d80a30f93f1ca1d3 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <30859809+shariquerik@users.noreply.github.com>
Date: Thu, 6 Mar 2025 17:19:14 +0530
Subject: [PATCH 1/3] fix: Allow rename prospect doctype (#46352)

fix: allow rename prospect doctype
(cherry picked from commit 884709deb8ff9a882c009ba0c8b7a521fa71dac8)

# Conflicts:
#	erpnext/crm/doctype/prospect/prospect.json
---
 erpnext/crm/doctype/prospect/prospect.json | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/erpnext/crm/doctype/prospect/prospect.json b/erpnext/crm/doctype/prospect/prospect.json
index d32311bc4e1..d9fce557a15 100644
--- a/erpnext/crm/doctype/prospect/prospect.json
+++ b/erpnext/crm/doctype/prospect/prospect.json
@@ -1,6 +1,7 @@
 {
  "actions": [],
  "allow_events_in_timeline": 1,
+ "allow_rename": 1,
  "autoname": "field:company_name",
  "creation": "2021-08-19 00:21:06.995448",
  "doctype": "DocType",
@@ -216,9 +217,14 @@
    "options": "CRM Note"
   }
  ],
+ "grid_page_length": 50,
  "index_web_pages_for_search": 1,
  "links": [],
+<<<<<<< HEAD
  "modified": "2022-10-13 12:29:33.674561",
+=======
+ "modified": "2025-03-06 11:31:49.083983",
+>>>>>>> 884709deb8 (fix: Allow rename prospect doctype (#46352))
  "modified_by": "Administrator",
  "module": "CRM",
  "name": "Prospect",
@@ -258,7 +264,12 @@
    "share": 1
   }
  ],
+<<<<<<< HEAD
  "sort_field": "modified",
+=======
+ "row_format": "Dynamic",
+ "sort_field": "creation",
+>>>>>>> 884709deb8 (fix: Allow rename prospect doctype (#46352))
  "sort_order": "DESC",
  "states": [],
  "title_field": "company_name",

From 60364f6dc9e17a7adadd70501e57cce2fd49361f Mon Sep 17 00:00:00 2001
From: Nabin Hait <nabinhait@gmail.com>
Date: Thu, 6 Mar 2025 18:14:09 +0530
Subject: [PATCH 2/3] chore: conflicts

---
 erpnext/crm/doctype/prospect/prospect.json | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/erpnext/crm/doctype/prospect/prospect.json b/erpnext/crm/doctype/prospect/prospect.json
index d9fce557a15..5ff8284e66c 100644
--- a/erpnext/crm/doctype/prospect/prospect.json
+++ b/erpnext/crm/doctype/prospect/prospect.json
@@ -220,11 +220,7 @@
  "grid_page_length": 50,
  "index_web_pages_for_search": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2022-10-13 12:29:33.674561",
-=======
  "modified": "2025-03-06 11:31:49.083983",
->>>>>>> 884709deb8 (fix: Allow rename prospect doctype (#46352))
  "modified_by": "Administrator",
  "module": "CRM",
  "name": "Prospect",
@@ -264,14 +260,10 @@
    "share": 1
   }
  ],
-<<<<<<< HEAD
  "sort_field": "modified",
-=======
- "row_format": "Dynamic",
  "sort_field": "creation",
->>>>>>> 884709deb8 (fix: Allow rename prospect doctype (#46352))
  "sort_order": "DESC",
  "states": [],
  "title_field": "company_name",
  "track_changes": 1
-}
\ No newline at end of file
+}

From 4e688778dc3bedb69f662cebc2478ada50ca6c23 Mon Sep 17 00:00:00 2001
From: Nabin Hait <nabinhait@gmail.com>
Date: Fri, 7 Mar 2025 10:28:52 +0530
Subject: [PATCH 3/3] chore: linter issue

---
 erpnext/crm/doctype/prospect/prospect.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/erpnext/crm/doctype/prospect/prospect.json b/erpnext/crm/doctype/prospect/prospect.json
index 5ff8284e66c..af54ca3a185 100644
--- a/erpnext/crm/doctype/prospect/prospect.json
+++ b/erpnext/crm/doctype/prospect/prospect.json
@@ -260,7 +260,6 @@
    "share": 1
   }
  ],
- "sort_field": "modified",
  "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],