commit 268b2196d8909b87abf80955a4f74e8291198761
author Anand Doshi <anand@iwebnotes.com> Thu Mar 22 17:18:11 2012 +0530
committer Anand Doshi <anand@iwebnotes.com> Thu Mar 22 17:18:11 2012 +0530
tree 589081bef50a2a9ca242394bab2aadf487a33483
parent 365453e479780783c0155311051704111c58e40d
parent 14079e5ea6798c5a0f4b6920980a7a24ad15ca4d

Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate

Conflicts:
	version.num

js/all-app.js

diff --git a/js/all-app.js b/js/all-app.js
index 0772a95..4227406 100644
--- a/js/all-app.js
+++ b/js/all-app.js
@@ -254,11 +254,11 @@
     \
     <div class="list-filters hide">\
      <div class="show_filters well">\
+      <div class="filter_area"></div>\
       <div>\
        <button class="btn btn-small add-filter-btn">\
         <i class="icon-plus"></i> Add Filter</button>\
       </div>\
-      <div class="filter_area"></div>\
      </div>\
     </div>\
     \
@@ -2150,7 +2150,7 @@
 this.refresh();},refresh:function(){var me=this;$c('webnotes.widgets.form.assign_to.get',{doctype:me.doctype,name:me.name},function(r,rt){me.render(r.message)})},render:function(d){var me=this;$(this.body).empty();if(this.dialog){this.dialog.hide();}
 for(var i=0;i<d.length;i++){$(this.body).append(repl('<div>%(owner)s \
     <a class="close" href="#" data-owner="%(owner)s">&#215</a></div>',d[i]))}
-$(this.body).find('a.close').click(function(){$c('webnotes.widgets.form.assign_to.remove',{doctype:me.doctype,name:me.name,assign_to:$(this).attr('data-owner')},function(r,rt){me.render(r.message);});return false;});},add:function(){var me=this;if(!me.dialog){me.dialog=new wn.widgets.Dialog({title:'Add to To Do',width:350,fields:[{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:'Date',fieldname:'date',label:'Complete By'},{fieldtype:'Select',fieldname:'priority',label:'Priority',options:'Low\nMedium\nHigh','default':'Medium'},{fieldtype:'Check',fieldname:'notify',label:'Notify By Email'},{fieldtype:'Button',label:'Add',fieldname:'add_btn'}]});me.dialog.fields_dict.add_btn.input.onclick=function(){var assign_to=me.dialog.fields_dict.assign_to.get_value();if(assign_to){$c('webnotes.widgets.form.assign_to.add',{doctype:me.doctype,name:me.name,assign_to:assign_to,description:me.dialog.fields_dict.description.get_value(),priority:me.dialog.fields_dict.priority.get_value(),date:me.dialog.fields_dict.date.get_value(),notify:me.dialog.fields_dict.notify.get_value()},function(r,rt){me.render(r.message);});}}}
+$(this.body).find('a.close').click(function(){$c('webnotes.widgets.form.assign_to.remove',{doctype:me.doctype,name:me.name,assign_to:$(this).attr('data-owner')},function(r,rt){me.render(r.message);});return false;});},add:function(){var me=this;if(!me.dialog){me.dialog=new wn.widgets.Dialog({title:'Add to To Do',width:350,fields:[{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'},{fieldtype:'Date',fieldname:'date',label:'Complete By'},{fieldtype:'Select',fieldname:'priority',label:'Priority',options:'Low\nMedium\nHigh','default':'Medium'},{fieldtype:'Check',fieldname:'notify',label:'Notify By Email'},{fieldtype:'Button',label:'Add',fieldname:'add_btn'}]});me.dialog.fields_dict.add_btn.input.onclick=function(){var assign_to=me.dialog.fields_dict.assign_to.get_value();if(assign_to){$c('webnotes.widgets.form.assign_to.add',{doctype:me.doctype,name:me.name,assign_to:assign_to,description:me.dialog.fields_dict.description.get_value(),priority:me.dialog.fields_dict.priority.get_value(),date:me.dialog.fields_dict.date.get_value(),notify:me.dialog.fields_dict.notify.get_value()},function(r,rt){me.render(r.message);});}}}
 me.dialog.clear();me.dialog.show();}});
 /*
  *	lib/js/legacy/app.js

js/all-web.js

diff --git a/js/all-web.js b/js/all-web.js
index 48fea5a..2621293 100644
--- a/js/all-web.js
+++ b/js/all-web.js
@@ -168,11 +168,11 @@
     \
     <div class="list-filters hide">\
      <div class="show_filters well">\
+      <div class="filter_area"></div>\
       <div>\
        <button class="btn btn-small add-filter-btn">\
         <i class="icon-plus"></i> Add Filter</button>\
       </div>\
-      <div class="filter_area"></div>\
      </div>\
     </div>\
     \
@@ -892,11 +892,11 @@
     \
     <div class="list-filters hide">\
      <div class="show_filters well">\
+      <div class="filter_area"></div>\
       <div>\
        <button class="btn btn-small add-filter-btn">\
         <i class="icon-plus"></i> Add Filter</button>\
       </div>\
-      <div class="filter_area"></div>\
      </div>\
     </div>\
     \

version.num

diff --git a/version.num b/version.num
index 6794342..f252370 100644
--- a/version.num
+++ b/version.num
@@ -1 +1 @@
-1393
\ No newline at end of file
+1393