vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge branch 'develop' into print-asset-failure-exception

Browse source
This commit is contained in:
Suraj Shetty 2024-12-03 16:41:05 +05:30 • committed by GitHub
commit 3cf4d9f370
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
frappe/model/workflow.py
View file

@ -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()

8
frappe/public/js/frappe/form/form.js
View file

@ -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;
}