[MERGE] trunk

bzr revid: al@openerp.com-20120522081312-7fsq4o5eod2mhxt4

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_kanban/static/src/css/kanban.css
Simple merge

diff --cc addons/web_kanban/static/src/xml/web_kanban.xml
index cec843d,4a19332..9531896
--- 1/addons/web_kanban/static/src/xml/web_kanban.xml
--- 2/addons/web_kanban/static/src/xml/web_kanban.xml
+++ b/addons/web_kanban/static/src/xml/web_kanban.xml
@@@ -16,11 -18,13 +18,13 @@@
      </t>
  </div>
  <t t-name="KanbanView.group_header">
 -    <td>
 +    <td class="oe_kanban_group_header">
          <t t-if="widget.view.group_by">
 -            <div class="oe_kanban_group_header">
 +            <div class="oe_kanban_header">
                  <div class="oe_kanban_fold_icon"></div>
-                 <div class="oe_kanban_add"></div>
+                 <t t-if="widget.view._is_quick_create_enabled()">
+                     <div class="oe_kanban_add"></div>
+                 </t>
                  <div class="oe_fold_column">
                      <div t-attf-class="oe_kanban_group_title #{widget.undefined_title ? 'oe_kanban_group_title_undefined' : ''}">
                          <t t-esc="widget.title"/>