Merge branch 'master' into develop

frappe/__init__.py

@@ -13,7 +13,7 @@ import os, sys, importlib, inspect, json
 from .exceptions import *
 from .utils.jinja import get_jenv, get_template, render_template
 
-__version__ = '8.0.54'
+__version__ = '8.0.55'
 __title__ = "Frappe Framework"
 
 local = Local()

frappe/public/js/frappe/ui/sort_selector.js

@@ -128,7 +128,7 @@ frappe.ui.SortSelector = Class.extend({
 
 			// meta sort field
 			if(meta_sort_field) _options.push({ 'fieldname': meta_sort_field });
-			
+
 			// more default options
 			_options.push(
 				{'fieldname': 'name'},
@@ -163,8 +163,8 @@ frappe.ui.SortSelector = Class.extend({
 			}
 		} else {
 			return {
-				meta_sort_field: meta.sort_field,
-				meta_sort_order: meta.sort_order.toLowerCase()
+				meta_sort_field: meta.sort_field || 'modified',
+				meta_sort_order: meta.sort_order ? meta.sort_order.toLowerCase() : ''
 			}
 		}
 	},