odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] merge trunk 

bzr revid: chm@openerp.com-20120919075038-urm5g8mixi7k5f9p
This commit is contained in:
Christophe Matthieu 2012-09-19 09:50:38 +02:00
parent f71dd62f2b cfa035e25a
commit a3351d5d0f
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/web_kanban/static/src/js/kanban.js
View File

@ -71,9 +71,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
this.fields_keys = _.keys(this.fields_view.fields);
this.add_qweb_template();
this.has_been_loaded.resolve();
this._super.apply(this, arguments);
return $.when();
},
_is_quick_create_enabled: function() {
@ -862,7 +860,7 @@ instance.web_kanban.KanbanRecord = instance.web.Widget.extend({
if(this.$el.find('.oe_kanban_global_click_edit').size()>0)
this.do_action_edit();
else
this.do_action_open();
this.do_action_open();
},
setup_color_picker: function() {
var self = this;