From fc7207bcd37fbb2fc943c47b80841147461b2f76 Mon Sep 17 00:00:00 2001
From: venkat102 <venkatesharunachalam659@gmail.com>
Date: Thu, 10 Oct 2024 12:33:12 +0530
Subject: [PATCH] refactor: remove 'format:' based naming

(cherry picked from commit e8e1ec0e851496a8096184a2dddebea8efcd6551)

# Conflicts:
#	erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json
---
 .../doctype/unreconcile_payment/unreconcile_payment.json   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json b/erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json
index f906dc6cec6..8ba79581d50 100644
--- a/erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json
+++ b/erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json
@@ -1,7 +1,5 @@
 {
  "actions": [],
- "allow_rename": 1,
- "autoname": "format:UNREC-{#####}",
  "creation": "2023-08-22 10:26:34.421423",
  "default_view": "List",
  "doctype": "DocType",
@@ -58,11 +56,14 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
+<<<<<<< HEAD
  "modified": "2023-08-28 17:42:50.261377",
+=======
+ "modified": "2024-10-10 12:03:50.022444",
+>>>>>>> e8e1ec0e85 (refactor: remove 'format:' based naming)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Unreconcile Payment",
- "naming_rule": "Expression",
  "owner": "Administrator",
  "permissions": [
   {