From 1c9a4ce12736664b8debbf48cae13350dc28fad8 Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Tue, 26 Jun 2012 15:09:15 +0530
Subject: [PATCH 01/17] [IMP]association : membership product form view
 improvement

bzr revid: hsa@tinyerp.com-20120626093915-30fvknrjzwmpmfex
---
 addons/membership/membership_view.xml | 82 ++++++++++++++++-----------
 1 file changed, 50 insertions(+), 32 deletions(-)

diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 15645294bb7..93840b51bea 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -52,38 +52,56 @@
             <field name="model">product.product</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Membership products">
-                  <group col="6">
-                      <field name="name"/>
-                      <field name="default_code"/>
-                      <field name="active"/>
-                      <field name="membership" invisible="1"/>
-                      <field name="membership_date_from" required="1"/>
-                      <field name="membership_date_to" required="1"/>
-                      <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    </group>
-                    <notebook colspan="4">
-                      <page string="General">
-                        <separator string="Accounting Info" colspan="2"/>
-                        <separator string="Categorization" colspan="2"/>
-                        <field name="list_price" string="Membership Fee"/>
-                        <field name="type" />
-                        <field name="property_account_income" domain="[('type', '!=', 'view')]"/>
-                        <field name="categ_id"/>
-                        <separator string="Sale Taxes" colspan="2"/>
-                        <newline/>
-                        <field name="taxes_id" nolabel="1" colspan="4"/>
-                      </page>
-                      <page string="Description">
-                            <separator string="Description"/>
-                            <field colspan="4" name="description" nolabel="1"/>
-                            <separator string="Sale Description"/>
-                            <field colspan="4" name="description_sale" nolabel="1"/>
-                            <separator string="Purchase Description"/>
-                            <field colspan="4" name="description_purchase" nolabel="1"/>
-                      </page>
-                    </notebook>
-                </form>
+                <form string="Membership products" version="7.0">
+                    <sheet>
+                        <group>
+                            <group>
+                                <field name="name" />
+                                <field name="default_code" />
+                                <field name="type" />
+                                <field name="categ_id" />
+                            </group>
+                            <group>
+                                <field name="membership" invisible="1"/>
+                                <label for="membership_date_from"
+                                    string="Membership Duration" />
+                                <div>
+                                    <field name="membership_date_from"
+                                        required="1" class="oe_online"
+                                        nolabel="1" />
+                                    <label string="-" />
+                                    <field name="membership_date_to"
+                                        required="1" class="oe_online"
+                                        nolabel="1" />
+                                </div>
+                                <field name="list_price"
+                                    string="Membership Fee" />
+                                <field
+                                    name="property_account_income"
+                                    domain="[('type', '!=', 'view')]" />
+                            </group>
+                        </group>
+                        <field name="taxes_id" nolabel="1" colspan="4" />
+                        <group>
+                            <field name="company_id"
+                                groups="base.group_multi_company"
+                                widget="selection" />
+                            <field name="active" />
+                        </group>
+                        <group string="Description">
+                            <field colspan="4" name="description"
+                                nolabel="1" />
+                        </group>
+                        <group string="Sale Description">
+                            <field colspan="4" name="description_sale"
+                                nolabel="1" />
+                        </group>
+                        <group string="Purchase Description">
+                            <field colspan="4"
+                                name="description_purchase" nolabel="1" />
+                        </group>
+                    </sheet>
+                 </form>
             </field>
         </record>
 

From 41c0355b4fb0036990bb1a9f247f11f2232205a4 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 26 Jun 2012 16:18:24 +0530
Subject: [PATCH 02/17] [IMP] Membership: improve tax as m2m_tags

bzr revid: dbr@tinyerp.com-20120626104824-uwv8bjefgn03mfgq
---
 addons/membership/membership_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 93840b51bea..9ecf4c908a6 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -81,7 +81,7 @@
                                     domain="[('type', '!=', 'view')]" />
                             </group>
                         </group>
-                        <field name="taxes_id" nolabel="1" colspan="4" />
+                        <field name="taxes_id" widget="many2many_tags"/>
                         <group>
                             <field name="company_id"
                                 groups="base.group_multi_company"

From e2067d9ceae5d3c65fb139f0fe023d89353be995 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 27 Jun 2012 15:53:10 +0530
Subject: [PATCH 03/17] [IMP]membership: Improve view for taxes

bzr revid: dbr@tinyerp.com-20120627102310-5vjntnem3re0wjdg
---
 addons/membership/membership_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 9ecf4c908a6..20b06dd0d99 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -60,6 +60,7 @@
                                 <field name="default_code" />
                                 <field name="type" />
                                 <field name="categ_id" />
+                                <field name="taxes_id" widget="many2many_tags" string="Taxes"/>
                             </group>
                             <group>
                                 <field name="membership" invisible="1"/>
@@ -81,7 +82,6 @@
                                     domain="[('type', '!=', 'view')]" />
                             </group>
                         </group>
-                        <field name="taxes_id" widget="many2many_tags"/>
                         <group>
                             <field name="company_id"
                                 groups="base.group_multi_company"

From 51c05a3300084e2afbcf4aa37f066ecead05f62e Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Fri, 29 Jun 2012 10:51:57 +0530
Subject: [PATCH 04/17] [IMP]membership: set placeholder for descriptions

bzr revid: dbr@tinyerp.com-20120629052157-q1ba8scocramd92o
---
 addons/membership/membership_view.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 20b06dd0d99..147023e6803 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -88,16 +88,16 @@
                                 widget="selection" />
                             <field name="active" />
                         </group>
-                        <group string="Description">
-                            <field colspan="4" name="description"
+                        <group>
+                            <field colspan="4" name="description" placeholder="Add a description"
                                 nolabel="1" />
                         </group>
-                        <group string="Sale Description">
-                            <field colspan="4" name="description_sale"
+                        <group>
+                            <field colspan="4" name="description_sale" placeholder="Add a sale description"
                                 nolabel="1" />
                         </group>
-                        <group string="Purchase Description">
-                            <field colspan="4"
+                        <group>
+                            <field colspan="4" placeholder="Add a purchase description"
                                 name="description_purchase" nolabel="1" />
                         </group>
                     </sheet>

From f9f511931f3ed56775a3b2266fa42aa918703886 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 2 Jul 2012 11:19:44 +0530
Subject: [PATCH 05/17] [IMP]membership: View imp for date fields

bzr revid: dbr@tinyerp.com-20120702054944-1ehvpr113zie4yrp
---
 addons/membership/membership_view.xml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 147023e6803..47b904e3028 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -67,13 +67,8 @@
                                 <label for="membership_date_from"
                                     string="Membership Duration" />
                                 <div>
-                                    <field name="membership_date_from"
-                                        required="1" class="oe_online"
-                                        nolabel="1" />
-                                    <label string="-" />
-                                    <field name="membership_date_to"
-                                        required="1" class="oe_online"
-                                        nolabel="1" />
+                                    <field name="membership_date_from" required="1" class="oe_inline"/> - 
+                                    <field name="membership_date_to" required="1"  class="oe_inline"/>
                                 </div>
                                 <field name="list_price"
                                     string="Membership Fee" />

