diff --git a/frappe/model/delete_doc.py b/frappe/model/delete_doc.py index 66aaf5e999..401e1181de 100644 --- a/frappe/model/delete_doc.py +++ b/frappe/model/delete_doc.py @@ -86,7 +86,7 @@ def delete_doc(doctype=None, name=None, force=0, ignore_doctypes=None, for_reloa delete_email_subscribe(doc) # check if links exist - if not force and doc.doctype not in ("ToDo", "Communication", "DocShare", "Email Unsubscribe"): + if not force: check_if_doc_is_linked(doc) check_if_doc_is_dynamically_linked(doc) diff --git a/frappe/public/js/frappe/views/reports/reportview.js b/frappe/public/js/frappe/views/reports/reportview.js index b6b4726df7..935e5ce245 100644 --- a/frappe/public/js/frappe/views/reports/reportview.js +++ b/frappe/public/js/frappe/views/reports/reportview.js @@ -627,8 +627,7 @@ frappe.ui.ColumnPicker = Class.extend({ this.columns = []; $(this.dialog.body).html('
'+__("Drag to sort columns")+'
\
\ -
'); +
'); }, show: function(columns) {