From 3229e2869c40418afe818b36d56af2b2df05dc74 Mon Sep 17 00:00:00 2001
From: Corentin Flr <10946971+cogk@users.noreply.github.com>
Date: Tue, 11 Jul 2023 15:26:57 +0200
Subject: [PATCH] fix(event)!: Move "Cancelled" to `status` instead of
 `event_type` (#21471)

---
 frappe/desk/doctype/event/event.json                 |  6 +++---
 frappe/patches.txt                                   |  1 +
 .../patches/v15_0/move_event_cancelled_to_status.py  | 12 ++++++++++++
 3 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 frappe/patches/v15_0/move_event_cancelled_to_status.py

diff --git a/frappe/desk/doctype/event/event.json b/frappe/desk/doctype/event/event.json
index 5ca49f3831..3a4f192656 100644
--- a/frappe/desk/doctype/event/event.json
+++ b/frappe/desk/doctype/event/event.json
@@ -75,7 +75,7 @@
    "label": "Event Type",
    "oldfieldname": "event_type",
    "oldfieldtype": "Select",
-   "options": "Private\nPublic\nCancelled",
+   "options": "Private\nPublic",
    "reqd": 1,
    "search_index": 1
   },
@@ -223,7 +223,7 @@
    "in_list_view": 1,
    "in_standard_filter": 1,
    "label": "Status",
-   "options": "Open\nCompleted\nClosed"
+   "options": "Open\nCompleted\nClosed\nCancelled"
   },
   {
    "collapsible": 1,
@@ -295,7 +295,7 @@
  "icon": "fa fa-calendar",
  "idx": 1,
  "links": [],
- "modified": "2022-08-12 19:24:34.794098",
+ "modified": "2023-06-23 10:33:15.685368",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Event",
diff --git a/frappe/patches.txt b/frappe/patches.txt
index ebdda9b220..054fe9b946 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -226,3 +226,4 @@ frappe.desk.doctype.form_tour.patches.introduce_ui_tours
 execute:frappe.delete_doc_if_exists("Workspace", "Customization")
 execute:frappe.db.set_single_value("Document Naming Settings", "default_amend_naming", "Amend Counter")
 execute:frappe.delete_doc_if_exists("DocType", "Error Snapshot")
+frappe.patches.v15_0.move_event_cancelled_to_status
diff --git a/frappe/patches/v15_0/move_event_cancelled_to_status.py b/frappe/patches/v15_0/move_event_cancelled_to_status.py
new file mode 100644
index 0000000000..3cb63a46fd
--- /dev/null
+++ b/frappe/patches/v15_0/move_event_cancelled_to_status.py
@@ -0,0 +1,12 @@
+import frappe
+
+
+def execute():
+	Event = frappe.qb.DocType("Event")
+	query = (
+		frappe.qb.update(Event)
+		.set(Event.event_type, "Private")
+		.set(Event.status, "Cancelled")
+		.where(Event.event_type == "Cancelled")
+	)
+	query.run()