Sfoglia il codice sorgente

[test] [fix] delete_doc

version-14
Rushabh Mehta 9 anni fa
parent
commit
a4e43631f6
2 ha cambiato i file con 2 aggiunte e 3 eliminazioni
  1. +1
    -1
      frappe/model/delete_doc.py
  2. +1
    -2
      frappe/public/js/frappe/views/reports/reportview.js

+ 1
- 1
frappe/model/delete_doc.py Vedi File

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



+ 1
- 2
frappe/public/js/frappe/views/reports/reportview.js Vedi File

@@ -627,8 +627,7 @@ frappe.ui.ColumnPicker = Class.extend({
this.columns = [];
$(this.dialog.body).html('<div class="text-muted">'+__("Drag to sort columns")+'</div>\
<div class="column-list"></div>\
<div><button class="btn btn-default btn-add"><i class="icon-plus"></i>\
'+__("Add Column")+'</button></div>');
<div><button class="btn btn-default btn-sm btn-add">'+__("Add Column")+'</button></div>');

},
show: function(columns) {


Caricamento…
Annulla
Salva