Merge branch 'hotfix'

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.0.26"
+__version__ = "7.0.27"
 
 local = Local()
 

frappe/public/js/frappe/form/control.js

@@ -1319,8 +1319,9 @@ frappe.ui.form.ControlLink = frappe.ui.form.ControlData.extend({
 				// if remember_selected hook is set, add this value
 				// to defaults so you do not need to set it again
 				// unless it is changed.
-				if(frappe.boot.remember_selected && frappe.boot.remember_selected.indexOf(me.df.options)!==-1) {
-					frappe.boot.user.defaults[me.df.options] = ui.item.value;
+				if(frappe.boot.remember_selected 
+						&& frappe.boot.remember_selected.indexOf(me.df.options)!==-1) {
+					frappe.boot.user.last_selected_values[me.df.options] = ui.item.value;
 				}
 
 				if(me.frm && me.frm.doc) {

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

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