diff --git a/frappe/model/document.py b/frappe/model/document.py index 92e8af2cdc..f9c9ae7ae1 100644 --- a/frappe/model/document.py +++ b/frappe/model/document.py @@ -1075,6 +1075,7 @@ class Document(BaseDocument): self.run_method("before_discard") self.db_set("docstatus", DocStatus.cancelled()) + delattr(self, "_action") self.run_method("on_discard") @frappe.whitelist() diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js index c415cb09ce..252010d36f 100644 --- a/frappe/public/js/frappe/form/form.js +++ b/frappe/public/js/frappe/form/form.js @@ -836,7 +836,6 @@ frappe.ui.form.Form = class FrappeForm { discard(btn, callback, on_error) { const me = this; return new Promise((resolve) => { - // this.validate_form_action("Discard") // ? frappe.confirm(__("Discard {0}", [this.docname]), function () { me.script_manager.trigger("before_discard").then(function () { return me._discard(btn, callback, on_error, false); // ?