Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into loyalty-program-fix

2019-01-01 19:46:08 +05:30
parent a1d015cc2f 137a24f457
commit 78ad6c4cb7
30 changed files with 686 additions and 316 deletions
--- a/erpnext/public/js/utils.js
+++ b/erpnext/public/js/utils.js
@@ -256,7 +256,7 @@ $.extend(erpnext.utils, {
 		let unscrub_option = frappe.model.unscrub(option);
 		let user_permission = frappe.defaults.get_user_permissions();
 		if(user_permission && user_permission[unscrub_option]) {
-			return user_permission[unscrub_option]["docs"];
+			return user_permission[unscrub_option].map(perm => perm.doc);
 		} else {
 			return $.map(locals[`:${unscrub_option}`], function(c) { return c.name; }).sort();
 		}