From de9b8a7e9cc46ff6b439ae3d621d1eeac5eff433 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 4 Jul 2012 15:42:56 +0530
Subject: [PATCH 06/17] [IMP]:membership:improved view

bzr revid: apa@tinyerp.com-20120704101256-1ev49svrjymy2tsx
---
 addons/membership/membership_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index cdcd5780cca..21960ce1ec8 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -66,7 +66,7 @@
                                 <field name="membership" invisible="1"/>
                                 <label for="membership_date_from"
                                     string="Membership Duration" />
-                                <div>
+                                <div style="min-width:370px">
                                     <field name="membership_date_from" required="1" class="oe_inline"/> - 
                                     <field name="membership_date_to" required="1"  class="oe_inline"/>
                                 </div>

From b83fff287a2c341cae3ee8c93a2925d15433e29e Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Thu, 12 Jul 2012 14:56:37 +0200
Subject: [PATCH 07/17] [IMP] change CSS classes for m2m tags and get them out
 of the oe_form namespace this way, we can consistently display m2m tags
 anywhere without dummy CSS copy/paste (example: projet issues, projet tasks)
 oe_form_field_many2manytags became oe_field_many2many_tags (container)
 oe_form_field_many2manytags_box became oe_field_many2many_tag (item) Qweb
 templates names have been changed accordingly

bzr revid: abo@openerp.com-20120712125637-hji6e9chch1h01f0
---
 addons/web/static/src/css/base.css    | 54 +++++++++++-----------
 addons/web/static/src/css/base.sass   | 64 +++++++++++++--------------
 addons/web/static/src/js/view_form.js | 58 ++++++++++++------------
 addons/web/static/src/xml/base.xml    |  8 ++--
 4 files changed, 93 insertions(+), 91 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index f9493f08e55..b9e2e42946f 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -34,7 +34,7 @@
   background: white;
   /* http://www.quirksmode.org/dom/inputfile.html
    * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image
-   */ */
+   */
 }
 .openerp a {
   text-decoration: none;
@@ -450,6 +450,32 @@
 .openerp .oe_webclient .oe_star_on {
   color: gold;
 }
+.openerp .oe_field_many2many_tags .text-wrap {
+  width: 100% !important;
+}
+.openerp .oe_field_many2many_tags .text-wrap textarea {
+  width: 100% !important;
+}
+.openerp .oe_field_many2many_tags .oe_field_many2many_tag {
+  border-radius: 2px;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  -ms-box-sizing: border-box;
+  box-sizing: border-box;
+  position: relative;
+  float: left;
+  border: 1px solid #9daccc;
+  background: #e2e6f0;
+  color: black;
+  padding: 0px 3px 0px 3px;
+  margin: 0 2px 2px 0;
+  height: 16px;
+  font: 11px "lucida grande", tahoma, verdana, arial, sans-serif;
+}
+.openerp .oe_field_many2many_tags .text-core .text-wrap .text-dropdown .text-list .text-suggestion em {
+  font-style: italic;
+  text-decoration: none;
+}
 .openerp.oe_tooltip {
   font-size: 12px;
 }
@@ -2017,32 +2043,6 @@
   padding-top: 4px;
   width: auto;
 }
-.openerp .oe_form .oe_form_field_many2manytags .text-wrap {
-  width: 100% !important;
-}
-.openerp .oe_form .oe_form_field_many2manytags .text-wrap textarea {
-  width: 100% !important;
-}
-.openerp .oe_form .oe_form_field_many2manytags .oe_form_field_many2manytags_box {
-  border-radius: 2px;
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  -ms-box-sizing: border-box;
-  box-sizing: border-box;
-  position: relative;
-  float: left;
-  border: 1px solid #9daccc;
-  background: #e2e6f0;
-  color: black;
-  padding: 0px 3px 0px 3px;
-  margin: 0 2px 2px 0;
-  height: 16px;
-  font: 11px "lucida grande", tahoma, verdana, arial, sans-serif;
-}
-.openerp .oe_form .oe_form_field_many2manytags .text-core .text-wrap .text-dropdown .text-list .text-suggestion em {
-  font-style: italic;
-  text-decoration: none;
-}
 .openerp .oe_form .oe_datepicker_container {
   display: none;
 }
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index d26b6c9e29b..01e2bdb1005 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -362,8 +362,28 @@ $sheet-max-width: 860px
             text-decoration: none
         .oe_star_on
             color: gold
-
-    //.oe_edit_only 
+    // }}}
+    // Many2many tags {{{
+    .oe_field_many2many_tags
+        .text-wrap
+            width: 100% !important
+            textarea
+                width: 100% !important
+        .oe_field_many2many_tag
+            border-radius: 2px
+            @include box-sizing(border)
+            position: relative
+            float: left
+            border: 1px solid #9DACCC
+            background: #E2E6F0
+            color: black
+            padding: 0px 3px 0px 3px
+            margin: 0 2px 2px 0
+            height: 16px
+            font: 11px "lucida grande", tahoma, verdana, arial, sans-serif
+        .text-core .text-wrap .text-dropdown .text-list .text-suggestion em
+            font-style: italic
+            text-decoration: none
     // }}}
     // Tooltips {{{
     &.oe_tooltip
@@ -823,7 +843,7 @@ $sheet-max-width: 860px
                 text-shadow: 0 1px 1px rgba(0,0,0,0.2)
                 @include radius(4px)
                 @include box-shadow(inset 0 1px 1px rgba(0, 0, 0, 0.2))
-        .oe_menu_counter 
+        .oe_menu_counter
             float: right
             background: #8a89ba
             color: #eee
@@ -846,7 +866,7 @@ $sheet-max-width: 860px
                 color: $colour4
                 text-shadow: 0 1px 1px white
                 @include box-shadow(0 1px 1px rgba(0, 0, 0, 0.2))
-            .oe_menu_counter 
+            .oe_menu_counter
                 background: #eee
                 color: #8a89ba
         .oe_menu_toggler:before
@@ -1312,7 +1332,7 @@ $sheet-max-width: 860px
                 margin: 0 0 0 4px
                 padding: 0
 
-                    
+
     // }}}
     // Views Common {{{
     .oe_view_nocontent
@@ -1356,7 +1376,7 @@ $sheet-max-width: 860px
             display: none !important
         .oe_form .oe_form_field_date
             width: auto
-    .oe_form_nosheet 
+    .oe_form_nosheet
         margin-left: 10px
         margin-right: 10px
     .oe_form_nosheet > header
@@ -1364,13 +1384,13 @@ $sheet-max-width: 860px
         margin-right: -10px
     // }}}
     // FormView.custom tags and classes {{{
