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 e02d9e5db0..fe39f51ce9 100644 --- a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py +++ b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py @@ -71,7 +71,7 @@ class ScheduledJobType(Document): def execute(self): self.scheduler_log = None try: - self.log_status('Start') + self.log_status('Started') if self.server_script: script_name = frappe.db.get_value("Server Script", self.server_script) if script_name: @@ -117,6 +117,7 @@ def execute_event(doc: str): frappe.only_for("System Manager") doc = json.loads(doc) frappe.get_doc("Scheduled Job Type", doc.get("name")).enqueue(force=True) + return doc def run_scheduled_job(job_type: str): diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js index 8d96054d16..49b234d540 100644 --- a/frappe/public/js/frappe/form/form.js +++ b/frappe/public/js/frappe/form/form.js @@ -334,7 +334,7 @@ frappe.ui.form.Form = class FrappeForm { } } if (action.action_type==='Server Action') { - frappe.xcall(action.action, {doc: this.doc}).then((doc) => { + frappe.xcall(action.action, {'doc': this.doc}).then((doc) => { if (doc.doctype) { // document is returned by the method, // apply the changes locally and refresh