diff --git a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.json b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.json index 8cbdd9435b..d7dff50b44 100644 --- a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.json +++ b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.json @@ -14,6 +14,7 @@ "stopped", "method", "server_script", + "scheduler_event", "frequency", "cron_format", "create_log", @@ -93,6 +94,13 @@ { "fieldname": "column_break_9", "fieldtype": "Column Break" + }, + { + "fieldname": "scheduler_event", + "fieldtype": "Link", + "label": "Scheduler Event", + "options": "Scheduler Event", + "read_only": 1 } ], "in_create": 1, @@ -102,7 +110,7 @@ "link_fieldname": "scheduled_job_type" } ], - "modified": "2024-03-30 11:39:49.693632", + "modified": "2025-01-13 10:39:39.975031", "modified_by": "Administrator", "module": "Core", "name": "Scheduled Job Type", diff --git a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py index 90f62e52cc..426ab54d7a 100644 --- a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py +++ b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py @@ -44,6 +44,7 @@ class ScheduledJobType(Document): last_execution: DF.Datetime | None method: DF.Data next_execution: DF.Datetime | None + scheduler_event: DF.Link | None server_script: DF.Link | None stopped: DF.Check # end: auto-generated types @@ -267,6 +268,9 @@ def clear_events(scheduler_events: dict): if event.server_script: return True + if event.scheduler_event: + return True + freq = frappe.scrub(event.frequency) if freq == "cron": return event.method in scheduler_events.get(freq, {}).get(event.cron_format, []) diff --git a/frappe/core/doctype/scheduler_event/scheduler_event.json b/frappe/core/doctype/scheduler_event/scheduler_event.json index 442923e0ef..22b252ee83 100644 --- a/frappe/core/doctype/scheduler_event/scheduler_event.json +++ b/frappe/core/doctype/scheduler_event/scheduler_event.json @@ -24,7 +24,7 @@ "in_create": 1, "index_web_pages_for_search": 1, "links": [], - "modified": "2025-01-13 10:31:06.968422", + "modified": "2025-01-13 10:36:52.332434", "modified_by": "Administrator", "module": "Core", "name": "Scheduler Event",