From c834a9de855ceaff128a96b74cbe006f2e1d1037 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Thu, 23 May 2024 17:01:24 +0530 Subject: [PATCH] refactor: remove 'format:' based naming in internal doctypes (cherry picked from commit e2ec3e453a4995cacabb676165b135cf43e07315) # Conflicts: # erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.json # erpnext/accounts/doctype/repost_payment_ledger/repost_payment_ledger.json --- .../repost_accounting_ledger/repost_accounting_ledger.json | 7 ++++--- .../repost_payment_ledger/repost_payment_ledger.json | 5 ++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.json b/erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.json index 5b7cd2b0b20..cef88965f6b 100644 --- a/erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.json +++ b/erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.json @@ -1,7 +1,5 @@ { "actions": [], - "allow_rename": 1, - "autoname": "format:ACC-REPOST-{#####}", "creation": "2023-07-04 13:07:32.923675", "default_view": "List", "doctype": "DocType", @@ -55,11 +53,14 @@ "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], +<<<<<<< HEAD "modified": "2023-09-26 14:21:27.362567", +======= + "modified": "2024-05-23 17:00:42.984798", +>>>>>>> e2ec3e453a (refactor: remove 'format:' based naming in internal doctypes) "modified_by": "Administrator", "module": "Accounts", "name": "Repost Accounting Ledger", - "naming_rule": "Expression", "owner": "Administrator", "permissions": [ { diff --git a/erpnext/accounts/doctype/repost_payment_ledger/repost_payment_ledger.json b/erpnext/accounts/doctype/repost_payment_ledger/repost_payment_ledger.json index ed8d395a0ec..84205990dda 100644 --- a/erpnext/accounts/doctype/repost_payment_ledger/repost_payment_ledger.json +++ b/erpnext/accounts/doctype/repost_payment_ledger/repost_payment_ledger.json @@ -1,6 +1,5 @@ { "actions": [], - "allow_rename": 1, "creation": "2022-10-19 21:59:33.553852", "doctype": "DocType", "editable_grid": 1, @@ -99,7 +98,11 @@ "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], +<<<<<<< HEAD "modified": "2023-09-26 14:21:35.719727", +======= + "modified": "2024-05-23 17:00:31.540640", +>>>>>>> e2ec3e453a (refactor: remove 'format:' based naming in internal doctypes) "modified_by": "Administrator", "module": "Accounts", "name": "Repost Payment Ledger",