[fix] Get user defaults based on fieldname in special cases

frappe/model/create_new.py

@@ -74,6 +74,8 @@ def get_user_default_value(df, defaults, user_permissions):
 
 		# 2 - Look in user defaults
 		user_default = defaults.get(df.options)
+		if not user_default and df.fieldname != frappe.scrub(df.options):
+			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, [])))
 

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

@@ -96,6 +96,9 @@ $.extend(frappe.model, {
 
 			// 2 - look in user defaults
 			var user_default = frappe.defaults.get_user_default(df.options);
+			if (!user_default && df.fieldname !== frappe.model.scrub(df.options))
+				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);