From 07c98146c5cb2fe25363435109c97a0923a6b273 Mon Sep 17 00:00:00 2001
From: ruthra kumar <ruthra@erpnext.com>
Date: Sat, 3 Feb 2024 11:58:11 +0530
Subject: [PATCH] refactor: more options for 'status' and move it to top

(cherry picked from commit 0d65d878deb717b80a22cae4d152d07289acae58)

# Conflicts:
#	erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py
---
 .../transaction_deletion_record.json          | 22 ++++++++++++++-----
 .../transaction_deletion_record.py            | 22 +++++++++++++++++++
 2 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.json b/erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.json
index 23e59472a6d..8f3a5d05666 100644
--- a/erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+++ b/erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.json
@@ -7,10 +7,12 @@
  "engine": "InnoDB",
  "field_order": [
   "company",
+  "column_break_txbg",
+  "status",
+  "section_break_tbej",
   "doctypes",
   "doctypes_to_be_ignored",
-  "amended_from",
-  "status"
+  "amended_from"
  ],
  "fields": [
   {
@@ -46,18 +48,27 @@
   {
    "fieldname": "status",
    "fieldtype": "Select",
-   "hidden": 1,
    "label": "Status",
-   "options": "Draft\nCompleted"
+   "options": "Queued\nRunning\nFailed\nCompleted\nCancelled",
+   "read_only": 1
+  },
+  {
+   "fieldname": "column_break_txbg",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "section_break_tbej",
+   "fieldtype": "Section Break"
   }
  ],
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2021-08-04 20:15:59.071493",
+ "modified": "2024-02-03 12:42:21.628177",
  "modified_by": "Administrator",
  "module": "Setup",
  "name": "Transaction Deletion Record",
+ "naming_rule": "Expression (old style)",
  "owner": "Administrator",
  "permissions": [
   {
@@ -76,5 +87,6 @@
  ],
  "sort_field": "modified",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py b/erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py
index 649b43b5e91..7f6e72db725 100644
--- a/erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py
+++ b/erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py
@@ -10,6 +10,28 @@ from frappe.utils import cint, create_batch
 
 
 class TransactionDeletionRecord(Document):
+<<<<<<< HEAD
+=======
+	# begin: auto-generated types
+	# This code is auto-generated. Do not modify anything in this block.
+
+	from typing import TYPE_CHECKING
+
+	if TYPE_CHECKING:
+		from frappe.types import DF
+
+		from erpnext.setup.doctype.transaction_deletion_record_item.transaction_deletion_record_item import (
+			TransactionDeletionRecordItem,
+		)
+
+		amended_from: DF.Link | None
+		company: DF.Link
+		doctypes: DF.Table[TransactionDeletionRecordItem]
+		doctypes_to_be_ignored: DF.Table[TransactionDeletionRecordItem]
+		status: DF.Literal["Queued", "Running", "Completed"]
+	# end: auto-generated types
+
+>>>>>>> 0d65d878de (refactor: more options for 'status' and move it to top)
 	def __init__(self, *args, **kwargs):
 		super(TransactionDeletionRecord, self).__init__(*args, **kwargs)
 		self.batch_size = 5000