Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate
Conflicts:
version.num
diff --git a/js/all-app.js b/js/all-app.js
index 28f0e45..88a2dd8 100644
--- a/js/all-app.js
+++ b/js/all-app.js
@@ -1332,7 +1332,7 @@
/*
* lib/js/wn/ui/toolbar/search.js
*/
-wn.ui.toolbar.Search=wn.ui.toolbar.SelectorDialog.extend({init:function(){this._super({title:"Search",execute:function(val){selector.set_search(val);selector.show();},});this.set_values(profile.can_read.join(',').split(','));makeselector();}});
+wn.ui.toolbar.Search=wn.ui.toolbar.SelectorDialog.extend({init:function(){this._super({title:"Search",execute:function(val){selector.set_search(val);selector.show();},});this.set_values(profile.can_search.join(',').split(','));makeselector();}});
/*
* lib/js/wn/ui/toolbar/report.js
*/
diff --git a/version.num b/version.num
index 438ea09..02b327e 100644
--- a/version.num
+++ b/version.num
@@ -1 +1 @@
-1341
\ No newline at end of file
+1341