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

[MERGE] forward port of branch 7.0 up to revid 4055 chs@openerp.com-20131105121843-rqplhk83fczxww0t 

bzr revid: chs@openerp.com-20131105125947-2q11suxxpxh18hyc
This commit is contained in:
Christophe Simonis 2013-11-05 13:59:47 +01:00
parent b030c9b032 3213ad4ddd
commit aabbb0b1c3
3 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/web/static/src/js/data.js
View File

@ -743,7 +743,7 @@ instance.web.DataSetSearch = instance.web.DataSet.extend({
});
},
get_domain: function (other_domain) {
this._model.domain(other_domain);
return this._model.domain(other_domain);
},
alter_ids: function (ids) {
this._super(ids);

1
addons/web_kanban/static/src/css/kanban.css
View File

@ -690,7 +690,6 @@
.openerp_ie .oe_kanban_view .oe_kanban_group_title_vertical {
-ms-writing-mode: lr-tb !important;
background: #f0eeee;
top: -5px !important;
}
.openerp_ie .oe_kanban_view.oe_kanban_grouped .oe_kanban_group_header {
height: 1%;

1
addons/web_kanban/static/src/css/kanban.sass
View File

@ -572,7 +572,6 @@
.oe_kanban_group_title_vertical
-ms-writing-mode: lr-tb !important
background: rgb(240, 238, 238)
top: -5px !important
&.oe_kanban_grouped
.oe_kanban_group_header
height: 1%