[fix] save un translated doctype names for desktop icons, fixes frappe/erpnext#8157

frappe/desk/doctype/desktop_icon/desktop_icon.py

@@ -94,7 +94,7 @@ def get_desktop_icons(user=None):
 def add_user_icon(_doctype, label=None, link=None, type='link', standard=0):
 	'''Add a new user desktop icon to the desktop'''
 
-	if not label: label = frappe._(_doctype)
+	if not label: label = _doctype
 	if not link: link = 'List/{0}'.format(_doctype)
 
 	# find if a standard icon exists

frappe/model/document.py

@@ -804,7 +804,8 @@ class Document(BaseDocument):
 		self.notify_update()
 
 		try:
-			frappe.enqueue('frappe.utils.global_search.update_global_search', now=frappe.flags.in_test, doc=self)
+			frappe.enqueue('frappe.utils.global_search.update_global_search',
+				now=frappe.flags.in_test or frappe.flags.in_install, doc=self)
 		except redis.exceptions.ConnectionError:
 			update_global_search(self)
 

frappe/model/naming.py

@@ -187,11 +187,13 @@ def _set_amended_name(doc):
 	doc.name = am_prefix + '-' + str(am_id)
 	return doc.name
 
-def append_number_if_name_exists(doctype, name):
+def append_number_if_name_exists(doctype, name, fieldname='name'):
 	if frappe.db.exists(doctype, name):
-		last = frappe.db.sql("""select name from `tab{}`
-			where name regexp '^{}-[[:digit:]]+'
-			order by length(name) desc, name desc limit 1""".format(doctype, name))
+		last = frappe.db.sql("""select name from `tab{doctype}`
+			where {fieldname} regexp '^{name}-[[:digit:]]+'
+			order by length({fieldname}) desc,
+				{fieldname} desc limit 1""".format(doctype=doctype,
+					name=name, fieldname=fieldname))
 
 		if last:
 			count = str(cint(last[0][0].rsplit("-", 1)[1]) + 1)
@@ -201,15 +203,3 @@ def append_number_if_name_exists(doctype, name):
 		name = "{0}-{1}".format(name, count)
 
 	return name
-
-def de_duplicate(doctype, name):
-	original_name = name
-	count = 0
-	while True:
-		if frappe.db.exists(doctype, name):
-			count += 1
-			name = "{0}-{1}".format(original_name, count)
-		else:
-			break
-
-	return name

frappe/public/js/frappe/desk.js

@@ -452,7 +452,7 @@ frappe.get_desktop_icons = function(show_hidden, show_global) {
 		out.push(module);
 	}
 
-	var show_module = function(module) {
+	var show_module = function(m) {
 		var out = true;
 		if(m.type==="page") {
 			out = m.link in frappe.boot.page_info;
@@ -469,7 +469,7 @@ frappe.get_desktop_icons = function(show_hidden, show_global) {
 				out = frappe.boot.user.allow_modules.indexOf(m.module_name) !== -1
 			}
 		}
-		if(m.hidden&& !show_hidden) {
+		if(m.hidden && !show_hidden) {
 			out = false;
 		}
 		if(m.blocked && !show_global) {

frappe/public/js/frappe/views/reports/reportview.js

@@ -107,7 +107,7 @@ frappe.views.ReportView = frappe.ui.BaseList.extend({
 
 		// add to desktop
 		this.page.add_menu_item(__("Add to Desktop"), function() {
-			frappe.add_to_desktop(__('{0} Report', [me.doctype]), me.doctype);
+			frappe.add_to_desktop(me.docname || __('{0} Report', [me.doctype]), me.doctype);
 		}, true);
 
 	},