diff --git a/frappe/__init__.py b/frappe/__init__.py
index 1e01423841..3aadfd418e 100644
--- a/frappe/__init__.py
+++ b/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__ = '7.1.6'
+__version__ = '7.1.7'
 __title__ = "Frappe Framework"
 
 local = Local()
diff --git a/frappe/core/page/permission_manager/permission_manager.py b/frappe/core/page/permission_manager/permission_manager.py
index 18e7057d4b..b223352e77 100644
--- a/frappe/core/page/permission_manager/permission_manager.py
+++ b/frappe/core/page/permission_manager/permission_manager.py
@@ -17,7 +17,8 @@ def get_roles_and_doctypes():
 		"doctypes": [d[0] for d in frappe.db.sql("""select name from `tabDocType` dt where
 			istable=0 and
 			name not in ('DocType') and
-			exists(select * from `tabDocField` where parent=dt.name)""")],
+			exists(select * from `tabDocField` where parent=dt.name) and
+			exists(select * from `tabDocPerm` dp,`tabRole` role where dp.role = role.name and dp.parent=dt.name and not role.disabled)""")],
 		"roles": [d[0] for d in frappe.db.sql("""select name from tabRole where
 			name != 'Administrator' and disabled=0""")]
 	}
diff --git a/frappe/public/css/desk.css b/frappe/public/css/desk.css
index f7a5239d40..7b5149f542 100644
--- a/frappe/public/css/desk.css
+++ b/frappe/public/css/desk.css
@@ -354,6 +354,9 @@ fieldset[disabled] .form-control {
   border-bottom: 1px solid #EBEFF2;
 }
 /* jquery ui */
+.ui-datepicker {
+  z-index: 100 !important;
+}
 .ui-datepicker .ui-datepicker-header {
   border-radius: 0px !important;
 }
diff --git a/frappe/public/js/frappe/form/footer/attachments.js b/frappe/public/js/frappe/form/footer/attachments.js
index 9fef9e5436..49b2137349 100644
--- a/frappe/public/js/frappe/form/footer/attachments.js
+++ b/frappe/public/js/frappe/form/footer/attachments.js
@@ -228,7 +228,7 @@ frappe.ui.get_upload_dialog = function(opts){
 			'method': 'frappe.client.get_value',
 			'args': {
 			'doctype': 'File',
-			'fieldname': ['file_url','filename'],
+			'fieldname': ['file_url','file_name'],
 			  'filters': {
 			      'name': dialog.get_value("file")
 			    }
@@ -260,4 +260,4 @@ frappe.ui.get_upload_dialog = function(opts){
 	});
 
 	return dialog;
-}
+}
\ No newline at end of file
diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less
index 0a40377748..c3fb6bc098 100644
--- a/frappe/public/less/desk.less
+++ b/frappe/public/less/desk.less
@@ -145,6 +145,10 @@ textarea.form-control {
 
 /* jquery ui */
 
+.ui-datepicker {
+	z-index: 100 !important;
+}
+
 .ui-datepicker .ui-datepicker-header {
 	border-radius: 0px !important;
 }