Merge branch 'master' into handlerupdate

js/legacy/wn/widgets/form/assign_to.js

@@ -79,8 +79,7 @@ wn.widgets.form.sidebar.AssignTo = Class.extend({
 					{fieldtype:'Link', fieldname:'assign_to', options:'Profile', 
 						label:'Assign To', 
 						description:'Add to To Do List of', reqd:true},
-					{fieldtype:'Data', fieldname:'description', label:'Comment',
-						'default': 'Assigned by ' + user}, 
+					{fieldtype:'Data', fieldname:'description', label:'Comment'}, 
 					{fieldtype:'Date', fieldname:'date', label:'Complete By'}, 
 					{fieldtype:'Select', fieldname:'priority', label:'Priority',
 						options:'Low\nMedium\nHigh', 'default':'Medium'},

py/webnotes/boot.py

@@ -78,7 +78,7 @@ def get_fullnames():
 	import webnotes
 	ret = webnotes.conn.sql("""select name, 
 		concat(ifnull(first_name, ''), 
-			if(ifnull(first_name, '')!='', ' ', ''), ifnull(last_name, '')), 
+			if(ifnull(last_name, '')!='', ' ', ''), ifnull(last_name, '')), 
 			user_image, gender
 		from tabProfile where ifnull(enabled, 0)=1""", as_list=1)
 	d = {}

py/webnotes/widgets/form/assign_to.py

@@ -110,7 +110,7 @@ def notify_assignment(assigned_by, owner, doc_type, doc_name, action='CLOSE', no
 		arg = {
 			'uid': owner,
 			'comment': "A new task, %s, has been assigned to you by %s." \
-				% (assignment, webnotes.session.get('uer')),
+				% (assignment, webnotes.session.get('user')),
 			'notify': notify
 		}
 	from home.page.my_company import my_company