-    .oe_form 
+    .oe_form
         header
             position: relative
             border-bottom: 1px solid #cacaca
             @include vertical-gradient(#fcfcfc, #dedede)
             padding: 0 8px
-            line-height: 30px 
+            line-height: 30px
             ul
                 display: inline-block
                 float: right
@@ -1387,12 +1407,12 @@ $sheet-max-width: 860px
             vertical-align: top
             margin-left: 8px
         li
-            border-right: none 
+            border-right: none
             padding: 0
             margin: 0
-            float: left 
+            float: left
             vertical-align: top
-            height: 30px 
+            height: 30px
             padding: 0 0 0 12px
             &:first-child
                 border-left: 1px solid #cacaca
@@ -1428,7 +1448,7 @@ $sheet-max-width: 860px
         .oe_form_sheetbg
             background: url(/web/static/src/img/form_sheetbg.png)
             padding: 8px 0
-            border-bottom: 1px solid #ddd 
+            border-bottom: 1px solid #ddd
         .oe_form_sheet_width
             min-width: 650px
             max-width: $sheet-max-width
@@ -1572,26 +1592,6 @@ $sheet-max-width: 860px
         .oe_form_field_boolean
             padding-top: 4px
             width: auto
-        .oe_form_field_many2manytags
-            .text-wrap
-                width: 100% !important
-                textarea
-                    width: 100% !important
-            .oe_form_field_many2manytags_box
-                border-radius: 2px
-                @include box-sizing(border)
-                position: relative
-                float: left
-                border: 1px solid #9DACCC
-                background: #E2E6F0
-                color: black
-                padding: 0px 3px 0px 3px
-                margin: 0 2px 2px 0
-                height: 16px
-                font: 11px "lucida grande", tahoma, verdana, arial, sans-serif
-            .text-core .text-wrap .text-dropdown .text-list .text-suggestion em
-                font-style: italic
-                text-decoration: none
         .oe_datepicker_container
             display: none
         .oe_datepicker_root
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index d629b8e9b3d..fa6cd2644f1 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -9,7 +9,7 @@ instance.web.form = {};
 /**
  * Interface implemented by the form view or any other object
  * able to provide the features necessary for the fields to work.
- * 
+ *
  * Properties:
  *     - display_invalid_fields : if true, all fields where is_valid() return true should
  *     be displayed as invalid.
@@ -953,7 +953,7 @@ instance.web.form.FormRenderingEngineInterface = instance.web.Class.extend({
 
 /**
  * Default rendering engine for the form view.
- * 
+ *
  * It is necessary to set the view using set_view() before usage.
  */
 instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInterface.extend({
@@ -1276,7 +1276,7 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
             page_attrs.__page = $new_page;
             page_attrs.__ic = ic;
             pages.push(page_attrs);
-            
+
             $new_page.children().each(function() {
                 self.process($(this));
             });
@@ -1302,7 +1302,7 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
                 }
             });
         });
-                
+
         this.handle_common_properties($new_notebook, $notebook);
         return $new_notebook;
     },
