From 79578f4889f16fee7e63fbc3a96988af37b3bbf5 Mon Sep 17 00:00:00 2001 From: Kanchan Chauhan Date: Fri, 4 Nov 2016 17:30:24 +0530 Subject: [PATCH 1/4] [Fix] Customer Addresses and Contacts report fixed for CRM module --- frappe/public/js/frappe/form/footer/attachments.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From aa94847574efcc6f19a7cedf1cc890c6795041f6 Mon Sep 17 00:00:00 2001 From: robert schouten Date: Mon, 7 Nov 2016 19:29:52 +0800 Subject: [PATCH 2/4] [minor]dont show doctypes with all disabled roles in permission manager (#2268) --- frappe/core/page/permission_manager/permission_manager.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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""")] } From 9486968891549da7405dbfa7f4ad57f98b830c7c Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 7 Nov 2016 17:18:58 +0530 Subject: [PATCH 3/4] [fix] z-index for datepicker (#2271) --- frappe/public/css/desk.css | 3 +++ frappe/public/less/desk.less | 4 ++++ 2 files changed, 7 insertions(+) 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/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; } From f17bae772c81694a8014083c087674a35c33c9c8 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 8 Nov 2016 15:50:34 +0600 Subject: [PATCH 4/4] bumped to version 7.1.7 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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()