[MERGE] forward port of branch 7.0 up to revid 4067 chs@openerp.com-20131114142639...

bzr revid: dle@openerp.com-20131112134311-h1vsux0ge17bsqkc
bzr revid: chs@openerp.com-20131114134731-n324awyon0spq624
bzr revid: chs@openerp.com-20130823145204-xwpnlwg0gg2259f6
bzr revid: chs@openerp.com-20130906170157-e7m4pjskyi47q82o
bzr revid: dle@openerp.com-20130909170408-wxgoduzggap6o4ng
bzr revid: dle@openerp.com-20130919141212-ridtrvvfwvu6calr
bzr revid: dle@openerp.com-20131018120136-fvoq337kgx74njsy
bzr revid: dle@openerp.com-20131023103308-18pj2gqq3imrcir7
bzr revid: chs@openerp.com-20131030180528-hqsztaujjjqev8ky
bzr revid: dle@openerp.com-20131106100128-mx8mnguvp321wick
bzr revid: chs@openerp.com-20131115104909-3u3mu40g9xnler88

diff --cc addons/web/static/src/css/base.css
Simple merge

diff --cc addons/web/static/src/css/base.sass
Simple merge

diff --cc addons/web/static/src/js/search.js
Simple merge

diff --cc addons/web/static/src/js/view_form.js
Simple merge

diff --cc addons/web/static/src/xml/base.xml
Simple merge

diff --cc addons/web_kanban/static/src/css/kanban.css
index 9397c89,c7c7f3f..f00b14b
--- 1/addons/web_kanban/static/src/css/kanban.css
--- 2/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@@ -558,18 -655,22 +558,18 @@@
    background-image: linear-gradient(to bottom, #f6f6f6, #e3e3e3);
    -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
    -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
 -  -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
 -}
 +  -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset; }
  
  .openerp_ie .oe_kanban_view .oe_kanban_group_header .oe_kanban_group_title_vertical {
 -  display: none !important;
 -}
 +  display: none !important; }
  .openerp_ie .oe_kanban_view .oe_kanban_group_header.oe_kanban_group_folded .oe_kanban_group_title_vertical {
 -  display: inline-block !important;
 -}
 +  display: inline-block !important; }
  .openerp_ie .oe_kanban_view .oe_kanban_group_title_vertical {
    -ms-writing-mode: lr-tb !important;
--  background: #f0eeee;
-   top: -5px !important; }
 -}
++  background: #f0eeee;}
++
  .openerp_ie .oe_kanban_view.oe_kanban_grouped .oe_kanban_group_header {
 -  height: 1%;
 -}
 +  height: 1%; }
  
  @media print {
    .openerp .oe_kanban_groups button {

diff --cc addons/web_kanban/static/src/css/kanban.sass
Simple merge

diff --cc addons/web_kanban/static/src/js/kanban.js
index 534d78c,2b893fe..5c5e6b2
--- 1/addons/web_kanban/static/src/js/kanban.js
--- 2/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@@ -235,9 -236,12 +235,13 @@@ instance.web_kanban.KanbanView = instan
              self.$buttons.find('.oe_alternative').toggle(self.grouped_by_m2o);
              self.$el.toggleClass('oe_kanban_grouped_by_m2o', self.grouped_by_m2o);
              var grouping_fields = self.group_by ? [self.group_by].concat(_.keys(self.aggregates)) : undefined;
-             var grouping = new instance.web.Model(self.dataset.model, context, domain).query().group_by(grouping_fields);
+             if (!_.isEmpty(grouping_fields)) {
+                 // ensure group_by fields are read.
+                 self.fields_keys = _.unique(self.fields_keys.concat(grouping_fields));
+             }
+             var grouping = new instance.web.Model(self.dataset.model, context, domain).query(self.fields_keys).group_by(grouping_fields);
              return self.alive($.when(grouping)).done(function(groups) {
 +                self.remove_no_result();
                  if (groups) {
                      self.do_process_groups(groups);
                  } else {

diff --cc openerp/osv/orm.py
Simple merge