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

[test] [fix] delete_doc

Browse source
This commit is contained in:
Rushabh Mehta 2016-04-28 15:20:41 +05:30
parent d069e1603c
commit a4e43631f6
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/model/delete_doc.py
View 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)

3
frappe/public/js/frappe/views/reports/reportview.js
View 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) {