Merge branch 'develop'

Author: nabinhait

frappe/__version__.py

@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = "6.16.1"
+__version__ = "6.16.2"

frappe/defaults.py

@@ -19,16 +19,30 @@ def add_user_default(key, value, user=None, parenttype=None):
 def get_user_default(key, user=None):
 	user_defaults = get_defaults(user or frappe.session.user)
 	d = user_defaults.get(key, None)
-	if(not d and key != frappe.scrub(key)):
-		d = user_defaults.get(frappe.scrub(key), None)
-	return isinstance(d, list) and d[0] or d
+	
+	if key != frappe.scrub(key):
+		if d and isinstance(d, (list, tuple)) and len(d)==1:
+			# Use User Permission value when only when it has a single value
+			d = d[0]
+			
+		else:
+			d = user_defaults.get(frappe.scrub(key), None)
+	
+	return isinstance(d, (list, tuple)) and d[0] or d
 
 def get_user_default_as_list(key, user=None):
 	user_defaults = get_defaults(user or frappe.session.user)
 	d = user_defaults.get(key, None)
-	if(not d and key != frappe.scrub(key)):
-		d = user_defaults.get(frappe.scrub(key), None)
-	return (not isinstance(d, list)) and [d] or d
+	
+	if key != frappe.scrub(key):
+		if d and isinstance(d, (list, tuple)) and len(d)==1:
+			# Use User Permission value when only when it has a single value
+			d = [d[0]]
+			
+		else:
+			d = user_defaults.get(frappe.scrub(key), None)
+
+	return (not isinstance(d, (list, tuple))) and [d] or d
 
 def get_user_permissions(user=None):
 	if not user:

frappe/hooks.py

@@ -5,7 +5,7 @@
 app_description = "Full stack web framework with Python, Javascript, MariaDB, Redis, Node"
 
 app_icon = "octicon octicon-circuit-board"
-app_version = "6.16.1"
+app_version = "6.16.2"
 app_color = "orange"
 source_link = "https://github.com/frappe/frappe"
 app_license = "MIT"

frappe/model/create_new.py

@@ -73,9 +73,7 @@ def get_user_default_value(df, defaults, user_permissions):
 			return user_permissions[df.options][0]
 
 		# 2 - Look in user defaults
-		user_default = defaults.get(df.options)
-		if not user_default:
-			user_default = defaults.get(df.fieldname)
+		user_default = defaults.get(df.fieldname)
 		is_allowed_user_default = user_default and (not user_permissions_exist(df, user_permissions)
 			or (user_default in user_permissions.get(df.options, [])))
 
@@ -111,7 +109,7 @@ def set_dynamic_default_values(doc, parent_doc, parentfield):
 		if df.get("default"):
 			if df.default.startswith(":"):
 				default_value = get_default_based_on_another_field(df, user_permissions, parent_doc)
-				if default_value is not None:
+				if default_value is not None and not doc.get(df.fieldname):
 					doc[df.fieldname] = default_value
 
 			elif df.fieldtype == "Datetime" and df.default.lower() == "now":

frappe/public/js/frappe/defaults.js

@@ -13,8 +13,15 @@ frappe.defaults = {
 	get_user_defaults: function(key) {
 		var defaults = frappe.boot.user.defaults;
 		var d = defaults[key];
-		if(!d && (key !== frappe.model.scrub(key)))
-			d = defaults[frappe.model.scrub(key)];
+		
+		if (key !== frappe.model.scrub(key)) {
+			if (d && $.isArray(d) && d.length===1) {
+				// Use User Permission value when only when it has a single value
+				d = d[0];
+			} else {
+				d = defaults[frappe.model.scrub(key)];
+			}
+		}
 		if(!$.isArray(d)) d = [d];
 		return d;
 	},
@@ -45,8 +52,14 @@ frappe.defaults = {
 	get_default: function(key) {
 		var defaults = frappe.boot.user.defaults;
 		var value = defaults[key];
-		if(!value && (key !== frappe.model.scrub(key)))
-			value = defaults[frappe.model.scrub(key)];
+		if (key !== frappe.model.scrub(key)) {
+			if (value && $.isArray(value) && value.length===1) {
+				value = value[0];
+			} else {
+				value = defaults[frappe.model.scrub(key)];
+			}
+		}
+		
 		if(value) {
 			try {
 				return JSON.parse(value)

frappe/public/js/frappe/model/create_new.js

@@ -95,10 +95,7 @@ $.extend(frappe.model, {
 			}
 
 			// 2 - look in user defaults
-			var user_default = frappe.defaults.get_user_default(df.options);
-			if (!user_default)
-				user_default = frappe.defaults.get_user_default(df.fieldname);
-
+			var user_default = frappe.defaults.get_user_default(df.fieldname);
 			var is_allowed_user_default = user_default &&
 				(!has_user_permissions || user_permissions[df.options].indexOf(user_default)!==-1);
 

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 from pip.req import parse_requirements
 
-version = "6.16.1"
+version = "6.16.2"
 requirements = parse_requirements("requirements.txt", session="")
 
 setup(