Merge branch 'develop'

config.json

@@ -1,6 +1,6 @@
 {
  "base_template": "lib/website/templates/base.html", 
- "framework_version": "3.7.0", 
+ "framework_version": "3.7.1", 
  "modules": {
   "Calendar": {
    "color": "#2980b9", 

core/page/messages/messages.py

@@ -3,6 +3,8 @@
 
 from __future__ import unicode_literals
 import webnotes
+from core.doctype.notification_count.notification_count import delete_notification_count_for
+
 
 @webnotes.whitelist()
 def get_list(arg=None):
@@ -17,6 +19,9 @@ def get_list(arg=None):
 	set docstatus = 1 where comment_doctype in ('My Company', 'Message')
 	and comment_docname = %s
 	""", webnotes.user.name)
+	
+	delete_notification_count_for("Messages")
+	
 	webnotes.conn.commit()
 
 	if webnotes.form_dict['contact'] == webnotes.session['user']:
@@ -69,6 +74,8 @@ def post(arg=None):
 	d.comment_docname = arg['contact']
 	d.comment_doctype = 'Message'
 	d.save()
+	
+	delete_notification_count_for("Messages")
 
 	import webnotes.utils
 	if webnotes.utils.cint(arg.get('notify')):

public/js/wn/ui/filters.js

@@ -145,7 +145,8 @@ wn.ui.Filter = Class.extend({
 					me.field.desc_area = $a(me.field.wrapper, 'span', 'help', null,
 						'values separated by comma');				
 			} else {
-				me.set_field(me.field.df.parent, me.field.df.fieldname);				
+				me.set_field(me.field.df.parent, me.field.df.fieldname, null, 
+					me.$w.find('.condition').val());				
 			}
 		});
 		
@@ -166,7 +167,7 @@ wn.ui.Filter = Class.extend({
 		if(value!=null) this.field.set_input(value);
 	},
 	
-	set_field: function(tablename, fieldname, fieldtype) {
+	set_field: function(tablename, fieldname, fieldtype, condition) {
 		var me = this;
 		
 		// set in fieldname (again)
@@ -212,7 +213,7 @@ wn.ui.Filter = Class.extend({
 		if(old_text) 
 			me.field.set_input(old_text);
 		
-		this.set_default_condition(df, fieldtype);
+		if(!condition) this.set_default_condition(df, fieldtype);
 		
 		$(me.field.wrapper).find(':input').keydown(function(ev) {
 			if(ev.which==13) {