@@ -1603,7 +1603,7 @@ instance.web.form.FormWidget = instance.web.Widget.extend(instance.web.form.Invi
         if (! v_context) {
             v_context = (this.field || {}).context || {};
         }
-        
+
         if (v_context.__ref || true) { //TODO: remove true
             var fields_values = this._build_eval_context(blacklist);
             v_context = new instance.web.CompoundContext(v_context).set_eval_context(fields_values);
@@ -1711,14 +1711,14 @@ instance.web.form.WidgetButton = instance.web.form.FormWidget.extend({
 
 /**
  * Interface to be implemented by fields.
- * 
+ *
  * Properties:
  *     - readonly: boolean. If set to true the field should appear in readonly mode.
  *     - force_readonly: boolean, When it is true, the field should always appear
  *      in read only mode, no matter what the value of the "readonly" property can be.
  * Events:
  *     - changed_value: triggered to inform the view to check on_changes
- * 
+ *
  */
 instance.web.form.FieldInterface = {
     /**
@@ -1729,14 +1729,14 @@ instance.web.form.FieldInterface = {
     init: function(field_manager, node) {},
     /**
      * Called by the form view to indicate the value of the field.
-     * 
+     *
      * set_value() may return an object that can be passed to $.when() that represents the moment when
      * the field has finished all operations necessary before the user can effectively use the widget.
-     * 
+     *
      * Multiple calls to set_value() can occur at any time and must be handled correctly by the implementation,
      * regardless of any asynchronous operation currently running and the status of any promise that a
      * previous call to set_value() could have returned.
-     * 
+     *
      * set_value() must be able, at any moment, to handle the syntax returned by the "read" method of the
      * osv class in the OpenERP server as well as the syntax used by the set_value() (see below). It must
      * also be able to handle any other format commonly used in the _defaults key on the models in the addons
@@ -1746,16 +1746,16 @@ instance.web.form.FieldInterface = {
     set_value: function(value_) {},
     /**
      * Get the current value of the widget.
-     * 
+     *
      * Must always return a syntaxically correct value to be passed to the "write" method of the osv class in
      * the OpenERP server, although it is not assumed to respect the constraints applied to the field.
      * For example if the field is marqued as "required", a call to get_value() can return false.
-     * 
+     *
      * get_value() can also be called *before* a call to set_value() and, in that case, is supposed to
      * return a defaut value according to the type of field.
-     * 
+     *
      * This method is always assumed to perform synchronously, it can not return a promise.
-     * 
+     *
      * If there was no user interaction to modify the value of the field, it is always assumed that
      * get_value() return the same semantic value than the one passed in the last call to set_value(),
      * altough the syntax can be different. This can be the case for type of fields that have a different
@@ -1785,14 +1785,14 @@ instance.web.form.FieldInterface = {
 
 /**
  * Abstract class for classes implementing FieldInterface.
- * 
+ *
  * Properties:
  *     - effective_readonly: when it is true, the widget is displayed as readonly. Vary depending
  *      the values of the "readonly" property and the "force_readonly" property on the field manager.
  *     - value: useful property to hold the value of the field. By default, set_value() and get_value()
  *     set and retrieve the value property. Changing the value property also triggers automatically
  *     a 'changed_value' event that inform the view to trigger on_changes.
- * 
+ *
  */
 instance.web.form.AbstractField = instance.web.form.FormWidget.extend(instance.web.form.FieldInterface, {
     /**
@@ -1811,7 +1811,7 @@ instance.web.form.AbstractField = instance.web.form.FormWidget.extend(instance.w
         this.string = this.node.attrs.string || this.field.string || this.name;
         this.set({'value': false});
         this.set({required: this.modifiers['required'] === true});
-        
+
         // some events to make the property "effective_readonly" sync automatically with "readonly" and
         // "force_readonly"
         this.set({"readonly": this.modifiers['readonly'] === true});
@@ -1821,7 +1821,7 @@ instance.web.form.AbstractField = instance.web.form.FormWidget.extend(instance.w
         this.on("change:readonly", this, test_effective_readonly);
         this.on("change:force_readonly", this, test_effective_readonly);
         _.bind(test_effective_readonly, this)();
-        
+
         this.on("change:value", this, function() {
             if (! this._inhibit_on_change)
                 this.trigger('changed_value');
@@ -2003,7 +2003,7 @@ instance.web.form.FieldChar = instance.web.form.AbstractField.extend(instance.we
 });
 
 instance.web.form.FieldID = instance.web.form.FieldChar.extend({
-    
+
 });
 
 instance.web.form.FieldEmail = instance.web.form.FieldChar.extend({
@@ -2396,7 +2396,7 @@ instance.web.form.FieldSelection = instance.web.form.AbstractField.extend(instan
         } else {
             var self = this;
             var option = _(this.values)
-                .detect(function (record) { return record[0] === self.get('value'); }); 
+                .detect(function (record) { return record[0] === self.get('value'); });
             this.$element.text(option ? option[1] : this.values[0][1]);
         }
     },
@@ -2575,7 +2575,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
     render_editable: function() {
         var self = this;
         this.$input = this.$element.find("input");
-        
+
         self.$input.tipsy({
             title: function() {
                 return "No element was selected, you should create or select one from the dropdown list.";
@@ -2583,10 +2583,10 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
             trigger:'manual',
             fade: true,
         });
-        
+
         this.$drop_down = this.$element.find(".oe_m2o_drop_down_button");
         this.$follow_button = $(".oe_m2o_cm_button", this.$element);
-        
+
         this.$follow_button.click(function() {
             if (!self.get('value')) {
                 self.focus();
@@ -2880,7 +2880,7 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
     },
     load_views: function() {
         var self = this;
-        
+
         var modes = this.node.attrs.mode;
         modes = !!modes ? modes.split(",") : ["tree"];
         var views = [];
@@ -3462,7 +3462,7 @@ instance.web.form.FieldMany2ManyTags = instance.web.form.AbstractField.extend(in
                 $("textarea", self.$element).css("padding-left", "3px");
                 self.tags.addTags(_.map(data, function(el) {return {name: el[1], id:el[0]};}));
             } else {
-                self.$element.html(QWeb.render("FieldMany2ManyTags.box", {elements: data}));
+                self.$element.html(QWeb.render("FieldMany2ManyTag", {elements: data}));
             }
         };
         if (! self.get('values') || self.get('values').length > 0) {
@@ -3634,7 +3634,7 @@ instance.web.form.FieldMany2ManyKanban = instance.web.form.AbstractField.extend(
         this.dataset.on_unlink.add_last(function(ids) {
             self.dataset_changed();
         });
-        
+
         this.is_setted.then(function() {
             self.load_view();
         });
@@ -3750,7 +3750,7 @@ instance.web.form.Many2ManyKanbanView = instance.web_kanban.KanbanView.extend({
 });
 instance.web.form.Many2ManyQuickCreate = instance.web.Widget.extend({
     template: 'Many2ManyKanban.quick_create',
-    
+
     /**
      * close_btn: If true, the widget will display a "Close" button able to trigger
      * a "close" event.
@@ -4443,7 +4443,7 @@ instance.web.form.FieldStatus = instance.web.form.AbstractField.extend({
             this.selection = [];
             // get fold information from widget
             var fold = ((this.node.attrs || {}).statusbar_fold || true);
-            // build final domain: if fold option required, add the 
+            // build final domain: if fold option required, add the
             if (fold == true) {
                 var domain = new instance.web.CompoundDomain(['|'], ['&'], self.build_domain(), [['fold', '=', false]], [['id', '=', self.selected_value]]);
             } else {
@@ -4475,7 +4475,7 @@ instance.web.form.FieldStatus = instance.web.form.AbstractField.extend({
         var shown = _.map(((this.node.attrs || {}).statusbar_visible || "").split(","),
             function(x) { return _.str.trim(x); });
         shown = _.select(shown, function(x) { return x.length > 0; });
-        
+
         if (shown.length == 0) {
             this.to_show = this.selection;
         } else {
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index aa04df98f04..4615e16b2a1 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -961,18 +961,20 @@
         </t>
     </span>
 </t>
+<!-- Collection of m2m tags -->
 <t t-name="FieldMany2ManyTags">
-    <div class="oe_form_field oe_form_field_many2manytags" t-att-style="widget.node.attrs.style">
+    <div class="oe_form_field oe_field_many2many_tags" t-att-style="widget.node.attrs.style">
         <t t-if="! widget.get('effective_readonly')">
             <textarea rows="1" style="width: 100%"
                 t-att-placeholder="widget.node.attrs.placeholder"></textarea>
         </t>
     </div>
 </t>
-<t t-name="FieldMany2ManyTags.box">
+<!-- Individual m2m tag element -->
+<t t-name="FieldMany2ManyTag">
     <t t-set="i" t-value="0"/>
     <t t-foreach="elements" t-as="el">
-        <span class="oe_form_field_many2manytags_box" t-att-data-index="i">
+        <span class="oe_field_many2many_tag" t-att-data-index="i">
             <t t-esc="el[1]"/>
         </span>
         <t t-set="i" t-value="i + 1"/>

From ae44723e2bed58dd289bfb2d9708219401f7cf7e Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Thu, 12 Jul 2012 15:32:50 +0200
Subject: [PATCH 08/17] [IMP] turn many2many tags CSS classes into *real*
 generic classes, without any reference to other openerp elements like fields
 oe_field_many2many_tags becomes oe_tags oe_field_many2many_tag becomes oe_tag

bzr revid: abo@openerp.com-20120712133250-c2ss8ygqujx4m2w2
---
 addons/web/static/src/css/base.css  | 8 ++++----
 addons/web/static/src/css/base.sass | 6 +++---
 addons/web/static/src/xml/base.xml  | 4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index b9e2e42946f..13ce5b73795 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -450,13 +450,13 @@
 .openerp .oe_webclient .oe_star_on {
   color: gold;
 }
-.openerp .oe_field_many2many_tags .text-wrap {
+.openerp .oe_tags .text-wrap {
   width: 100% !important;
 }
-.openerp .oe_field_many2many_tags .text-wrap textarea {
+.openerp .oe_tags .text-wrap textarea {
   width: 100% !important;
 }
-.openerp .oe_field_many2many_tags .oe_field_many2many_tag {
+.openerp .oe_tags .oe_tag {
   border-radius: 2px;
   -webkit-box-sizing: border-box;
   -moz-box-sizing: border-box;
@@ -472,7 +472,7 @@
   height: 16px;
   font: 11px "lucida grande", tahoma, verdana, arial, sans-serif;
 }
-.openerp .oe_field_many2many_tags .text-core .text-wrap .text-dropdown .text-list .text-suggestion em {
+.openerp .oe_tags .text-core .text-wrap .text-dropdown .text-list .text-suggestion em {
   font-style: italic;
   text-decoration: none;
 }
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 01e2bdb1005..5a0daae0674 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -363,13 +363,13 @@ $sheet-max-width: 860px
         .oe_star_on
             color: gold
     // }}}
-    // Many2many tags {{{
-    .oe_field_many2many_tags
+    // Tags (for many2many tags, among others) {{{
+    .oe_tags
         .text-wrap
             width: 100% !important
             textarea
                 width: 100% !important
-        .oe_field_many2many_tag
+        .oe_tag
             border-radius: 2px
             @include box-sizing(border)
             position: relative
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 4615e16b2a1..5b3a6ac7166 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -963,7 +963,7 @@
 </t>
 <!-- Collection of m2m tags -->
 <t t-name="FieldMany2ManyTags">
-    <div class="oe_form_field oe_field_many2many_tags" t-att-style="widget.node.attrs.style">
+    <div class="oe_form_field oe_tags" t-att-style="widget.node.attrs.style">
         <t t-if="! widget.get('effective_readonly')">
             <textarea rows="1" style="width: 100%"
                 t-att-placeholder="widget.node.attrs.placeholder"></textarea>
@@ -974,7 +974,7 @@
 <t t-name="FieldMany2ManyTag">
     <t t-set="i" t-value="0"/>
     <t t-foreach="elements" t-as="el">
-        <span class="oe_field_many2many_tag" t-att-data-index="i">
+        <span class="oe_tag" t-att-data-index="i">
             <t t-esc="el[1]"/>
         </span>
         <t t-set="i" t-value="i + 1"/>

From 94b6dcd2b78c35269ec41c0001417f5ba3954012 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 12 Jul 2012 17:20:16 +0200
Subject: [PATCH 09/17] [IMP] membership: usability, review of form view of
 membership product

bzr revid: qdp-launchpad@openerp.com-20120712152016-r591xu1sxi730sgc
---
 addons/membership/membership_view.xml | 52 +++++++++++----------------
 1 file changed, 21 insertions(+), 31 deletions(-)

diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 21960ce1ec8..9c566a69bde 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -54,47 +54,37 @@
             <field name="arch" type="xml">
                 <form string="Membership products" version="7.0">
                     <sheet>
+                        <label for="name" class="oe_edit_only"/>
+                        <h1>
+                            <field name="name"/>
+                        </h1>
                         <group>
                             <group>
-                                <field name="name" />
-                                <field name="default_code" />
-                                <field name="type" />
-                                <field name="categ_id" />
-                                <field name="taxes_id" widget="many2many_tags" string="Taxes"/>
+                                <field name="default_code"/>
+                                <field name="categ_id"/>
+                                <field name="membership" invisible="1"/>
+                                <field name="company_id"
+                                    groups="base.group_multi_company"
+                                    widget="selection"/>
+                                <field name="active"/>
                             </group>
                             <group>
-                                <field name="membership" invisible="1"/>
-                                <label for="membership_date_from"
-                                    string="Membership Duration" />
-                                <div style="min-width:370px">
+                                <label for="membership_date_from" string="Membership Duration"/>
+                                <div>
                                     <field name="membership_date_from" required="1" class="oe_inline"/> - 
-                                    <field name="membership_date_to" required="1"  class="oe_inline"/>
+                                    <field name="membership_date_to" required="1" class="oe_inline"/>
                                 </div>
-                                <field name="list_price"
-                                    string="Membership Fee" />
+                                <field name="list_price" string="Membership Fee"/>
                                 <field
                                     name="property_account_income"
-                                    domain="[('type', '!=', 'view')]" />
+                                    domain="[('type', '!=', 'view')]"/>
+                                <field name="taxes_id" widget="many2many_tags" string="Taxes"/>
                             </group>
                         </group>
-                        <group>
-                            <field name="company_id"
-                                groups="base.group_multi_company"
-                                widget="selection" />
-                            <field name="active" />
-                        </group>
-                        <group>
-                            <field colspan="4" name="description" placeholder="Add a description"
-                                nolabel="1" />
-                        </group>
-                        <group>
-                            <field colspan="4" name="description_sale" placeholder="Add a sale description"
-                                nolabel="1" />
-                        </group>
-                        <group>
-                            <field colspan="4" placeholder="Add a purchase description"
-                                name="description_purchase" nolabel="1" />
-                        </group>
+                        <label for="description"/>
+                        <field colspan="4" name="description" placeholder="Add a description..."/>
+                        <label for="description_sale"/>
+                        <field colspan="4" name="description_sale" placeholder="This note will be displayed on quotations..."/>
                     </sheet>
                  </form>
             </field>

From ec877e57c97ec5d4b7b248a5a2d1de0757c147cc Mon Sep 17 00:00:00 2001
From: Alexis de Lattre <alexis@via.ecp.fr>
Date: Thu, 12 Jul 2012 23:09:24 +0200
Subject: [PATCH 10/17] [FIX] the regression introduced by the merge of my
 branch trunk-addons-analytic-on-tax-v2 in addons-trunk revno 7018

bzr revid: alexis@via.ecp.fr-20120712210924-25gkfvmqyfainnf0
---
 addons/account/account_invoice.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 5e27a2e3663..23ad28dcb83 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -1002,7 +1002,7 @@ class account_invoice(osv.osv):
             'quantity': x.get('quantity',1.00),
             'product_id': x.get('product_id', False),
             'product_uom_id': x.get('uos_id', False),
-            'analytic_account_id': x.get('analytic_account_id', False),
+            'analytic_account_id': x.get('account_analytic_id', False),
         }
 
     def action_number(self, cr, uid, ids, context=None):
@@ -1691,7 +1691,7 @@ class account_invoice_tax(osv.osv):
                 'account_id': t['account_id'],
                 'tax_code_id': t['tax_code_id'],
                 'tax_amount': t['tax_amount'],
-                'analytic_account_id': t['account_analytic_id'],
+                'account_analytic_id': t['account_analytic_id'],
             })
         return res
 

From 9a4fe00b09c158e1ed17c4bc59b51484a91a9b90 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 13 Jul 2012 11:07:44 +0200
Subject: [PATCH 11/17] [IMP] address format

bzr revid: fp@tinyerp.com-20120713090744-zy3g8jhbraxoikym
---
 openerp/addons/base/res/res_partner_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index f54390b435a..f0cd65872bb 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -135,7 +135,7 @@
                             <div>
                                 <field name="street" placeholder="Street..."/>
                                 <field name="street2"/>
-                                <div>
+                                <div class="address_format">
                                     <field name="city" placeholder="City" style="width: 40%%"/>
                                     <field name="state_id" class="oe_no_button" placeholder="State" style="width: 24%%"/>
                                     <field name="zip" placeholder="ZIP" style="width: 34%%"/>

From 8b198aae251c535109b935436b75b182b8931190 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 13 Jul 2012 11:07:52 +0200
Subject: [PATCH 12/17] [IMP] address format

bzr revid: fp@tinyerp.com-20120713090752-1ccmu9yz7l2xxj8n
---
 addons/crm/crm_lead_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 67f2b7e7080..71ecda1c8a0 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -520,7 +520,7 @@
                                 <div>
                                     <field name="street" placeholder="Street..."/>
                                     <field name="street2"/>
-                                    <div>
+                                    <div class="address_format">
                                         <field name="city" placeholder="City" style="width: 40%%"/>
                                         <field name="state_id" class="oe_no_button" placeholder="State" style="width: 24%%"/>
                                         <field name="zip" placeholder="ZIP" style="width: 34%%"/>

From b1ea5e4c977e63a9416f788ac69853b20862664a Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 13 Jul 2012 11:53:41 +0200
Subject: [PATCH 13/17] [IMP] replace footer by divs for chatter

bzr revid: fp@tinyerp.com-20120713095341-6h0ganz4zmlwv9wg
---
 addons/account/account_invoice_view.xml              |  8 ++++----
 addons/account_voucher/account_voucher_view.xml      |  6 +++---
 .../account_voucher/voucher_payment_receipt_view.xml |  8 ++++----
 .../account_voucher/voucher_sales_purchase_view.xml  | 12 ++++++------
 addons/analytic/analytic_view.xml                    |  4 ++--
 addons/base_calendar/crm_meeting_view.xml            |  4 ++--
 addons/crm/crm_lead_view.xml                         |  8 ++++----
 addons/crm/crm_phonecall_view.xml                    |  4 ++--
 addons/crm_claim/crm_claim_view.xml                  |  4 ++--
 addons/crm_fundraising/crm_fundraising_view.xml      |  4 ++--
 addons/crm_helpdesk/crm_helpdesk_view.xml            |  4 ++--
 addons/event/event_view.xml                          |  8 ++++----
 addons/hr_expense/hr_expense_view.xml                |  4 ++--
 addons/hr_holidays/hr_holidays_view.xml              |  8 ++++----
 addons/hr_recruitment/hr_recruitment_view.xml        |  4 ++--
 addons/idea/idea_view.xml                            |  4 ++--
 addons/mail/mail_group_view.xml                      |  4 ++--
 addons/mail/res_partner_view.xml                     |  4 ++--
 addons/mail/static/src/css/mail_group.css            |  2 +-
 addons/mrp/mrp_view.xml                              |  4 ++--
 addons/mrp_operations/mrp_operations_view.xml        |  4 ++--
 addons/procurement/procurement_view.xml              |  4 ++--
 addons/product/product_view.xml                      |  4 ++--
 addons/project/project_view.xml                      |  8 ++++----
 addons/project_issue/project_issue_view.xml          |  4 ++--
 addons/purchase/purchase_view.xml                    |  4 ++--
 .../purchase_requisition_view.xml                    |  4 ++--
 addons/sale/sale_view.xml                            |  4 ++--
 addons/stock/stock_view.xml                          |  8 ++++----
 29 files changed, 76 insertions(+), 76 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index bc964b787c7..78cdea764f3 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -271,9 +271,9 @@
                         </page>
                     </notebook>
                 </sheet>
-                <footer>
+                <div class="oe_chatter">
                     <field name="message_ids" widget="mail_thread"/>
-                </footer>
+                </div>
                 </form>
             </field>
         </record>
@@ -406,9 +406,9 @@
                         </page>
                     </notebook>
                 </sheet>
-                <footer>
+                <div class="oe_chatter">
                     <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
-                </footer>
+                </div>
                 </form>
             </field>
         </record>
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 2c294fa628c..74da5ac4836 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -111,9 +111,9 @@
                         </page>
                     </notebook>
                   </sheet>
-                    <footer>
-                        <field name="message_ids" widget="mail_thread"/>
-                    </footer>
+                  <div class="oe_chatter">
+                      <field name="message_ids" widget="mail_thread"/>
+                  </div>
                 </form>
             </field>
         </record>
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index c3291fb3bc3..b73538cddcc 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -257,9 +257,9 @@
                         </page>
                     </notebook>
                     </sheet>
-                    <footer>
+                    <div class="oe_chatter">
                         <field name="message_ids" widget="mail_thread"/>
-                    </footer>
+                    </div>
                 </form>
             </field>
         </record>
@@ -430,9 +430,9 @@
                         </page>
                     </notebook>
                     </sheet>
-                    <footer>
+                    <<div class="oe_chatter">
                         <field name="message_ids" widget="mail_thread"/>
-                    </footer>
+                    </div>
                 </form>
             </field>
         </record>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index adb078fac22..31f91b22ce6 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -130,13 +130,13 @@
                                     <field name="narration" placeholder="Internal Notes" nolabel="1" />
                                 </group>
                                 <group>
-                                    <group class="oe_subtotal_footer" string="Total">
+                                    <group class="oe_subtotal_<div class="oe_chatter">
                                         <field name="tax_id" 
                                             on_change="onchange_price(line_cr_ids, tax_id, partner_id)"
                                             widget="selection"
                                             domain="[('type_tax_use','in',('sale','all')), ('parent_id', '=', False)]"/>
                                         <field name="tax_amount" nolabel="1"/>
-                                        <field name="amount" class="oe_subtotal_footer_separator" />
+                                        <field name="amount" class="oe_subtotal_div" />
                                         <button type="object"
                                             icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax"
                                             attrs="{'invisible': [('state','!=','draft')]}"/>
@@ -167,9 +167,9 @@
                         </page>
                     </notebook>
                     </sheet>
-                    <footer>
+                    <div class="oe_chatter">
                         <field name="message_ids" widget="mail_thread"/>
-                    </footer>
+                    </div>
                 </form>
             </field>
         </record>
@@ -320,9 +320,9 @@
                         </page>
                     </notebook>
                     </sheet>
-                    <footer>
+                    <div class="oe_chatter">
                         <field name="message_ids" widget="mail_thread"/>
-                    </footer>
+                    </div>
                 </form>
             </field>
         </record>
diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index 0c06c90150c..6d6a38b4b44 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -43,9 +43,9 @@
                             </page>
                         </notebook>
                     </sheet>
-                    <footer>
+                    <div class="oe_chatter">
                         <field name="message_ids" widget="mail_thread"/>
-                    </footer>
+                    </div>
                 </form>
             </field>
         </record>
diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index b6365ebc53c..a2f3c2408d7 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -245,9 +245,9 @@
                         </page>
                     </notebook>
                 </sheet>
-                <footer>
+                <div class="oe_chatter">
                     <field name="message_ids" widget="mail_thread"/>
-                </footer>
+                </div>
             </form>
         </field>
     </record>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 71ecda1c8a0..30b0af1dc85 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -212,9 +212,9 @@
                     </page>
                     </notebook>
                 </sheet>
-                <footer>
+                <div class="oe_chatter">
                     <field name="message_ids" widget="mail_thread"/>
-                </footer>
+                </div>
             </form>
         </field>
         </record>
@@ -564,9 +564,9 @@
                     </page>
                     </notebook>
                 </sheet>
-                <footer>
+                <div class="oe_chatter">
                     <field name="message_ids" widget="mail_thread"/>
-                </footer>
+                </div>
             </form>
         </field>
     </record>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index a874eeee239..1f15e29263b 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -145,9 +145,9 @@
 
                 <field name="description" placeholder="Description..." />
             </sheet>
-            <footer>
+            <div class="oe_chatter">
                 <field name="message_ids" widget="mail_thread"/>
-            </footer>
+            </div>
             </form>
         </field>
     </record>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index cf803fe6384..676bad59a45 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -168,9 +168,9 @@
                         </notebook>
                     </group>
                 </sheet>
-                <footer>
+                <div class="oe_chatter">
                     <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
-                </footer>
+                </div>
                 </form>
             </field>
         </record>
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 26a95c99505..9e67a4001a7 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -128,9 +128,9 @@
                         </page>
                     </notebook>
                 </sheet>
-                <footer>
+                <div class="oe_chatter">
                     <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
-                </footer>
+                </div>
                 </form>
             </field>
         </record>
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 79760a0a9fd..4c2d81f94e3 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -99,9 +99,9 @@
                         </page>
                     </notebook>
                 </sheet>
-                <footer>
+                <div class="oe_chatter">
                     <field name="message_ids" widget="mail_thread"/>
-                </footer>
+                </div>
                 </form>
             </field>
         </record>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 142ba2bb2a4..1b1b5daa9a9 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -189,9 +189,9 @@
                             </page>
                         </notebook>
                     </sheet>
-                    <footer>
+                    <div class="oe_chatter">
                         <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
-                    </footer>
+                    </div>
                 </form>
             </field>
         </record>
@@ -484,9 +484,9 @@
                             </group>
                         </group>
                     </sheet>
-                    <footer>
+                    <div class="oe_chatter">
                         <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
-                    </footer>
+                    </div>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index b8868c3319f..de19ed74b09 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -122,9 +122,9 @@
                         </page>
                     </notebook>
                 </sheet>
-                <footer>
+                <div class="oe_chatter">
                     <field name="message_ids" widget="mail_thread"/>
-                </footer>
+                </div>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index b1bb96c876c..161ca478f36 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -146,9 +146,9 @@
                         </page>
                     </notebook>
                 </sheet>
-                <footer>
+                <div class="oe_chatter">
                     <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
-                </footer>
+                </div>
                 </form>
             </field>
         </record>
@@ -193,9 +193,9 @@
                         </page>
                     </notebook>
                 </sheet>
-                <footer>
+                <div class="oe_chatter">
                     <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
-                </footer>
+                </div>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 9118fb05ea1..5569874e269 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -191,9 +191,9 @@
                 <separator string="Application Summary"/>
                 <field name="description" placeholder="Feedback of interviews..."/>
             </sheet>
-            <footer>
+            <div class="oe_chatter">
                 <field name="message_ids" widget="mail_thread"/>
-            </footer>
+            </div>
           </form>
         </field>
     </record>
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 8d7a726f015..ec7f0e6d328 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -80,9 +80,9 @@
                     <label for="description"/><newline/>
                     <field name="description"/>
                 </sheet>
-                <footer>
+                <div class="oe_chatter">
                     <field name="message_ids" widget="mail_thread"/>
-                </footer>
+                </div>
             </form>
         </field>
     </record>
diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index 6ad1792b3b4..97210b8c179 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -72,10 +72,10 @@
                             </group>
                         </group>
                     </sheet>
-                    <footer class="openerp_mail_group_footer">
+                    <div class="oe_chatter oe_mail_group_footer">
                         <field name="message_ids" widget="mail_thread"
                                 options='{"thread_level": 1}'/>
-                    </footer>
+                    </div>
                 </form>
             </field>
         </record>
diff --git a/addons/mail/res_partner_view.xml b/addons/mail/res_partner_view.xml
index 15f6618c8e5..2d425f18c7b 100644
--- a/addons/mail/res_partner_view.xml
+++ b/addons/mail/res_partner_view.xml
@@ -9,10 +9,10 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//sheet" position="after">
-                    <footer>
+                    <div class="oe_chatter">
                     <field name="message_ids" widget="mail_thread" 
                             options='{"thread_level": 1}'/>
-                    </footer>
+                    </div>
                 </xpath>
             </field>
         </record>
diff --git a/addons/mail/static/src/css/mail_group.css b/addons/mail/static/src/css/mail_group.css
index 048b7a06415..b03be086fc6 100644
--- a/addons/mail/static/src/css/mail_group.css
+++ b/addons/mail/static/src/css/mail_group.css
@@ -16,7 +16,7 @@
 }
 
 /* Resize footer width */
-.openerp .oe_form footer.openerp_mail_group_footer {
+.openerp .oe_form div.oe_mail_group_footer {
   max-width: 80%;
 }
 
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 6fe3d61a804..86b0fcee0d5 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -795,9 +795,9 @@
                         </page>
                     </notebook>
                 </sheet>
-                <footer>
+                <div class="oe_chatter">
                     <field name="message_ids" widget="mail_thread"/>
-                </footer>
+                </div>
                 </form>
             </field>
         </record>
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 85cbaca0cbc..0a16626ecd9 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -111,9 +111,9 @@
                 </page>
                 </notebook>
                 </sheet>
-                <footer>
+                <div class="oe_chatter">
                     <field name="message_ids" widget="mail_thread"/>
-                </footer>
+                </div>
             </form>
         </field>
     </record>
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 3b0404d376b..4c45f90b904 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -93,9 +93,9 @@
                     </page>
                     </notebook>
                     </sheet>
-                    <footer>
+                    <div class="oe_chatter">
                         <field name="message_ids" widget="mail_thread"/>
-                    </footer>
+                    </div>
                 </form>
             </field>
         </record>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index cdf4d48c904..e4158a88ae0 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -183,9 +183,9 @@
                             </page>
                         </notebook>
                     </sheet>
-                    <footer>
+                    <div class="oe_chatter">
                         <field name="message_ids" widget="mail_thread"/>
-                    </footer>
+                    </div>
                 </form>
             </field>
         </record>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index d2edef8d7a8..9e4f3c44a27 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -143,9 +143,9 @@
                         </page>
                     </notebook>
                 </sheet>
-                <footer>
+                <div class="oe_chatter">
                     <field name="message_ids" widget="mail_thread"/>
-                </footer>
+                </div>
                 </form>
             </field>
         </record>
@@ -486,9 +486,9 @@
                         </page>
                     </notebook>
                     </sheet>
-                    <footer>
+                    <div class="oe_chatter">
                         <field name="message_ids" widget="mail_thread"/>
-                    </footer>
+                    </div>
                 </form>
             </field>
         </record>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 13e60ccd7be..e730805fb46 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -169,9 +169,9 @@
                         </page>
                     </notebook>
                 </sheet>
-                <footer>
+                <div class="oe_chatter">
                     <field name="message_ids" widget="mail_thread"/>
-                </footer>
+                </div>
                 </form>
             </field>
         </record>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 0be6b8ddf8c..88d9595ac08 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -256,9 +256,9 @@
                         </page>
                     </notebook>
                 </sheet>
-                <footer>
+                <div class="oe_chatter">
                    <field name="message_ids" widget="mail_thread"/>
-                </footer>
+                </div>
                 </form>
             </field>
         </record>
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index d8c2d0124b6..c1fc14c29bf 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -104,9 +104,9 @@
                     </page>
                 </notebook>
             </sheet>
-            <footer>
+            <div class="oe_chatter">
                   <field name="message_ids" widget="mail_thread"/>
-            </footer> 
+            </div> 
             </form>
         </field>
     </record>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index f586305573b..acfd1516c55 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -318,9 +318,9 @@
                         </page>
                     </notebook>
                 </sheet>
-                <footer>
+                <div class="oe_chatter">
                     <field name="message_ids" widget="mail_thread"/>
-                </footer>
+                </div>
                 </form>
             </field>
         </record>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 55be1fdc267..432b3ce365b 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -977,9 +977,9 @@
                         <field name="partner_id" on_change="onchange_partner_in(partner_id)"  colspan="4" string="Customer"/>
                     </xpath>
                     <xpath expr="/form/sheet" position="after">
-                        <footer>
+                        <div class="oe_chatter">
                             <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
-                        </footer>
+                        </div>
                     </xpath>
                 </data>
             </field>
@@ -1090,9 +1090,9 @@
                         <field name="partner_id" on_change="onchange_partner_in(partner_id)"  colspan="4" string="Supplier"/>
                     </xpath>
                     <xpath expr="/form/sheet" position="after">
-                        <footer>
+                        <div class="oe_chatter">
                             <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
-                        </footer>
+                        </div>
                     </xpath>
                 </data>
             </field>

From 2b6cce2c7c1a53680b974fa0a3a17a83a8702732 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 13 Jul 2012 13:47:37 +0200
Subject: [PATCH 15/17] [IMP] modal dialogs

bzr revid: fp@tinyerp.com-20120713114737-hqieh0oi6nnnbjqh
---
 addons/web/static/src/css/base.css    |  7 +++++--
 addons/web/static/src/css/base.sass   |  4 +++-
 addons/web/static/src/js/chrome.js    | 20 ++++++++++----------
 addons/web/static/src/js/view_form.js |  2 +-
 addons/web/static/src/js/views.js     | 11 ++++++++++-
 5 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 75af0a44202..05c0a9b68b8 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -34,7 +34,7 @@
   background: white;
   /* http://www.quirksmode.org/dom/inputfile.html
    * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image
-   */
+   */ */
 }
 .openerp a {
   text-decoration: none;
@@ -240,6 +240,9 @@
 .openerp.ui-dialog .ui-dialog-buttonpane button {
   margin-left: 8px;
 }
+.openerp.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
+  float: left;
+}
 .openerp.ui-dialog .ui-dialog-titlebar-close {
   padding: 0;
 }
@@ -1785,7 +1788,7 @@
   display: inline-block;
   float: right;
 }
-.openerp .oe_form footer {
+.openerp .oe_form div.oe_chatter {
   min-width: 650px;
   max-width: 860px;
   margin: 0 auto;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index f9a0306c969..f6e3e9a6ea2 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -235,6 +235,8 @@ $sheet-max-width: 860px
             @include radius(0 0 2px 2px)
             button
                 margin-left: 8px
+            .ui-dialog-buttonset
+                float: left
         .ui-dialog-titlebar-close
             padding: 0
             .ui-icon-closethick
@@ -1388,7 +1390,7 @@ $sheet-max-width: 860px
             ul
                 display: inline-block
                 float: right
-        footer
+        div.oe_chatter
             min-width: 650px
             max-width: $sheet-max-width
             margin: 0 auto
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index c32d4feafe1..e4d543c69ce 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -63,7 +63,7 @@ instance.web.Dialog = instance.web.Widget.extend({
         this.dialog_options = {
             modal: true,
             destroy_on_close: true,
-            width: 750,
+            width: 700,
             min_width: 0,
             max_width: '95%',
             height: 'auto',
@@ -86,7 +86,7 @@ instance.web.Dialog = instance.web.Widget.extend({
         if (this.dialog_options.autoOpen) {
             this.open();
         } else {
-            instance.web.dialog(this.$element, this.get_options());
+            test = instance.web.dialog(this.$element, this.get_options());
         }
     },
     get_options: function(options) {
@@ -145,9 +145,9 @@ instance.web.Dialog = instance.web.Widget.extend({
         _.each(this.getChildren(), function(el) {
             el.destroy();
         });
-	if (! this.isDestroyed()) {
-	    this.$element.dialog('destroy');
-	}
+    if (! this.isDestroyed()) {
+        this.$element.dialog('destroy');
+    }
         this._super();
     }
 });
@@ -212,11 +212,11 @@ instance.web.CrashManager = instance.web.CallbackEnabled.extend({
         dialog.$element.html(QWeb.render('CrashManager.error', {session: instance.connection, error: error}));
     },
     on_javascript_exception: function(exception) {
-	this.on_traceback({
-	    type: _t("Client Error"),
-	    message: exception,
-	    data: {debug: ""}
-	});
+    this.on_traceback({
+        type: _t("Client Error"),
+        message: exception,
+        data: {debug: ""}
+    });
     },
 });
 
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index a2e0baaded6..3a3c49b2375 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -526,7 +526,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
             this.on_form_changed();
         }
         if (!_.isEmpty(result.warning)) {
-        	instance.web.dialog($(QWeb.render("CrashManager.warning", result.warning)), {
+            instance.web.dialog($(QWeb.render("CrashManager.warning", result.warning)), {
                 title:result.warning.title,
                 modal: true,
                 buttons: [
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 423bf3f9d46..1bfd7d18776 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -220,7 +220,10 @@ instance.web.ActionManager = instance.web.Widget.extend({
         }
         if (action.target === 'new') {
             if (this.dialog === null) {
-                this.dialog = new instance.web.Dialog(this, { width: '80%' });
+                // These buttons will be overwrited by <footer> if any
+                this.dialog = new instance.web.Dialog(this, {
+                    buttons: { "Close": function() { $(this).dialog("close"); }}
+                });
                 if(on_close)
                     this.dialog.on_close.add(on_close);
             } else {
@@ -404,6 +407,12 @@ instance.web.ViewManager =  instance.web.Widget.extend({
                         container.hide();
                         controller.do_hide();
                     }
+                    if (self.$element.parent('.ui-dialog-content') && self.$element.find('footer')) {
+                        self.$element.parent('.ui-dialog-content').parent().find('div.ui-dialog-buttonset').hide()
+                        self.$element.find('footer').appendTo(
+                            self.$element.parent('.ui-dialog-content').parent().find('div.ui-dialog-buttonpane')
+                        );
+                    }
                 }
             });
         });

From c321c37645d0de22252c7d9eb90bcff143eda159 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 13 Jul 2012 14:28:44 +0200
Subject: [PATCH 16/17] [FIX] stupid type fixed

bzr revid: fp@tinyerp.com-20120713122844-qnvoxlk6cms9b5gm
---
 addons/account_voucher/voucher_payment_receipt_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index b73538cddcc..98693a3f531 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -430,7 +430,7 @@
                         </page>
                     </notebook>
                     </sheet>
-                    <<div class="oe_chatter">
+                    <div class="oe_chatter">
                         <field name="message_ids" widget="mail_thread"/>
                     </div>
                 </form>

From 1176476743be0b76708358b416429006356f1876 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Fri, 13 Jul 2012 14:52:35 +0200
Subject: [PATCH 17/17] [FIX] more fixes for fabien's mess

bzr revid: fva@openerp.com-20120713125235-9m3rdccqoeq0pnw7
---
 addons/account_voucher/voucher_sales_purchase_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 31f91b22ce6..f26dd3ae38d 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -130,13 +130,13 @@
                                     <field name="narration" placeholder="Internal Notes" nolabel="1" />
                                 </group>
                                 <group>
-                                    <group class="oe_subtotal_<div class="oe_chatter">
+                                    <group class="oe_subtotal_footer" string="Total">
                                         <field name="tax_id" 
                                             on_change="onchange_price(line_cr_ids, tax_id, partner_id)"
                                             widget="selection"
                                             domain="[('type_tax_use','in',('sale','all')), ('parent_id', '=', False)]"/>
                                         <field name="tax_amount" nolabel="1"/>
-                                        <field name="amount" class="oe_subtotal_div" />
+                                        <field name="amount" class="oe_subtotal_footer_separator" />
                                         <button type="object"
                                             icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax"
                                             attrs="{'invisible': [('state','!=','draft')]}"/>