Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into e-commerce-refactor

erpnext/utilities/activation.py

@@ -13,33 +13,33 @@ def get_level():
 	min_count = 0
 	doctypes = {
 		"Asset": 5,
-		"BOM": 3, 
-		"Customer": 5, 
+		"BOM": 3,
+		"Customer": 5,
 		"Delivery Note": 5,
-		"Employee": 3, 
-		"Instructor": 5, 
+		"Employee": 3,
+		"Instructor": 5,
 		"Issue": 5,
-		"Item": 5, 
-		"Journal Entry": 3, 
+		"Item": 5,
+		"Journal Entry": 3,
 		"Lead": 3,
 		"Leave Application": 5,
 		"Material Request": 5,
-		"Opportunity": 5, 
-		"Payment Entry": 2, 
+		"Opportunity": 5,
+		"Payment Entry": 2,
 		"Project": 5,
-		"Purchase Order": 2, 
+		"Purchase Order": 2,
 		"Purchase Invoice": 5,
 		"Purchase Receipt": 5,
 		"Quotation": 3,
 		"Salary Slip": 5,
 		"Salary Structure": 5,
-		"Sales Order": 2, 
-		"Sales Invoice": 2, 
+		"Sales Order": 2,
+		"Sales Invoice": 2,
 		"Stock Entry": 3,
-		"Student": 5, 
+		"Student": 5,
 		"Supplier": 5,
 		"Task": 5,
-		"User": 5, 
+		"User": 5,
 		"Work Order": 5
 	}
 

erpnext/utilities/bot.py

@@ -36,4 +36,4 @@ class FindItemBot(BotParser):
 				return "\n\n".join(out)
 
 			else:
-				return _("Did not find any item called {0}").format(item)
+				return _("Did not find any item called {0}").format(item)

erpnext/utilities/doctype/rename_tool/rename_tool.py

@@ -29,4 +29,3 @@ def upload(select_doctype=None, rows=None):
 	rows = read_csv_content_from_attached_file(frappe.get_doc("Rename Tool", "Rename Tool"))
 
 	return bulk_rename(select_doctype, rows=rows)
-

erpnext/utilities/doctype/video/video_list.js

@@ -4,4 +4,4 @@ frappe.listview_settings["Video"] = {
 			frappe.set_route("Form","Video Settings", "Video Settings");
 		});
 	}
-}
+}

erpnext/utilities/doctype/video_settings/video_settings.py

@@ -19,4 +19,4 @@ class VideoSettings(Document):
 			except Exception:
 				title = _("Failed to Authenticate the API key.")
 				frappe.log_error(title + "\n\n" +  frappe.get_traceback(), title=title)
-				frappe.throw(title + " Please check the error logs.", title=_("Invalid Credentials"))
+				frappe.throw(title + " Please check the error logs.", title=_("Invalid Credentials"))

erpnext/utilities/hierarchy_chart.py

@@ -26,4 +26,4 @@ def get_all_nodes(parent, parent_name, method, company):
 			if d.get('expandable'):
 				nodes_to_expand.append({'id': d.get('id'), 'name': d.get('name')})
 
-	return result
+	return result

erpnext/utilities/report/youtube_interactions/youtube_interactions.py

@@ -110,4 +110,4 @@ def get_chart_summary_data(data):
 			"datatype": "Float",
 		}
 	]
-	return chart_data, summary
+	return chart_data, summary

erpnext/utilities/web_form/addresses/addresses.js

@@ -1,3 +1,3 @@
 frappe.ready(function() {
 	// bind events here
-})
+})