From e967b37c7889d984e332a8fe882d8dd5b96fe9bd Mon Sep 17 00:00:00 2001 From: Sumit Bhanushali Date: Tue, 3 Dec 2024 11:27:07 +0530 Subject: [PATCH 1/2] fix: workflow should also support queue_in_background (cherry picked from commit 3d51e725c6bd89af4cd215a858ab25725b24c847) --- frappe/model/workflow.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/frappe/model/workflow.py b/frappe/model/workflow.py index 460b7cced0..447cfbd019 100644 --- a/frappe/model/workflow.py +++ b/frappe/model/workflow.py @@ -130,6 +130,13 @@ def apply_workflow(doc, action): if doc.docstatus.is_draft() and new_docstatus == DocStatus.draft(): doc.save() elif doc.docstatus.is_draft() and new_docstatus == DocStatus.submitted(): + from frappe.core.doctype.submission_queue.submission_queue import queue_submission + from frappe.utils.scheduler import is_scheduler_inactive + + if doc.meta.queue_in_background and not is_scheduler_inactive(): + queue_submission(doc, "Submit") + return + doc.submit() elif doc.docstatus.is_submitted() and new_docstatus == DocStatus.submitted(): doc.save() From cca62e1bc15527bcc13862a8742c6c9778d20eec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20D=C6=B0=C6=A1ng?= <97208260+duonguwu@users.noreply.github.com> Date: Tue, 3 Dec 2024 16:19:58 +0700 Subject: [PATCH 2/2] fix: remove duplicate mobile button creation in add_custom_button --- frappe/public/js/frappe/form/form.js | 8 -------- 1 file changed, 8 deletions(-) diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js index 466754261e..21f7432a7a 100644 --- a/frappe/public/js/frappe/form/form.js +++ b/frappe/public/js/frappe/form/form.js @@ -1479,14 +1479,6 @@ frappe.ui.form.Form = class FrappeForm { let btn = this.page.add_inner_button(label, fn, group); - if (btn) { - // Add actions as menu item in Mobile View - let menu_item_label = group ? `${group} > ${label}` : label; - let menu_item = this.page.add_menu_item(menu_item_label, fn, false); - menu_item.parent().addClass("hidden-xl"); - - this.custom_buttons[label] = btn; - } return btn; }