From b9c815f16557cf262246a71cc2fb376261b605d1 Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Mon, 28 May 2012 17:25:47 +0530
Subject: [PATCH 01/71] [IMP]crm: Add placeholder @name

bzr revid: hsa@tinyerp.com-20120528115547-gwi2rpew4koba4oa
---
 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 3c2b8f48eb6..b13c65b3169 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -414,7 +414,7 @@
                 </div>
                 <sheet layout="auto">
                 <group colspan="4" col="2" width="auto">
-                    <field name="name" required="1" nolabel="1" class="oe_form_title"/>
+                    <field name="name" required="1" nolabel="1" class="oe_form_title" placeholder="Need new website design"/>
                     <div class="oe_text_right">
                         <button string="Schedule/Log Call"
                             name="%(opportunity2phonecall_act)d" icon="terp-call-start"

From 56ba54bd04353464d43c9909f133c3659eb2c879 Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Mon, 28 May 2012 18:08:28 +0530
Subject: [PATCH 02/71] [IMP]crm: Add placeholder @name,@next action, @phone,
 @campaign, @channel,@fax, @mobile, @referred

bzr revid: hsa@tinyerp.com-20120528123828-91eej2idz1cuaym8
---
 addons/crm/crm_lead_view.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index b13c65b3169..62b32ea4796 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -431,7 +431,7 @@
                     <field name="date_action"/>
                     <field name="date_deadline"/>
 
-                    <field name="title_action"/>
+                    <field name="title_action" placeholder="Call to analyse needs"/>
                     <field name="probability"/>
 
                     <field name="type" invisible="1"/>
@@ -447,7 +447,7 @@
                                 icon="terp-partner" type="action"
                                 string="Create"
                                 attrs="{'invisible':[('partner_id','!=',False)]}"/>
-                            <field name="phone" colspan="3"/>
+                            <field name="phone" colspan="3" placeholder="+32.81.81.37.00"/>
                             <field width="80%%" name="email_from" string="Email"/>
                             <button string="Mail"
                                 name="%(mail.action_email_compose_message_wizard)d"
@@ -487,14 +487,14 @@
                     </group>
                     <group colspan="2" col="2" class="oe_form_group_label_border">
                         <field domain="[('domain', '=', 'contact')]" name="title" widget="selection"/>
-                        <field name="fax"/>
+                        <field name="fax" placeholder="+32.81.81.37.00"/>
                         <field name="street"/>
                         <field name="zip"/>
                         <field name="country_id"/>
                     </group>
                     <group colspan="2" col="2" class="oe_form_group_label_border">
                         <field name="function" />
-                        <field name="mobile"/>
+                        <field name="mobile" placeholder="+32.81.81.37.00"/>
                         <field name="street2"/>
                         <field name="city"/>
                         <field name="state_id"/>
@@ -502,8 +502,8 @@
 
                     <group colspan="2" col="2" class="oe_form_group_label_border">
                         <separator string="Categorization" colspan="2"/>
-                        <field name="type_id" widget="selection"/>
-                        <field name="channel_id" widget="selection"/>
+                        <field name="type_id" widget="selection" placeholder="Mailing june"/>
++                        <field name="channel_id" widget="selection" placeholder="E-mail"/>
                     </group>
                     <group colspan="2" col="2" class="oe_form_group_label_border">
                         <separator string="Mailings" colspan="2"/>
@@ -517,7 +517,7 @@
                         <field name="active"/>
                         <field name="day_open" groups="base.group_no_one"/>
                         <field name="day_close" groups="base.group_no_one"/>
-                        <field name="referred"/>
+                        <field name="referred" placeholder="tom@reseller.com"/>
                     </group>
                     <group col="2" colspan="2" class="oe_form_group_label_border">
                         <separator colspan="4" string="References"/>

From 4f8f60850bd0051f9fba9dcac283721ccbbd1e6f Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Mon, 28 May 2012 18:27:34 +0530
Subject: [PATCH 03/71] [IMP]sales : Add plceholder @name,@notes

bzr revid: hsa@tinyerp.com-20120528125734-ocvhd9cw1mc5oxnd
---
 addons/sale/sale_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 36c061645e7..318ea8aa0e7 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -147,8 +147,8 @@
                                                 context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
                                                 name="product_id"
                                                 on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, True, parent.date_order, product_packaging, parent.fiscal_position, False, context)"/>
-                                            <field name="name"/>
-
+                                            <field name="name" placeholder="Porduct/Service characteristics"/>
+ 
                                             <field
                                                 context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
                                                 name="product_uom_qty"
@@ -168,7 +168,7 @@
                                                 colspan="3"/>
                                             <field name="discount" groups="sale.group_discount_per_so_line"/>
                                             <separator colspan="5" string="Notes" groups="base.group_sale_notes_subtotal"/>
-                                            <field colspan="5" name="notes" nolabel="1" groups="base.group_sale_notes_subtotal"/>
+                                            <field colspan="5" name="notes" nolabel="1" groups="base.group_sale_notes_subtotal" placeholder="Our quotation is valid for 30 days..."/>
                                             <separator colspan="5" string="Taxes"/>
                                             <field colspan="5" name="tax_id" nolabel="1" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
                                             <group colspan="5" col="5">

From 00a8454c809d915e037d09f64a264daf1fe7495b Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Mon, 28 May 2012 18:43:57 +0530
Subject: [PATCH 04/71] [IMP]product : Add help in ean13 field, Add placeholder
 @sales description, @purchase description

bzr revid: hsa@tinyerp.com-20120528131357-7ribxq9dbqsah1bo
---
 addons/product/product.py       | 2 +-
 addons/product/product_view.xml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/product/product.py b/addons/product/product.py
index 4201c16402a..f81378be04e 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -518,7 +518,7 @@ class product_product(osv.osv):
         'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the product without removing it."),
         'variants': fields.char('Variants', size=64),
         'product_tmpl_id': fields.many2one('product.template', 'Product Template', required=True, ondelete="cascade"),
-        'ean13': fields.char('EAN13', size=13),
+        'ean13': fields.char('EAN13', size=13, help="The numbers encoded in EAN-13 bar codes are product identification numbers."),
         'packaging' : fields.one2many('product.packaging', 'product_id', 'Logistical Units', help="Gives the different ways to package the same product. This has no impact on the picking order and is mainly used if you use the EDI module."),
         'price_extra': fields.float('Variant Price Extra', digits_compute=dp.get_precision('Sale Price')),
         'price_margin': fields.float('Variant Price Margin', digits_compute=dp.get_precision('Sale Price')),
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 5d06a80b024..3c099b4abc3 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -78,7 +78,7 @@
                         <group colspan="1" col="2">
                             <separator string="Codes" colspan="2"/>
                             <field name="default_code"/>
-                            <field name="ean13"/>
+                            <field name="ean13" placeholder="5901234123457" />
                         </group>
                         <group colspan="1" col="2">
                             <separator string="Characteristics" colspan="2"/>
@@ -163,9 +163,9 @@
                             <separator string="Description"/>
                             <field colspan="4" name="description" nolabel="1"/>
                             <separator string="Sale Description"/>
-                            <field colspan="4" name="description_sale" nolabel="1"/>
+                            <field colspan="4" name="description_sale" nolabel="1" placeholder="This note will be displayed on quotations..."/>
                             <separator string="Purchase Description"/>
-                            <field colspan="4" name="description_purchase" nolabel="1"/>
+                            <field colspan="4" name="description_purchase" nolabel="1" placeholder="This note will be displayed on requests for quotation..."/>
                         </page>
                         <page groups="product.group_stock_packaging" string="Packaging">
                             <field colspan="4" name="packaging" nolabel="1">

From 3482cd453cd98816d02a003d7a19fe0fb0ac695f Mon Sep 17 00:00:00 2001
From: Amit Rasmiya <ram@tinyerp.com>
Date: Mon, 28 May 2012 18:57:32 +0530
Subject: [PATCH 05/71] [IMP]Account : Add placeholder @customer invoice, Add
 placeholder @supplier invoice, @payment

bzr revid: ram@tinyerp.com-20120528132732-wxvnpi2mocc0vmme
---
 addons/account/account_invoice_view.xml         | 10 +++++-----
 addons/account_voucher/account_voucher_view.xml |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 05da4af666e..0847a5d3d48 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -159,7 +159,7 @@
                 <sheet string="Supplier Invoice" layout="auto">
                     <group col="8" colspan="4" class="oe_form_header">
                         <field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"/>
-                        <field name="number" readonly="1"/>
+                        <field name="number" readonly="1" placeholder="PO0025"/>
                         <field name="type" invisible="1"/>
                         <field name="currency_id" width="50"/>
                         <button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" groups="account.group_account_user"/>
@@ -177,7 +177,7 @@
                         <page string="Invoice">
                            <field domain="[('company_id', '=', company_id), ('type', '=', 'payable')]" name="account_id" groups="account.group_account_user"/>
                             <field name="reference_type" nolabel="1" size="0"/>
-                            <field name="reference" nolabel="1"/>
+                            <field name="reference" nolabel="1" placeholder="Payment Reference"/>
                             <field name="date_due"/>
                             <field colspan="4" context="{'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False, 'type': type}" name="invoice_line" nolabel="1">
                                 <tree string="Invoice lines">
@@ -225,7 +225,7 @@
                             <field name="payment_term" widget="selection"/>
                             <field name="name"/>
                             <newline/>
-                            <field name="origin"/>
+                            <field name="origin" placeholder="PO0025"/>
                             <field name="user_id"/>
                             <field name="move_id" groups="account.group_account_user"/>
                             <separator colspan="4" string="Additional Information"/>
@@ -290,7 +290,7 @@
                     <field name="payment_term" widget="selection"/>
                     <newline/>
                     <field domain="[('company_id', '=', company_id),('type','=', 'receivable')]" name="account_id" groups="account.group_account_user"/>
-                    <field name="name"/>
+                    <field name="name" placeholder="Project XYZ"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Invoice">
@@ -328,7 +328,7 @@
                             <field name="user_id"/>
                             <newline/>
                             <field domain="[('partner_id.ref_companies', 'in', [company_id])]" name="partner_bank_id"/>
-                            <field name="origin"/>
+                            <field name="origin" placeholder="SO0032"/>
                             <field name="move_id" groups="account.group_account_user"/>
                             <separator colspan="4" string="Additional Information"/>
                             <field colspan="4" name="comment" nolabel="1"/>
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 349d4e70ed7..f87bad847b3 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -57,9 +57,9 @@
                         <field name="date" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id)"/>
                         <field name="journal_id" widget="selection" select="1" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
                         <field name="type" required="1"/>
-                        <field name="name" colspan="2"/>
+                        <field name="name" colspan="2" placeholder="Invoice SAJ/0042"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                        <field name="reference" select="1"/>
+                        <field name="reference" select="1" placeholder="003/10"/>
                         <field name="account_id" widget="selection" invisible="True"/>
                     </group>
                     <notebook colspan="4">

From 9d7d7f668b1c169dd731f7fd72bcaf4a83f04b5e Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Mon, 28 May 2012 19:21:14 +0200
Subject: [PATCH 06/71] [IMP] improved CSS, XML

bzr revid: fp@openerp.com-20120528172114-dc950hkrmn9wthnd
---
 addons/web/static/src/css/base.css    |  11 ++-
 addons/web/static/src/css/base.sass   |   9 +-
 addons/web/static/src/js/view_form.js | 126 ++++++++++++++------------
 addons/web/static/src/xml/base.xml    | 121 +++++++++++--------------
 4 files changed, 133 insertions(+), 134 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 89b8cc1a38f..6eeeac715d6 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1607,6 +1607,11 @@
   top: -4px;
   padding: 0 2px;
 }
+.openerp .oe_form h2 input {
+  font-size: 20px;
+  font-weight: bold;
+  height: 30px;
+}
 .openerp .oe_form textarea {
   resize: vertical;
 }
@@ -1767,6 +1772,7 @@
 .openerp .oe_form .oe-binary-file-set {
   overflow: hidden;
   position: relative;
+  display: inline-block;
   width: 45px;
   height: 30px;
 }
@@ -1895,11 +1901,6 @@
 .openerp .oe-select-create-popup-view-form > .oe_formview > .oe_form_pager {
   display: none;
 }
-.openerp .oe_form .oe_form_title, .openerp .oe_form .oe_form_title input {
-  font-size: 20px;
-  font-weight: bold;
-  height: 30px;
-}
 .openerp .oe_form .oe_form_group_odd_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell:nth-child(odd),
 .openerp .oe_form .oe_form_group_label_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell_label {
   border-right: 1px solid #dddddd;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index e013009f9b1..e8e5b36bce8 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1305,6 +1305,10 @@ $colour4: #8a89ba
     // }}}
     // FormView.fields {{{
     .oe_form
+        h2 input
+            font-size: 20px
+            font-weight: bold
+            height: 30px
         textarea
             resize: vertical
         input[type="text"],
@@ -1448,6 +1452,7 @@ $colour4: #8a89ba
         .oe-binary-file-set
             overflow: hidden
             position: relative
+            display: inline-block
             width: 45px
             height: 30px
         input.oe-binary-file
@@ -1567,10 +1572,6 @@ $colour4: #8a89ba
     // }}}
     // FormView.classes for openerp views {{{
     .oe_form
-        .oe_form_title, .oe_form_title input
-            font-size: 20px
-            font-weight: bold
-            height: 30px
         .oe_form_group_odd_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell:nth-child(odd),
         .oe_form_group_label_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell_label
             border-right: 1px solid #ddd
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 22f2a1c23a4..c8f53e7fd50 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1023,6 +1023,11 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
         }
         this.process($new_form, layout);
     },
+    /*
+     * Used by direct <field> children of a <group> tag only
+     * This method will add the implicit <label...> for every field
+     * in the <group>
+    */
     preprocess_field: function($field) {
         var self = this;
         var name = $field.attr('name'),
@@ -1056,17 +1061,20 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
         return $label;
     },
     process_field: function($field, layout) {
-        var $label = this.preprocess_field($field);
-        if ($label)
-            this.process($label, layout);
+        // Note FP: No implicit labels for normal fields, only for <group> children
+        // var $label = this.preprocess_field($field);
+        // if ($label)
+        //     this.process($label, layout);
         this.fields_to_init.push($field);
         return $field;
     },
     process_group: function($group, layout) {
         var self = this;
-        if ($group.parent().is('.oe_form_group_cell')) {
-            $group.parent().addClass('oe_form_group_nested');
-        }
+	// Note FP: not clean to do such a hack, commenting it
+        // if ($group.parent().is('.oe_form_group_cell')) {
+        //     $group.parent().addClass('oe_form_group_nested');
+        // }
+
         $group.children('field').each(function() {
             self.preprocess_field($(this));
         });
@@ -1077,7 +1085,10 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
         } else {
             $table = $new_group.find('table:first');
         }
+
+	// Note FP: why don't we put that in the QWeb template ?
         $table.addClass('oe_form_group');
+
         var $tr, $td,
             cols = parseInt($group.attr('col') || 4, 10),
             row_cols = cols;
@@ -1089,6 +1100,8 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
             var tagName = $child[0].tagName.toLowerCase();
             var $td = $('<td/>').addClass('oe_form_group_cell').attr('colspan', colspan);
             var newline = tagName === 'newline';
+
+            // Note FP: looks like a hack to avoid
             if ($tr && row_cols > 0 && (newline || row_cols < colspan)) {
                 $tr.addClass('oe_form_group_row_incomplete');
                 if (newline) {
@@ -1119,57 +1132,58 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
         $group.before($new_group).remove();
 
         // Now compute width of cells
-        $table.find('> tbody > tr').each(function() {
-            var to_compute = [],
-                row_cols = cols,
-                total = 100;
-            $(this).children().each(function() {
-                var $td = $(this),
-                    $child = $td.children(':first');
-                switch ($child[0].tagName.toLowerCase()) {
-                    case 'separator':
-                        if ($child.attr('orientation') === 'vertical') {
-                            $td.addClass('oe_vertical_separator').attr('width', '1');
-                            $td.empty();
-                            row_cols--;
-                        }
-                        break;
-                    case 'label':
-                        if ($child.attr('for')) {
-                            $td.attr('width', '1%').addClass('oe_form_group_cell_label');
-                            row_cols--;
-                            total--;
-                        }
-                        break;
-                    default:
-                        var width = _.str.trim($child.attr('width') || ''),
-                            iwidth = parseInt(width, 10);
-                        if (iwidth) {
-                            if (width.substr(-1) === '%') {
-                                total -= iwidth;
-                                width = iwidth + '%';
-                            } else {
-                                // Absolute width
-                                $td.css('min-width', width + 'px');
-                            }
-                            $td.attr('width', width);
-                            $child.removeAttr('width');
-                            row_cols--;
-                        } else {
-                            to_compute.push($td);
-                        }
+	// Note FP: It would be better to remove this, using width="50%" rather than colspan="2"
+        // $table.find('> tbody > tr').each(function() {
+        //     var to_compute = [],
+        //         row_cols = cols,
+        //         total = 100;
+        //     $(this).children().each(function() {
+        //         var $td = $(this),
+        //             $child = $td.children(':first');
+        //         switch ($child[0].tagName.toLowerCase()) {
+        //             case 'separator':
+        //                 if ($child.attr('orientation') === 'vertical') {
+        //                     $td.addClass('oe_vertical_separator').attr('width', '1');
+        //                     $td.empty();
+        //                     row_cols--;
+        //                 }
+        //                 break;
+        //             case 'label':
+        //                 if ($child.attr('for')) {
+        //                     $td.attr('width', '1%').addClass('oe_form_group_cell_label');
+        //                     row_cols--;
+        //                     total--;
+        //                 }
+        //                 break;
+        //             default:
+        //                 var width = _.str.trim($child.attr('width') || ''),
+        //                     iwidth = parseInt(width, 10);
+        //                 if (iwidth) {
+        //                     if (width.substr(-1) === '%') {
+        //                         total -= iwidth;
+        //                         width = iwidth + '%';
+        //                     } else {
+        //                         // Absolute width
+        //                         $td.css('min-width', width + 'px');
+        //                     }
+        //                     $td.attr('width', width);
+        //                     $child.removeAttr('width');
+        //                     row_cols--;
+        //                 } else {
+        //                     to_compute.push($td);
+        //                 }
 
-                }
-            });
-            var unit = Math.floor(total / row_cols);
-            if (!$(this).is('.oe_form_group_row_incomplete')) {
-                _.each(to_compute, function($td, i) {
-                    var width = parseInt($td.attr('colspan'), 10) * unit;
-                    $td.attr('width', ((i == to_compute.length - 1) ? total : width) + '%');
-                    total -= width;
-                });
-            }
-        });
+        //         }
+        //     });
+        //     var unit = Math.floor(total / row_cols);
+        //     if (!$(this).is('.oe_form_group_row_incomplete')) {
+        //         _.each(to_compute, function($td, i) {
+        //             var width = parseInt($td.attr('colspan'), 10) * unit;
+        //             $td.attr('width', ((i == to_compute.length - 1) ? total : width) + '%');
+        //             total -= width;
+        //         });
+        //     }
+        // });
         _.each(children, function(el) {
             self.process($(el));
         });
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index b1101fb09d2..9c628982301 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -786,18 +786,10 @@
 <t t-name="FormRenderingSheet" t-extend="FormRenderingForm">
 </t>
 <t t-name="FormRenderingGroup">
-    <t t-set="table">
-        <table border="0" cellpadding="0" cellspacing="0" width="100%" t-att-class="classnames"/>
-    </t>
     <t t-if="string">
-        <fieldset class="oe_group_box">
-            <legend><t t-esc="string"/></legend>
-            <t t-raw="table"/>
-        </fieldset>
-    </t>
-    <t t-if="!string">
-        <t t-raw="table"/>
+        <separator t-attf="#{string}"/>
     </t>
+    <table border="0" cellpadding="0" cellspacing="0" width="100%" t-att-class="classnames"/>
 </t>
 <t t-name="FormRenderingNotebook">
     <div>
@@ -1075,70 +1067,61 @@
     </div>
 </t>
 <t t-name="FieldStatus.content">
-    <ul class="oe-arrow-list">
-        <t t-set="size" t-value="widget.to_show.length"/>
-        <t t-foreach="_.range(size)" t-as="i">
-            <li t-att-class="widget.to_show[i][0] === widget.selected_value ? 'oe-arrow-list-selected' : ''">
-                <span class="oe-arrow-list-before" t-if="i &gt; 0"></span><span><t t-esc="widget.to_show[i][1]"/></span><span class="oe-arrow-list-after" t-if="i &lt; size - 1"></span>
-            </li>
-        </t>
-    </ul>
+    <div class="oe_right">
+
+        <ul class="oe-arrow-list">
+            <t t-set="size" t-value="widget.to_show.length"/>
+            <t t-foreach="_.range(size)" t-as="i">
+                <li t-att-class="widget.to_show[i][0] === widget.selected_value ? 'oe-arrow-list-selected' : ''">
+                    <span class="oe-arrow-list-before" t-if="i &gt; 0"></span><span><t t-esc="widget.to_show[i][1]"/></span><span class="oe-arrow-list-after" t-if="i &lt; size - 1"></span>
+                </li>
+            </t>
+        </ul>
+    </div>
+    <div class="oe_clear"/>
 </t>
 <t t-name="FieldStatus.content">
-    <ul class="oe_form_steps">
-        <t t-set="size" t-value="widget.to_show.length"/>
-        <t t-foreach="_.range(size)" t-as="i">
-            <li t-att-class="widget.to_show[i][0] === widget.selected_value ? 'oe_form_steps_active' : ''">
-                <t t-esc="widget.to_show[i][1]"/>
-                <img t-att-src='_s + "/web/static/src/img/form_steps.png"' class="oe_form_steps_arrow" t-if="i &lt; size - 1"/>
-            </li>
-        </t>
-    </ul>
+    <div class="oe_right">
+        <ul class="oe_form_steps">
+            <t t-set="size" t-value="widget.to_show.length"/>
+            <t t-foreach="_.range(size)" t-as="i">
+                <li t-att-class="widget.to_show[i][0] === widget.selected_value ? 'oe_form_steps_active' : ''">
+                    <t t-esc="widget.to_show[i][1]"/>
+                    <img t-att-src='_s + "/web/static/src/img/form_steps.png"' class="oe_form_steps_arrow" t-if="i &lt; size - 1"/>
+                </li>
+            </t>
+        </ul>
+    </div>
+    <div class="oe_clear"/>
 </t>
 <t t-name="FieldBinaryImage">
-    <table cellpadding="0" cellspacing="0" border="0" width="100%">
-    <tr>
-        <td class="oe_form_field-binary-image-placeholder" align="center">
-
-        </td>
-    </tr>
-    <tr>
-        <td align="center" valign="bottom" height="25">
-            <div class="oe-binary">
-                <table cellspacing="0" cellpadding="0" border="0">
-                <tr>
-                    <td>
-                        <div class="oe-binary-file-set">
-                            <form class="oe-binary-form" t-att-target="widget.iframe"
-                                method="post" enctype="multipart/form-data" action="/web/binary/upload">
-                                <input type="hidden" name="session_id" value=""/>
-                                <input type="hidden" name="callback" t-att-value="widget.iframe"/>
-                                <button class="oe_button" type="button" title="Set Image">
-                                    <img t-att-src='_s + "/web/static/src/img/icons/STOCK_DIRECTORY.png"'/>
-                                </button>
-                                <input type="file" class="oe-binary-file" name="ufile"
-                                    t-att-tabindex="widget.node.attrs.tabindex"
-                                    t-att-autofocus="widget.node.attrs.autofocus"
-                                />
-                            </form>
-                        </div>
-                    </td>
-                    <td>
-                        <button class="oe_button oe-binary-file-clear" type="button" title="Clear">
-                            <img t-att-src='_s + "/web/static/src/img/icons/STOCK_MISSING_IMAGE.png"'/>
-                        </button>
-                    </td>
-                </tr>
-                </table>
+    <div class="oe_binary_image">
+        <div class="oe_form_field-binary-image-placeholder"></div>
+        <div class="oe-binary">
+            <div class="oe-binary-file-set">
+                <form class="oe-binary-form" t-att-target="widget.iframe"
+                    method="post" enctype="multipart/form-data" action="/web/binary/upload">
+                    <input type="hidden" name="session_id" value=""/>
+                    <input type="hidden" name="callback" t-att-value="widget.iframe"/>
+                    <button class="oe_button" type="button" title="Set Image">
+                        <img t-att-src='_s + "/web/static/src/img/icons/STOCK_DIRECTORY.png"'/>
+                    </button>
+                    <input type="file" class="oe-binary-file" name="ufile"
+                        t-att-tabindex="widget.node.attrs.tabindex"
+                        t-att-autofocus="widget.node.attrs.autofocus"
+                    />
+                </form>
             </div>
-            <div class="oe-binary-progress" style="display: none">
-                <img t-att-src='_s + "/web/static/src/img/throbber.gif"' width="16" height="16"/>
-                <b>Uploading ...</b>
-            </div>
-            <iframe t-att-id="widget.iframe" t-att-name="widget.iframe" style="display: none"/>
-        </td>
-    </tr>
-    </table>
+            <button class="oe_button oe-binary-file-clear" type="button" title="Clear">
+                <img t-att-src='_s + "/web/static/src/img/icons/STOCK_MISSING_IMAGE.png"'/>
+            </button>
+        </div>
+        <div class="oe-binary-progress" style="display: none">
+            <img t-att-src='_s + "/web/static/src/img/throbber.gif"' width="16" height="16"/>
+            <b>Uploading ...</b>
+        </div>
+        <iframe t-att-id="widget.iframe" t-att-name="widget.iframe" style="display: none"/>
+    </div>
 </t>
 <t t-name="FieldBinaryImage-img">
     <img t-att-src='url' class="oe-binary-image field_image"

From 8ada377048a37ffaf33f5038cdb34c817dbe276b Mon Sep 17 00:00:00 2001
From: Amit Rasmiya <ram@tinyerp.com>
Date: Tue, 29 May 2012 11:26:01 +0530
Subject: [PATCH 07/71] [IMP] Add Placeholder @stock

bzr revid: ram@tinyerp.com-20120529055601-hxy4dpcvc99bbr50
---
 addons/stock/stock_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index cff0298d08b..747863143d5 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -121,7 +121,7 @@
                 </div>
                 <sheet string="Physical Inventory" layout="auto">
                 <group class="oe_form_header">
-                    <field name="name"/>
+                    <field name="name" placeholder="Annual invetory 2013"/>
                     <field name="date"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     <notebook colspan="4">
@@ -726,7 +726,7 @@
                     <group colspan="4" col="6">
                         <group colspan="4" col="4">
                             <field name="name" readonly="1"/>
-                            <field name="origin"/>
+                            <field name="origin" placeholder="PO0032"/>
                             <field name="partner_id" on_change="onchange_partner_in(partner_id)" colspan="4"/>
                             <field name="invoice_state" string="Invoice Control"/>
                             <field name="backorder_id" readonly="1"/>
@@ -835,7 +835,7 @@
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                         </page>
                         <page string="Notes">
-                            <field colspan="4" name="note" nolabel="1"/>
+                            <field colspan="4" name="note" nolabel="1" placeholder="Quality test ok..."/>
                         </page>
                     </notebook>
                 </sheet>

From cde44d38487354b01c90313beaf05f958649d033 Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Tue, 29 May 2012 12:45:19 +0530
Subject: [PATCH 08/71] [IMP]base_vat: Add placeholder @name, l10n_ro: Add
 placeholder @nrc, base/res/: Add Placeholder @name,@phone,@website,@comment

bzr revid: hsa@tinyerp.com-20120529071519-uas7470hkfwqkh3d
---
 openerp/addons/base/res/res_partner_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 35589aa8037..169c840a6ac 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -322,7 +322,7 @@
                             <field name="photo" widget='image' nolabel="1"/>
                         </group>
                         <group colspan="4">
-                            <h2><field name="name" required="1" nolabel="1" colspan="4"/></h2><newline/>
+                            <h2><field name="name" required="1" nolabel="1" colspan="4" placeholder="Customer Name"/></h2><newline/>
                                 <field name="function" attrs="{'invisible': [('is_company', '=', True)]}"/>
                                 <field name="title" size="0" domain="[('domain', '=', 'contact')]"/>
                                 <field name="parent_id" string="Company" attrs="{'invisible': [('is_company','=', True)]}"
@@ -354,11 +354,11 @@
                             </group>
                             <group colspan="2">
                                 <separator string="Communication" colspan="4"/>
-                                <field name="phone" colspan="4"/>
+                                <field name="phone" colspan="4" placeholder="+32.81.81.37.00"/>
                                 <field name="mobile" colspan="4"/>
                                 <field name="fax" colspan="4"/>
                                 <field name="email" widget="email" colspan="4"/>
-                                <field name="website" widget="url" colspan="4"/>
+                                <field name="website" widget="url" colspan="4" placeholder="www.openerp.com"/>
                                 <field name="ref" colspan="4"/>
                             </group>
                             <group colspan="4" attrs="{'invisible': [('is_company','=', False)]}">
@@ -429,7 +429,7 @@
                             <field name="category_id" colspan="4" nolabel="1" widget="many2many_tags"/>
                         </page>
                         <page string="Notes">
-                            <field name="comment" colspan="4" nolabel="1"/>
+                            <field name="comment" colspan="4" nolabel="1" placeholder="Internal notes about this customer..."/>
                         </page>
                     </notebook>
                 </form>

From 6b53c8fcc07d31d790d5325684773bba6a1b89b1 Mon Sep 17 00:00:00 2001
From: Amit Rasmiya <ram@tinyerp.com>
Date: Tue, 29 May 2012 14:26:42 +0530
Subject: [PATCH 09/71] [IMP] Add Placeholder @account

bzr revid: ram@tinyerp.com-20120529085642-pafsgia2y20yi5i0
---
 addons/account/company_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/company_view.xml b/addons/account/company_view.xml
index 0cc67f23cfe..b8c595f3ca0 100644
--- a/addons/account/company_view.xml
+++ b/addons/account/company_view.xml
@@ -24,7 +24,7 @@
             <field name="arch" type="xml">
                 <field name="currency_id" position="after">
                       <field name="property_reserve_and_surplus_account" colspan="2"/>
-                      <field name="paypal_account" />
+                      <field name="paypal_account"  placeholder="sales@openerp.com"/>
                 </field>
             </field>
         </record>

From 0e81b563d755e8efe9984def04f239efc8150772 Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Tue, 29 May 2012 16:04:02 +0530
Subject: [PATCH 10/71] [IMP]base_vat: Add placeholder @name, l10n_ro: Add
 placeholder @nrc

bzr revid: hsa@tinyerp.com-20120529103402-bdcw3mu93l1wbf0z
---
 addons/base_vat/base_vat_view.xml | 2 +-
 addons/l10n_ro/partner_view.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/base_vat/base_vat_view.xml b/addons/base_vat/base_vat_view.xml
index 6be9d306546..fe43cc0770a 100644
--- a/addons/base_vat/base_vat_view.xml
+++ b/addons/base_vat/base_vat_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <field name="property_account_payable" position="after">
                     <group colspan="2" col="6">
-                        <field name="vat" on_change="vat_change(vat)"/>
+                        <field name="vat" on_change="vat_change(vat)" placeholder="BE0477472702"/>
                         <button colspan="2" name="button_check_vat" string="Check VAT" type="object" icon="gtk-execute"/>
                         <field name="vat_subjected" colspan="1"/>
                     </group>
diff --git a/addons/l10n_ro/partner_view.xml b/addons/l10n_ro/partner_view.xml
index db98168bb09..8aad0e59ab7 100644
--- a/addons/l10n_ro/partner_view.xml
+++ b/addons/l10n_ro/partner_view.xml
@@ -8,7 +8,7 @@
 			<field name="type">form</field>
 			<field name="arch" type="xml">
 				<field name="vat" position="after">
-					<field name="nrc"/>
+					<field name="nrc" placeholder="77 FR 14445"/>
 				</field>
 			</field>
 		</record>

From 4c6a1abad5ef0f698f897c710e552039d0bce557 Mon Sep 17 00:00:00 2001
From: Amit Rasmiya <ram@tinyerp.com>
Date: Tue, 29 May 2012 16:05:44 +0530
Subject: [PATCH 11/71] [IMP] Add Placeholder @base

bzr revid: ram@tinyerp.com-20120529103544-t4s9cauvmc1fzr31
---
 openerp/addons/base/res/res_company_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_company_view.xml b/openerp/addons/base/res/res_company_view.xml
index 98c69947ff3..3fe92117d8c 100644
--- a/openerp/addons/base/res/res_company_view.xml
+++ b/openerp/addons/base/res/res_company_view.xml
@@ -61,7 +61,7 @@
                             <group colspan="2" col="4">
                                <field name="paper_format" on_change="onchange_paper_format(paper_format)"/>
                             </group>
-                            <field colspan="4" name="rml_header" nolabel="1"/>
+                            <field colspan="4" name="rml_header" nolabel="1" placeholder="Global Business Solutions"/>
                         </page>
                         <page string="Internal Header/Footer" groups="base.group_no_one">
                             <separator string="Portrait" colspan="2"/>

From bcb86755c0f9de70e227ec5014792c213882d78e Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 29 May 2012 17:10:55 +0200
Subject: [PATCH 12/71] [FIX] Fix trunk-fp

bzr revid: fme@openerp.com-20120529151055-gc098pdvfvyh3dep
---
 addons/web/static/src/css/base.css    |   3 -
 addons/web/static/src/css/base.sass   |   2 -
 addons/web/static/src/js/view_form.js | 133 +++++++++++++-------------
 addons/web/static/src/xml/base.xml    |  20 +---
 4 files changed, 66 insertions(+), 92 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 6eeeac715d6..d956cc1c39f 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1591,9 +1591,6 @@
 .openerp .oe_form .oe_form_group_cell > div > .oe_datepicker_root > input.oe_datepicker_master {
   width: 100%;
 }
-.openerp .oe_form .oe_form_group_cell.oe_form_group_nested {
-  padding: 0;
-}
 .openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] {
   font-weight: bold;
   white-space: nowrap;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index e8e5b36bce8..7ff1af4743d 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1286,8 +1286,6 @@ $colour4: #8a89ba
         .oe_form_group_cell > div > .oe_datepicker_root,
         .oe_form_group_cell > div > .oe_datepicker_root > input.oe_datepicker_master
             width: 100%
-        .oe_form_group_cell.oe_form_group_nested
-            padding: 0
     // }}}
     // FormView.label {{{
     .oe_form
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index c8f53e7fd50..f20f6bf1781 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1061,34 +1061,31 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
         return $label;
     },
     process_field: function($field, layout) {
-        // Note FP: No implicit labels for normal fields, only for <group> children
-        // var $label = this.preprocess_field($field);
-        // if ($label)
-        //     this.process($label, layout);
+        if ($field.parent().is('group')) {
+            // No implicit labels for normal fields, only for <group> direct children
+            var $label = this.preprocess_field($field);
+            if ($label) {
+                this.process($label, layout);
+            }
+        }
         this.fields_to_init.push($field);
         return $field;
     },
     process_group: function($group, layout) {
         var self = this;
-	// Note FP: not clean to do such a hack, commenting it
-        // if ($group.parent().is('.oe_form_group_cell')) {
-        //     $group.parent().addClass('oe_form_group_nested');
-        // }
-
         $group.children('field').each(function() {
             self.preprocess_field($(this));
         });
-        var $new_group = this.render_element('FormRenderingGroup', layout, $group.getAttributes()),
-            $table;
-        if ($new_group.is('table')) {
+        var $new_group = this.render_element('FormRenderingGroup', layout, $group.getAttributes());
+        var $table;
+        if ($new_group.first().is('table.oe_form_group')) {
             $table = $new_group;
+        } else if ($new_group.filter('table.oe_form_group').length) {
+            $table = $new_group.filter('table.oe_form_group').first();
         } else {
-            $table = $new_group.find('table:first');
+            $table = $new_group.find('table.oe_form_group').first();
         }
 
-	// Note FP: why don't we put that in the QWeb template ?
-        $table.addClass('oe_form_group');
-
         var $tr, $td,
             cols = parseInt($group.attr('col') || 4, 10),
             row_cols = cols;
@@ -1101,7 +1098,7 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
             var $td = $('<td/>').addClass('oe_form_group_cell').attr('colspan', colspan);
             var newline = tagName === 'newline';
 
-            // Note FP: looks like a hack to avoid
+            // Note FME: those classes are used in layout debug mode
             if ($tr && row_cols > 0 && (newline || row_cols < colspan)) {
                 $tr.addClass('oe_form_group_row_incomplete');
                 if (newline) {
@@ -1131,59 +1128,57 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
         }
         $group.before($new_group).remove();
 
-        // Now compute width of cells
-	// Note FP: It would be better to remove this, using width="50%" rather than colspan="2"
-        // $table.find('> tbody > tr').each(function() {
-        //     var to_compute = [],
-        //         row_cols = cols,
-        //         total = 100;
-        //     $(this).children().each(function() {
-        //         var $td = $(this),
-        //             $child = $td.children(':first');
-        //         switch ($child[0].tagName.toLowerCase()) {
-        //             case 'separator':
-        //                 if ($child.attr('orientation') === 'vertical') {
-        //                     $td.addClass('oe_vertical_separator').attr('width', '1');
-        //                     $td.empty();
-        //                     row_cols--;
-        //                 }
-        //                 break;
-        //             case 'label':
-        //                 if ($child.attr('for')) {
-        //                     $td.attr('width', '1%').addClass('oe_form_group_cell_label');
-        //                     row_cols--;
-        //                     total--;
-        //                 }
-        //                 break;
-        //             default:
-        //                 var width = _.str.trim($child.attr('width') || ''),
-        //                     iwidth = parseInt(width, 10);
-        //                 if (iwidth) {
-        //                     if (width.substr(-1) === '%') {
-        //                         total -= iwidth;
-        //                         width = iwidth + '%';
-        //                     } else {
-        //                         // Absolute width
-        //                         $td.css('min-width', width + 'px');
-        //                     }
-        //                     $td.attr('width', width);
-        //                     $child.removeAttr('width');
-        //                     row_cols--;
-        //                 } else {
-        //                     to_compute.push($td);
-        //                 }
+        $table.find('> tbody > tr').each(function() {
+            var to_compute = [],
+                row_cols = cols,
+                total = 100;
+            $(this).children().each(function() {
+                var $td = $(this),
+                    $child = $td.children(':first');
+                switch ($child[0].tagName.toLowerCase()) {
+                    case 'separator':
+                        if ($child.attr('orientation') === 'vertical') {
+                            $td.addClass('oe_vertical_separator').attr('width', '1');
+                            $td.empty();
+                            row_cols--;
+                        }
+                        break;
+                    case 'label':
+                        if ($child.attr('for')) {
+                            $td.attr('width', '1%').addClass('oe_form_group_cell_label');
+                            row_cols--;
+                            total--;
+                        }
+                        break;
+                    default:
+                        var width = _.str.trim($child.attr('width') || ''),
+                            iwidth = parseInt(width, 10);
+                        if (iwidth) {
+                            if (width.substr(-1) === '%') {
+                                total -= iwidth;
+                                width = iwidth + '%';
+                            } else {
+                                // Absolute width
+                                $td.css('min-width', width + 'px');
+                            }
+                            $td.attr('width', width);
+                            $child.removeAttr('width');
+                            row_cols--;
+                        } else {
+                            to_compute.push($td);
+                        }
 
-        //         }
-        //     });
-        //     var unit = Math.floor(total / row_cols);
-        //     if (!$(this).is('.oe_form_group_row_incomplete')) {
-        //         _.each(to_compute, function($td, i) {
-        //             var width = parseInt($td.attr('colspan'), 10) * unit;
-        //             $td.attr('width', ((i == to_compute.length - 1) ? total : width) + '%');
-        //             total -= width;
-        //         });
-        //     }
-        // });
+                }
+            });
+            var unit = Math.floor(total / row_cols);
+            if (!$(this).is('.oe_form_group_row_incomplete')) {
+                _.each(to_compute, function($td, i) {
+                    var width = parseInt($td.attr('colspan'), 10) * unit;
+                    $td.attr('width', ((i == to_compute.length - 1) ? total : width) + '%');
+                    total -= width;
+                });
+            }
+        });
         _.each(children, function(el) {
             self.process($(el));
         });
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 9c628982301..56f7c379c65 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -786,10 +786,8 @@
 <t t-name="FormRenderingSheet" t-extend="FormRenderingForm">
 </t>
 <t t-name="FormRenderingGroup">
-    <t t-if="string">
-        <separator t-attf="#{string}"/>
-    </t>
-    <table border="0" cellpadding="0" cellspacing="0" width="100%" t-att-class="classnames"/>
+    <t t-call="FormRenderingSeparator"/>
+    <table border="0" cellpadding="0" cellspacing="0" width="100%" t-attf-class="oe_form_group classnames"/>
 </t>
 <t t-name="FormRenderingNotebook">
     <div>
@@ -1066,20 +1064,6 @@
         <span></span>
     </div>
 </t>
-<t t-name="FieldStatus.content">
-    <div class="oe_right">
-
-        <ul class="oe-arrow-list">
-            <t t-set="size" t-value="widget.to_show.length"/>
-            <t t-foreach="_.range(size)" t-as="i">
-                <li t-att-class="widget.to_show[i][0] === widget.selected_value ? 'oe-arrow-list-selected' : ''">
-                    <span class="oe-arrow-list-before" t-if="i &gt; 0"></span><span><t t-esc="widget.to_show[i][1]"/></span><span class="oe-arrow-list-after" t-if="i &lt; size - 1"></span>
-                </li>
-            </t>
-        </ul>
-    </div>
-    <div class="oe_clear"/>
-</t>
 <t t-name="FieldStatus.content">
     <div class="oe_right">
         <ul class="oe_form_steps">

From d1318ad8fac76e23f98740358483efed4c7bc47e Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 29 May 2012 17:14:46 +0200
Subject: [PATCH 13/71] [FIX] Fix <group> @string

bzr revid: fme@openerp.com-20120529151446-49hetgxlzakua8id
---
 addons/web/static/src/xml/base.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 56f7c379c65..396bd8e8642 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -786,7 +786,7 @@
 <t t-name="FormRenderingSheet" t-extend="FormRenderingForm">
 </t>
 <t t-name="FormRenderingGroup">
-    <t t-call="FormRenderingSeparator"/>
+    <t t-if="string" t-call="FormRenderingSeparator"/>
     <table border="0" cellpadding="0" cellspacing="0" width="100%" t-attf-class="oe_form_group classnames"/>
 </t>
 <t t-name="FormRenderingNotebook">

From 5a65e3459b14052da1eef58c5228870463e510b7 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 30 May 2012 11:34:46 +0200
Subject: [PATCH 14/71] [FIX] FormRenderingEngine losing text nodes.

bzr revid: fme@openerp.com-20120530093446-idhvo9n1so65q28x
---
 addons/web/static/src/js/view_form.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index f20f6bf1781..60bba9879ef 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -953,7 +953,7 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
             var obj = self.tags_registry.get_object(tag_name);
             var w = new (obj)(self.view, instance.web.xml_to_json($elem[0]));
             w.replace($elem);
-        })
+        });
         // TODO: return a deferred
     },
     render_element: function(template, layout/* dictionaries */) {
@@ -1006,7 +1006,7 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
         var $new_sheet = this.render_element('FormRenderingSheet', layout, $sheet.getAttributes());
         this.handle_common_properties($new_sheet, $sheet);
         var $dst = (layout === 'auto') ? $new_sheet.find('group:first') : $new_sheet.find('.oe_form_sheet');
-        $sheet.children().appendTo($dst);
+        $sheet.contents().appendTo($dst);
         $sheet.before($new_sheet).remove();
         this.process($new_sheet, layout);
     },
@@ -1014,7 +1014,7 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
         var $new_form = this.render_element('FormRenderingForm', layout, $form.getAttributes());
         this.handle_common_properties($new_form, $form);
         var $dst = (layout === 'auto') ? $new_form.find('group:first') : $new_form;
-        $form.children().appendTo($dst);
+        $form.contents().appendTo($dst);
         if ($form[0] === this.$form[0]) {
             // If root element, replace it
             this.$form = $new_form;
@@ -1195,12 +1195,12 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
             pages.push(page_attrs);
             var $new_page = self.render_element('FormRenderingNotebookPage', layout, page_attrs);
             var $dst = (layout === 'auto') ? $new_page.find('group:first') : $new_page;
-            $page.children().appendTo($dst);
+            $page.contents().appendTo($dst);
             $page.before($new_page).remove();
             self.handle_common_properties($new_page, $page);
         });
         var $new_notebook = this.render_element('FormRenderingNotebook', layout, { pages : pages });
-        $notebook.children().appendTo($new_notebook);
+        $notebook.contents().appendTo($new_notebook);
         $notebook.before($new_notebook).remove();
         $new_notebook.children().each(function() {
             self.process($(this));

From f1ea7634eaeec6c51daadb3e894ad4eb287be711 Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Wed, 30 May 2012 17:11:50 +0530
Subject: [PATCH 15/71] [IMP]stock_location : Add placeholder for pulled flows
 and pushed flows

bzr revid: hsa@tinyerp.com-20120530114150-awfcspnqh6ntkmym
---
 addons/stock_location/stock_location_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock_location/stock_location_view.xml b/addons/stock_location/stock_location_view.xml
index 94a9feb9d57..5f2bacd565f 100644
--- a/addons/stock_location/stock_location_view.xml
+++ b/addons/stock_location/stock_location_view.xml
@@ -51,7 +51,7 @@
                             </tree>
                             <form string="Pulled Paths">
                                 <separator string="Conditions" colspan="4"/>
-                                <field name="name" colspan="4"/>
+                                <field name="name" colspan="4" placeholder="Fulfill needs on location X from location Y "/>
                                 <field name="location_id"/>
                                 <separator string="Action Type" colspan="4"/>
                                 <field name="type_proc"/>
@@ -81,7 +81,7 @@
                             </tree>
                             <form string="Pushed flows">
                                 <group colspan="4" col="6">
-                                    <field name="name"/>
+                                    <field name="name" placeholder="When receiving at location X, move to location Y"/>
                                     <field name="location_from_id"/>
                                     <field name="location_dest_id"/>
                                     <field name="auto"/>

From 950490f792c2b89e83d3558b5e4993d299033a15 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 30 May 2012 23:26:51 +0200
Subject: [PATCH 16/71] [FIX] Make most fields inline(-block) instead of block
 level elements

bzr revid: fme@openerp.com-20120530212651-eqzd23mvrjw1bgla
---
 addons/web/static/src/css/base.css    |  56 ++++++---
 addons/web/static/src/css/base.sass   |  52 +++++---
 addons/web/static/src/js/view_form.js |   4 +-
 addons/web/static/src/js/view_list.js |   2 +-
 addons/web/static/src/xml/base.xml    | 168 ++++++++++----------------
 5 files changed, 145 insertions(+), 137 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index d956cc1c39f..e6c590e3ac6 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1466,6 +1466,7 @@
   background: #ed6f6a;
 }
 .openerp .oe_form_topbar {
+  position: relative;
   border-bottom: 1px solid #cacaca;
   background-color: #fcfcfc;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede));
@@ -1515,6 +1516,11 @@
 .openerp .oe_form_topbar ul li a:hover {
   color: black;
 }
+.openerp .oe_form_topbar .oe_form_steps {
+  display: inline-block;
+  position: absolute;
+  right: 0;
+}
 .openerp .oe_form_topbar .oe_form_steps img {
   margin: 0 8px;
   vertical-align: top;
@@ -1587,8 +1593,9 @@
 .openerp .oe_form .oe_form_group_cell > .oe_form_field_url input,
 .openerp .oe_form .oe_form_group_cell > .oe_form_field_float input,
 .openerp .oe_form .oe_form_group_cell > .oe_form_field_selection select,
-.openerp .oe_form .oe_form_group_cell > div > .oe_datepicker_root,
-.openerp .oe_form .oe_form_group_cell > div > .oe_datepicker_root > input.oe_datepicker_master {
+.openerp .oe_form .oe_form_group_cell > .oe_form_field_progressbar,
+.openerp .oe_form .oe_form_group_cell > span > .oe_datepicker_root,
+.openerp .oe_form .oe_form_group_cell > span > .oe_datepicker_root > input.oe_datepicker_master {
   width: 100%;
 }
 .openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] {
@@ -1721,17 +1728,6 @@
   background-color: #ff6666 !important;
   border: 1px solid #dd0000 !important;
 }
-.openerp .oe_form .oe_button.oe_field_button {
-  display: block;
-  -webkit-border-top-left-radius: 0px;
-  -webkit-border-bottom-left-radius: 0px;
-  -moz-border-radius-topleft: 0px;
-  -moz-border-radius-bottomleft: 0px;
-  border-top-left-radius: 0px;
-  border-bottom-left-radius: 0px;
-  margin-right: -1px;
-  height: 22px;
-}
 .openerp .oe_form .oe_input_icon {
   cursor: pointer;
   margin: 3px 0 0 -21px;
@@ -1748,6 +1744,31 @@
 .openerp .oe_form .oe_form_group_cell .oe_kanban_view {
   position: static;
 }
+.openerp .oe_form .oe_form_field_with_button {
+  display: inline-block;
+}
+.openerp .oe_form .oe_form_field_with_button > .oe_button {
+  float: right;
+  -webkit-border-top-left-radius: 0px;
+  -webkit-border-bottom-left-radius: 0px;
+  -moz-border-radius-topleft: 0px;
+  -moz-border-radius-bottomleft: 0px;
+  border-top-left-radius: 0px;
+  border-bottom-left-radius: 0px;
+  margin-right: -1px;
+  height: 22px;
+}
+.openerp .oe_form .oe_form_field_with_button > div {
+  position: relative;
+  overflow: hidden;
+}
+.openerp .oe_form .oe_form_field_with_button > div > input {
+  line-height: 23px;
+  margin-right: 0;
+}
+.openerp .oe_form .oe_form_group_cell .oe_kanban_view {
+  position: static;
+}
 .openerp .oe_form .oe_form_button.oe_button {
   height: 22px;
   color: #4c4c4c;
@@ -1786,6 +1807,9 @@
   margin: 0;
   padding: 0;
 }
+.openerp .oe_form .oe_binary_image {
+  display: inline-block;
+}
 .openerp .oe_horizontal_border {
   border-bottom: 1px solid black;
 }
@@ -1858,6 +1882,10 @@
 .openerp .ui-tabs-hide {
   display: none;
 }
+.openerp .oe_form .oe_form_field_progressbar {
+  display: inline-block;
+  min-width: 70px;
+}
 .openerp .oe_form .oe_form_field_progressbar.ui-progressbar {
   height: 22px;
   font-size: 10px;
@@ -1999,7 +2027,7 @@
 .openerp .oe-listview-content > tbody > tr > td.oe_list_checkbox:first-child:after, .openerp .oe-listview-content > tbody > tr th.oe_list_checkbox:first-child:after {
   border-width: 0;
 }
-.openerp .oe-listview-content > tbody > tr > td.oe-number {
+.openerp .oe-listview-content > tbody > tr > td.oe_number {
   text-align: right !important;
 }
 .openerp .oe-listview-content > tbody > tr:nth-child(odd) {
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 7ff1af4743d..4ef576b20a7 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1184,6 +1184,7 @@ $colour4: #8a89ba
     // }}}
     // FormView.customdivs {{{
     .oe_form_topbar
+        position: relative
         border-bottom: 1px solid #cacaca
         @include vertical-gradient(#fcfcfc, #dedede)
         padding: 0 8px
@@ -1220,10 +1221,13 @@ $colour4: #8a89ba
                     &:hover
                         color: black
         .oe_form_steps
-            img  
+            display: inline-block
+            position: absolute
+            right: 0
+            img
                 margin: 0 8px
                 vertical-align: top
-            li   
+            li
                 border-right: none 
                 padding: 0
                 &:first-child
@@ -1283,8 +1287,9 @@ $colour4: #8a89ba
         .oe_form_group_cell > .oe_form_field_url input,
         .oe_form_group_cell > .oe_form_field_float input,
         .oe_form_group_cell > .oe_form_field_selection select,
-        .oe_form_group_cell > div > .oe_datepicker_root,
-        .oe_form_group_cell > div > .oe_datepicker_root > input.oe_datepicker_master
+        .oe_form_group_cell > .oe_form_field_progressbar,
+        .oe_form_group_cell > span > .oe_datepicker_root,
+        .oe_form_group_cell > span > .oe_datepicker_root > input.oe_datepicker_master
             width: 100%
     // }}}
     // FormView.label {{{
@@ -1400,16 +1405,6 @@ $colour4: #8a89ba
             input, select, textarea
                 background-color: #F66 !important
                 border: 1px solid #D00 !important
-        .oe_button.oe_field_button
-            display: block
-            -webkit-border-top-left-radius: 0px
-            -webkit-border-bottom-left-radius: 0px
-            -moz-border-radius-topleft: 0px
-            -moz-border-radius-bottomleft: 0px
-            border-top-left-radius: 0px
-            border-bottom-left-radius: 0px
-            margin-right: -1px
-            height: 22px
         .oe_input_icon
             cursor: pointer
             margin: 3px 0 0 -21px
@@ -1424,6 +1419,28 @@ $colour4: #8a89ba
         .oe_form_group_cell .oe_kanban_view
             // Hack due to absolute positioning of kanban view messing with o2m
             position: static
+        .oe_form_field_with_button
+            display: inline-block
+            > .oe_button
+                float: right
+                -webkit-border-top-left-radius: 0px
+                -webkit-border-bottom-left-radius: 0px
+                -moz-border-radius-topleft: 0px
+                -moz-border-radius-bottomleft: 0px
+                border-top-left-radius: 0px
+                border-bottom-left-radius: 0px
+                margin-right: -1px
+                height: 22px
+            > div
+                position: relative
+                overflow: hidden
+                > input
+                    line-height: 23px
+                    margin-right: 0
+
+        .oe_form_group_cell .oe_kanban_view
+            // Hack due to absolute positioning of kanban view messing with o2m
+            position: static
     // }}}
     // FormView.buttons {{{
     .oe_form
@@ -1466,6 +1483,8 @@ $colour4: #8a89ba
             -ms-filter: "alpha(opacity=0)"
             margin: 0
             padding: 0
+        .oe_binary_image
+            display: inline-block
     // }}}
     // FormView.separator {{{
     .oe_horizontal_border
@@ -1528,6 +1547,9 @@ $colour4: #8a89ba
     // }}}
     // FormView.progressbar {{{
     .oe_form
+        .oe_form_field_progressbar
+            display: inline-block
+            min-width: 70px
         .oe_form_field_progressbar.ui-progressbar
             height: 22px
             font-size: 10px
@@ -1653,7 +1675,7 @@ $colour4: #8a89ba
                     width: 17px
                     &:after
                         border-width: 0
-                > td.oe-number
+                > td.oe_number
                     text-align: right !important
             > tr:nth-child(odd)
                 background-color: #f0f0fa
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 60bba9879ef..0c19751fc69 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2049,7 +2049,7 @@ instance.web.DateWidget = instance.web.DateTimeWidget.extend({
 });
 
 instance.web.form.FieldDatetime = instance.web.form.AbstractField.extend(_.extend({}, instance.web.form.ReinitializeFieldMixin, {
-    template: "EmptyComponent",
+    tagName: "span",
     build_widget: function() {
         return new instance.web.DateTimeWidget(this);
     },
@@ -4089,7 +4089,7 @@ instance.web.form.FieldBinaryImage = instance.web.form.FieldBinary.extend({
 });
 
 instance.web.form.FieldStatus = instance.web.form.AbstractField.extend({
-    template: "EmptyComponent",
+    tagName: "span",
     start: function() {
         this._super();
         this.selected_value = null;
diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 67c8ce0239e..081c4444a72 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -1338,7 +1338,7 @@ instance.web.ListView.Groups = instance.web.Class.extend( /** @lends instance.we
                     } else if (column.id in group.aggregates) {
                         var r = {};
                         r[column.id] = {value: group.aggregates[column.id]};
-                        $('<td class="oe-number">')
+                        $('<td class="oe_number">')
                             .html(instance.web.format_cell(
                                 r, column, {process_modifiers: false}))
                             .appendTo($row);
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 396bd8e8642..df1d444b491 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -591,7 +591,7 @@
         t-if="!field.attrs.modifiers.tree_invisible"
         t-att-data-id="record.id"
         t-att-style="color_for(record) + style "
-        t-attf-class="#{class} #{rank} #{(fields[field.attrs.name].type === 'float') or (fields[field.attrs.name].type === 'integer') ? 'oe-number' : ''}">
+        t-attf-class="#{class} #{rank} #{(fields[field.attrs.name].type === 'float') or (fields[field.attrs.name].type === 'integer') ? 'oe_number' : ''}">
 
         <span t-if="!field.attrs.modifiers.invisible" >
             <t t-esc="render(record[field.attrs.name], fields[field.attrs.name])" />
@@ -634,7 +634,7 @@
     <tfoot>
         <tr>
             <td t-if="options.selectable"/>
-            <td t-foreach="aggregate_columns" t-as="column" class="oe-list-footer oe-number"
+            <td t-foreach="aggregate_columns" t-as="column" class="oe-list-footer oe_number"
                 t-att-data-field="column.id" t-att-title="column.label">
             </td>
             <td t-if="options.deletable"/>
@@ -679,7 +679,7 @@
     <t t-foreach="columns" t-as="column">
         <t t-set="align" t-value="column.type === 'integer' or column.type == 'float'"/>
         <td t-if="!column.meta and column.invisible !== '1'" t-att-title="column.help"
-            t-att-class="'oe-field-cell' + (align ? ' oe-number' : '')
+            t-att-class="'oe-field-cell' + (align ? ' oe_number' : '')
                          + (column.tag === 'button' ? ' oe-button' : '')"
             t-att-data-field="column.id">
             <t t-raw="render_cell(record, column)"/>
@@ -885,71 +885,44 @@
     </ul>
 </t>
 <t t-name="FieldChar">
-    <t t-if="!widget.get('effective_readonly')">
-        <div class="oe_form_field_char">
+    <span class="oe_form_field_char">
+        <t  t-if="!widget.get('effective_readonly')">
             <input t-att-type="widget.password ? 'password' : 'text'"
                 t-att-id="widget.id_for_label"
                 t-att-tabindex="widget.node.attrs.tabindex"
                 t-att-autofocus="widget.node.attrs.autofocus"
-                t-attf-class="field_char #{widget.is_field_number ? 'oe-number' : ''}"
+                class="field_char"
                 t-att-placeholder="widget.node.attrs.placeholder"
             /><img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" t-att-src='_s + "/web/static/src/img/icons/terp-translate.png"' width="16" height="16" border="0"/>
-        </div>
-    </t>
-    <t t-if="widget.get('effective_readonly')">
-        <span t-attf-class="oe_form_field_char #{widget.is_field_number ? 'oe-number' : ''}"/>
-    </t>
+        </t>
+    </span>
 </t>
 <t t-name="FieldEmail">
-    <t t-if="!widget.get('effective_readonly')">
-        <table class="oe_form_field_email" cellpadding="0" cellspacing="0" border="0">
-        <tr>
-            <td>
+    <span class="oe_form_field_email oe_form_field_with_button">
+        <a t-if="widget.get('effective_readonly')" href="#" class="oe_form_uri"/>
+        <t t-if="!widget.get('effective_readonly')">
+            <button class="oe_button" tabindex="-1" type="button" title="Send an e-mail with your default e-mail client">
+                <img t-att-src='_s + "/web/static/src/img/icons/terp-mail-message-new.png"'/>
+            </button>
+            <div>
                 <input type="text"
                     t-att-id="widget.id_for_label"
                     t-att-tabindex="widget.node.attrs.tabindex"
                     t-att-autofocus="widget.node.attrs.autofocus"
                     t-att-placeholder="widget.node.attrs.placeholder"
                 />
-            </td>
-            <td width="16">
-                <button class="oe_button oe_field_button" tabindex="-1" type="button" title="Send an e-mail with your default e-mail client">
-                    <img t-att-src='_s + "/web/static/src/img/icons/terp-mail-message-new.png"'/>
-                </button>
-            </td>
-        </tr>
-        </table>
-    </t>
-    <t t-if="widget.get('effective_readonly')">
-        <span>
-            <a href="#" class="oe_form_uri"/>
-        </span>
-    </t>
+            </div>
+        </t>
+    </span>
 </t>
-<t t-name="FieldUrl">
-    <t t-if="!widget.get('effective_readonly')">
-        <table class="oe_form_field_url" cellpadding="0" cellspacing="0" border="0">
-        <tr>
-            <td>
-                <input type="text"
-                    t-att-id="widget.id_for_label"
-                    t-att-tabindex="widget.node.attrs.tabindex"
-                    t-att-autofocus="widget.node.attrs.autofocus"
-                    t-att-placeholder="widget.node.attrs.placeholder"
-                />
-            </td>
-            <td width="16">
-                <button class="oe_button oe_field_button" tabindex="-1" type="button" title="Open this resource">
-                    <img t-att-src='_s + "/web/static/src/img/icons/gtk-ok.png"'/>
-                </button>
-            </td>
-        </tr>
-        </table>
+<t t-name="FieldUrl" t-extend="FieldEmail">
+    <t t-jquery="span:first">
+        this.removeClass('oe_form_field_email').addClass('oe_form_field_url');
     </t>
-    <t t-if="widget.get('effective_readonly')">
-        <span>
-            <a href="#" class="oe_form_uri"/>
-        </span>
+    <t t-jquery="button.oe_button" t-operation="replace">
+        <button class="oe_button" tabindex="-1" type="button" title="Open this resource">
+            <img t-att-src='_s + "/web/static/src/img/icons/gtk-ok.png"'/>
+        </button>
     </t>
 </t>
 <t t-name="FieldText">
@@ -967,7 +940,7 @@
 </t>
 <t t-name="web.datetimepicker">
     <t t-set="placeholder" t-value="widget.getParent().node and widget.getParent().node.attrs.placeholder"/>
-    <div class="oe_datepicker_root oe_form_field_datetime">
+    <span class="oe_datepicker_root oe_form_field_datetime">
         <input type="text" class="oe_datepicker_container" disabled="disabled" style="display: none;"/>
         <input type="text"
             t-att-name="widget.name"
@@ -975,31 +948,29 @@
             t-attf-class="oe_datepicker_master field_#{widget.type_of_date} oe_form_field_#{widget.type_of_date}"
         /><img class="oe_input_icon oe_datepicker_trigger" t-att-src='_s + "/web/static/src/img/ui/field_calendar.png"'
              title="Select date" width="16" height="16" border="0"/>
-    </div>
+    </span>
 </t>
 <t t-name="FieldSelection">
-    <t t-if="!widget.get('effective_readonly')">
-        <div class="oe_form_field_selection">
-            <select
-                t-att-name="widget.name"
-                t-att-tabindex="widget.node.attrs.tabindex"
-                t-att-autofocus="widget.node.attrs.autofocus"
-                t-att-id="widget.id_for_label">
-                    <t t-foreach="widget.values" t-as="option">
-                        <option><t t-esc="option[1]"/></option>
-                    </t>
-            </select>
-        </div>
-    </t>
-    <t t-if="widget.get('effective_readonly')">
-        <span class="field_selection"/>
-    </t>
+    <span class="oe_form_field_selection">
+        <select t-if="!widget.get('effective_readonly')"
+            t-att-name="widget.name"
+            t-att-tabindex="widget.node.attrs.tabindex"
+            t-att-autofocus="widget.node.attrs.autofocus"
+            t-att-id="widget.id_for_label">
+                <t t-foreach="widget.values" t-as="option">
+                    <option><t t-esc="option[1]"/></option>
+                </t>
+        </select>
+    </span>
 </t>
 <t t-name="FieldMany2One">
-    <t t-if="!widget.get('effective_readonly')">
-        <table class="oe_form_field_many2one" cellpadding="0" cellspacing="0" border="0">
-        <tr>
-            <td valign="top">
+    <span class="oe_form_field_many2one oe_form_field_with_button">
+        <a t-if="widget.get('effective_readonly')" href="#" class="oe_form_uri"/>
+        <t t-if="!widget.get('effective_readonly')">
+            <button class="oe_button oe-m2o-cm-button" title="Open Resource">
+                <img t-att-src='_s + "/web/static/src/img/icons/terp-folder-yellow.png"'/>
+            </button>
+            <div>
                 <input type="text"
                     t-att-id="widget.id_for_label"
                     t-att-tabindex="widget.node.attrs.tabindex"
@@ -1007,21 +978,11 @@
                     t-att-placeholder="widget.node.attrs.placeholder"
                 />
                 <span class="oe-m2o-drop-down-button">
-                    <img t-att-src='_s + "/web/static/src/img/down-arrow.png"' /></span>
-            </td>
-            <td width="16">
-                <button class="oe_button oe_field_button oe-m2o-cm-button" title="Open Resource">
-                    <img t-att-src='_s + "/web/static/src/img/icons/terp-folder-yellow.png"'/>
-                </button>
-            </td>
-        </tr>
-        </table>
-    </t>
-    <t t-if="widget.get('effective_readonly')">
-        <span>
-            <a href="#" class="oe_form_uri"/>
-        </span>
-    </t>
+                    <img t-att-src='_s + "/web/static/src/img/down-arrow.png"'/>
+                </span>
+            </div>
+        </t>
+    </span>
 </t>
 <t t-name="FieldMany2ManyTags">
     <div class="oe_form_field_many2manytags">
@@ -1060,26 +1021,23 @@
     </span>
 </t>
 <t t-name="FieldProgressBar">
-    <div class="oe_form_field_progressbar" t-opentag="true">
+    <span class="oe_form_field_progressbar" t-opentag="true">
         <span></span>
-    </div>
+    </span>
 </t>
 <t t-name="FieldStatus.content">
-    <div class="oe_right">
-        <ul class="oe_form_steps">
-            <t t-set="size" t-value="widget.to_show.length"/>
-            <t t-foreach="_.range(size)" t-as="i">
-                <li t-att-class="widget.to_show[i][0] === widget.selected_value ? 'oe_form_steps_active' : ''">
-                    <t t-esc="widget.to_show[i][1]"/>
-                    <img t-att-src='_s + "/web/static/src/img/form_steps.png"' class="oe_form_steps_arrow" t-if="i &lt; size - 1"/>
-                </li>
-            </t>
-        </ul>
-    </div>
-    <div class="oe_clear"/>
+    <ul class="oe_form_steps">
+        <t t-set="size" t-value="widget.to_show.length"/>
+        <t t-foreach="_.range(size)" t-as="i">
+            <li t-att-class="widget.to_show[i][0] === widget.selected_value ? 'oe_form_steps_active' : ''">
+                <t t-esc="widget.to_show[i][1]"/>
+                <img t-att-src='_s + "/web/static/src/img/form_steps.png"' class="oe_form_steps_arrow" t-if="i &lt; size - 1"/>
+            </li>
+        </t>
+    </ul>
 </t>
 <t t-name="FieldBinaryImage">
-    <div class="oe_binary_image">
+    <span class="oe_binary_image">
         <div class="oe_form_field-binary-image-placeholder"></div>
         <div class="oe-binary">
             <div class="oe-binary-file-set">
@@ -1105,7 +1063,7 @@
             <b>Uploading ...</b>
         </div>
         <iframe t-att-id="widget.iframe" t-att-name="widget.iframe" style="display: none"/>
-    </div>
+    </span>
 </t>
 <t t-name="FieldBinaryImage-img">
     <img t-att-src='url' class="oe-binary-image field_image"

From b5b480a7a74c44cf037bc4a9818ee029dc00562d Mon Sep 17 00:00:00 2001
From: "Amit (OpenERP)" <amp@tinyerp.com>
Date: Thu, 31 May 2012 13:34:06 +0530
Subject: [PATCH 17/71] [FIX] osv_execption raised from report service gives a
 error

lp bug: https://launchpad.net/bugs/941124 fixed

bzr revid: amp@tinyerp.com-20120531080406-k0ue29zympib1qu9
---
 addons/web/common/http.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/common/http.py b/addons/web/common/http.py
index 9294808fda4..0af64a18e5a 100644
--- a/addons/web/common/http.py
+++ b/addons/web/common/http.py
@@ -593,7 +593,7 @@ class LocalConnector(openerplib.Connector):
         except Exception,e:
         # TODO change the except to raise LibException instead of their emulated xmlrpc fault
             if isinstance(e, openerp.osv.osv.except_osv):
-                fault = xmlrpclib.Fault('warning -- ' + e.name + '\n\n' + e.value, '')
+                fault = xmlrpclib.Fault('warning -- ' + e.name + '\n\n' + str(e.value), '')
             elif isinstance(e, openerp.exceptions.Warning):
                 fault = xmlrpclib.Fault('warning -- Warning\n\n' + str(e), '')
             elif isinstance(e, openerp.exceptions.AccessError):

From aa13f0c118328d2e18b8593a89312422b93d33b2 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 31 May 2012 11:08:30 +0200
Subject: [PATCH 18/71] [REM] Removed layout auto|manual. Layout is always
 manual. <group> is not anymore implicit for <form>, <sheet>, and <page>

bzr revid: fme@openerp.com-20120531090830-1qeqfpfg0mijmqbd
---
 addons/web/static/src/js/view_form.js | 59 +++++++++++----------------
 addons/web/static/src/xml/base.xml    | 15 +++----
 2 files changed, 30 insertions(+), 44 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 0c19751fc69..41251930675 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -919,9 +919,6 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
         //       but one day, we will have to get rid of xml2json
         var xml = instance.web.json_node_to_xml(this.fvg.arch);
         this.$form = $('<div class="oe_form">' + xml + '</div>');
-        if (this.fvg.arch.attrs && this.fvg.arch.attrs['layout'] !== 'manual') {
-            this.$form.attr('layout', 'auto');
-        }
 
         this.fields_to_init = [];
         this.tags_to_init = [];
@@ -956,13 +953,10 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
         });
         // TODO: return a deferred
     },
-    render_element: function(template, layout/* dictionaries */) {
-        var dicts = [].slice.call(arguments).slice(2);
-        dicts.unshift({ 'layout' : layout });
+    render_element: function(template /* dictionaries */) {
+        var dicts = [].slice.call(arguments).slice(1);
         var dict = _.extend.apply(_, dicts);
         dict['classnames'] = dict['class'] || ''; // class is a reserved word and might caused problem to Safari when used from QWeb
-        var alt_template = template + '.' + layout;
-        template = QWeb.has_template(alt_template) ? alt_template : template;
         return $(QWeb.render(template, dict));
     },
     alter_field: function(field) {
@@ -977,10 +971,8 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
         }
         this.$target.toggleClass('oe_layout_debugging');
     },
-    process: function($tag, layout) {
+    process: function($tag) {
         var self = this;
-        layout = $tag.attr('layout') || layout || 'auto';
-        $tag.removeAttr('layout');
         var tagname = $tag[0].nodeName.toLowerCase();
         if (this.tags_registry.contains(tagname)) {
             this.tags_to_init.push($tag);
@@ -990,38 +982,36 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
         if (fn) {
             var args = [].slice.call(arguments);
             args[0] = $tag;
-            args[1] = layout;
             return fn.apply(self, args);
         } else {
             // generic tag handling, just process children
             $tag.children().each(function() {
-                self.process($(this), layout);
+                self.process($(this));
             });
             self.handle_common_properties($tag, $tag);
             $tag.removeAttr("modifiers");
             return $tag;
         }
     },
-    process_sheet: function($sheet, layout) {
-        var $new_sheet = this.render_element('FormRenderingSheet', layout, $sheet.getAttributes());
+    process_sheet: function($sheet) {
+        var $new_sheet = this.render_element('FormRenderingSheet', $sheet.getAttributes());
         this.handle_common_properties($new_sheet, $sheet);
-        var $dst = (layout === 'auto') ? $new_sheet.find('group:first') : $new_sheet.find('.oe_form_sheet');
+        var $dst = $new_sheet.find('.oe_form_sheet');
         $sheet.contents().appendTo($dst);
         $sheet.before($new_sheet).remove();
-        this.process($new_sheet, layout);
+        this.process($new_sheet);
     },
-    process_form: function($form, layout) {
-        var $new_form = this.render_element('FormRenderingForm', layout, $form.getAttributes());
+    process_form: function($form) {
+        var $new_form = this.render_element('FormRenderingForm', $form.getAttributes());
         this.handle_common_properties($new_form, $form);
-        var $dst = (layout === 'auto') ? $new_form.find('group:first') : $new_form;
-        $form.contents().appendTo($dst);
+        $form.contents().appendTo($new_form);
         if ($form[0] === this.$form[0]) {
             // If root element, replace it
             this.$form = $new_form;
         } else {
             $form.before($new_form).remove();
         }
-        this.process($new_form, layout);
+        this.process($new_form);
     },
     /*
      * Used by direct <field> children of a <group> tag only
@@ -1060,23 +1050,23 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
         }
         return $label;
     },
-    process_field: function($field, layout) {
+    process_field: function($field) {
         if ($field.parent().is('group')) {
             // No implicit labels for normal fields, only for <group> direct children
             var $label = this.preprocess_field($field);
             if ($label) {
-                this.process($label, layout);
+                this.process($label);
             }
         }
         this.fields_to_init.push($field);
         return $field;
     },
-    process_group: function($group, layout) {
+    process_group: function($group) {
         var self = this;
         $group.children('field').each(function() {
             self.preprocess_field($(this));
         });
-        var $new_group = this.render_element('FormRenderingGroup', layout, $group.getAttributes());
+        var $new_group = this.render_element('FormRenderingGroup', $group.getAttributes());
         var $table;
         if ($new_group.first().is('table.oe_form_group')) {
             $table = $new_group;
@@ -1185,7 +1175,7 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
         this.handle_common_properties($new_group, $group);
         return $new_group;
     },
-    process_notebook: function($notebook, layout) {
+    process_notebook: function($notebook) {
         var self = this;
         var pages = [];
         $notebook.find('> page').each(function() {
@@ -1193,13 +1183,12 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
             var page_attrs = $page.getAttributes();
             page_attrs.id = _.uniqueId('notebook_page_');
             pages.push(page_attrs);
-            var $new_page = self.render_element('FormRenderingNotebookPage', layout, page_attrs);
-            var $dst = (layout === 'auto') ? $new_page.find('group:first') : $new_page;
-            $page.contents().appendTo($dst);
+            var $new_page = self.render_element('FormRenderingNotebookPage', page_attrs);
+            $page.contents().appendTo($new_page);
             $page.before($new_page).remove();
             self.handle_common_properties($new_page, $page);
         });
-        var $new_notebook = this.render_element('FormRenderingNotebook', layout, { pages : pages });
+        var $new_notebook = this.render_element('FormRenderingNotebook', { pages : pages });
         $notebook.contents().appendTo($new_notebook);
         $notebook.before($new_notebook).remove();
         $new_notebook.children().each(function() {
@@ -1209,13 +1198,13 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
         this.handle_common_properties($new_notebook, $notebook);
         return $new_notebook;
     },
-    process_separator: function($separator, layout) {
-        var $new_separator = this.render_element('FormRenderingSeparator', layout, $separator.getAttributes());
+    process_separator: function($separator) {
+        var $new_separator = this.render_element('FormRenderingSeparator', $separator.getAttributes());
         $separator.before($new_separator).remove();
         this.handle_common_properties($new_separator, $separator);
         return $new_separator;
     },
-    process_label: function($label, layout) {
+    process_label: function($label) {
         var name = $label.attr("for"),
             field_orm = this.fvg.fields[name];
         var dict = {
@@ -1232,7 +1221,7 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
             align = 'center';
         }
         dict.align = align;
-        var $new_label = this.render_element('FormRenderingLabel', layout, dict);
+        var $new_label = this.render_element('FormRenderingLabel', dict);
         $label.before($new_label).remove();
         this.handle_common_properties($new_label, $label);
         if (name) {
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index df1d444b491..d02d1a6f0a7 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -773,17 +773,15 @@
     </table>
 </form>
 
-<t t-name="FormRenderingForm.manual">
-    <div class="oe_form_manual_layout"/>
-</t>
 <t t-name="FormRenderingForm">
-    <div class="oe_form_sheetbg">
-        <div t-attf-class="oe_form_sheet oe_form_sheet_width #{classnames}">
-            <group t-if="layout === 'auto'" col="4"/>
-        </div>
+    <div t-attf-class="#{classnames}">
     </div>
 </t>
-<t t-name="FormRenderingSheet" t-extend="FormRenderingForm">
+<t t-name="FormRenderingSheet">
+    <div class="oe_form_sheetbg">
+        <div t-attf-class="oe_form_sheet oe_form_sheet_width #{classnames}">
+        </div>
+    </div>
 </t>
 <t t-name="FormRenderingGroup">
     <t t-if="string" t-call="FormRenderingSeparator"/>
@@ -802,7 +800,6 @@
 </t>
 <t t-name="FormRenderingNotebookPage">
     <div t-attf-class="oe_form_notebook_page #{classnames}" t-att-id="id">
-        <group t-if="layout === 'auto'" col="4"/>
     </div>
 </t>
 <t t-name="FormRenderingSeparator">

From 53597dc1922184adc950b92796562f22baad35f6 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 31 May 2012 11:41:00 +0200
Subject: [PATCH 19/71] Small inconsistency in m2mtags

bzr revid: nicolas.vanhoren@openerp.com-20120531094100-ynh1zz5koclrkxbd
---
 addons/web/static/src/js/view_form.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index ca1d576a8e5..7d52ccf2599 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3168,7 +3168,7 @@ instance.web.form.FieldMany2ManyTags = instance.web.form.AbstractField.extend(_.
         });
         self.tags = self.$text.textext()[0].tags();
         $("textarea", this.$element).focusout(function() {
-            $("textarea", this.$element).val("");
+            self.$text.trigger("setInputData", "");
         }).keydown(function(e) {
             if (event.keyCode === 9 && self._drop_shown) {
                 self.$text.textext()[0].autocomplete().selectFromDropdown();

From cc8997ef41aa58b3b18871f684e9815993eb4ee5 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 31 May 2012 11:43:08 +0200
Subject: [PATCH 20/71] [IMP] oe_form_group_label_border class is now the
 default behaviour

bzr revid: fme@openerp.com-20120531094308-if9ycy381x331jer
---
 addons/web/static/src/css/base.css  | 9 +++------
 addons/web/static/src/css/base.sass | 6 ++----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index e6c590e3ac6..ee32ea2159f 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1926,17 +1926,14 @@
 .openerp .oe-select-create-popup-view-form > .oe_formview > .oe_form_pager {
   display: none;
 }
-.openerp .oe_form .oe_form_group_odd_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell:nth-child(odd),
-.openerp .oe_form .oe_form_group_label_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell_label {
+.openerp .oe_form td.oe_form_group_cell_label {
   border-right: 1px solid #dddddd;
 }
-.openerp .oe_form .oe_form_group_odd_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell:nth-child(odd) label,
-.openerp .oe_form .oe_form_group_label_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell_label label {
+.openerp .oe_form td.oe_form_group_cell_label label {
   display: block;
   min-width: 120px;
 }
-.openerp .oe_form .oe_form_group_odd_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell,
-.openerp .oe_form .oe_form_group_label_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell {
+.openerp .oe_form td.oe_form_group_cell_label + .oe_form_group_cell {
   padding-left: 8px;
 }
 .openerp .oe_form .oe_form_subtotal_footer {
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 4ef576b20a7..81c6a6cd3c1 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1592,14 +1592,12 @@ $colour4: #8a89ba
     // }}}
     // FormView.classes for openerp views {{{
     .oe_form
-        .oe_form_group_odd_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell:nth-child(odd),
-        .oe_form_group_label_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell_label
+        td.oe_form_group_cell_label
             border-right: 1px solid #ddd
             label
                 display: block
                 min-width: 120px
-        .oe_form_group_odd_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell,
-        .oe_form_group_label_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell
+        td.oe_form_group_cell_label + .oe_form_group_cell
             padding-left: 8px
         .oe_form_subtotal_footer
             float: right

From d2a018d093184c9a88c01711b637850bbd3fd6de Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 31 May 2012 11:46:39 +0200
Subject: [PATCH 21/71] [FIX] Fix small classnames bug

bzr revid: fme@openerp.com-20120531094639-8atb1htlru9skp0h
---
 addons/web/static/src/xml/base.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index d02d1a6f0a7..c86e2268462 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -785,7 +785,7 @@
 </t>
 <t t-name="FormRenderingGroup">
     <t t-if="string" t-call="FormRenderingSeparator"/>
-    <table border="0" cellpadding="0" cellspacing="0" width="100%" t-attf-class="oe_form_group classnames"/>
+    <table border="0" cellpadding="0" cellspacing="0" width="100%" t-attf-class="oe_form_group #{classnames}"/>
 </t>
 <t t-name="FormRenderingNotebook">
     <div>

From d5daf869daf13a900a85499e3577703b9eaac811 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 31 May 2012 11:46:47 +0200
Subject: [PATCH 22/71] Changed buttons in quick create

bzr revid: nicolas.vanhoren@openerp.com-20120531094647-by15fj5di9a2m9kv
---
 addons/web_kanban/static/src/css/kanban.css     | 3 ---
 addons/web_kanban/static/src/xml/web_kanban.xml | 6 ++++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index dd376ef44e5..aba80c203bc 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -107,9 +107,6 @@
   box-sizing: border-box;
   width: 100%;
 }
-.openerp .oe_kanban_view .oe_kanban_quick_create button {
-  float: right;
-}
 .openerp .oe_kanban_view .oe_kanban_vignette {
   padding: 8px;
   min-height: 100px;
diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml
index cabe9cb52fb..736c64f90b8 100644
--- a/addons/web_kanban/static/src/xml/web_kanban.xml
+++ b/addons/web_kanban/static/src/xml/web_kanban.xml
@@ -66,8 +66,10 @@
 <div t-name="KanbanView.quick_create" class="oe_kanban_quick_create">
     <input t-att-placeholder="_t('Type name to create')"/>
     <t t-if="widget._buttons">
-        <button class="oe-kanban-quick_create_add">Add</button>
-        <button class="oe-kanban-quick_create_close">Close</button>
+        <div>
+            <button class="oe-kanban-quick_create_add">Add</button>
+            or <a class="oe-kanban-quick_create_close">Cancel</a>
+        </div>
     </t>
 </div>
 </template>

From c257e6f1bf45d750fce9c25700f4673bb8d75090 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 31 May 2012 12:01:09 +0200
Subject: [PATCH 23/71] Corrected bug with quick create in group mode

bzr revid: nicolas.vanhoren@openerp.com-20120531100109-qekw54w6s7xoebzn
---
 addons/web_kanban/static/src/css/kanban.css     | 3 +++
 addons/web_kanban/static/src/js/kanban.js       | 6 +++---
 addons/web_kanban/static/src/xml/web_kanban.xml | 3 ++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index aba80c203bc..c341475c169 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -107,6 +107,9 @@
   box-sizing: border-box;
   width: 100%;
 }
+.openerp .oe_kanban_view .oe_kanban_quick_create .oe_kanban_quick_create_buttons {
+    margin-bottom: 10px;
+}
 .openerp .oe_kanban_view .oe_kanban_vignette {
   padding: 8px;
   min-height: 100px;
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 4a4e385cd1b..9a8e23bc515 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -417,7 +417,7 @@ instance.web_kanban.KanbanGroup = instance.web.OldWidget.extend({
                     this.quick.destroy();
                     delete this.quick;
                 });
-            self.quick.appendTo(self.$element.find('.oe_kanban_header'));
+            self.quick.appendTo($(".oe_kanban_group_list_header", self.$records));
             self.quick.focus();
         });
         this.$records.find('.oe_kanban_show_more').click(this.do_show_more);
@@ -466,7 +466,7 @@ instance.web_kanban.KanbanGroup = instance.web.OldWidget.extend({
                 rec.insertBefore(self.$records.find('.oe_kanban_show_more'));
                 self.records.push(rec);
             } else {
-                rec.prependTo(self.$records);
+                rec.insertAfter($(".oe_kanban_group_list_header", self.$records));
                 self.records.unshift(rec);
             }
         });
@@ -502,7 +502,7 @@ instance.web_kanban.KanbanGroup = instance.web.OldWidget.extend({
         this.dataset.read_ids([id], this.view.fields_keys)
             .then(function (records) {
                 self.view.dataset.ids.push(id);
-                self.do_add_records(records, 'prepend');
+                self.do_add_records(records, true);
             });
     }
 });
diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml
index 736c64f90b8..18922fefa71 100644
--- a/addons/web_kanban/static/src/xml/web_kanban.xml
+++ b/addons/web_kanban/static/src/xml/web_kanban.xml
@@ -48,6 +48,7 @@
 </t>
 <t t-name="KanbanView.group_records_container">
     <td t-attf-class="oe_kanban_column #{widget.group ? 'oe_kanban_grouped' : 'oe_kanban_ungrouped'}">
+        <div class="oe_kanban_group_list_header"/>
         <div class="oe_kanban_show_more">
             <button class="oe_button">Show more... (<span class="oe_kanban_remaining"></span> remaining)</button>
         </div>
@@ -66,7 +67,7 @@
 <div t-name="KanbanView.quick_create" class="oe_kanban_quick_create">
     <input t-att-placeholder="_t('Type name to create')"/>
     <t t-if="widget._buttons">
-        <div>
+        <div class="oe_kanban_quick_create_buttons">
             <button class="oe-kanban-quick_create_add">Add</button>
             or <a class="oe-kanban-quick_create_close">Cancel</a>
         </div>

From 8afd115acab38f2c7698eef1e498ae6fa30d6886 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 31 May 2012 12:02:17 +0200
Subject: [PATCH 24/71] Changed text

bzr revid: nicolas.vanhoren@openerp.com-20120531100217-87yxss40g0ebcsr0
---
 addons/web_kanban/static/src/xml/web_kanban.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml
index 18922fefa71..b50c2910e3c 100644
--- a/addons/web_kanban/static/src/xml/web_kanban.xml
+++ b/addons/web_kanban/static/src/xml/web_kanban.xml
@@ -65,7 +65,7 @@
     </li>
 </t>
 <div t-name="KanbanView.quick_create" class="oe_kanban_quick_create">
-    <input t-att-placeholder="_t('Type name to create')"/>
+    <input t-att-placeholder="_t('Create a new record')"/>
     <t t-if="widget._buttons">
         <div class="oe_kanban_quick_create_buttons">
             <button class="oe-kanban-quick_create_add">Add</button>

From 7f45005f9bee2eefb6e82500bb4eee238b101d10 Mon Sep 17 00:00:00 2001
From: Amit Rasmiya <ram@tinyerp.com>
Date: Thu, 31 May 2012 15:34:56 +0530
Subject: [PATCH 25/71] [IMP] Add Placeholder @payment

bzr revid: ram@tinyerp.com-20120531100456-41jm0oxqbhmahe0l
---
 addons/account_voucher/voucher_payment_receipt_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 5ceee46b2cd..bb18c6325d0 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -165,8 +165,8 @@
                             on_change="onchange_journal(journal_id, line_dr_ids, False, partner_id, date, amount, type, company_id, context)"
                             string="Payment Method"/>
                         <field name="date" select="1" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
-                        <field name="reference" select="1" invisible="context.get('line_type', False)" string="Payment Ref"/>
-                        <field name="name" colspan="2" invisible="context.get('line_type', False)"/>
+                        <field name="reference" select="1" invisible="context.get('line_type', False)" string="Payment Ref" placeholder="003/10"/>
+                        <field name="name" colspan="2" invisible="context.get('line_type', False)" placeholder="Invoice SAJ/0042"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         <field name="account_id"
                             widget="selection"
@@ -323,8 +323,8 @@
                             on_change="onchange_journal(journal_id, line_cr_ids, False, partner_id, date, amount, type, company_id, context)"
                             string="Payment Method"/>
                         <field name="date" select="1" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
-                        <field name="reference" select="1" invisible="context.get('line_type', False)" string="Payment Ref"/>
-                        <field name="name" colspan="2" invisible="context.get('line_type', False)"/>
+                        <field name="reference" select="1" invisible="context.get('line_type', False)" string="Payment Ref" placeholder="003/10"/>
+                        <field name="name" colspan="2" invisible="context.get('line_type', False)" placeholder="Invoice SAJ/0042"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         <field name="account_id"
                             widget="selection"

From 3eafe0a6be1ab577e149a6c02d9151947e13a32e Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 31 May 2012 12:05:03 +0200
Subject: [PATCH 26/71] Added esc button handling

bzr revid: nicolas.vanhoren@openerp.com-20120531100503-bvn4jz3ztoscww55
---
 addons/web_kanban/static/src/js/kanban.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 9a8e23bc515..360a9dd169a 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -774,6 +774,11 @@ instance.web_kanban.QuickCreate = instance.web.Widget.extend({
         $(".oe-kanban-quick_create_close", this.$element).click(function () {
             self.trigger('close');
         });
+        self.$input.keyup(function(e) {
+            if (e.keyCode == 27 && self._buttons) {
+                self.trigger('close');
+            }
+        });
     },
     focus: function() {
         this.$element.find('input').focus();

From 99feb93de9d5ceeaeb7e8daca4ea8934308b55a8 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 31 May 2012 17:05:50 +0200
Subject: [PATCH 27/71] [ADD] form <header, footer, h1, h2, ... > +
 editable/readonly hidden classes

bzr revid: fme@openerp.com-20120531150550-zpl67q0lcy0omlmf
---
 addons/web/static/src/css/base.css    | 47 +++++++++++++++++----------
 addons/web/static/src/css/base.sass   | 18 +++++++---
 addons/web/static/src/js/view_form.js |  2 ++
 3 files changed, 46 insertions(+), 21 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index ee32ea2159f..da4e056e411 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1465,7 +1465,7 @@
 .openerp .oe_form_button_save_dirty:hover {
   background: #ed6f6a;
 }
-.openerp .oe_form_topbar {
+.openerp header {
   position: relative;
   border-bottom: 1px solid #cacaca;
   background-color: #fcfcfc;
@@ -1478,7 +1478,7 @@
   padding: 0 8px;
   line-height: 30px;
 }
-.openerp .oe_form_topbar button {
+.openerp header button {
   font-size: 12px;
   height: 24px !important;
   line-height: 24px;
@@ -1486,11 +1486,11 @@
   padding: 0 10px;
   margin: 3px 4px 3px 0;
 }
-.openerp .oe_form_topbar button span.i {
+.openerp header button span.i {
   line-height: 20px;
   height: 24px;
 }
-.openerp .oe_form_topbar ul {
+.openerp header ul {
   height: 30px;
   padding: 0;
   margin: 0;
@@ -1498,7 +1498,7 @@
   border-left: 1px solid #cacaca;
   border-right: 1px solid #cacaca;
 }
-.openerp .oe_form_topbar ul li {
+.openerp header ul li {
   padding: 0;
   margin: 0;
   float: left;
@@ -1507,40 +1507,40 @@
   height: 30px;
   padding: 0 12px;
 }
-.openerp .oe_form_topbar ul li:first-child {
+.openerp header ul li:first-child {
   border-left: 1px solid #cacaca;
 }
-.openerp .oe_form_topbar ul li a {
+.openerp header ul li a {
   color: #4c4c4c;
 }
-.openerp .oe_form_topbar ul li a:hover {
+.openerp header ul li a:hover {
   color: black;
 }
-.openerp .oe_form_topbar .oe_form_steps {
+.openerp header .oe_form_steps {
   display: inline-block;
   position: absolute;
   right: 0;
 }
-.openerp .oe_form_topbar .oe_form_steps img {
+.openerp header .oe_form_steps img {
   margin: 0 8px;
   vertical-align: top;
 }
-.openerp .oe_form_topbar .oe_form_steps li {
+.openerp header .oe_form_steps li {
   border-right: none;
   padding: 0;
 }
-.openerp .oe_form_topbar .oe_form_steps li:first-child {
+.openerp header .oe_form_steps li:first-child {
   margin-left: 12px;
   border-left: none;
 }
-.openerp .oe_form_topbar .oe_form_steps li:last-child {
+.openerp header .oe_form_steps li:last-child {
   margin-right: 12px;
 }
-.openerp .oe_form_topbar .oe_form_steps_active {
+.openerp header .oe_form_steps_active {
   font-weight: bold;
   color: #b33630;
 }
-.openerp .oe_form_topbar.oe_form_topbar_hifirst button:first-child, .openerp button.oe_form_button_hi {
+.openerp header.oe_form_topbar_hifirst button:first-child, .openerp button.oe_form_button_hi {
   color: white;
   background: #dc5f59;
   background: -moz-linear-gradient(#dc5f59, #b33630);
@@ -1550,7 +1550,7 @@
   -webkit-box-shadow: none;
   -box-shadow: none;
 }
-.openerp .oe_form_topbar.oe_form_topbar_hifirst button:first-child:hover, .openerp button.oe_form_button_hi:hover {
+.openerp header.oe_form_topbar_hifirst button:first-child:hover, .openerp button.oe_form_button_hi:hover {
   background: #df6b66;
   background: -moz-linear-gradient(#df6b66, #bf3a33);
   background: -webkit-gradient(linear, left top, left bottom, from(#df6b66), to(#bf3a33));
@@ -1564,7 +1564,7 @@
   padding: 8px 0;
   border-bottom: 1px solid #dddddd;
 }
-.openerp .oe_application .oe_form_sheet_width, .openerp .oe_application .oe_form_bottom {
+.openerp .oe_application .oe_form_sheet_width, .openerp .oe_application footer {
   min-width: 650px;
   max-width: 980px;
   margin: 0 auto;
@@ -1578,6 +1578,12 @@
   -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
   -box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
 }
+.openerp .oe_form_editable .oe_form_editable_hidden {
+  display: none;
+}
+.openerp .oe_form_readonly .oe_form_readonly_hidden {
+  display: none;
+}
 .openerp .oe_form .oe_form_group_cell {
   line-height: 18px;
   padding: 2px;
@@ -1598,6 +1604,13 @@
 .openerp .oe_form .oe_form_group_cell > span > .oe_datepicker_root > input.oe_datepicker_master {
   width: 100%;
 }
+.openerp .oe_form h1, .openerp .oe_form h2, .openerp .oe_form h3, .openerp .oe_form h4, .openerp .oe_form h5, .openerp .oe_form h6 {
+  margin: 0 0 4px 0;
+}
+.openerp .oe_form h1 input, .openerp .oe_form h2 input, .openerp .oe_form h3 input, .openerp .oe_form h4 input, .openerp .oe_form h5 input, .openerp .oe_form h6 input {
+  height: inherit !important;
+  font-size: inherit;
+}
 .openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] {
   font-weight: bold;
   white-space: nowrap;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 81c6a6cd3c1..ae6d62a0e31 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1183,7 +1183,7 @@ $colour4: #8a89ba
             background: #ED6F6A
     // }}}
     // FormView.customdivs {{{
-    .oe_form_topbar
+    header
         position: relative
         border-bottom: 1px solid #cacaca
         @include vertical-gradient(#fcfcfc, #dedede)
@@ -1238,7 +1238,7 @@ $colour4: #8a89ba
         .oe_form_steps_active
             font-weight: bold 
             color: #b33630
-    .oe_form_topbar.oe_form_topbar_hifirst button:first-child, button.oe_form_button_hi
+    header.oe_form_topbar_hifirst button:first-child, button.oe_form_button_hi
         color: white
         background: #DC5F59
         background: -moz-linear-gradient(#DC5F59, #B33630)
@@ -1247,7 +1247,7 @@ $colour4: #8a89ba
         -moz-box-shadow: none
         -webkit-box-shadow: none
         -box-shadow: none
-    .oe_form_topbar.oe_form_topbar_hifirst button:first-child:hover, button.oe_form_button_hi:hover
+    header.oe_form_topbar_hifirst button:first-child:hover, button.oe_form_button_hi:hover
         background: #DF6B66
         background: -moz-linear-gradient( #DF6B66, #BF3A33)
         background: -webkit-gradient(linear, left top, left bottom, from( #DF6B66), to( #BF3A33))
@@ -1260,7 +1260,7 @@ $colour4: #8a89ba
             background: url(/web/static/src/img/form_sheetbg.png)
             padding: 8px 0
             border-bottom: 1px solid #ddd 
-        .oe_form_sheet_width, .oe_form_bottom
+        .oe_form_sheet_width, footer
             min-width: 650px
             max-width: 980px
             margin: 0 auto
@@ -1272,6 +1272,10 @@ $colour4: #8a89ba
             @include box-shadow(0 0 10px rgba(0,0,0,0.3))
     // }}}
     // FormView.layout {{{
+    .oe_form_editable .oe_form_editable_hidden
+        display: none
+    .oe_form_readonly .oe_form_readonly_hidden
+        display: none
     .oe_form
         .oe_form_group_cell
             line-height: 18px
@@ -1291,6 +1295,12 @@ $colour4: #8a89ba
         .oe_form_group_cell > span > .oe_datepicker_root,
         .oe_form_group_cell > span > .oe_datepicker_root > input.oe_datepicker_master
             width: 100%
+        h1, h2, h3, h4, h5, h6
+            margin: 0 0 4px 0
+            input
+                height: inherit !important
+                font-size: inherit
+
     // }}}
     // FormView.label {{{
     .oe_form
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 41251930675..dda4a24b79f 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -521,6 +521,7 @@ instance.web.FormView = instance.web.View.extend(_.extend({}, instance.web.form.
     switch_mode: function() {
         var self = this;
         if(this.get("mode") == "view") {
+            self.$element.removeClass('oe_form_editable').addClass('oe_form_readonly');
             self.$buttons.find('.oe_form_buttons_edit').hide();
             self.$buttons.find('.oe_form_buttons_view').show();
             self.$sidebar.show();
@@ -528,6 +529,7 @@ instance.web.FormView = instance.web.View.extend(_.extend({}, instance.web.form.
                 field.set({"force_readonly": true});
             });
         } else {
+            self.$element.removeClass('oe_form_readonly').addClass('oe_form_editable');
             self.$buttons.find('.oe_form_buttons_edit').show();
             self.$buttons.find('.oe_form_buttons_view').hide();
             self.$sidebar.hide();

From e5cebfac452d191db1aff3dffd9a1d05d49e18a0 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 31 May 2012 17:14:06 +0200
Subject: [PATCH 28/71] [WIP] Opportunities form view

bzr revid: fme@openerp.com-20120531151406-mftxdoxumk93mty4
---
 addons/crm/crm_lead_view.xml | 216 +++++++++++++++++------------------
 1 file changed, 107 insertions(+), 109 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 3c2b8f48eb6..a3eb65d6a80 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -398,8 +398,8 @@
         <field name="type">form</field>
         <field name="priority">20</field>
         <field name="arch" type="xml">
-            <form string="Opportunities" layout="manual">
-                <div class="oe_form_topbar oe_form_topbar_hifirst">
+            <form string="Opportunities" validate="0">
+                <header class="oe_form_topbar_hifirst">
                     <button name="case_mark_won" string="Mark Won" states="open,pending" type="object" />
                     <button name="case_open" string="Open" states="draft,pending" type="object" />
                     <button name="case_pending" string="Pending" states="draft,open" type="object" />
@@ -407,15 +407,10 @@
                     <button name="case_mark_lost" string="Mark Lost" states="open,pending" type="object" />
                     <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" />
                     <button name="case_cancel" string="Cancel" states="draft" type="object" />
+                    <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+                </header>
+                <sheet>
                     <div class="oe_right">
-                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
-                <sheet layout="auto">
-                <group colspan="4" col="2" width="auto">
-                    <field name="name" required="1" nolabel="1" class="oe_form_title"/>
-                    <div class="oe_text_right">
                         <button string="Schedule/Log Call"
                             name="%(opportunity2phonecall_act)d" icon="terp-call-start"
                             type="action"/>
@@ -423,113 +418,116 @@
                             name="action_makeMeeting"
                             type="object"/>
                     </div>
-                </group>
-                <group colspan="4" col="4" class="oe_form_group_label_border" style="margin-top: 20px;">
-                    <field name="user_id"/>
-                    <field name="planned_revenue"/>
+                    <h1>
+                        <label for="name" class="oe_form_readonly_hidden"/>
+                        <field name="name" required="1" nolabel="1" class="oe_form_title"/>
+                    </h1>
+                    <h3>
+                        <field name="planned_revenue"/> <field name="company_currency" readonly="1"/> at <field name="probability"/> %% success rate
+                    </h3>
 
-                    <field name="date_action"/>
-                    <field name="date_deadline"/>
+                    <group class="oe_clear" style="margin: 20px 0">
+                        <field name="user_id"/>
 
-                    <field name="title_action"/>
-                    <field name="probability"/>
+                        <field name="date_action"/>
+                        <field name="date_deadline"/>
 
-                    <field name="type" invisible="1"/>
-                </group>
-                <notebook colspan="4">
-                <page string="Opportunity">
-                    <group col="4" colspan="2">
-                        <separator colspan="4" string="Contacts"/>
-                        <group colspan="2" col="3" class="oe_form_group_label_border">
-                            <field width="80%%" name="partner_id" select="1"
-                                on_change="onchange_partner_id(partner_id, email_from)" string="Customer"/>
-                            <button name="%(action_crm_lead2partner)d"
-                                icon="terp-partner" type="action"
-                                string="Create"
-                                attrs="{'invisible':[('partner_id','!=',False)]}"/>
-                            <field name="phone" colspan="3"/>
-                            <field width="80%%" name="email_from" string="Email"/>
-                            <button string="Mail"
-                                name="%(mail.action_email_compose_message_wizard)d"
-                                context="{'mail':'new', 'model': 'crm.lead'}"
-                                icon="terp-mail-message-new" type="action" />
+                        <field name="title_action"/>
+
+                        <field name="type" invisible="1"/>
+                    </group>
+
+                    <notebook colspan="4">
+                    <page string="Opportunity">
+                        <group>
+                            <group col="4" colspan="2" string="Contacts">
+                                <group colspan="2" col="3">
+                                    <field width="80%%" name="partner_id" select="1"
+                                        on_change="onchange_partner_id(partner_id, email_from)" string="Customer"/>
+                                    <button name="%(action_crm_lead2partner)d"
+                                        icon="terp-partner" type="action"
+                                        string="Create"
+                                        attrs="{'invisible':[('partner_id','!=',False)]}"/>
+                                    <field name="phone" colspan="3"/>
+                                    <field width="80%%" name="email_from" string="Email"/>
+                                    <button string="Mail"
+                                        name="%(mail.action_email_compose_message_wizard)d"
+                                        context="{'mail':'new', 'model': 'crm.lead'}"
+                                        icon="terp-mail-message-new" type="action" />
+                                </group>
+                            </group>
+                            <group col="2" colspan="2" string="Category">
+                                <field name="section_id" colspan="1" widget="selection"/>
+                                <field name="categ_id" select="1"
+                                    string="Category" widget="selection"
+                                    domain="[('object_id.model', '=', 'crm.lead')]" />
+
+                                <label string="Stage" for="stage_id" align="1.0"/>
+                                <group colspan="1" col="3">
+                                    <field name="stage_id" nolabel="1"
+                                        on_change="onchange_stage_id(stage_id)"
+                                        domain="section_id and [('section_ids', '=', section_id)] or []" width="60%%"/>
+                                    <button name="stage_previous"
+                                        states="draft,open,pending" type="object"
+                                        icon="gtk-go-back" string="" context="{'stage_type': 'opportunity'}"/>
+                                    <button name="stage_next" states="draft,open,pending"
+                                        type="object" icon="gtk-go-forward" string="" context="{'stage_type': 'opportunity'}"/>
+                                </group>
+
+                                <field name="priority" string="Priority"/>
+                            </group>
+
+                            <separator colspan="4" string="Details"/>
+                            <field name="description" nolabel="1" colspan="4"/>
                         </group>
-                    </group>
-                    <group col="2" colspan="2" class="oe_form_group_label_border">
-                        <separator colspan="2" string="Category"/>
-                        <field name="section_id" colspan="1" widget="selection"/>
-                        <field name="categ_id" select="1"
-                            string="Category" widget="selection"
-                            domain="[('object_id.model', '=', 'crm.lead')]" />
+                    </page>
+                    <page string="Lead">
+                        <group string="Contact">
+                            <field name="partner_name" string="Customer Name" colspan="4"/>
+                            <group colspan="2" col="2">
+                                <field domain="[('domain', '=', 'contact')]" name="title" widget="selection"/>
+                                <field name="fax"/>
+                                <field name="street"/>
+                                <field name="zip"/>
+                                <field name="country_id"/>
+                            </group>
+                            <group colspan="2" col="2">
+                                <field name="function" />
+                                <field name="mobile"/>
+                                <field name="street2"/>
+                                <field name="city"/>
+                                <field name="state_id"/>
+                            </group>
 
-                        <label string="Stage" for="stage_id" align="1.0"/>
-                        <group colspan="1" col="3">
-                            <field name="stage_id" nolabel="1"
-                                on_change="onchange_stage_id(stage_id)"
-                                domain="section_id and [('section_ids', '=', section_id)] or []" width="60%%"/>
-                            <button name="stage_previous"
-                                states="draft,open,pending" type="object"
-                                icon="gtk-go-back" string="" context="{'stage_type': 'opportunity'}"/>
-                            <button name="stage_next" states="draft,open,pending"
-                                type="object" icon="gtk-go-forward" string="" context="{'stage_type': 'opportunity'}"/>
+                            <group colspan="2" col="2" string="Categorization">
+                                <field name="type_id" widget="selection"/>
+                                <field name="channel_id" widget="selection"/>
+                            </group>
+                            <group colspan="2" col="2" string="Mailings">
+                                <field name="opt_in" on_change="on_change_opt_in(opt_in)"/>
+                                <field name="opt_out" on_change="on_change_opt_out(opt_out)"/>
+                            </group>
                         </group>
-
-                        <field name="priority" string="Priority"/>
-                    </group>
-
-                    <separator colspan="4" string="Details"/>
-                    <field name="description" nolabel="1" colspan="4"/>
-                </page>
-                <page string="Lead">
-                    <separator string="Contact" colspan="4"/>
-                    <group colspan="4" col="4" class="oe_form_group_label_border">
-                        <field name="partner_name" string="Customer Name" colspan="4"/>
-                    </group>
-                    <group colspan="2" col="2" class="oe_form_group_label_border">
-                        <field domain="[('domain', '=', 'contact')]" name="title" widget="selection"/>
-                        <field name="fax"/>
-                        <field name="street"/>
-                        <field name="zip"/>
-                        <field name="country_id"/>
-                    </group>
-                    <group colspan="2" col="2" class="oe_form_group_label_border">
-                        <field name="function" />
-                        <field name="mobile"/>
-                        <field name="street2"/>
-                        <field name="city"/>
-                        <field name="state_id"/>
-                    </group>
-
-                    <group colspan="2" col="2" class="oe_form_group_label_border">
-                        <separator string="Categorization" colspan="2"/>
-                        <field name="type_id" widget="selection"/>
-                        <field name="channel_id" widget="selection"/>
-                    </group>
-                    <group colspan="2" col="2" class="oe_form_group_label_border">
-                        <separator string="Mailings" colspan="2"/>
-                        <field name="opt_in" on_change="on_change_opt_in(opt_in)"/>
-                        <field name="opt_out" on_change="on_change_opt_out(opt_out)"/>
-                    </group>
-                </page>
-                <page string="Extra Info">
-                    <group col="2" colspan="2" class="oe_form_group_label_border">
-                        <separator string="Misc" colspan="2"/>
-                        <field name="active"/>
-                        <field name="day_open" groups="base.group_no_one"/>
-                        <field name="day_close" groups="base.group_no_one"/>
-                        <field name="referred"/>
-                    </group>
-                    <group col="2" colspan="2" class="oe_form_group_label_border">
-                        <separator colspan="4" string="References"/>
-                        <field name="ref"/>
-                        <field name="ref2"/>
-                    </group>
-                </page>
-                </notebook>
+                    </page>
+                    <page string="Extra Info">
+                        <group>
+                            <group col="2" colspan="2" string="Misc">
+                                <field name="active"/>
+                                <field name="day_open" groups="base.group_no_one"/>
+                                <field name="day_close" groups="base.group_no_one"/>
+                                <field name="referred"/>
+                            </group>
+                            <group col="2" colspan="2" string="References">
+                                <field name="ref"/>
+                                <field name="ref2"/>
+                            </group>
+                        </group>
+                    </page>
+                    </notebook>
                 </sheet>
-                <div class="oe_form_bottom">
+                <footer>
                     <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
-                </div>
+                </footer>
             </form>
         </field>
     </record>

From 97bd13570666cb213136518f44404d700ed14559 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 31 May 2012 18:44:07 +0200
Subject: [PATCH 29/71] [WIP] Opportunity form view

bzr revid: fme@openerp.com-20120531164407-q1dqenfo57w0fj69
---
 addons/crm/crm_lead_view.xml | 106 ++++++++++++++++++-----------------
 1 file changed, 55 insertions(+), 51 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index a3eb65d6a80..ff4224fd3f6 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -418,65 +418,69 @@
                             name="action_makeMeeting"
                             type="object"/>
                     </div>
-                    <h1>
-                        <label for="name" class="oe_form_readonly_hidden"/>
-                        <field name="name" required="1" nolabel="1" class="oe_form_title"/>
-                    </h1>
-                    <h3>
-                        <field name="planned_revenue"/> <field name="company_currency" readonly="1"/> at <field name="probability"/> %% success rate
-                    </h3>
+
+                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <h1><field name="name" required="1" nolabel="1" class="oe_form_title"/></h1>
+
+                    <label for="planned_revenue" class="oe_form_readonly_hidden"/>
+                    <h3><field name="planned_revenue"/><field name="company_currency" readonly="1"/> at <field name="probability"/> %% success rate</h3>
 
                     <group class="oe_clear" style="margin: 20px 0">
+                        <field name="partner_id" select="1"
+                            on_change="onchange_partner_id(partner_id, email_from)" string="Customer"/>
+
+                        <label for="title_action"/>
+                        <div>
+                            <field name="date_action"/> -
+                            <field name="title_action" style="width: 63%%"/>
+                        </div>
+
+                        <field name="email_from" string="Email"/>
+                        <label for="date_deadline"/>
+                        <div>
+                            <field name="date_deadline"/>
+                        </div>
+
+                        <field name="phone"/>
+                        <field name="priority" string="Priority"/>
+
+                        <div colspan="4"><!-- Spacer --></div>
+
                         <field name="user_id"/>
+                        <field name="categ_id" select="1"
+                            string="Category" widget="selection"
+                            domain="[('object_id.model', '=', 'crm.lead')]" />
 
-                        <field name="date_action"/>
-                        <field name="date_deadline"/>
-
-                        <field name="title_action"/>
-
-                        <field name="type" invisible="1"/>
+                        <field name="section_id" colspan="1" widget="selection"/>
+                        <div colspan="2"><!-- TODO FME: correct bug with incomplete row --></div>
+                        <!--
+                        <label string="Stage" for="stage_id" align="1.0"/>
+                        <group colspan="1" col="3">
+                            <field name="stage_id" nolabel="1"
+                                on_change="onchange_stage_id(stage_id)"
+                                domain="section_id and [('section_ids', '=', section_id)] or []" width="60%%"/>
+                            <button name="stage_previous"
+                                states="draft,open,pending" type="object"
+                                icon="gtk-go-back" string="" context="{'stage_type': 'opportunity'}"/>
+                            <button name="stage_next" states="draft,open,pending"
+                                type="object" icon="gtk-go-forward" string="" context="{'stage_type': 'opportunity'}"/>
+                        </group>
+                        -->
                     </group>
 
+                    <field name="type" invisible="1"/>
+                                    <!--<button name="%(action_crm_lead2partner)d"
+                                        icon="terp-partner" type="action"
+                                        string="Create"
+                                        attrs="{'invisible':[('partner_id','!=',False)]}"/>-->
+                                    <!--<button string="Mail"
+                                        name="%(mail.action_email_compose_message_wizard)d"
+                                        context="{'mail':'new', 'model': 'crm.lead'}"
+                                        icon="terp-mail-message-new" type="action" />-->
+
                     <notebook colspan="4">
                     <page string="Opportunity">
                         <group>
-                            <group col="4" colspan="2" string="Contacts">
-                                <group colspan="2" col="3">
-                                    <field width="80%%" name="partner_id" select="1"
-                                        on_change="onchange_partner_id(partner_id, email_from)" string="Customer"/>
-                                    <button name="%(action_crm_lead2partner)d"
-                                        icon="terp-partner" type="action"
-                                        string="Create"
-                                        attrs="{'invisible':[('partner_id','!=',False)]}"/>
-                                    <field name="phone" colspan="3"/>
-                                    <field width="80%%" name="email_from" string="Email"/>
-                                    <button string="Mail"
-                                        name="%(mail.action_email_compose_message_wizard)d"
-                                        context="{'mail':'new', 'model': 'crm.lead'}"
-                                        icon="terp-mail-message-new" type="action" />
-                                </group>
-                            </group>
-                            <group col="2" colspan="2" string="Category">
-                                <field name="section_id" colspan="1" widget="selection"/>
-                                <field name="categ_id" select="1"
-                                    string="Category" widget="selection"
-                                    domain="[('object_id.model', '=', 'crm.lead')]" />
-
-                                <label string="Stage" for="stage_id" align="1.0"/>
-                                <group colspan="1" col="3">
-                                    <field name="stage_id" nolabel="1"
-                                        on_change="onchange_stage_id(stage_id)"
-                                        domain="section_id and [('section_ids', '=', section_id)] or []" width="60%%"/>
-                                    <button name="stage_previous"
-                                        states="draft,open,pending" type="object"
-                                        icon="gtk-go-back" string="" context="{'stage_type': 'opportunity'}"/>
-                                    <button name="stage_next" states="draft,open,pending"
-                                        type="object" icon="gtk-go-forward" string="" context="{'stage_type': 'opportunity'}"/>
-                                </group>
-
-                                <field name="priority" string="Priority"/>
-                            </group>
-
                             <separator colspan="4" string="Details"/>
                             <field name="description" nolabel="1" colspan="4"/>
                         </group>
@@ -526,7 +530,7 @@
                     </notebook>
                 </sheet>
                 <footer>
-                    <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                    <field name="message_ids_social" widget="ThreadView"/>
                 </footer>
             </form>
         </field>

From 46b9a8cfa7dab61a3a9677853707fff5cda78069 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 1 Jun 2012 19:09:57 +0200
Subject: [PATCH 30/71] [IMP] CRM View, new design

bzr revid: fp@tinyerp.com-20120601170957-5vyii0axa4brqp0f
---
 addons/crm/crm_lead_view.xml | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index bcc91dbdba1..d38342be0b3 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -397,12 +397,17 @@
                             type="object"/>
                     </div>
 
-                    <label for="name" class="oe_form_readonly_hidden"/>
-                    <h1><field name="name" class="oe_form_width_100"/></h1>
-
-                    <label for="planned_revenue" class="oe_form_readonly_hidden"/>
-                    <h2><field name="planned_revenue" class="oe_form_inline"/> <field name="company_currency" readonly="1"/> at <field name="probability" class="oe_form_inline"/> %% success rate</h2>
+                    <div class="oe_form_title">
+                        <label for="name" class="oe_form_readonly_hidden"/>
+                        <h1><field name="name"/></h1>
 
+                        <label for="planned_revenue" class="oe_form_readonly_hidden"/>
+                        <h2>
+                            <field name="planned_revenue" class="oe_form_inline"/>
+                            <field name="company_currency" class="oe_form_readonly_hidden oe_form_inline"/> at 
+                            <field name="probability" class="oe_form_inline"/> %% success rate
+                        </h2>
+                    </div>
                     <group>
                         <group>
                             <field name="partner_id"
@@ -416,8 +421,8 @@
                         <group>
                             <label for="title_action"/>
                             <div>
-                                <field name="date_action"/> -
-                                <field name="title_action" style="width: 63%%" class="oe_form_inline"/>
+                                <field name="date_action" nolabel="1"/> -
+                                <field name="title_action" class="oe_form_inline" nolabel="1" placeholder="Call for proposal"/>
                             </div>
                             <field name="date_deadline"/>
                             <field name="priority"/>
@@ -450,14 +455,14 @@
                                 <field name="partner_name"/>
                                 <label for="street" string="Address"/>
                                 <div>
-                                    <field name="street"/>
-                                    <field name="street2"/>
+                                    <field name="street" placeholder="Street..."/>
+                                    <field name="street2" placeholder="...Street"/>
                                     <div>
-                                        <field name="zip" class="oe_form_inline"/>&amp;nbsp;
-                                        <field name="city" class="oe_form_inline"/>
+                                        <field name="zip" class="oe_form_inline" placeholder="ZIP"/>&amp;nbsp;
+                                        <field name="city" class="oe_form_inline" placeholder="City"/>
                                     </div>
-                                    <field name="state_id"/>
-                                    <field name="country_id"/>
+                                    <field name="state_id" placeholder="State"/>
+                                    <field name="country_id" placeholder="Country"/>
                                 </div>
                             </group>
 

From d4f68f98c9a93e34a71fce2349210f7b5e05675a Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 1 Jun 2012 19:10:53 +0200
Subject: [PATCH 31/71] [IMP] clean design, bugfix on reference fields

bzr revid: fp@tinyerp.com-20120601171053-vbpe16k783tpzvz4
---
 addons/web/static/src/css/base.css    | 54 +++++++++++++++------------
 addons/web/static/src/css/base.sass   | 49 ++++++++++++++----------
 addons/web/static/src/js/view_form.js |  2 +
 addons/web/static/src/xml/base.xml    |  9 +++--
 4 files changed, 68 insertions(+), 46 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 602885160ae..6fac2461065 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1673,44 +1673,34 @@
 .openerp .oe_form_readonly .oe_form_readonly_hidden {
   display: none;
 }
-.openerp .oe_form .oe_form_field_text,
-.openerp .oe_form .oe_form_field_char {
+.openerp .oe_form .oe_form_field_text {
   width: 100%;
 }
-.openerp .oe_form .oe_form_inline {
-  width: auto;
-}
 .openerp .oe_form .oe_form_group_cell {
   line-height: 18px;
   padding: 2px;
   height: 20px;
 }
-.openerp .oe_form .oe_form_group_cell > .oe_form_field_many2one,
-.openerp .oe_form .oe_form_group_cell > .oe_form_field_many2one input,
-.openerp .oe_form .oe_form_group_cell > .oe_form_field_char input,
-.openerp .oe_form .oe_form_group_cell > .oe_form_field_text textarea,
-.openerp .oe_form .oe_form_group_cell > .oe_form_field_email,
-.openerp .oe_form .oe_form_group_cell > .oe_form_field_email input,
-.openerp .oe_form .oe_form_group_cell > .oe_form_field_url,
-.openerp .oe_form .oe_form_group_cell > .oe_form_field_url input,
-.openerp .oe_form .oe_form_group_cell > .oe_form_field_float input,
-.openerp .oe_form .oe_form_group_cell > .oe_form_field_selection select,
-.openerp .oe_form .oe_form_group_cell > .oe_form_field_progressbar,
-.openerp .oe_form .oe_form_group_cell > span > .oe_datepicker_root,
-.openerp .oe_form .oe_form_group_cell > span > .oe_datepicker_root > input.oe_datepicker_master {
+.openerp .oe_form .oe_form_field_char input,
+.openerp .oe_form .oe_form_field_text textarea,
+.openerp .oe_form .oe_form_field_email input,
+.openerp .oe_form .oe_form_field_url input,
+.openerp .oe_form .oe_form_field_selection select {
+  width: inherit;
+}
+.openerp .oe_form .oe_form_field_many2one input {
   width: 100%;
 }
+.openerp .oe_form .oe_form_field_float input {
+  width: 100px;
+}
 .openerp .oe_form h1, .openerp .oe_form h2, .openerp .oe_form h3, .openerp .oe_form h4, .openerp .oe_form h5, .openerp .oe_form h6 {
   margin: 0 0 4px 0;
-  width: 55%;
 }
 .openerp .oe_form h1 input, .openerp .oe_form h2 input, .openerp .oe_form h3 input, .openerp .oe_form h4 input, .openerp .oe_form h5 input, .openerp .oe_form h6 input {
   height: inherit !important;
   font-size: inherit;
 }
-.openerp .oe_form h1 input {
-  width: 100%;
-}
 .openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] {
   font-weight: bold;
   white-space: nowrap;
@@ -1724,9 +1714,24 @@
   top: -4px;
   padding: 0 2px;
 }
-.openerp .oe_form textarea {
+.openerp .oe_form .oe_form_field_text textarea {
   resize: vertical;
+}
+.openerp .oe_form .oe_form_field_many2one,
+.openerp .oe_form .oe_form_field_char,
+.openerp .oe_form .oe_form_field_text,
+.openerp .oe_form .oe_form_field_email,
+.openerp .oe_form .oe_form_field_url,
+.openerp .oe_form .oe_form_field_selection,
+.openerp .oe_form .oe_form_field_reference {
   width: 100%;
+  display: inline-block;
+}
+.openerp .oe_form .oe_form_field_float {
+  width: 180px;
+}
+.openerp .oe_form .oe_form_inline {
+  width: auto;
 }
 .openerp .oe_form input[type="text"],
 .openerp .oe_form input[type="password"],
@@ -1878,6 +1883,9 @@
   line-height: 23px;
   margin-right: 0;
 }
+.openerp .oe_form .oe_form_title {
+  width: 65%;
+}
 .openerp .oe_form .oe_form_button_box {
   width: 200px;
   text-align: center;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 84f8d541759..145ebabbeaa 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1327,34 +1327,29 @@ $colour4: #8a89ba
     .oe_form
         .oe_form_field_text
             width: 100%
-        .oe_form_inline
-            width: auto
         .oe_form_group_cell
             line-height: 18px
             padding: 2px
             height: 20px
-        .oe_form_group_cell > .oe_form_field_many2one,
-        .oe_form_group_cell > .oe_form_field_many2one input,
-        .oe_form_group_cell > .oe_form_field_char input,
-        .oe_form_group_cell > .oe_form_field_text textarea,
-        .oe_form_group_cell > .oe_form_field_email,
-        .oe_form_group_cell > .oe_form_field_email input,
-        .oe_form_group_cell > .oe_form_field_url,
-        .oe_form_group_cell > .oe_form_field_url input,
-        .oe_form_group_cell > .oe_form_field_float input,
-        .oe_form_group_cell > .oe_form_field_selection select,
-        .oe_form_group_cell > .oe_form_field_progressbar,
-        .oe_form_group_cell > span > .oe_datepicker_root,
-        .oe_form_group_cell > span > .oe_datepicker_root > input.oe_datepicker_master
+
+        .oe_form_field_char input,
+        .oe_form_field_text textarea,
+        .oe_form_field_email input,
+        .oe_form_field_url input,
+        .oe_form_field_selection select
+            width: inherit
+
+        .oe_form_field_many2one input
             width: 100%
+
+        .oe_form_field_float input
+            width: 100px
+
         h1, h2, h3, h4, h5, h6
             margin: 0 0 4px 0
-            width: 55%
             input
                 height: inherit !important
                 font-size: inherit
-        h1 input
-            width: 100%
 
     // }}}
     // FormView.label {{{
@@ -1373,9 +1368,23 @@ $colour4: #8a89ba
     // }}}
     // FormView.fields {{{
     .oe_form
-        textarea
+        .oe_form_field_text textarea
             resize: vertical
+        .oe_form_field_many2one,
+        .oe_form_field_char,
+        .oe_form_field_text,
+        .oe_form_field_email,
+        .oe_form_field_url,
+        .oe_form_field_selection,
+        .oe_form_field_reference
             width: 100%
+            display: inline-block
+
+        .oe_form_field_float
+            width: 180px
+        .oe_form_inline
+            width: auto
+
         input[type="text"],
         input[type="password"],
         input[type="file"],
@@ -1502,6 +1511,8 @@ $colour4: #8a89ba
                     line-height: 23px
                     margin-right: 0
 
+        .oe_form_title
+            width: 65%
         .oe_form_button_box
             width: 200px
             text-align: center
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index be49faa1969..3930396410f 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1832,6 +1832,7 @@ instance.web.form.ReinitializeFieldMixin =  {
 
 instance.web.form.FieldChar = instance.web.form.AbstractField.extend(_.extend({}, instance.web.form.ReinitializeFieldMixin, {
     template: 'FieldChar',
+    widget_class: 'oe_form_field_char',
     init: function (field_manager, node) {
         this._super(field_manager, node);
         this.password = this.node.attrs.password === 'True' || this.node.attrs.password === '1';
@@ -1936,6 +1937,7 @@ instance.web.form.FieldUrl = instance.web.form.FieldChar.extend({
 
 instance.web.form.FieldFloat = instance.web.form.FieldChar.extend({
     is_field_number: true,
+    widget_class: 'oe_form_field_float',
     init: function (field_manager, node) {
         this._super(field_manager, node);
         this.set({'value': 0});
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 43871326267..9c3b0b9ef53 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -882,13 +882,12 @@
     </ul>
 </t>
 <t t-name="FieldChar">
-    <span class="oe_form_field_char">
+    <span t-att-class="widget.widget_class">
         <t  t-if="!widget.get('effective_readonly')">
             <input t-att-type="widget.password ? 'password' : 'text'"
                 t-att-id="widget.id_for_label"
                 t-att-tabindex="widget.node.attrs.tabindex"
                 t-att-autofocus="widget.node.attrs.autofocus"
-                class="field_char"
                 t-att-placeholder="widget.node.attrs.placeholder"
             /><img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" t-att-src='_s + "/web/static/src/img/icons/terp-translate.png"' width="16" height="16" border="0"/>
         </t>
@@ -1012,9 +1011,11 @@
 <t t-name="FieldReference">
     <table class="oe_form_field_reference oe_form" border="0" cellpadding="0" cellspacing="0">
     <tr>
-        <td t-attf-class="oe_form_frame_cell oe_form_selection oe_form_view_reference_selection">
+        <td t-attf-class="oe_form_frame_cell oe_form_selection">
+            <span t-attf-class="oe_form_view_reference_selection"/>
         </td>
-        <td t-attf-class="oe_form_frame_cell oe_form_many2one oe_form_view_reference_m2o" nowrap="true" style="display: none">
+        <td t-attf-class="oe_form_frame_cell oe_form_many2one" nowrap="true">
+            <span t-attf-class="oe_form_view_reference_m2o"/>
         </td>
     </tr>
     </table>

From 84e23111b80cc779e3050b899b66231e2f2b0e13 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 2 Jun 2012 08:58:45 +0200
Subject: [PATCH 32/71] [IMP] reduced min height of sheet

bzr revid: fp@tinyerp.com-20120602065845-e1yo8fyzkngmbj15
---
 addons/web/static/src/css/base.sass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 145ebabbeaa..11539c5d643 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1315,7 +1315,7 @@ $colour4: #8a89ba
         .oe_form_sheet
             padding: 8px 8px 8px 8px
             background: white
-            min-height: 420px
+            min-height: 330px
             border: 1px solid #afafb6
             @include box-shadow(0 0 10px rgba(0,0,0,0.3))
     // }}}

From 20196e20777a4fbd9abbae84e8937da17b542b97 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 2 Jun 2012 09:08:49 +0200
Subject: [PATCH 33/71] [IMP] hX float

bzr revid: fp@tinyerp.com-20120602070849-4fo4hq9cl0w898t8
---
 addons/web/static/src/css/base.css  | 8 +++++++-
 addons/web/static/src/css/base.sass | 6 ++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 6fac2461065..e53905bff2a 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1661,7 +1661,7 @@
 .openerp .oe_application .oe_form_sheet {
   padding: 8px 8px 8px 8px;
   background: white;
-  min-height: 420px;
+  min-height: 330px;
   border: 1px solid #afafb6;
   -moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
   -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
@@ -1694,6 +1694,12 @@
 .openerp .oe_form .oe_form_field_float input {
   width: 100px;
 }
+.openerp .oe_form h1 .oe_form_field_float input {
+  width: 140px;
+}
+.openerp .oe_form h2 .oe_form_field_float input {
+  width: 120px;
+}
 .openerp .oe_form h1, .openerp .oe_form h2, .openerp .oe_form h3, .openerp .oe_form h4, .openerp .oe_form h5, .openerp .oe_form h6 {
   margin: 0 0 4px 0;
 }
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 11539c5d643..f7970f064c7 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1345,6 +1345,12 @@ $colour4: #8a89ba
         .oe_form_field_float input
             width: 100px
 
+        h1 .oe_form_field_float input
+            width: 140px
+
+        h2 .oe_form_field_float input
+            width: 120px
+
         h1, h2, h3, h4, h5, h6
             margin: 0 0 4px 0
             input

From 3afd001335a175e94c13027ac38fb3171ff54eb7 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 2 Jun 2012 09:10:58 +0200
Subject: [PATCH 34/71] [IMP] removed icon

bzr revid: fp@tinyerp.com-20120602071058-zxy85ib0dotj9vo2
---
 addons/crm/crm_lead_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index d38342be0b3..c8963af4e0c 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -390,9 +390,9 @@
                 <sheet>
                     <div class="oe_right oe_form_button_box">
                         <button string="Schedule/Log Call"
-                            name="%(opportunity2phonecall_act)d" icon="terp-call-start"
+                            name="%(opportunity2phonecall_act)d"
                             type="action"/>
-                        <button string="Schedule Meeting" icon="gtk-redo"
+                        <button string="Schedule Meeting"
                             name="action_makeMeeting"
                             type="object"/>
                     </div>

From 4f33607d4dbb9971cb0998c4693751a9ca6206f5 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 3 Jun 2012 16:54:39 +0200
Subject: [PATCH 35/71] [imp] crm pportunity form new layout

bzr revid: fp@openerp.com-20120603145439-y1xy146egv9aj2at
---
 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 68d6bb2322d..6c69001ac22 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -456,7 +456,7 @@
                                 <label for="street" string="Address"/>
                                 <div>
                                     <field name="street" placeholder="Street..."/>
-                                    <field name="street2" placeholder="street optional second line"/>
+                                    <field name="street2"/>
                                     <div>
                                         <field name="zip" class="oe_form_inline" placeholder="ZIP"/>
                                         <field name="city" class="oe_form_inline" placeholder="City"/>

From dc6c9800e20d4aa2839cf78c2e7f34ffa21c80c4 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 3 Jun 2012 17:26:04 +0200
Subject: [PATCH 36/71] [IMP] better CSS

bzr revid: fp@openerp.com-20120603152604-13po0uq3j60ebcvf
---
 addons/web/static/src/css/base.css  | 2 +-
 addons/web/static/src/css/base.sass | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 374bfa02cbe..70deb96a4c5 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1721,7 +1721,7 @@
 .openerp .oe_form .oe_form_field {
   width: 100%;
   display: inline-block;
-  padding: 2px 0px 2px 0px;
+  padding: 2px 2px 2px 0px;
   line-height: 18px;
 }
 .openerp .oe_form .oe_form_field input {
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 682f328199f..2b60c780de3 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1375,7 +1375,7 @@ $colour4: #8a89ba
         .oe_form_field
             width: 100%
             display: inline-block
-            padding: 2px 0px 2px 0px
+            padding: 2px 2px 2px 0px
             line-height: 18px
             input
                 margin: 0px

From b58646b2468efc2e1f7d7f0bec1085d0da165ddf Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 3 Jun 2012 17:55:11 +0200
Subject: [PATCH 37/71] [IMP] better CSS

bzr revid: fp@openerp.com-20120603155511-p9v21xi6jwe0foyy
---
 addons/web/static/src/css/base.css  | 1 +
 addons/web/static/src/css/base.sass | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 70deb96a4c5..eafab9d0432 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1895,6 +1895,7 @@
 }
 .openerp .oe_form .oe_form_button.oe_button {
   height: 22px;
+  white-space: nowrap;
 }
 .openerp .oe_form .oe_form_button.oe_button span {
   position: relative;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 2b60c780de3..8e3d3a7cfd7 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -177,7 +177,7 @@ $colour4: #8a89ba
         border: 1px solid #ababab
         color: #404040
         margin: 0
-        padding: 4px 12px
+        padding: 3px 12px
         font-size: 13px
         text-align: center
         @include vertical-gradient(#efefef, #d8d8d8)
@@ -1525,6 +1525,7 @@ $colour4: #8a89ba
     .oe_form
         .oe_form_button.oe_button
             height: 22px
+            white-space: nowrap
             span
                 position: relative
                 vertical-align: top

From 23e45847398622e76f182eeda2eb1cf721983e8c Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 3 Jun 2012 17:57:51 +0200
Subject: [PATCH 38/71] [IMP] cleaning crm_partner_assign

bzr revid: fp@openerp.com-20120603155751-a3dvm7si3snsupo1
---
 addons/crm/crm_lead_view.xml                | 17 ++++-----
 addons/crm_partner_assign/crm_lead_view.xml | 39 +++++++++++----------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 6c69001ac22..8d0dfe6ff2f 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -239,18 +239,15 @@
                                 <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
                             </ul>
                             <div class="oe_kanban_content">
-                                <h3>
-                                    <field name="partner_id"/>
-                                    <t t-if="record.planned_revenue.raw_value">
-                                        - <t t-esc="Math.round(record.planned_revenue.value)"/>
-                                        <field name="company_currency"/>
-                                    </t>
-                                </h3>
                                 <div>
-                                    <b> <field name="partner_address_name"/> </b>
+                                    <b><field name="name"/></b>
+                                    <t t-if="record.planned_revenue.raw_value">
+                                        - <b><t t-esc="Math.round(record.planned_revenue.value)"/>
+                                        <field name="company_currency"/></b>
+                                    </t>
                                 </div>
                                 <div>
-                                    <field name="name"/>
+                                    <field name="partner_id"/>
                                 </div>
                                 <div style="padding-left: 0.5em">
                                     <i>
@@ -405,7 +402,7 @@
                         <h2>
                             <field name="planned_revenue" class="oe_form_inline"/>
                             <field name="company_currency" class="oe_form_readonly_hidden oe_form_inline"/> at 
-                            <field name="probability" class="oe_form_inline"/> % success rate
+                            <field name="probability" class="oe_form_inline"/> %% success rate
                         </h2>
                     </div>
                     <group>
diff --git a/addons/crm_partner_assign/crm_lead_view.xml b/addons/crm_partner_assign/crm_lead_view.xml
index 8da4d623435..83f0e470c55 100644
--- a/addons/crm_partner_assign/crm_lead_view.xml
+++ b/addons/crm_partner_assign/crm_lead_view.xml
@@ -10,25 +10,28 @@
                 <data>
                     <xpath expr="//notebook/page[@string='Lead']" position="after">
                         <page string="Assignation">
-                        <group name="partner_assign_group" col="5" colspan="4" class="oe_form_group_label_border">
-                            <separator string="Partner Assignation" colspan="5"/>
-                            <field width="50%%" name="partner_assigned_id" on_change="onchange_assign_id(partner_assigned_id)" domain="[('grade_id','&lt;&gt;',False)]"/>
-                            <field width="40%%" name="date_assign"/>
-                            <group width="10%%" colspan="1" col="1">
-                                <button string="Forward"
-                                    attrs="{'invisible':[('partner_assigned_id','=',False)]}"
-                                    name="%(crm_lead_forward_to_partner_act)d"
-                                    icon="terp-mail-forward" type="action"
-                                    context="{'default_name': 'partner', 'default_partner_id': partner_assigned_id}"
-                                />
+                            <group name="partner_assign_group">
+                                <group string="Partner Assignation">
+                                    <field name="partner_assigned_id" on_change="onchange_assign_id(partner_assigned_id)" domain="[('grade_id','&lt;&gt;',False)]"/>
+                                    <label for="date_assign"/>
+                                    <div>
+                                        <field name="date_assign"/>
+                                        <button string="Forward"
+                                            attrs="{'invisible':[('partner_assigned_id','=',False)]}"
+                                            name="%(crm_lead_forward_to_partner_act)d"
+                                            icon="terp-mail-forward" type="action"
+                                            context="{'default_name': 'partner', 'default_partner_id': partner_assigned_id}"
+                                        />
+                                    </div>
+                                </group>
+                                <group string="Geo Assignation">
+                                    <field name="partner_latitude"/>
+                                    <field name="partner_longitude"/>
+				    <span/>
+                                    <button string="Geo Assign" name="action_assign_partner" type="object" colspan="1"
+                                        icon="gtk-apply"/>
+                                </group>
                             </group>
-
-                            <separator string="Geo Assignation" colspan="5"/>
-                            <field width="50%%" name="partner_latitude"/>
-                            <field width="40%%" name="partner_longitude"/>
-                            <button width="10%%" string="Geo Assign" name="action_assign_partner" type="object" colspan="1"
-                                icon="gtk-apply"/>
-                        </group>
                         </page>
                     </xpath>
                 </data>

From a43df58d6ada771f534e479eafc9e03328f4f134 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 3 Jun 2012 22:34:50 +0200
Subject: [PATCH 39/71] [IMP] crm inheritancies fix

bzr revid: fp@openerp.com-20120603203450-8bfanbgot6xf1tp4
---
 addons/crm/crm_lead_view.xml      | 2 +-
 addons/sale_crm/sale_crm_view.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 8d0dfe6ff2f..11a9f5d7f6d 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -374,7 +374,7 @@
         <field name="priority">20</field>
         <field name="arch" type="xml">
             <form string="Opportunities" validate="0">
-                <header class="oe_form_topbar_hifirst">
+                <header class="oe_form_topbar">
                     <button name="case_mark_won" string="Mark Won" states="open,pending" type="object" />
                     <button name="case_open" string="Open" states="draft,pending" type="object" />
                     <button name="case_pending" string="Pending" states="draft,open" type="object" />
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index 3151c910e2f..49e7686542c 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -9,9 +9,9 @@
             <field name="inherit_id" ref="crm.crm_case_form_view_oppor"/>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="//div[contains(@class,'oe_form_topbar')]/div[contains(@class,'oe_right')]" position="before">
+                    <field name="state" position="before">
                         <button string="Convert to Quote" name="%(action_crm_make_sale)d" type="action"/>
-                    </xpath>
+                    </field>
                 </data>
             </field>
         </record>

From 6c8e451eadc1ca9405f6294784f5a522222a4f62 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 3 Jun 2012 22:49:45 +0200
Subject: [PATCH 40/71] [IMP] CSS for email field

bzr revid: fp@openerp.com-20120603204945-tc10sapjzt2n33on
---
 addons/web/static/src/css/base.css  | 10 +++-------
 addons/web/static/src/css/base.sass |  7 ++-----
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index eafab9d0432..7cf6cbe54e8 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -142,7 +142,7 @@
   border: 1px solid #ababab;
   color: #404040;
   margin: 0;
-  padding: 4px 12px;
+  padding: 3px 12px;
   font-size: 13px;
   text-align: center;
   background-color: #efefef;
@@ -1678,14 +1678,10 @@
 }
 .openerp .oe_form .oe_form_field_char input,
 .openerp .oe_form .oe_form_field_text textarea,
-.openerp .oe_form .oe_form_field_email input,
 .openerp .oe_form .oe_form_field_url input,
 .openerp .oe_form .oe_form_field_selection select {
   width: inherit;
 }
-.openerp .oe_form .oe_form_field_many2one input {
-  width: 100%;
-}
 .openerp .oe_form .oe_form_field_float input {
   width: 100px;
 }
@@ -1863,8 +1859,8 @@
 .openerp .oe_form .oe_form_group_cell .oe_kanban_view {
   position: static;
 }
-.openerp .oe_form .oe_form_field_with_button {
-  display: inline-block;
+.openerp .oe_form .oe_form_field_with_button input {
+  width: 100%;
 }
 .openerp .oe_form .oe_form_field_with_button > .oe_button {
   float: right;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 8e3d3a7cfd7..1dc4f15c90b 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1330,14 +1330,10 @@ $colour4: #8a89ba
 
         .oe_form_field_char input,
         .oe_form_field_text textarea,
-        .oe_form_field_email input,
         .oe_form_field_url input,
         .oe_form_field_selection select
             width: inherit
 
-        .oe_form_field_many2one input
-            width: 100%
-
         .oe_form_field_float input
             width: 100px
 
@@ -1494,7 +1490,8 @@ $colour4: #8a89ba
             // Hack due to absolute positioning of kanban view messing with o2m
             position: static
         .oe_form_field_with_button
-            display: inline-block
+            input
+                width: 100%
             > .oe_button
                 float: right
                 -webkit-border-top-left-radius: 0px

From a1b4bf2df6a86c959750f26d085eb8595cc7eff0 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 3 Jun 2012 23:23:55 +0200
Subject: [PATCH 41/71] [FIX] inheritancy of opportunity

bzr revid: fp@openerp.com-20120603212355-sj9y9k2kz4r7tah0
---
 addons/crm_todo/crm_todo_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm_todo/crm_todo_view.xml b/addons/crm_todo/crm_todo_view.xml
index a587463fedb..c7617f317b0 100644
--- a/addons/crm_todo/crm_todo_view.xml
+++ b/addons/crm_todo/crm_todo_view.xml
@@ -9,7 +9,7 @@
         <field name="inherit_id" ref="crm.crm_case_form_view_oppor" />
         <field name="arch" type="xml">
             <data>
-            <page string="Extra Info" position="before">
+            <page string="Lead" position="before">
                 <page string="Tasks">
                     <field name="task_ids" colspan="4" nolabel="1">
                         <tree editable="bottom" string="Tasks">

From c45b53a446a4e37025c4c0025c178ad2033c9184 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Mon, 4 Jun 2012 06:49:06 +0200
Subject: [PATCH 42/71] [IMP] phonecall view

bzr revid: fp@openerp.com-20120604044906-9hvhybk38od4dlei
---
 .../crm_opportunity_to_phonecall_view.xml     | 40 ++++++++++---------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
index 9c4f1361e7c..3904377bdc7 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
@@ -9,26 +9,30 @@
             <field name="model">crm.opportunity2phonecall</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Schedule/Log a Call">
-                 	<separator string="Schedule/Log a Call" colspan="4"/>
-                    <field name="action"/>
-                    <separator string="Call Details" colspan="4"/>
-                    <field name="name"/>
-                    <field name="date" string="Planned Date" attrs="{'invisible': [('action','=','log')]}"/>
-                    <newline/>
-                    <field name="partner_id" readonly="True"/>
-                    <field name="categ_id" string="Type" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
-                    <field name="phone"/>
-                    <field name="user_id" attrs="{'invisible': [('action','=','log')]}"/>
-                    <field name="section_id" widget="selection" attrs="{'invisible': [('action','=','log')]}"/>
-                    <separator string="Notes" colspan="4"/>
-                    <field name="note" colspan="4" nolabel="1"/>
-                    <separator string="" colspan="4"/>
-                    <group colspan="4" col="3">
-                        <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
+                <form string="Schedule/Log a Call" layout="manual">
+	            <div class="oe_form_topbar">
                        	<button name="action_schedule" type="object" string="Log call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'log')]}" />
                         <button name="action_schedule" type="object" string="Schedule Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" />
-                    </group>
+                        <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
+                    </div>
+		    <group>
+		    	<group>
+			    <field name="action"/>
+			    <field name="name"/>
+			    <field name="date" string="Planned Date" attrs="{'invisible': [('action','=','log')]}"/>
+			</group>
+			<group>
+			    <field name="partner_id" readonly="True"/>
+			    <field name="categ_id" string="Type"
+			    	widget="selection"
+				domain="[('object_id.model', '=', 'crm.phonecall')]"
+				groups="base.group_no_one"/>
+			    <field name="phone"/>
+			    <field name="user_id" attrs="{'invisible': [('action','=','log')]}"/>
+			    <field name="section_id" widget="selection" attrs="{'invisible': [('action','=','log')]}"/>
+			</group>
+	            </group>
+                    <field name="note"/>
                 </form>
             </field>
         </record>

From 9ef64335c6024a0b6071b042aec7c47a2d09b283 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 4 Jun 2012 10:26:46 +0200
Subject: [PATCH 43/71] [IMP] crm lead/opportunity, set field 'name' as
 required in model

bzr revid: fme@openerp.com-20120604082646-zlbn2o34t56sos0n
---
 addons/crm/crm_lead.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index c27c184fcfd..82bc50eafea 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -189,7 +189,7 @@ class crm_lead(base_stage, osv.osv):
             select=True, help="Optional linked partner, usually after conversion of the lead"),
 
         'id': fields.integer('ID', readonly=True),
-        'name': fields.char('Subject', size=64, select=1),
+        'name': fields.char('Subject', size=64, required=True, select=1),
         'active': fields.boolean('Active', required=False),
         'date_action_last': fields.datetime('Last Action', readonly=1),
         'date_action_next': fields.datetime('Next Action', readonly=1),

From 5ad8a9c041d5e634c3d260fbf204e56163e5bd0f Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 4 Jun 2012 11:14:31 +0200
Subject: [PATCH 44/71] [fix] problem with remove in kanban view

bzr revid: nicolas.vanhoren@openerp.com-20120604091431-41ohfxb57yl2n3c8
---
 addons/web_kanban/static/src/js/kanban.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 4a4e385cd1b..3f1d944a62b 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -474,9 +474,10 @@ instance.web_kanban.KanbanGroup = instance.web.OldWidget.extend({
             .find('.oe_kanban_remaining').text(this.dataset.size() - this.records.length);
     },
     remove_record: function(id, remove_from_dataset) {
-        for (var i = 0, ii = this.records.length; i < ii; i++) {
+        for (var i = 0; i < this.records.length; i++) {
             if (this.records[i]['id'] === id) {
                 this.records.splice(i, 1);
+                i--;
             }
         }
     },

From 72e17e620e0eeecf89a9da7c2c05c2c75292f3f6 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 4 Jun 2012 11:31:03 +0200
Subject: [PATCH 45/71] Added customization in kanban view to better fit o2m

bzr revid: nicolas.vanhoren@openerp.com-20120604093103-lydwjek920m3zxoe
---
 addons/web/static/src/js/view_form.js     |  3 +++
 addons/web_kanban/static/src/js/kanban.js | 23 ++++++++++++++++++-----
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 809c707feb0..0889f7d8dee 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2744,9 +2744,12 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
                 }
                 view.options.not_interactible_on_create = true;
             } else if (view.view_type === "kanban") {
+                view.options.confirm_on_delete = false;
                 if (self.get("effective_readonly")) {
                     view.options.action_buttons = false;
                     view.options.quick_creatable = false;
+                    view.options.creatable = false;
+                    view.options.read_only_mode = true;
                 }
             }
             views.push(view);
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 13fd9547376..96487fa8b7e 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -14,7 +14,13 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
     number_of_color_schemes: 10,
     init: function (parent, dataset, view_id, options) {
         this._super(parent, dataset, view_id, options);
-        _.defaults(this.options, {"quick_creatable": true, "creatable": true, "create_text": undefined});
+        _.defaults(this.options, {
+            "quick_creatable": true,
+            "creatable": true,
+            "create_text": undefined,
+            "read_only_mode": false,
+            "confirm_on_delete": true,
+        });
         this.fields_view = {};
         this.fields_keys = [];
         this.group_by = null;
@@ -550,7 +556,8 @@ instance.web_kanban.KanbanRecord = instance.web.OldWidget.extend({
     render: function() {
         this.qweb_context = {
             record: this.record,
-            widget: this
+            widget: this,
+            read_only_mode: this.view.options.read_only_mode,
         };
         for (var p in this) {
             if (_.str.startsWith(p, 'kanban_')) {
@@ -653,12 +660,18 @@ instance.web_kanban.KanbanRecord = instance.web.OldWidget.extend({
     },
     do_action_delete: function($action) {
         var self = this;
-        if (confirm(_t("Are you sure you want to delete this record ?"))) {
-            return $.when(this.view.dataset.unlink([this.id])).then(function() {
+        function do_it() {
+            return $.when(self.view.dataset.unlink([self.id])).then(function() {
                 self.group.remove_record(self.id);
                 self.destroy();
             });
-        }
+        };
+        if (this.view.options.confirm_on_delete) {
+            if (confirm(_t("Are you sure you want to delete this record ?"))) {
+                return do_it();
+            }
+        } else
+            return do_it();
     },
     do_action_edit: function($action) {
         var self = this;

From d69df82d0160fd5ae9e13f6cb8b047aec01e37e3 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 4 Jun 2012 11:32:39 +0200
Subject: [PATCH 46/71] [FIX] Fix date fields widgets

bzr revid: fme@openerp.com-20120604093239-szs3brw3ioyg3dr0
---
 addons/web/static/src/js/view_form.js |  6 +++---
 addons/web/static/src/xml/base.xml    | 22 ++++++++--------------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 3930396410f..e92d5cf7635 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1957,7 +1957,7 @@ instance.web.form.FieldFloat = instance.web.form.FieldChar.extend({
 });
 
 instance.web.DateTimeWidget = instance.web.OldWidget.extend({
-    template: "web.datetimepicker",
+    template: "web.datepicker",
     jqueryui_object: 'datetimepicker',
     type_of_date: "datetime",
     init: function(parent) {
@@ -2038,12 +2038,11 @@ instance.web.DateTimeWidget = instance.web.OldWidget.extend({
 
 instance.web.DateWidget = instance.web.DateTimeWidget.extend({
     jqueryui_object: 'datepicker',
-    template: "web.datepicker",
     type_of_date: "date"
 });
 
 instance.web.form.FieldDatetime = instance.web.form.AbstractField.extend(_.extend({}, instance.web.form.ReinitializeFieldMixin, {
-    tagName: "span",
+    template: "FieldDatetime",
     build_widget: function() {
         return new instance.web.DateTimeWidget(this);
     },
@@ -2089,6 +2088,7 @@ instance.web.form.FieldDatetime = instance.web.form.AbstractField.extend(_.exten
 }));
 
 instance.web.form.FieldDate = instance.web.form.FieldDatetime.extend({
+    template: "FieldDate",
     build_widget: function() {
         return new instance.web.DateWidget(this);
     }
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index eff32200f50..152fd2249e0 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -935,28 +935,22 @@
     </div>
 </t>
 <t t-name="web.datepicker">
-    <t t-set="placeholder" t-value="widget.getParent().node and widget.getParent().node.attrs.placeholder"/>
-    <span class="oe_form_field oe_datepicker_root oe_form_field_date">
+    <span>
+        <t t-set="placeholder" t-value="widget.getParent().node and widget.getParent().node.attrs.placeholder"/>
         <input type="text" class="oe_datepicker_container" disabled="disabled" style="display: none;"/>
         <input type="text"
             t-att-name="widget.name"
             t-att-placeholder="placeholder"
-            t-attf-class="oe_datepicker_master field_#{widget.type_of_date} oe_form_field_#{widget.type_of_date}"
+            class="oe_datepicker_master"
         /><img class="oe_input_icon oe_datepicker_trigger" t-att-src='_s + "/web/static/src/img/ui/field_calendar.png"'
              title="Select date" width="16" height="16" border="0"/>
     </span>
 </t>
-<t t-name="web.datetimepicker">
-    <t t-set="placeholder" t-value="widget.getParent().node and widget.getParent().node.attrs.placeholder"/>
-    <span class="oe_form_field oe_datepicker_root oe_form_field_datetime">
-        <input type="text" class="oe_datepicker_container" disabled="disabled" style="display: none;"/>
-        <input type="text"
-            t-att-name="widget.name"
-            t-att-placeholder="placeholder"
-            t-attf-class="oe_datepicker_master field_#{widget.type_of_date} oe_form_field_#{widget.type_of_date}"
-        /><img class="oe_input_icon oe_datepicker_trigger" t-att-src='_s + "/web/static/src/img/ui/field_calendar.png"'
-             title="Select date" width="16" height="16" border="0"/>
-    </span>
+<t t-name="FieldDate">
+    <span class="oe_form_field oe_datepicker_root oe_form_field_date"/>
+</t>
+<t t-name="FieldDatetime">
+    <span class="oe_form_field oe_datepicker_root oe_form_field_datetime"/>
 </t>
 <t t-name="FieldSelection">
     <span class="oe_form_field oe_form_field_selection">

From f70cc239e4b0cb64559cbf17f141a3a272a0077c Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Mon, 4 Jun 2012 12:04:44 +0200
Subject: [PATCH 47/71] [FIX] project: remove group_no_one from menu
 Project/Project/Projects

bzr revid: rco@openerp.com-20120604100444-s5pmufor3j2vjg41
---
 addons/project/project_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index d5aff449816..47cd93ee781 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -715,7 +715,7 @@
         <menuitem id="menu_project_config_project" name="Stages" parent="project.menu_definitions" sequence="1"/>
 
         <menuitem action="open_task_type_form" name="Task Stages" id="menu_task_types_view" parent="menu_project_config_project" sequence="2"/>
-        <menuitem action="open_view_project_all" id="menu_projects" name="Projects" parent="menu_project_management" sequence="1" groups="base.group_no_one"/>
+        <menuitem action="open_view_project_all" id="menu_projects" name="Projects" parent="menu_project_management" sequence="1"/>
 
         <act_window context="{'search_default_user_id': [active_id], 'default_user_id': active_id}" id="act_res_users_2_project_project" name="User's projects" res_model="project.project" src_model="res.users" view_mode="tree,form" view_type="form"/>
 

From 4d80adac5b029e1a71e823fb21fe4994a452131d Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 4 Jun 2012 12:11:45 +0200
Subject: [PATCH 48/71] [ADD] Add class on oe_form when no <sheet> is present

bzr revid: fme@openerp.com-20120604101145-5o9ssysf6lx4o450
---
 addons/web/static/src/css/base.css    | 4 ++++
 addons/web/static/src/css/base.sass   | 3 +++
 addons/web/static/src/js/view_form.js | 3 +++
 3 files changed, 10 insertions(+)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 7cf6cbe54e8..6f4fcde3e95 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1698,6 +1698,10 @@
   height: inherit !important;
   font-size: inherit;
 }
+.openerp .oe_form_nosheet > *:not(.oe_form_topbar) {
+  margin-left: 10px !important;
+  margin-right: 10px !important;
+}
 .openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] {
   font-weight: bold;
   white-space: nowrap;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 1dc4f15c90b..4283a9633b3 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1348,6 +1348,9 @@ $colour4: #8a89ba
             input
                 height: inherit !important
                 font-size: inherit
+    .oe_form_nosheet > *:not(.oe_form_topbar)
+        margin-left: 10px !important
+        margin-right: 10px !important
 
     // }}}
     // FormView.label {{{
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index e92d5cf7635..6bc708527af 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1004,6 +1004,9 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
         this.process($new_sheet);
     },
     process_form: function($form) {
+        if ($form.find('> sheet').length == 0) {
+            $form.addClass('oe_form_nosheet');
+        }
         var $new_form = this.render_element('FormRenderingForm', $form.getAttributes());
         this.handle_common_properties($new_form, $form);
         $form.contents().appendTo($new_form);

From 3b2da06efde82832b700f9d40855d6c090258d60 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Mon, 4 Jun 2012 12:14:40 +0200
Subject: [PATCH 49/71] [FIX] project: fix search defaults

bzr revid: rco@openerp.com-20120604101440-c6cgurg4s2i7ld1e
---
 addons/project/project_view.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 47cd93ee781..21ea84ddb72 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -163,7 +163,7 @@
         </record>
 
         <act_window
-            context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"
+            context="{'search_default_project_id': active_id, 'default_project_id': active_id}"
             id="act_project_project_2_project_task_all"
             name="Tasks"
             res_model="project.task"
@@ -578,6 +578,7 @@
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <filter name="project" string="Project" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-check"/>
+                        <field name="project_id"/>
                         <field name="user_id">
                             <filter string="My Tasks" domain="[('user_id','=',uid)]"  help="My Tasks" icon="terp-personal" />
                             <filter string="Unassigned Tasks" domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="terp-personal-" />
@@ -717,7 +718,7 @@
         <menuitem action="open_task_type_form" name="Task Stages" id="menu_task_types_view" parent="menu_project_config_project" sequence="2"/>
         <menuitem action="open_view_project_all" id="menu_projects" name="Projects" parent="menu_project_management" sequence="1"/>
 
-        <act_window context="{'search_default_user_id': [active_id], 'default_user_id': active_id}" id="act_res_users_2_project_project" name="User's projects" res_model="project.project" src_model="res.users" view_mode="tree,form" view_type="form"/>
+        <act_window context="{'search_default_user_id': active_id, 'default_user_id': active_id}" id="act_res_users_2_project_project" name="User's projects" res_model="project.project" src_model="res.users" view_mode="tree,form" view_type="form"/>
 
          <record id="task_company" model="ir.ui.view">
             <field name="name">res.company.task.config</field>

From e304cd68ebcf1af7613633efcb41417b8de7bc98 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 4 Jun 2012 12:37:35 +0200
Subject: [PATCH 50/71] Customization of kanban view for m2m

bzr revid: nicolas.vanhoren@openerp.com-20120604103735-qrxlou2p8kdm2vq8
---
 addons/web/static/src/js/view_form.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 0889f7d8dee..db055879051 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3410,6 +3410,8 @@ instance.web.form.FieldMany2ManyKanban = instance.web.form.AbstractField.extend(
                     'create_text': _t("Add"),
                     'creatable': self.get("effective_readonly") ? false : true,
                     'quick_creatable': self.get("effective_readonly") ? false : true,
+                    'read_only_mode': self.get("effective_readonly") ? true : false,
+                    'confirm_on_delete': false,
             });
         var embedded = (this.field.views || {}).kanban;
         if (embedded) {

From 623fd428bd909e92b1f05bfd283f89aa77f33b9a Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 4 Jun 2012 12:50:56 +0200
Subject: [PATCH 51/71] [IMP] xml of topbars, removed oe_right, oe_clear

bzr revid: fp@tinyerp.com-20120604105056-xvos3jwt3i9wsqrb
---
 addons/account/account_invoice_view.xml       | 10 ++-----
 addons/account/account_view.xml               | 30 ++++---------------
 addons/account_asset/account_asset_view.xml   |  5 +---
 addons/account_budget/account_budget_view.xml |  5 +---
 .../account_payment/account_payment_view.xml  |  5 +---
 .../account_voucher/account_voucher_view.xml  |  5 +---
 .../voucher_payment_receipt_view.xml          | 10 ++-----
 .../voucher_sales_purchase_view.xml           | 10 ++-----
 addons/base_calendar/base_calendar_view.xml   | 10 ++-----
 addons/crm/crm_lead_view.xml                  |  5 +---
 addons/crm/crm_meeting_view.xml               |  5 +---
 addons/crm/crm_phonecall_view.xml             |  5 +---
 addons/crm_claim/crm_claim_view.xml           |  5 +---
 .../crm_fundraising/crm_fundraising_view.xml  |  5 +---
 addons/crm_helpdesk/crm_helpdesk_view.xml     |  5 +---
 addons/event/event_view.xml                   | 10 ++-----
 addons/hr/hr_view.xml                         |  5 +---
 addons/hr_evaluation/hr_evaluation_view.xml   |  5 +---
 addons/hr_expense/hr_expense_view.xml         |  5 +---
 addons/hr_holidays/hr_holidays_view.xml       | 10 ++-----
 addons/hr_payroll/hr_payroll_view.xml         | 10 ++-----
 addons/hr_recruitment/hr_recruitment_view.xml |  5 +---
 .../hr_timesheet_invoice_view.xml             |  5 +---
 .../hr_timesheet_sheet_view.xml               |  5 +---
 addons/idea/idea_view.xml                     |  5 +---
 addons/lunch/lunch_view.xml                   |  5 +---
 .../marketing_campaign_view.xml               | 15 ++--------
 addons/mrp/mrp_view.xml                       |  5 +---
 addons/mrp_operations/mrp_operations_view.xml |  5 +---
 addons/mrp_repair/mrp_repair_view.xml         |  5 +---
 addons/point_of_sale/point_of_sale_view.xml   |  5 +---
 addons/procurement/procurement_view.xml       |  5 +---
 addons/project/project_view.xml               | 10 ++-----
 addons/project_issue/project_issue_view.xml   |  5 +---
 .../project_long_term_view.xml                |  5 +---
 .../project_planning_view.xml                 |  5 +---
 addons/project_scrum/project_scrum_view.xml   | 10 ++-----
 addons/purchase/purchase_view.xml             |  5 +---
 .../purchase_requisition_view.xml             |  5 +---
 addons/sale/sale_view.xml                     |  5 +---
 addons/stock/stock_view.xml                   |  5 +---
 addons/stock_planning/stock_planning_view.xml | 10 ++-----
 addons/subscription/subscription_view.xml     |  5 +---
 addons/survey/survey_view.xml                 | 10 ++-----
 44 files changed, 62 insertions(+), 248 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 8254d5183be..6545a59ae65 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -149,10 +149,7 @@
                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="base.group_no_one"/>
                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
                     <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
-                    <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
-                    </div>
-                    <div class="oe_clear"/>
+                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
                 </div>
                 <sheet string="Supplier Invoice" layout="auto">
                     <group col="8" colspan="4" class="oe_form_header">
@@ -269,10 +266,7 @@
                     <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object"/>
                     <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
                     <!--button name="%(account_invoices)d" string="Print Invoice" type="action" states="open,paid,proforma,sale,proforma2"/-->
-                    <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
-                    </div>
-                    <div class="oe_clear"/>
+                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
                 </div>
                 <sheet string="Invoice" layout="auto">
                     <group colspan="4" col="8" class="oe_form_header">
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index fe1bafecde0..237ab245943 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -15,10 +15,7 @@
                 <div class="oe_form_topbar">
                     <button name="create_period" states="draft" string="Create Monthly Periods" type="object"/>
                     <button name="create_period3" states="draft" string="Create 3 Months Periods" type="object"/>
-                    <div class="oe_right">
-                        <field name="state" select="1" widget="statusbar" nolabel="1" />
-                    </div>
-                    <div class="oe_clear"/>
+                    <field name="state" select="1" widget="statusbar" nolabel="1" />
                 </div>
                 <sheet string="Fiscalyear" layout="auto">
                     <group class="oe_form_header">
@@ -99,10 +96,7 @@
                 <form layout="manual">
                 <div class="oe_form_topbar">
                     <button name="action_draft" states="done" string="Set to Draft" type="object" groups="account.group_account_manager"/>
-                    <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1"/>
-                    </div>
-                    <div class="oe_clear"/>
+                    <field name="state" widget="statusbar" nolabel="1"/>
                 </div>
                 <sheet string="Period" layout="auto">
                 <group class="oe_form_header">
@@ -605,10 +599,7 @@
                     <button name="button_confirm_bank" states="draft" string="Confirm" type="object" />
                     <button name="button_dummy" states="draft" string="Compute" type="object"/>
                     <button name="button_cancel" states="confirm" string="Cancel" type="object"/>
-                    <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
-                    </div>
-                    <div class="oe_clear"/>
+                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
                 </div>
                 <sheet string="Bank Statement" layout="auto">
                     <group col="7" colspan="4" class="oe_form_header">
@@ -670,10 +661,7 @@
                     <button name="button_confirm_bank" states="draft" string="Confirm" type="object" />
                     <button name="button_dummy" states="draft" string="Compute" type="object"/>
                     <button name="button_cancel" states="confirm" string="Cancel" type="object"/>
-                    <div class="oe_right">
-                        <field name="state"  widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
-                    </div>
-                    <div class="oe_clear"/>
+                    <field name="state"  widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
                 </div>
                 <sheet string="Bank Statement" layout="auto">
                     <group col="7" colspan="4" class="oe_form_header">
@@ -1364,10 +1352,7 @@
                 <div class="oe_form_topbar">
                     <button name="button_validate" states="draft" string="Post" type="object"/>
                     <button name="button_cancel" states="posted" string="Cancel" type="object"/>
-                    <div class="oe_right">
-                        <field name="state" select="1" widget="statusbar" nolabel="1" />
-                    </div>
-                    <div class="oe_clear"/>
+                    <field name="state" select="1" widget="statusbar" nolabel="1" />
                 </div>
                 <sheet string="Journal Entries" layout="auto">
                     <group colspan="4" col="6" class="oe_form_header">
@@ -2636,10 +2621,7 @@ action = pool.get('res.config').next(cr, uid, [], context)
                     <button name="button_confirm_cash" states="open" string="Close CashBox" type="object"/>
                     <button name="button_open" states="draft" string="Open CashBox" type="object"/>
                     <button name="button_cancel" states="confirm,open" string="Cancel" type="object" groups="base.group_extended"/>
-                    <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
-                    </div>
-                    <div class="oe_clear"/>
+                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
                 </div>
                 <sheet string="Statement" layout="auto">
                     <group col="6" colspan="4" class="oe_form_header">
diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index 1affcf7a85c..5e1a5f68d95 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -83,10 +83,7 @@
                <button name="validate" states="draft" string="Confirm Asset" type="object"/>
                <button name="set_to_close" states="open" string="Set to Close" type="object"/>
                <button name="set_to_draft" states="open" string="Set to Draft" type="object"/> 
-               <div class="oe_right">
-                   <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
-               </div>
-               <div class="oe_clear"/>
+               <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
            </div>
            <sheet string="Asset" layout="auto">
               <group col="6" colspan="4" class="oe_form_header">
diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index 13c97ca32d6..e99423c3f01 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -111,10 +111,7 @@
                     <button string="Done" name="done" states="validate" type="workflow"   />
                     <button name="draft" states="cancel" string="Reset to Draft" type="workflow"/>
                     <button string="Cancel" name="cancel" states="confirm,validate" type="workflow"/>
-                    <div class="oe_right">
-                        <field name="state" select="1" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
-                    </div>
-                    <div class="oe_clear"/>
+                    <field name="state" select="1" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
                 </div>
                 <sheet string="Budget" layout="auto">
                 <group class="oe_form_header">
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index a85d4156cc4..b6dc9743933 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -106,10 +106,7 @@
                     <button name="set_done" states="open" string="Make Payments" type="object"/>
                     <button name="set_to_draft" states="cancel" string="Set to draft" type="object"/>
                     <button name="cancel" states="draft,open" string="Cancel"/>
-                    <div class="oe_right">
-                        <field name="state" select="1" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
-                    </div>
-                    <div class="oe_clear"/>
+                    <field name="state" select="1" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
                 </div>
                 <sheet string="Payment order" layout="auto">
                     <group col="6" colspan="4" class="oe_form_header">
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index a1ff581006b..4747ac65bd8 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -45,10 +45,7 @@
                       <button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to unreconcile this record?"/>
                       <button name="cancel_voucher" string="Cancel" states="draft,proforma" />
                       <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>
-                      <div class="oe_right">
-                          <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
-                      </div>
-                      <div class="oe_clear"/>
+                      <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                   </div>
                   <sheet string="Accounting Voucher" layout="auto">
                     <group col="6" colspan="4" class="oe_form_header">
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 5ceee46b2cd..1571992e4cf 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -149,10 +149,7 @@
                     <button name="cancel_voucher" string="Cancel" states="draft,proforma"  invisible="context.get('line_type', False)"/>
                     <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile and cancel this record ?"/>
                     <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" invisible="context.get('line_type', False)"/>
-                    <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
-                    </div>
-                    <div class="oe_clear"/>
+                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                 </div>
                 <sheet string="Bill Payment" layout="auto">
                     <group col="6" colspan="4" class="oe_form_header">
@@ -303,10 +300,7 @@
                     <button name="cancel_voucher" string="Cancel" states="draft,proforma"  invisible="context.get('line_type', False)"/>
                     <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile and cancel this record ?"/>
                     <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" invisible="context.get('line_type', False)"/>
-                    <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
-                    </div>
-                    <div class="oe_clear"/>
+                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                 </div>
                 <sheet string="Customer Payment" layout="auto">
                     <group col="6" colspan="4" class="oe_form_header">
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index b3ba7c99cab..edbdc2f8c41 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -87,10 +87,7 @@
                     <button name="cancel_voucher" string="Cancel" states="draft,proforma" />
                     <button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to confirm this record ?"/>
                     <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>
-                    <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
-                    </div>
-                    <div class="oe_clear"/>
+                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                 </div>
                 <sheet string="Sales Receipt" layout="auto">
                     <group col="6" colspan="4" class="oe_form_header">
@@ -216,10 +213,7 @@
                     <button name="cancel_voucher" string="Cancel" states="draft,proforma" />
                     <button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to confirm this record ?"/>
                     <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>
-                    <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
-                    </div>
-                    <div class="oe_clear"/>
+                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                 </div>
                 <sheet string="Supplier Voucher" layout="auto">
                     <field name="pay_now" invisible="1"/>
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 5975210a99c..a5b6cd532e0 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -26,10 +26,7 @@
                         <button name="do_decline" string="Decline"
                             states="needs-action,tentative,accepted"
                             type="object" />
-                        <div class="oe_right">
-                            <field name="state" widget="statusbar" nolabel="1" statusbar_visible="tentative,needs-action,accepted" statusbar_colors='{"proforma":"blue"}'/>
-                        </div>
-                        <div class="oe_clear"/>
+                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="tentative,needs-action,accepted" statusbar_colors='{"proforma":"blue"}'/>
                     </div>
                     <sheet string="Invitation details" layout="auto">
                         <group col="6" colspan="4">
@@ -230,10 +227,7 @@
                         states="tentative,confirmed"
                         type="object"
                         />
-                    <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="tentative,confirmed" statusbar_colors='{"proforma":"blue"}'/>
-                    </div>
-                    <div class="oe_clear"/>
+                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="tentative,confirmed" statusbar_colors='{"proforma":"blue"}'/>
                 </div>
                 <sheet string="Events" layout="auto">
                     <group col="6" colspan="4">
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 11a9f5d7f6d..cbd0581c240 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -70,11 +70,8 @@
                             states="cancel"/>
                     <button name="case_cancel" string="Cancel" type="object"
                             states="draft,open,pending"/>
-                    <div class="oe_right">
-                        <field name="stage_id" nolabel="1" widget="statusbar"
+                    <field name="stage_id" widget="statusbar"
                             on_change="onchange_stage_id(stage_id)"/>
-                    </div>
-                    <div class="oe_clear"/>
                 </div>
                 <sheet layout="auto">
                 <group colspan="4" col="7">
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index e7176386842..233c5fc9413 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -35,10 +35,7 @@
                             states="cancel,done"/>
                     <button name="case_cancel" string="Cancel" type="object"
                             states="draft,open"/>
-                    <div class="oe_right">
-                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done"/>
-                    </div>
-                    <div class="oe_clear"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,open,done"/>
                 </div>
                 <sheet layout="auto">
                 <group col="6" colspan="4">
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 6360e24a217..07c33e4211b 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -72,10 +72,7 @@
                         states="cancel" icon="gtk-convert"/>
                 <button name="case_cancel" string="Cancel" type="object"
                         states="draft,open,pending" icon="gtk-cancel"/>
-                <div class="oe_right">
-                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,done" select="1"/>
-                </div>
-                <div class="oe_clear"/>
+                <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,done"/>
             </div>
             <sheet string="Phone Call" layout="auto">
                  <group colspan="6" col="7">
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 9d0f8d950b0..49b9f06b544 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -104,11 +104,8 @@
                             states="cancel,done"/>
                     <button name="case_cancel" string="Cancel" type="object"
                             states="draft,open,pending"/>
-                    <div class="oe_right">
-                        <field name="stage_id" nolabel="1" widget="statusbar"
+                    <field name="stage_id" widget="statusbar"
                             on_change="onchange_stage_id(stage_id)"/>
-                    </div>
-                    <div class="oe_clear"/>
                 </div>
                 <sheet string="Claims" layout="auto">
                     <group>
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index b4ed0a38c43..6861034cbd2 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -69,10 +69,7 @@
                     <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" groups="base.group_extended" />
                     <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" />
                     <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" />
-                    <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
-                    </div>
-                    <div class="oe_clear"/>
+                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                 </div>
                 <sheet string="Funds Form" layout="auto">
                     <group colspan="4" col="6" class="oe_form_header">
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index fe9db30c274..6f683470534 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -42,10 +42,7 @@
                             states="open,draft,pending"/>
                     <button name="case_cancel" string="Cancel" type="object"
                             states="draft,open,pending"/>
-                    <div class="oe_right">
-                        <field name="state" select="1" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
-                    </div>
-                    <div class="oe_clear"/>
+                    <field name="state" select="1" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                 </div>
                 <sheet string="Helpdesk Support" layout="auto">
                     <group colspan="4" col="7" class="oe_form_header">
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index bfa3b496aed..3706a292c6e 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -56,10 +56,7 @@
                     <button string="Event Ended" name="button_done" states="confirm" type="object"/>
                     <button string="Set To Draft" name="button_draft" states="cancel,done" type="object"/>
                     <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object"/>
-                    <div class="oe_right">
-                        <field name="state" select="1" nolabel="1" widget="statusbar" statusbar_visible="draft,confirm,done"/>
-                    </div>
-                    <div class="oe_clear"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,confirm,done"/>
                 </div>
                 <sheet layout="manual">
 
@@ -360,10 +357,7 @@
                     <button name="button_reg_close" string="Attended" states="open" type="object"/>
                     <button string="Set To Unconfirmed" name="do_draft" states="cancel,done" type="object"/>
                     <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object"/>
-                    <div class="oe_right">
-                        <field name="state" select="1" nolabel="1" colspan="2" widget="statusbar" statusbar_visible="draft,open,done"/>
-                    </div>
-                    <div class="oe_clear"/>
+                    <field name="state" select="1" nolabel="1" colspan="2" widget="statusbar" statusbar_visible="draft,open,done"/>
                 </div>
                 <sheet string="Registration" layout="auto">
                     <group col="6" colspan="4">
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 32eb3a84c83..5910a1f2244 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -350,10 +350,7 @@
                     <button name="job_recruitement" string="In Recruitement" states="open" type="object"/>
                     <button name="job_open" string="In Position" states="old,recruit" type="object"/>
                     <button name="job_old" string="Mark as Old" states="open,recruit" type="object"/>
-                    <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="recruit,open"/>
-                    </div>
-                    <div class="oe_clear"/>
+                    <field name="state" widget="statusbar" statusbar_visible="recruit,open"/>
                 </div>
                 <sheet string="Job" layout="auto">
                     <group col="6" colspan="4">
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 9611ec382e9..6479d66caf7 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -161,10 +161,7 @@
                     <button name="button_done" string="Done" states="progress" type="object"/>
                     <button name="button_draft" string="Reset to Draft" states="cancel" type="object"/>
                     <button name="button_cancel" string="Cancel" states="draft,wait,progress" type="object"/>
-                    <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,progress,wait,done" statusbar_colors='{"progress":"blue"}'/>
-                    </div>
-                    <div class="oe_clear"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,progress,wait,done" statusbar_colors='{"progress":"blue"}'/>
                 </div>
                 <sheet string="Appraisal" layout="auto">
                     <group col="4" colspan="3">
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index edc6f0fd243..cf478a3585f 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -70,10 +70,7 @@
                     <button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" groups="base.group_hr_user"/>
                     <button name="invoice" states="accepted" string="Invoice" type="object" groups="base.group_hr_user"/>
                     <button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" groups="base.group_hr_user" />
-                    <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm,accepted" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
-                    </div>
-                    <div class="oe_clear"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,confirm,accepted" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
                 </div>
                 <sheet string="Expenses Sheet" layout="auto">
                     <group colspan="4" col="6">
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index bbcec416aff..8842a8c466a 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -70,10 +70,7 @@
                     <button string="Validate" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user"/>
                     <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" groups="base.group_hr_user,base.group_hr_manager"/>
                     <button string="Reset to New" name="set_to_draft" states="refuse,validate" type="object" groups="base.group_hr_user"/>
-                    <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
-                    </div>
-                    <div class="oe_clear"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
                 </div>
                 <sheet string="Leave Request" layout="auto">
                     <group col="8" colspan="4">
@@ -122,10 +119,7 @@
                     <button string="Validate" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user"/>
                     <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" groups="base.group_hr_user"/>
                     <button string="Reset to New" name="set_to_draft" states="cancel,validate,refuse" type="object" groups="base.group_hr_user"/>
-                    <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
-                    </div>
-                    <div class="oe_clear"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
                 </div>
                 <sheet string="Allocation Request" layout="auto">
                 <group col="8" colspan="4" class="oe_form_header">
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 93e875b61be..9e8fbe5dec5 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -267,10 +267,7 @@
                     <button string="Set to Draft" name="draft" states="cancel"/>
                     <button string="Compute Sheet" name="compute_sheet" type="object" states="draft"/>
                     <button string="Cancel" name="cancel_sheet" states="draft,hr_check,confirm,verify"/>
-                    <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
-                    </div>
-                    <div class="oe_clear"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
                 </div>
                 <sheet string="Payslip" layout="auto">
                     <group col="6" colspan="4" class="oe_form_header">
@@ -729,10 +726,7 @@
                     <button name="close_payslip_run" type="object" string="Close" states="draft"/>
                     <button name="%(action_hr_payslip_by_employees)d" type="action" states="draft" string="Generate Payslips" />
                     <button string="Set to Draft" name="draft_payslip_run" type="object" states="close"/>
-                    <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1"/>
-                    </div>
-                    <div class="oe_clear"/>
+                    <field name="state" widget="statusbar"/>
                 </div>
                 <sheet string="Payslips Batches" layout="auto">
                     <group col="6" colspan="4" class="oe_form_header">
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 93a9d01107d..2d466c95e6d 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -86,10 +86,7 @@
                         states="open" icon="gtk-go-back"/>
                 <button name="stage_next" string="Next" type="object"
                         states="open" icon="gtk-go-forward"/>
-                <div class="oe_right">
-                    <field name="stage_id" nolabel="1" widget="statusbar"/>
-                </div>
-                <div class="oe_clear"/>
+                <field name="stage_id" widget="statusbar"/>
             </div>
             <sheet string="Jobs - Recruitment Form" layout="auto">
                 <group colspan="4" col="4">
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 43ca7a4004e..28d577fe445 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -28,11 +28,8 @@
                         <button name="set_close" string="Close" type="object" states="open,pending"/>
                         <button name="set_open" string="Re-open project" type="object" states="pending,cancelled,close,draft"/>
                         <button name="set_cancel" string="Cancel" type="object" states="open,pending"/>
-                        <div class="oe_right">
-                            <field name="state" readonly="1" widget="statusbar" nolabel="1"
+                        <field name="state" readonly="1" widget="statusbar"
                             statusbar_visible="open,pending,close" statusbar_colors='{"pending":"red", "template":"blue"}'/>
-                        </div>
-                        <div class="oe_clear"/>
                     </div>
                 </xpath>
             </field>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index aa815df5337..213be0c672f 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -66,10 +66,7 @@
                     <button name="done" states="confirm" string="Approve" type="workflow" groups="base.group_hr_user"/>
                     <button name="action_set_to_draft" states="done" string="Set to Draft" type="object"/>
                     <button name="cancel" states="confirm" string="Refuse" type="workflow" groups="base.group_hr_user"/>
-                    <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="new,confirm,done"/>
-                    </div>
-                    <div class="oe_clear"/>
+                    <field name="state" widget="statusbar" statusbar_visible="new,confirm,done"/>
                 </div>
                 <sheet string="Timesheet" layout="auto">
                     <group colspan="4" col="6" class="oe_form_header">
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index eacb0804658..7240c79f590 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -187,10 +187,7 @@
                 <button name="idea_open" string="Open" states="draft"/>
                 <button name="idea_close" string="Accept" states="open"/>
                 <button name="idea_cancel" string="Refuse" states="open" />
-                <div class="oe_right">
-                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,close"/>
-                </div>
-                <div class="oe_clear"/>
+                <field name="state" widget="statusbar" statusbar_visible="draft,open,close"/>
             </div>
             <sheet string="New Idea" layout="auto">
             <group col="6" colspan="4" class="oe_form_header">
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index aeb5eed5034..ff2c684bb4c 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -27,10 +27,7 @@
                 <div class="oe_form_topbar">
                     <button name="%(action_lunch_order_confirm)d" string="Confirm Order" type="action" attrs="{'invisible':[('state','=','confirmed')]}"/>
                     <button name="%(action_lunch_order_cancel)d" string="Cancel Order" type="action"/>
-                    <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirmed"/>
-                    </div>
-                    <div class="oe_clear"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,confirmed"/>
                 </div>
                 <sheet string="Order" layout="auto">
                     <field name="user_id" select="1"/>
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index a8edeb81ca4..bec1bede756 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -21,10 +21,7 @@
                 <button name="state_done_set" string="Done" states="running"/>
                 <button name="state_draft_set" string="Set to Draft" states="done,cancelled"/>
                 <button name="state_cancel_set" string="Cancel" states="running"/>
-                <div class="oe_right">
-                    <field name="state" readonly="1" widget="statusbar" nolabel="1" statusbar_visible="draft,running,done"/>
-                </div>
-                <div class="oe_clear"/>
+                <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,running,done"/>
             </div>
             <sheet string="Campaign" layout="auto">
                 <group colspan="4" col="6">
@@ -145,10 +142,7 @@
                 <button name="state_done_set" string="Close" states="running"/>
                 <button name="state_draft_set" string="Set to Draft" states="done,cancelled"/>
                 <button name="state_cancel_set" string="Cancel" states="running"/>
-                <div class="oe_right">
-                    <field name="state" readonly="1" nolabel="1" widget="statusbar" statusbar_visible="draft,running,done"/>
-                </div>
-                <div class="oe_clear"/>
+                <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,running,done"/>
             </div>
             <sheet string="Segments" layout="auto">
                 <group colspan="2" col="2">
@@ -368,10 +362,7 @@
                 <button string="Process" states="todo" name="process" type="object"/>
                 <button string="Reset" states="exception,cancelled" name="button_draft" type="object"/>
                 <button string="Cancel" states="todo,exception" name="button_cancel" type="object"/>
-                <div class="oe_right">
-                    <field name="state" readonly="True" nolabel="1" widget="statusbar" statusbar_visible="todo,done" statusbar_colors='{"exception":"red"}'/>
-                </div>
-                <div class="oe_clear"/>
+                <field name="state" readonly="True" widget="statusbar" statusbar_visible="todo,done" statusbar_colors='{"exception":"red"}'/>
             </div>
             <sheet string="Marketing Campaign Activities" layout="auto">
                 <group colspan="4" col="6">
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index f856622c8a1..328df0175fc 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -640,10 +640,7 @@
                     <button name="button_recreate" states="picking_except" string="Recreate Picking"/>
                     <button name="button_cancel" states="draft,ready,in_production,picking_except" string="Cancel"/>
                     <button name="action_cancel" type="object" states="confirmed" string="Cancel"/>
-                    <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,ready,in_production,done" statusbar_colors='{"picking_except":"red","confirmed":"blue"}'/>
-                    </div>
-                    <div class="oe_clear"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,ready,in_production,done" statusbar_colors='{"picking_except":"red","confirmed":"blue"}'/>
                 </div>
                 <sheet string="Manufacturing Orders" layout="auto">
                     <group colspan="4" col="7">
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 73a74baa471..d3ababd765a 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -75,10 +75,7 @@
                 <button name="button_pause" string="Pending" states="startworking"/>
                 <button name="button_draft" string="Set Draft" states="cancel"/>
                 <button name="button_cancel" string="Cancel" states="draft,startworking"/>
-                <div class="oe_right">
-                     <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,startworking"/>
-                </div>
-                <div class="oe_clear"/>
+                <field name="state" widget="statusbar" statusbar_visible="draft,startworking"/>
             </div>
             <sheet string="Work Orders" layout="auto">
                 <group col="6" colspan="4" class="oe_form_header">
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index ff262329ce2..c338f5b8dfc 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -40,10 +40,7 @@
                    <button name="%(action_cancel_repair)d" states="confirmed,2binvoiced,ready,under_repair" string="Cancel Repair" type="action"/>
                    <button name="%(action_cancel_repair)d" states="invoice_except" string="Cancel Repair" type="action"/>
                    <button name="cancel" states="draft" string="Cancel Repair"/>
-                   <div class="oe_right">
-                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirmed,ready" />
-                   </div>
-                   <div class="oe_clear"/>
+                   <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,ready" />
                </div>
                <sheet string="Repairs order" layout="auto">
                 <group col="6" colspan="4" class="oe_form_header">
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index a83aab01ca9..f5729a14faf 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -22,10 +22,7 @@
                     <button name="%(action_report_pos_receipt)d" string="Reprint" type="action" states="paid,done,invoiced"/>
                     <button name="refund" string="Return Products" type="object"
                         attrs="{'invisible':[('state','=','draft')]}"/>
-                    <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,paid,done" statusbar_colors='{"cancel":"red"}'/>
-                    </div>
-                    <div class="oe_clear"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,paid,done" statusbar_colors='{"cancel":"red"}'/>
                 </div>
                 <sheet string="PoS Orders" layout="auto">
                     <group col="7" colspan="4" class="oe_form_header">
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 427b699e0f6..402e3d8479f 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -52,10 +52,7 @@
                         <button name="button_check" states="confirmed" string="Run Procurement"/>
                         <button name="button_restart" states="exception" string="Retry"/>
                         <button name="button_cancel" states="draft,exception,waiting" string="Cancel"/>
-                        <div class="oe_right">
-                            <field name="state" readonly="1" widget="statusbar" nolabel="1" statusbar_visible="draft,confirmed" />
-                        </div>
-                        <div class="oe_clear"/>
+                        <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed" />
                     </div>
                 <sheet string="Procurement" layout="auto">
                     <group col="2" colspan="2" class="oe_form_header">
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index d5aff449816..e655b3e84f9 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -27,10 +27,7 @@
                     <button string="New Project Based on Template" name="duplicate_template"  type="object" states="template" context="{'parent_id':parent_id}"/>
                     <button name="reset_project" string="Reset as Project" type="object" states="template"/>
                     <button name="set_cancel" string="Cancel" type="object" states="open,pending"/>
-                    <div class="oe_right">
-                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="open,close" statusbar_colors='{"pending":"blue"}' select="1" readonly="1"/>
-                    </div>
-                    <div class="oe_clear"/>
+                    <field name="state" widget="statusbar" statusbar_visible="open,close" statusbar_colors='{"pending":"blue"}' readonly="1"/>
                 </div>
                 <sheet string="Project" layout="auto">
                     <group colspan="6" col="6">
@@ -323,10 +320,7 @@
                                 states="open,pending" icon="gtk-go-back" attrs="{'invisible': [('stage_id','=', False)]}"/>
                         <button name="stage_next" string="Next Stage" type="object"
                                 states="open,pending" icon="gtk-go-forward" attrs="{'invisible': [('stage_id','=', False)]}"/>
-                        <div class="oe_right">
-                            <field name="stage_id" nolabel="1" widget="statusbar"/>
-                        </div>
-                        <div class="oe_clear"/>
+                        <field name="stage_id" widget="statusbar"/>
                     </div>
                     <sheet string="Task edition" layout="auto">
                     <group colspan="6" col="6">
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 09501686ef9..8560c87105d 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -70,10 +70,7 @@
                             attrs="{'invisible': [('stage_id','=', False)]}"/>
                     <button name="case_cancel" string="Cancel" type="object"
                             states="draft,open,pending"/>
-                    <div class="oe_right">
-                        <field name="stage_id" nolabel="1" widget="statusbar"/>
-                    </div>
-                    <div class="oe_clear"/>
+                    <field name="stage_id" widget="statusbar"/>
                 </div>
                 <sheet string="Issue Tracker Form" layout="auto">
                     <group colspan="4" col="6">
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index eb2c86a0f1b..936f9995606 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -148,10 +148,7 @@
                     <button string="Pending" name="set_pending" states="open"/>
                     <button string="Draft" name="set_draft" states="open"/>
                     <button string="Cancel" name="set_cancel" states="draft,open,pending"/>
-                    <div class="oe_right">
-                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}' select="1"/>
-                    </div>
-                    <div class="oe_clear"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                 </div>
                 <sheet string="Project Phase" layout="auto">
                     <group colspan="6" col="6">
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index ef230543e9c..90294c1c30f 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -32,10 +32,7 @@
                     <button name="action_done" states="open" string="Done" type="object" />
                     <button name="action_draft" states="done,cancel" string="Reset to Draft" type="object" />
                     <button name="action_cancel" states="draft,open" string="Cancel" type="object" />
-                    <div class="oe_right">
-                       <field name="state" select="1" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
-                    </div>
-                    <div class="oe_clear"/>
+                   <field name="state" widget="statusbar" statusbar_visible="draft,open"/>
                 </div>
                 <sheet string="Planning by Account" layout="auto">
                     <group col="6" colspan="4" class="oe_form_header">
diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index 7617a71ba4c..b1669a99456 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -60,10 +60,7 @@
                     <button type="action" string="Convert to Task" name="%(action_scrum_backlog_to_task)d" states="pending"/>
                     <button type="object" string="Set to Draft" name="button_draft" states="cancel,done"/>
                     <button type="object" string="Cancel" name="button_cancel" states="draft,open,pending"/>
-                    <div class="oe_right">
-                        <field name="state" select="1" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
-                    </div>
-                    <div class="oe_clear"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,open"/>
                 </div>
                 <sheet string="Product backlog" layout="auto">
                     <group colspan="4" col="8" class="oe_form_header">
@@ -235,10 +232,7 @@
                     <button name="%(project_scrum.report_scrum_sprint_burndown_chart)d"
                                    string="Burndown Chart" type="action"/>
                     <button type="object" string="Set to Draft" name="button_draft" states="cancel,done"/>
-                    <div class="oe_right">
-                        <field name="state" readonly="1" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
-                    </div>
-                    <div class="oe_clear"/>
+                    <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,open"/>
                 </div>
                 <sheet string="Scrum Sprint" layout="auto">
                     <group colspan="4" col="6" class="oe_form_header">
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index ce2a9d85b5e..9eebadd2a53 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -144,10 +144,7 @@
                     <button name="view_picking" string="Receive Products" type="object" attrs="{'invisible': ['|', ('shipped','=',True), ('state','!=', 'approved')]}"/>
                     <button name="action_cancel_draft" states="cancel,sent,confirmed" string="Set to Draft" type="object"/>
                     <button name="purchase_cancel" states="draft,confirmed,wait_auth,sent" string="Cancel"/>
-                    <div class="oe_right">
-                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,approved,done" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue","wait":"blue"}' readonly="1"/>
-                    </div>
-                    <div class="oe_clear"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,approved,done" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue","wait":"blue"}' readonly="1"/>
                 </div>
                 <sheet string="Purchase Order" layout="auto">
                     <group col="6" colspan="4">
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 9a9d2bfa105..a0aec3736cf 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -38,10 +38,7 @@
                 <button name="tender_reset" states="done,cancel" string="Reset to Draft" type="object" />
                 <button name="tender_done" states="in_progress" string="Done" type="object" />
                 <button name="tender_cancel" states="draft,in_progress" string="Cancel" type="object" />
-                <div class="oe_right">
-                    <field name="state" nolabel="1" select="1" readonly ="1" widget="statusbar" statusbar_visible="draft,in_progress,done" statusbar_colors='{"in_progress":"blue"}'/>
-                </div>
-                <div class="oe_clear"/>
+                <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,in_progress,done" statusbar_colors='{"in_progress":"blue"}'/>
             </div>
             <sheet string="Purchase Requisition" layout="auto">
                 <group colspan="4" col="6">
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index abc13dc2c38..68f2a7a0f11 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -118,10 +118,7 @@
                         <button name="action_cancel" states="manual,progress" string="Cancel" type="object"/>
                         <button name="ship_cancel" states="shipping_except" string="Cancel"/>
                         <button name="invoice_cancel" states="invoice_except" string="Cancel"/>
-                    <div class="oe_right">
-                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,sent,progress,invoiced,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
-                    </div>
-                    <div class="oe_clear"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,sent,progress,invoiced,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
                 </div>
                 <sheet string="Sales Order" layout="auto">
                     <group col="6" colspan="4" class="oe_form_header">
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 792fcc8e388..b47a7fa5999 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1378,10 +1378,7 @@
                     <button name="force_assign" states="confirmed" string="Set Available" type="object"/>
                     <button name="%(action_partial_move_server)d" string="Process" type="action" states="assigned"/>
                     <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object"/>
-                    <div class="oe_right">
-                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
-                    </div>
-                    <div class="oe_clear"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
                 </div>
                 <sheet string="Receive Products" layout="auto">
                     <group colspan="4" col="7">
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index 7a4cef952bf..cb07baaeaa3 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -16,10 +16,7 @@
                 <div class="oe_form_topbar">
                     <button name="button_open" string="Open" states="draft" type="object"/>
                     <button name="button_close" string="Close" states="open" type="object"/>
-                    <div class="oe_right">
-                        <field name="state" select="1" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
-                    </div>
-                    <div class="oe_clear"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,open"/>
                 </div>
                 <sheet string="Stock Periods" layout="auto">
                     <group class="oe_form_header">
@@ -87,10 +84,7 @@
                 <form layout="manual">
                 <div class="oe_form_topbar">
                     <button name="action_validate" string="Approve" states="draft" type="object" />
-                    <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1"/>
-                    </div>
-                    <div class="oe_clear"/>
+                    <field name="state" widget="statusbar"/>
                 </div>
                 <sheet string="Stock and Sales Forecast" layout="auto">
                     <group colspan = "4" col = "4" class="oe_form_header">
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index 6f21af8c401..343a8bc0ba4 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -18,10 +18,7 @@
                     <button name="set_process" states="draft" string="Process" type="object"/>
                     <button name="set_done" states="running" string="Stop" type="object"/>
                     <button name="set_draft" states="done" string="Set to Draft" type="object"/>
-                    <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,running"/>
-                    </div>
-                    <div class="oe_clear"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,running"/>
                 </div>
                 <sheet string="Subscriptions" layout="auto">
                     <group col="6" colspan="4" class="oe_form_header">
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index e8f02f6d3e0..621172e2860 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -23,10 +23,7 @@
                     <button name="survey_open" string="Open" states="cancel,close" type="object"/>
                     <button name="survey_close" string="Close" states="open" type="object"/>
                     <button name="survey_cancel" string="Cancel" states="open" type="object"/>
-                    <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="open,close"/>
-                    </div>
-                    <div class="oe_clear"/>
+                    <field name="state" widget="statusbar" statusbar_visible="open,close"/>
                 </div>
                 <sheet string="Survey" layout="auto">
                     <field name="title" select="1"/>
@@ -1065,10 +1062,7 @@
                     <button name="survey_req_waiting_answer" string="Waiting Answer" states="draft" type="object"/>
                     <button name="survey_req_done" string="Done" states="waiting_answer" type="object"/>
                     <button name="survey_req_cancel" string="Cancel" states="waiting_answer" type="object"/>
-                    <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,waiting_answer"/>
-                    </div>
-                    <div class="oe_clear"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,waiting_answer"/>
                 </div>
                 <sheet string="Survey Request" layout="auto">
                     <group class="oe_form_header">

From 2e5ee20109347e9d60e13264c7b6e060600a6803 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 4 Jun 2012 16:29:45 +0530
Subject: [PATCH 52/71] [IMP]:crm:removed widget=selection.

bzr revid: apa@tinyerp.com-20120604105945-im7ng01topejq8xe
---
 addons/crm/crm_lead_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 92a2c6c301b..4b96433b385 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -476,8 +476,8 @@
 
                     <group colspan="2" col="2" class="oe_form_group_label_border">
                         <separator string="Categorization" colspan="2"/>
-                        <field name="type_id" widget="selection" placeholder="Mailing june"/>
-                        <field name="channel_id" widget="selection" placeholder="E-mail"/>
+                        <field name="type_id" placeholder="Mailing june"/>
+                        <field name="channel_id" placeholder="E-mail"/>
                     </group>
                     <group colspan="2" col="2" class="oe_form_group_label_border">
                         <separator string="Mailings" colspan="2"/>

From 1317543d72ed42ab079dbced6209388200532b13 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 4 Jun 2012 13:44:33 +0200
Subject: [PATCH 53/71] [IMP] Hide empty fields in form readonly

bzr revid: fme@openerp.com-20120604114433-4dvm68xvdmln0ck6
---
 addons/web/static/src/css/base.css    | 3 +++
 addons/web/static/src/css/base.sass   | 3 +++
 addons/web/static/src/js/view_form.js | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 6f4fcde3e95..3ee93c21b16 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1893,6 +1893,9 @@
 .openerp .oe_form .oe_form_group_cell .oe_kanban_view {
   position: static;
 }
+.openerp .oe_form .oe_form_readonly .oe_form_field:empty {
+  display: none;
+}
 .openerp .oe_form .oe_form_button.oe_button {
   height: 22px;
   white-space: nowrap;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 4283a9633b3..1d1dabe3c6d 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1520,6 +1520,9 @@ $colour4: #8a89ba
         .oe_form_group_cell .oe_kanban_view
             // Hack due to absolute positioning of kanban view messing with o2m
             position: static
+
+        .oe_form_readonly .oe_form_field:empty
+            display: none
     // }}}
     // FormView.buttons {{{
     .oe_form
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 6bc708527af..be78ce8f006 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1004,7 +1004,7 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
         this.process($new_sheet);
     },
     process_form: function($form) {
-        if ($form.find('> sheet').length == 0) {
+        if ($form.find('> sheet').length === 0) {
             $form.addClass('oe_form_nosheet');
         }
         var $new_form = this.render_element('FormRenderingForm', $form.getAttributes());

From 48f8823bad836df2dfae55795625470ff59061c0 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 4 Jun 2012 14:11:39 +0200
Subject: [PATCH 54/71] [IMP] replaced all oe_form_topbar with the new <header>
 style

bzr revid: fp@tinyerp.com-20120604121139-zqoqbou9v2fdue5h
---
 addons/account/account_invoice_view.xml       |  8 +--
 addons/account/account_view.xml               | 24 ++++-----
 addons/account/res_config_view.xml            |  4 +-
 addons/account_budget/account_budget_view.xml |  4 +-
 .../account_payment/account_payment_view.xml  |  4 +-
 .../account_voucher/account_voucher_view.xml  |  4 +-
 .../voucher_payment_receipt_view.xml          |  8 +--
 .../voucher_sales_purchase_view.xml           |  8 +--
 addons/base_calendar/base_calendar_view.xml   |  8 +--
 addons/base_setup/base_setup_views.xml        |  4 +-
 addons/base_setup/res_config_view.xml         |  4 +-
 addons/crm/crm_lead_view.xml                  |  6 +--
 addons/crm/crm_meeting_view.xml               |  4 +-
 addons/crm/crm_phonecall_view.xml             |  4 +-
 .../crm_opportunity_to_phonecall_view.xml     | 50 +++++++++----------
 addons/crm_claim/crm_claim_view.xml           |  4 +-
 .../crm_fundraising/crm_fundraising_view.xml  |  4 +-
 addons/crm_helpdesk/crm_helpdesk_view.xml     |  4 +-
 addons/delivery/delivery_view.xml             |  2 +-
 addons/event/event_view.xml                   |  8 +--
 addons/hr/hr_view.xml                         |  4 +-
 addons/hr/res_config_view.xml                 |  4 +-
 addons/hr_evaluation/hr_evaluation_view.xml   |  4 +-
 addons/hr_expense/hr_expense_view.xml         |  4 +-
 addons/hr_holidays/hr_holidays_view.xml       |  8 +--
 addons/hr_payroll/hr_payroll_view.xml         |  8 +--
 addons/hr_recruitment/hr_recruitment_view.xml |  4 +-
 .../hr_timesheet_invoice_view.xml             |  4 +-
 .../hr_timesheet_sheet_view.xml               |  4 +-
 addons/idea/idea_view.xml                     |  4 +-
 addons/knowledge/res_config_view.xml          |  4 +-
 addons/lunch/lunch_view.xml                   |  4 +-
 addons/marketing/res_config_view.xml          |  4 +-
 .../marketing_campaign_view.xml               | 12 ++---
 addons/mrp/mrp_view.xml                       |  4 +-
 addons/mrp/res_config_view.xml                |  4 +-
 addons/mrp_operations/mrp_operations_view.xml |  4 +-
 addons/mrp_repair/mrp_repair_view.xml         |  4 +-
 addons/point_of_sale/point_of_sale_view.xml   |  4 +-
 addons/procurement/procurement_view.xml       |  4 +-
 addons/project/project_view.xml               |  8 +--
 addons/project/res_config_view.xml            |  4 +-
 addons/project_issue/project_issue_view.xml   |  4 +-
 .../project_long_term_view.xml                |  4 +-
 .../project_planning_view.xml                 |  4 +-
 addons/project_scrum/project_scrum_view.xml   |  8 +--
 addons/purchase/purchase_view.xml             |  4 +-
 addons/purchase/res_config_view.xml           |  4 +-
 .../purchase_requisition_view.xml             |  4 +-
 addons/sale/sale_view.xml                     |  4 +-
 addons/stock/res_config_view.xml              |  4 +-
 addons/stock/stock_view.xml                   | 44 +++++++---------
 addons/stock_planning/stock_planning_view.xml |  8 +--
 addons/subscription/subscription_view.xml     |  4 +-
 addons/survey/survey_view.xml                 |  8 +--
 55 files changed, 185 insertions(+), 193 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 6545a59ae65..9d8ade644c6 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -143,14 +143,14 @@
             <field name="priority">2</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="invoice_open" states="draft,proforma2" string="Validate"/>
                     <button name="%(action_account_invoice_refund)d" type='action' string='Ask Refund' states='open,paid'/>
                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="base.group_no_one"/>
                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
                     <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
                     <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
-                </div>
+                </header>
                 <sheet string="Supplier Invoice" layout="auto">
                     <group col="8" colspan="4" class="oe_form_header">
                         <field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"/>
@@ -256,7 +256,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                 	<button name="action_invoice_sent" type="object" string="Send by Email" states="open" attrs="{'invisible':['|',('sent','=',True), ('state', '=', 'draft')]}"/>
                 	<button name="invoice_print" string="Print Invoice" type="object" states="open" attrs="{'invisible':['|',('sent','=',True), ('state', '=', 'draft')]}"/>
                     <button name="invoice_open" states="draft,proforma2" string="Validate"/>
@@ -267,7 +267,7 @@
                     <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
                     <!--button name="%(account_invoices)d" string="Print Invoice" type="action" states="open,paid,proforma,sale,proforma2"/-->
                     <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
-                </div>
+                </header>
                 <sheet string="Invoice" layout="auto">
                     <group colspan="4" col="8" class="oe_form_header">
                     <field name="journal_id" groups="base.group_user" on_change="onchange_journal_id(journal_id, context)" widget="selection"/>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 237ab245943..6eec7156d25 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -12,11 +12,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="create_period" states="draft" string="Create Monthly Periods" type="object"/>
                     <button name="create_period3" states="draft" string="Create 3 Months Periods" type="object"/>
                     <field name="state" select="1" widget="statusbar" nolabel="1" />
-                </div>
+                </header>
                 <sheet string="Fiscalyear" layout="auto">
                     <group class="oe_form_header">
                     <field name="name"/>
@@ -94,10 +94,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="action_draft" states="done" string="Set to Draft" type="object" groups="account.group_account_manager"/>
                     <field name="state" widget="statusbar" nolabel="1"/>
-                </div>
+                </header>
                 <sheet string="Period" layout="auto">
                 <group class="oe_form_header">
                     <field name="name"/>
@@ -595,12 +595,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="button_confirm_bank" states="draft" string="Confirm" type="object" />
                     <button name="button_dummy" states="draft" string="Compute" type="object"/>
                     <button name="button_cancel" states="confirm" string="Cancel" type="object"/>
                     <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
-                </div>
+                </header>
                 <sheet string="Bank Statement" layout="auto">
                     <group col="7" colspan="4" class="oe_form_header">
                         <field name="name" select="1"/>
@@ -657,12 +657,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="button_confirm_bank" states="draft" string="Confirm" type="object" />
                     <button name="button_dummy" states="draft" string="Compute" type="object"/>
                     <button name="button_cancel" states="confirm" string="Cancel" type="object"/>
                     <field name="state"  widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
-                </div>
+                </header>
                 <sheet string="Bank Statement" layout="auto">
                     <group col="7" colspan="4" class="oe_form_header">
                         <field name="name" select="1"/>
@@ -1349,11 +1349,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="button_validate" states="draft" string="Post" type="object"/>
                     <button name="button_cancel" states="posted" string="Cancel" type="object"/>
                     <field name="state" select="1" widget="statusbar" nolabel="1" />
-                </div>
+                </header>
                 <sheet string="Journal Entries" layout="auto">
                     <group colspan="4" col="6" class="oe_form_header">
                         <field name="name" readonly="True"/>
@@ -2617,12 +2617,12 @@ action = pool.get('res.config').next(cr, uid, [], context)
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="button_confirm_cash" states="open" string="Close CashBox" type="object"/>
                     <button name="button_open" states="draft" string="Open CashBox" type="object"/>
                     <button name="button_cancel" states="confirm,open" string="Cancel" type="object" groups="base.group_extended"/>
                     <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
-                </div>
+                </header>
                 <sheet string="Statement" layout="auto">
                     <group col="6" colspan="4" class="oe_form_header">
                         <field name="name" select="1"/>
diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index 1cf1e40f02b..41a0b121735 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -16,10 +16,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Configure Accounting" layout="manual">
-                    <div class="oe_form_topbar">
+                    <header>
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
-                    </div>
+                    </header>
                     <sheet layout="auto">
                         <field name="has_default_company" invisible="1" />
                         <field name="has_chart_of_accounts" invisible="1"/>
diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index e99423c3f01..667d35a9d6d 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -105,14 +105,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button string="Confirm" name="confirm" states="draft" type="workflow" />
                     <button string="Approve" name="validate" states="confirm" type="workflow"/>
                     <button string="Done" name="done" states="validate" type="workflow"   />
                     <button name="draft" states="cancel" string="Reset to Draft" type="workflow"/>
                     <button string="Cancel" name="cancel" states="confirm,validate" type="workflow"/>
                     <field name="state" select="1" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
-                </div>
+                </header>
                 <sheet string="Budget" layout="auto">
                 <group class="oe_form_header">
                             <field name="name" colspan="1" select="1" attrs="{'readonly':[('state','!=','draft')]}"/>
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index b6dc9743933..892c8636caf 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -101,13 +101,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="open" states="draft" string="Confirm Payments" />
                     <button name="set_done" states="open" string="Make Payments" type="object"/>
                     <button name="set_to_draft" states="cancel" string="Set to draft" type="object"/>
                     <button name="cancel" states="draft,open" string="Cancel"/>
                     <field name="state" select="1" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
-                </div>
+                </header>
                 <sheet string="Payment order" layout="auto">
                     <group col="6" colspan="4" class="oe_form_header">
                       <field name="reference"/>
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 4747ac65bd8..fe282138a72 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -40,13 +40,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                  <div class="oe_form_topbar">
+                  <header>
                       <button name="proforma_voucher" string="Post" states="draft"/>
                       <button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to unreconcile this record?"/>
                       <button name="cancel_voucher" string="Cancel" states="draft,proforma" />
                       <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>
                       <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
-                  </div>
+                  </header>
                   <sheet string="Accounting Voucher" layout="auto">
                     <group col="6" colspan="4" class="oe_form_header">
                         <field name="partner_id" required="1" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 1571992e4cf..f426b259ab6 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -144,13 +144,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="proforma_voucher" string="Validate" states="draft" invisible="context.get('line_type', False)"/>
                     <button name="cancel_voucher" string="Cancel" states="draft,proforma"  invisible="context.get('line_type', False)"/>
                     <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile and cancel this record ?"/>
                     <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" invisible="context.get('line_type', False)"/>
                     <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
-                </div>
+                </header>
                 <sheet string="Bill Payment" layout="auto">
                     <group col="6" colspan="4" class="oe_form_header">
                         <field name="partner_id" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'invoice_currency':currency_id, 'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"  string="Supplier"/>
@@ -295,13 +295,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="proforma_voucher" string="Validate" states="draft" invisible="context.get('line_type', False)"/>
                     <button name="cancel_voucher" string="Cancel" states="draft,proforma"  invisible="context.get('line_type', False)"/>
                     <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile and cancel this record ?"/>
                     <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" invisible="context.get('line_type', False)"/>
                     <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
-                </div>
+                </header>
                 <sheet string="Customer Payment" layout="auto">
                     <group col="6" colspan="4" class="oe_form_header">
                         <field name="partner_id" domain="[('customer','=',True)]" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer': 1}"/>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index edbdc2f8c41..5134c55c2a8 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -81,14 +81,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="proforma_voucher" string="Validate" states="draft"/>
                     <button name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id':partner_id, 'reference':reference, 'amount':amount}" type="action" string="Pay" attrs="{'invisible':['|',('pay_now','=','pay_now'),'|',('state','=','draft'), ('paid','=',True)]}"/>
                     <button name="cancel_voucher" string="Cancel" states="draft,proforma" />
                     <button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to confirm this record ?"/>
                     <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>
                     <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
-                </div>
+                </header>
                 <sheet string="Sales Receipt" layout="auto">
                     <group col="6" colspan="4" class="oe_form_header">
                         <field name="partner_id" domain="[('customer','=',True)]" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer': 1}"/>
@@ -207,14 +207,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="proforma_voucher" string="Validate" states="draft"/>
                     <button name="%(act_pay_bills)d" context="{'narration':narration, 'title':'Bill Payment', 'type':'payment', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay Bill" attrs="{'invisible':['|',('pay_now','=','pay_now'),'|',('state','=','draft'), ('paid','=',True)]}"/>
                     <button name="cancel_voucher" string="Cancel" states="draft,proforma" />
                     <button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to confirm this record ?"/>
                     <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>
                     <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
-                </div>
+                </header>
                 <sheet string="Supplier Voucher" layout="auto">
                     <field name="pay_now" invisible="1"/>
                     <group col="6" colspan="4" class="oe_form_header">
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index a5b6cd532e0..e5e45c07d61 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -9,7 +9,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                    <div class="oe_form_topbar">
+                    <header>
                         <button name="do_tentative"
                             states="needs-action,declined,accepted"
                             string="Uncertain" type="object"
@@ -27,7 +27,7 @@
                             states="needs-action,tentative,accepted"
                             type="object" />
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="tentative,needs-action,accepted" statusbar_colors='{"proforma":"blue"}'/>
-                    </div>
+                    </header>
                     <sheet string="Invitation details" layout="auto">
                         <group col="6" colspan="4">
                             <field name="email" string="Invitation To"/>
@@ -211,7 +211,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="do_confirm"
                         string="Confirm"
                         states="tentative,cancelled"
@@ -228,7 +228,7 @@
                         type="object"
                         />
                     <field name="state" widget="statusbar" nolabel="1" statusbar_visible="tentative,confirmed" statusbar_colors='{"proforma":"blue"}'/>
-                </div>
+                </header>
                 <sheet string="Events" layout="auto">
                     <group col="6" colspan="4">
                         <field name="name" select="1" string="Summary"
diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index b0b533d78e1..0692b4f651c 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -46,10 +46,10 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Configure Sales" layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button string="Apply" type="object" name="execute"/>
                     <button string="Cancel" special="cancel"/>
-                </div>
+                </header>
                 <sheet layout="auto">
                     <group>
                         <group name="config_sale" colspan="4"/>
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 0281263397a..ccf231924fe 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -7,10 +7,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="General Settings" layout="manual">
-                    <div class="oe_form_topbar">
+                    <header>
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
-                    </div>
+                    </header>
                     <sheet layout="auto">
                         <separator string="Company Settings" colspan="4"/>
                         <field name="module_multi_company"/>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index cbd0581c240..35180ebf937 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -61,7 +61,7 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Leads Form" layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="%(crm.action_crm_lead2opportunity_partner)d" string="Convert to Opportunity" type="action"
                             states="draft,open,pending" help="Convert to Opportunity"/>
                     <button name="case_escalate" string="Escalate" type="object"
@@ -72,7 +72,7 @@
                             states="draft,open,pending"/>
                     <field name="stage_id" widget="statusbar"
                             on_change="onchange_stage_id(stage_id)"/>
-                </div>
+                </header>
                 <sheet layout="auto">
                 <group colspan="4" col="7">
                     <field name="name"/>
@@ -371,7 +371,7 @@
         <field name="priority">20</field>
         <field name="arch" type="xml">
             <form string="Opportunities" validate="0">
-                <header class="oe_form_topbar">
+                <header>
                     <button name="case_mark_won" string="Mark Won" states="open,pending" type="object" />
                     <button name="case_open" string="Open" states="draft,pending" type="object" />
                     <button name="case_pending" string="Pending" states="draft,open" type="object" />
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 233c5fc9413..ea6f0bf7e43 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -26,7 +26,7 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Meetings" layout="manual">
-                <div class="oe_form_topbar oe_form_topbar_hifirst">
+                <header>
                     <button name="case_open" string="Confirm" type="object"
                             states="draft"/>
                     <button name="case_close" string="Done" type="object"
@@ -36,7 +36,7 @@
                     <button name="case_cancel" string="Cancel" type="object"
                             states="draft,open"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,done"/>
-                </div>
+                </header>
                 <sheet layout="auto">
                 <group col="6" colspan="4">
                     <field name="name" select="1" string="Title"
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 07c33e4211b..2e1c35e683a 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -63,7 +63,7 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form layout="manual">
-            <div class="oe_form_topbar">
+            <header>
                 <button name="case_open" string="Confirm" type="object"
                         states="draft,pending" icon="gtk-go-forward"/>
                 <button name="case_close" string="Held" type="object"
@@ -73,7 +73,7 @@
                 <button name="case_cancel" string="Cancel" type="object"
                         states="draft,open,pending" icon="gtk-cancel"/>
                 <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,done"/>
-            </div>
+            </header>
             <sheet string="Phone Call" layout="auto">
                  <group colspan="6" col="7">
                     <field name="name" required="1"/>
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
index 3904377bdc7..d0499bbdf6c 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-    	<!-- Opportunity to Phonecall view -->
+        <!-- Opportunity to Phonecall view -->
 
         <record model="ir.ui.view" id="opportunity2phonecall_view">
             <field name="name">crm.opportunity2phonecall.form</field>
@@ -10,36 +10,36 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Schedule/Log a Call" layout="manual">
-	            <div class="oe_form_topbar">
-                       	<button name="action_schedule" type="object" string="Log call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'log')]}" />
-                        <button name="action_schedule" type="object" string="Schedule Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" />
-                        <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
-                    </div>
-		    <group>
-		    	<group>
-			    <field name="action"/>
-			    <field name="name"/>
-			    <field name="date" string="Planned Date" attrs="{'invisible': [('action','=','log')]}"/>
-			</group>
-			<group>
-			    <field name="partner_id" readonly="True"/>
-			    <field name="categ_id" string="Type"
-			    	widget="selection"
-				domain="[('object_id.model', '=', 'crm.phonecall')]"
-				groups="base.group_no_one"/>
-			    <field name="phone"/>
-			    <field name="user_id" attrs="{'invisible': [('action','=','log')]}"/>
-			    <field name="section_id" widget="selection" attrs="{'invisible': [('action','=','log')]}"/>
-			</group>
-	            </group>
+                <header>
+                    <button name="action_schedule" type="object" string="Log call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'log')]}" />
+                    <button name="action_schedule" type="object" string="Schedule Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" />
+                    <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
+                </header>
+            <group>
+                <group>
+                <field name="action"/>
+                <field name="name"/>
+                <field name="date" string="Planned Date" attrs="{'invisible': [('action','=','log')]}"/>
+            </group>
+            <group>
+                <field name="partner_id" readonly="True"/>
+                <field name="categ_id" string="Type"
+                    widget="selection"
+                domain="[('object_id.model', '=', 'crm.phonecall')]"
+                groups="base.group_no_one"/>
+                <field name="phone"/>
+                <field name="user_id" attrs="{'invisible': [('action','=','log')]}"/>
+                <field name="section_id" widget="selection" attrs="{'invisible': [('action','=','log')]}"/>
+            </group>
+                </group>
                     <field name="note"/>
                 </form>
             </field>
         </record>
 
-		<!-- Opportunity to Phonecall action -->
+        <!-- Opportunity to Phonecall action -->
 
- 		<record model="ir.actions.act_window" id="opportunity2phonecall_act">
+         <record model="ir.actions.act_window" id="opportunity2phonecall_act">
             <field name="name">Schedule/Log Call</field>
             <field name="res_model">crm.opportunity2phonecall</field>
             <field name="view_type">form</field>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 49b9f06b544..4e49a0d9db8 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -89,7 +89,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="case_open" string="Open" type="object"
                             states="draft,pending"/>
                     <button name="case_close" string="Done" type="object"
@@ -106,7 +106,7 @@
                             states="draft,open,pending"/>
                     <field name="stage_id" widget="statusbar"
                             on_change="onchange_stage_id(stage_id)"/>
-                </div>
+                </header>
                 <sheet string="Claims" layout="auto">
                     <group>
                         <field name="name" />
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 6861034cbd2..02f85b1ad7f 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -62,7 +62,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="case_close" string="Done" states="open,pending" type="object" />
                     <button name="case_open" string="Open" states="draft,pending" type="object" />
                     <button name="case_pending" string="Pending" states="draft,open" type="object" />
@@ -70,7 +70,7 @@
                     <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" />
                     <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" />
                     <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
-                </div>
+                </header>
                 <sheet string="Funds Form" layout="auto">
                     <group colspan="4" col="6" class="oe_form_header">
                         <field name="name" select="1" string="Name"/>
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 6f683470534..d6b21ab9191 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -29,7 +29,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="case_open" string="Open" type="object"
                             states="draft,pending"/>
                     <button name="case_close" string="Close" type="object"
@@ -43,7 +43,7 @@
                     <button name="case_cancel" string="Cancel" type="object"
                             states="draft,open,pending"/>
                     <field name="state" select="1" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
-                </div>
+                </header>
                 <sheet string="Helpdesk Support" layout="auto">
                     <group colspan="4" col="7" class="oe_form_header">
                         <field name="name" select="1" string="Query"/>
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 10f12a63f4e..5eea9132f7c 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -266,7 +266,7 @@
             <field name="model">stock.picking</field>
             <field name="inherit_id" ref="stock.view_picking_out_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/div[@class='oe_form_topbar']/button[@string='Create Invoice']" position="after">
+                <header>
                     <button name="%(report_shipping)d" string="Delivery Order" states="done" type="action" icon="gtk-print"/>
                 </xpath>
             </field>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 3706a292c6e..e5442b5ec5f 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -51,13 +51,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Events" layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button string="Confirm Event" name="button_confirm" states="draft" type="object"/>
                     <button string="Event Ended" name="button_done" states="confirm" type="object"/>
                     <button string="Set To Draft" name="button_draft" states="cancel,done" type="object"/>
                     <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,done"/>
-                </div>
+                </header>
                 <sheet layout="manual">
 
 
@@ -352,13 +352,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="registration_open" string="Confirm" states="draft" type="object"/>
                     <button name="button_reg_close" string="Attended" states="open" type="object"/>
                     <button string="Set To Unconfirmed" name="do_draft" states="cancel,done" type="object"/>
                     <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object"/>
                     <field name="state" select="1" nolabel="1" colspan="2" widget="statusbar" statusbar_visible="draft,open,done"/>
-                </div>
+                </header>
                 <sheet string="Registration" layout="auto">
                     <group col="6" colspan="4">
                         <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]"/>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 5910a1f2244..461ba8fd71a 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -346,12 +346,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="job_recruitement" string="In Recruitement" states="open" type="object"/>
                     <button name="job_open" string="In Position" states="old,recruit" type="object"/>
                     <button name="job_old" string="Mark as Old" states="open,recruit" type="object"/>
                     <field name="state" widget="statusbar" statusbar_visible="recruit,open"/>
-                </div>
+                </header>
                 <sheet string="Job" layout="auto">
                     <group col="6" colspan="4">
                     <field name="name" />
diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index 739eaacdf79..e6b55ba45f0 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -15,10 +15,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string ="Configure Human Resources" layout="manual">
-                    <div class="oe_form_topbar">
+                    <header>
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
-                    </div>
+                    </header>
                     <sheet layout="auto">
                         <separator string="Additional Features" colspan="4"/>
                         <field name="module_hr_expense"/>
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 6479d66caf7..103c9f62722 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -155,14 +155,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="button_plan_in_progress" string="Start Appraisal" states="draft" type="object"/>
                     <button name="button_final_validation" string="Validate Appraisal" states="wait" type="object"/>
                     <button name="button_done" string="Done" states="progress" type="object"/>
                     <button name="button_draft" string="Reset to Draft" states="cancel" type="object"/>
                     <button name="button_cancel" string="Cancel" states="draft,wait,progress" type="object"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,progress,wait,done" statusbar_colors='{"progress":"blue"}'/>
-                </div>
+                </header>
                 <sheet string="Appraisal" layout="auto">
                     <group col="4" colspan="3">
                         <separator string="Appraisal Data" colspan="4"/>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index cf478a3585f..2fc1340fd23 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -64,14 +64,14 @@
             <field name="model">hr.expense.expense</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="confirm" states="draft" string="Submit to Manager" type="workflow"/>
                     <button name="validate" states="confirm" string="Approve" type="workflow" groups="base.group_hr_user"/>
                     <button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" groups="base.group_hr_user"/>
                     <button name="invoice" states="accepted" string="Invoice" type="object" groups="base.group_hr_user"/>
                     <button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" groups="base.group_hr_user" />
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,accepted" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
-                </div>
+                </header>
                 <sheet string="Expenses Sheet" layout="auto">
                     <group colspan="4" col="6">
                         <field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 8842a8c466a..58abaae02ac 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -64,14 +64,14 @@
             <field name="priority">1</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button string="Submit to Manager" name="confirm" states="draft" type="workflow"/>
                     <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user"/>
                     <button string="Validate" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user"/>
                     <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" groups="base.group_hr_user,base.group_hr_manager"/>
                     <button string="Reset to New" name="set_to_draft" states="refuse,validate" type="object" groups="base.group_hr_user"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
-                </div>
+                </header>
                 <sheet string="Leave Request" layout="auto">
                     <group col="8" colspan="4">
                     <field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
@@ -113,14 +113,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button string="Submit to Manager" name="confirm" states="draft" type="workflow"/>
                     <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user"/>
                     <button string="Validate" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user"/>
                     <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" groups="base.group_hr_user"/>
                     <button string="Reset to New" name="set_to_draft" states="cancel,validate,refuse" type="object" groups="base.group_hr_user"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
-                </div>
+                </header>
                 <sheet string="Allocation Request" layout="auto">
                 <group col="8" colspan="4" class="oe_form_header">
                     <field name="name"/>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 9e8fbe5dec5..f2626670523 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -261,14 +261,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button string="Confirm" name="hr_verify_sheet" states="draft"/>
                     <button string="Refund" name="refund_sheet" states="confirm,done" type='object'/>
                     <button string="Set to Draft" name="draft" states="cancel"/>
                     <button string="Compute Sheet" name="compute_sheet" type="object" states="draft"/>
                     <button string="Cancel" name="cancel_sheet" states="draft,hr_check,confirm,verify"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
-                </div>
+                </header>
                 <sheet string="Payslip" layout="auto">
                     <group col="6" colspan="4" class="oe_form_header">
                         <field name="employee_id" on_change="onchange_employee_id(date_from, date_to, employee_id, contract_id)"/>
@@ -722,12 +722,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="close_payslip_run" type="object" string="Close" states="draft"/>
                     <button name="%(action_hr_payslip_by_employees)d" type="action" states="draft" string="Generate Payslips" />
                     <button string="Set to Draft" name="draft_payslip_run" type="object" states="close"/>
                     <field name="state" widget="statusbar"/>
-                </div>
+                </header>
                 <sheet string="Payslips Batches" layout="auto">
                     <group col="6" colspan="4" class="oe_form_header">
                         <field name="name" colspan="4"/>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 2d466c95e6d..19039fc0dc9 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -71,7 +71,7 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form layout="manual">
-            <div class="oe_form_topbar">
+            <header>
                 <button name="%(action_hr_recruitment_hired_employee)d" string="Hire" type="action"
                         states="open,pending"/>
                 <button name="case_open" string="Open" type="object"
@@ -87,7 +87,7 @@
                 <button name="stage_next" string="Next" type="object"
                         states="open" icon="gtk-go-forward"/>
                 <field name="stage_id" widget="statusbar"/>
-            </div>
+            </header>
             <sheet string="Jobs - Recruitment Form" layout="auto">
                 <group colspan="4" col="4">
                     <field name="name" string="Subject"/>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 28d577fe445..f9486982432 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -23,14 +23,14 @@
                     </group>
                 </group>
                 <xpath expr="/form/sheet" position='before'>
-                    <div class="oe_form_topbar">
+                    <header>
                         <button name="set_pending" string="Pending" type="object" states="open"/>
                         <button name="set_close" string="Close" type="object" states="open,pending"/>
                         <button name="set_open" string="Re-open project" type="object" states="pending,cancelled,close,draft"/>
                         <button name="set_cancel" string="Cancel" type="object" states="open,pending"/>
                         <field name="state" readonly="1" widget="statusbar"
                             statusbar_visible="open,pending,close" statusbar_colors='{"pending":"red", "template":"blue"}'/>
-                    </div>
+                    </header>
                 </xpath>
             </field>
         </record>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 213be0c672f..afd04aed1e1 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -61,13 +61,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="button_confirm" states="draft" string="Submited to Manager" type="object"/>
                     <button name="done" states="confirm" string="Approve" type="workflow" groups="base.group_hr_user"/>
                     <button name="action_set_to_draft" states="done" string="Set to Draft" type="object"/>
                     <button name="cancel" states="confirm" string="Refuse" type="workflow" groups="base.group_hr_user"/>
                     <field name="state" widget="statusbar" statusbar_visible="new,confirm,done"/>
-                </div>
+                </header>
                 <sheet string="Timesheet" layout="auto">
                     <group colspan="4" col="6" class="oe_form_header">
                         <field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 7240c79f590..0e9fb40020f 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -183,12 +183,12 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form layout="manual">
-            <div class="oe_form_topbar">
+            <header>
                 <button name="idea_open" string="Open" states="draft"/>
                 <button name="idea_close" string="Accept" states="open"/>
                 <button name="idea_cancel" string="Refuse" states="open" />
                 <field name="state" widget="statusbar" statusbar_visible="draft,open,close"/>
-            </div>
+            </header>
             <sheet string="New Idea" layout="auto">
             <group col="6" colspan="4" class="oe_form_header">
                 <field name="name" select="1" />
diff --git a/addons/knowledge/res_config_view.xml b/addons/knowledge/res_config_view.xml
index 6816a9da3a1..d1debeaf562 100644
--- a/addons/knowledge/res_config_view.xml
+++ b/addons/knowledge/res_config_view.xml
@@ -7,10 +7,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Configure Knowledge" layout="manual">
-                    <div class="oe_form_topbar">
+                    <header>
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
-                    </div>
+                    </header>
                     <sheet layout="auto">
                         <separator string="Wiki" colspan="4"/>
                         <field name="module_wiki_faq"/>
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index ff2c684bb4c..57360829e19 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -24,11 +24,11 @@
             <field name="model">lunch.order</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="%(action_lunch_order_confirm)d" string="Confirm Order" type="action" attrs="{'invisible':[('state','=','confirmed')]}"/>
                     <button name="%(action_lunch_order_cancel)d" string="Cancel Order" type="action"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirmed"/>
-                </div>
+                </header>
                 <sheet string="Order" layout="auto">
                     <field name="user_id" select="1"/>
                     <field name="date" select="1"/>
diff --git a/addons/marketing/res_config_view.xml b/addons/marketing/res_config_view.xml
index b7230aa65a7..7a36956a9dc 100644
--- a/addons/marketing/res_config_view.xml
+++ b/addons/marketing/res_config_view.xml
@@ -7,10 +7,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Configure Marketing" layout="manual">
-                    <div class="oe_form_topbar">
+                    <header>
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
-                    </div>
+                    </header>
                     <sheet layout="auto">
                         <separator string="Campaigns" colspan="4"/>
                         <field name="module_marketing_campaign"/>
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index bec1bede756..9be08469cf4 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -16,13 +16,13 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form layout="manual">
-            <div class="oe_form_topbar">
+            <header>
                 <button name="state_running_set" string="Run" states="draft"/>
                 <button name="state_done_set" string="Done" states="running"/>
                 <button name="state_draft_set" string="Set to Draft" states="done,cancelled"/>
                 <button name="state_cancel_set" string="Cancel" states="running"/>
                 <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,running,done"/>
-            </div>
+            </header>
             <sheet string="Campaign" layout="auto">
                 <group colspan="4" col="6">
                     <group colspan="2" col="2">
@@ -137,13 +137,13 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form layout="manual">
-            <div class="oe_form_topbar">
+            <header>
                 <button name="state_running_set" string="Run" states="draft"/>
                 <button name="state_done_set" string="Close" states="running"/>
                 <button name="state_draft_set" string="Set to Draft" states="done,cancelled"/>
                 <button name="state_cancel_set" string="Cancel" states="running"/>
                 <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,running,done"/>
-            </div>
+            </header>
             <sheet string="Segments" layout="auto">
                 <group colspan="2" col="2">
                     <separator string="Segment" colspan="4"/>
@@ -358,12 +358,12 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form layout="manual">
-            <div class="oe_form_topbar">
+            <header>
                 <button string="Process" states="todo" name="process" type="object"/>
                 <button string="Reset" states="exception,cancelled" name="button_draft" type="object"/>
                 <button string="Cancel" states="todo,exception" name="button_cancel" type="object"/>
                 <field name="state" readonly="True" widget="statusbar" statusbar_visible="todo,done" statusbar_colors='{"exception":"red"}'/>
-            </div>
+            </header>
             <sheet string="Marketing Campaign Activities" layout="auto">
                 <group colspan="4" col="6">
                     <group colspan="2" col="2">
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 328df0175fc..7c8410cad7f 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -632,7 +632,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="button_confirm" states="draft" string="Confirm Production"/>
                     <button name="button_produce" states="ready" string="Start Production"/>
                     <button name="%(act_mrp_product_produce)d" states="in_production" string="Produce" type="action"/>
@@ -641,7 +641,7 @@
                     <button name="button_cancel" states="draft,ready,in_production,picking_except" string="Cancel"/>
                     <button name="action_cancel" type="object" states="confirmed" string="Cancel"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,ready,in_production,done" statusbar_colors='{"picking_except":"red","confirmed":"blue"}'/>
-                </div>
+                </header>
                 <sheet string="Manufacturing Orders" layout="auto">
                     <group colspan="4" col="7">
                         <field name="name" string="Reference"/>
diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index 8e5934b170a..258fe4f8356 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -7,10 +7,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Configure Manufacturing" layout="manual">
-                    <div class="oe_form_topbar">
+                    <header>
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
-                    </div>
+                    </header>
                     <sheet layout="auto">
                         <separator string="Manufacturing Order" colspan="4"/>
                         <field name="module_mrp_operations"/>
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index d3ababd765a..2ef70a9edf8 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -68,7 +68,7 @@
         <field name="inherit_id" eval="False"/>
         <field name="arch" type="xml">
             <form layout="manual">
-            <div class="oe_form_topbar">
+            <header>
                 <button name="button_start_working" string="Start" states="draft"/>
                 <button name="button_resume" string="Resume" states="pause"/>
                 <button name="button_done" string="Finished" states="startworking"/>
@@ -76,7 +76,7 @@
                 <button name="button_draft" string="Set Draft" states="cancel"/>
                 <button name="button_cancel" string="Cancel" states="draft,startworking"/>
                 <field name="state" widget="statusbar" statusbar_visible="draft,startworking"/>
-            </div>
+            </header>
             <sheet string="Work Orders" layout="auto">
                 <group col="6" colspan="4" class="oe_form_header">
                     <field colspan="4" name="name" select="1"/>
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index c338f5b8dfc..21e3dd5aa25 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -28,7 +28,7 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form layout="manual">
-               <div class="oe_form_topbar">
+               <header>
                    <button name="repair_confirm" states="draft" string="Confirm Repair"/>
                    <button name="repair_ready" states="confirmed" string="Start Repair"/>
                    <button name="action_repair_start" states="ready" string="Start Repair"/>
@@ -41,7 +41,7 @@
                    <button name="%(action_cancel_repair)d" states="invoice_except" string="Cancel Repair" type="action"/>
                    <button name="cancel" states="draft" string="Cancel Repair"/>
                    <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,ready" />
-               </div>
+               </header>
                <sheet string="Repairs order" layout="auto">
                 <group col="6" colspan="4" class="oe_form_header">
                     <field name="name"/>
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index f5729a14faf..670e10feec2 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -17,13 +17,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="%(action_pos_payment)d" string="Payment" type="action" states="draft"/>
                     <button name="%(action_report_pos_receipt)d" string="Reprint" type="action" states="paid,done,invoiced"/>
                     <button name="refund" string="Return Products" type="object"
                         attrs="{'invisible':[('state','=','draft')]}"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,paid,done" statusbar_colors='{"cancel":"red"}'/>
-                </div>
+                </header>
                 <sheet string="PoS Orders" layout="auto">
                     <group col="7" colspan="4" class="oe_form_header">
                         <field name="name"/>
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 402e3d8479f..09bf0c6c24f 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -47,13 +47,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                    <div class="oe_form_topbar">
+                    <header>
                         <button name="button_confirm" states="draft" string="Confirm"/>
                         <button name="button_check" states="confirmed" string="Run Procurement"/>
                         <button name="button_restart" states="exception" string="Retry"/>
                         <button name="button_cancel" states="draft,exception,waiting" string="Cancel"/>
                         <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed" />
-                    </div>
+                    </header>
                 <sheet string="Procurement" layout="auto">
                     <group col="2" colspan="2" class="oe_form_header">
                         <separator colspan="2" string="References"/>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index e655b3e84f9..408fe3572a4 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -19,7 +19,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Project" layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="set_done" string="Done" type="object" states="open,pending"/>
                     <button name="set_open" string="Re-open project" type="object" states="pending,cancelled,close"/>
                     <button name="set_pending" string="Pending" type="object" states="open"/>
@@ -28,7 +28,7 @@
                     <button name="reset_project" string="Reset as Project" type="object" states="template"/>
                     <button name="set_cancel" string="Cancel" type="object" states="open,pending"/>
                     <field name="state" widget="statusbar" statusbar_visible="open,close" statusbar_colors='{"pending":"blue"}' readonly="1"/>
-                </div>
+                </header>
                 <sheet string="Project" layout="auto">
                     <group colspan="6" col="6">
                         <field name="name" string="Project Name" select="1"/>
@@ -301,7 +301,7 @@
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <form string="Project" layout="manual">
-                    <div class="oe_form_topbar">
+                    <header>
                         <button name="do_open" string="Start Task" type="object"
                                 states="draft,pending"/>
                         <button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
@@ -321,7 +321,7 @@
                         <button name="stage_next" string="Next Stage" type="object"
                                 states="open,pending" icon="gtk-go-forward" attrs="{'invisible': [('stage_id','=', False)]}"/>
                         <field name="stage_id" widget="statusbar"/>
-                    </div>
+                    </header>
                     <sheet string="Task edition" layout="auto">
                     <group colspan="6" col="6">
                         <field name="name" select="1"/>
diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index ee937bfdcfc..4914ff26e88 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -8,10 +8,10 @@
             <field name="priority" eval="20"/>
             <field name="arch" type="xml">
                 <form string="Configure Project" layout="manual">
-                    <div class="oe_form_topbar">
+                    <header>
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
-                    </div>
+                    </header>
                     <sheet layout="auto">
                         <separator string="Project" colspan="4"/>
                         <field name="module_project_mrp"/>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 8560c87105d..895b4594185 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -51,7 +51,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="case_open" string="Open" type="object"
                             states="draft,pending"/>
                     <button name="case_close" string="Done" type="object"
@@ -71,7 +71,7 @@
                     <button name="case_cancel" string="Cancel" type="object"
                             states="draft,open,pending"/>
                     <field name="stage_id" widget="statusbar"/>
-                </div>
+                </header>
                 <sheet string="Issue Tracker Form" layout="auto">
                     <group colspan="4" col="6">
                         <field name="name"/>
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 936f9995606..0c175a4ef7e 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -142,14 +142,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button string="Start Phase" name="set_open" states="pending,draft"/>
                     <button string="Done" name="set_done" states="pending,open"/>
                     <button string="Pending" name="set_pending" states="open"/>
                     <button string="Draft" name="set_draft" states="open"/>
                     <button string="Cancel" name="set_cancel" states="draft,open,pending"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
-                </div>
+                </header>
                 <sheet string="Project Phase" layout="auto">
                     <group colspan="6" col="6">
                         <group colspan="6" col="7" >
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index 90294c1c30f..fd65ae61b88 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -27,13 +27,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="action_open" states="draft" string="Open" type="object" />
                     <button name="action_done" states="open" string="Done" type="object" />
                     <button name="action_draft" states="done,cancel" string="Reset to Draft" type="object" />
                     <button name="action_cancel" states="draft,open" string="Cancel" type="object" />
                    <field name="state" widget="statusbar" statusbar_visible="draft,open"/>
-                </div>
+                </header>
                 <sheet string="Planning by Account" layout="auto">
                     <group col="6" colspan="4" class="oe_form_header">
                         <field name="name" select="1" />
diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index b1669a99456..4e69dfd3550 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -53,7 +53,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button type="object" string="Open" name="button_open" states="draft,pending"/>
                     <button type="object" string="Close" name="button_close" states="open,pending"/>
                     <button type="object" string="Pending" name="button_pending" states="open"/>
@@ -61,7 +61,7 @@
                     <button type="object" string="Set to Draft" name="button_draft" states="cancel,done"/>
                     <button type="object" string="Cancel" name="button_cancel" states="draft,open,pending"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,open"/>
-                </div>
+                </header>
                 <sheet string="Product backlog" layout="auto">
                     <group colspan="4" col="8" class="oe_form_header">
                         <field name="name" select="1"/>
@@ -225,7 +225,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button type="object" string="Open" name="button_open" states="draft,pending"/>
                     <button type="object" string="Close" name="button_close" states="open,pending"/>
                     <button type="object" string="Pending" name="button_pending" states="open"/>
@@ -233,7 +233,7 @@
                                    string="Burndown Chart" type="action"/>
                     <button type="object" string="Set to Draft" name="button_draft" states="cancel,done"/>
                     <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,open"/>
-                </div>
+                </header>
                 <sheet string="Scrum Sprint" layout="auto">
                     <group colspan="4" col="6" class="oe_form_header">
                         <field name="name" select="1"/>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 9eebadd2a53..e561473363a 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -131,7 +131,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="purchase_confirm" states="draft,sent" string="Confirm Order" class="oe_form_button_hi"/>
                     <button name="wkf_send_rfq" states="draft" string="Send RFQ" type="object" context="{'send_rfq':True}"/>
                     <button name="wkf_send_rfq" states="confirmed" string="Resend Purchase Order" type="object"/>
@@ -145,7 +145,7 @@
                     <button name="action_cancel_draft" states="cancel,sent,confirmed" string="Set to Draft" type="object"/>
                     <button name="purchase_cancel" states="draft,confirmed,wait_auth,sent" string="Cancel"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,approved,done" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue","wait":"blue"}' readonly="1"/>
-                </div>
+                </header>
                 <sheet string="Purchase Order" layout="auto">
                     <group col="6" colspan="4">
                         <field name="name"/>
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index 3d4c96b9587..575863fddc4 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -7,10 +7,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Configure Purchases" layout="manual">
-                    <div class="oe_form_topbar">
+                    <header>
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
-                    </div>
+                    </header>
                     <sheet layout="auto">
                         <separator string="Invoicing" colspan="4"/>
                         <field name="default_invoice_method"/>
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index a0aec3736cf..2b2323308b2 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -33,13 +33,13 @@
         <field name="model">purchase.requisition</field>
         <field name="arch" type="xml">
             <form layout="manual">
-            <div class="oe_form_topbar">
+            <header>
                 <button name="tender_in_progress" states="draft" string="Start" type="object" />
                 <button name="tender_reset" states="done,cancel" string="Reset to Draft" type="object" />
                 <button name="tender_done" states="in_progress" string="Done" type="object" />
                 <button name="tender_cancel" states="draft,in_progress" string="Cancel" type="object" />
                 <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,in_progress,done" statusbar_colors='{"in_progress":"blue"}'/>
-            </div>
+            </header>
             <sheet string="Purchase Requisition" layout="auto">
                 <group colspan="4" col="6">
                     <field name="name"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 68f2a7a0f11..9d8b11f2d13 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -97,7 +97,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                    <div class="oe_form_topbar">
+                    <header>
                         <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice"/>
                         <button name="invoice_corrected" states="invoice_except" string="Ignore Exception"/>
                         <button name="ship_recreate" states="shipping_except" string="Recreate Delivery Order"/>
@@ -119,7 +119,7 @@
                         <button name="ship_cancel" states="shipping_except" string="Cancel"/>
                         <button name="invoice_cancel" states="invoice_except" string="Cancel"/>
                         <field name="state" widget="statusbar" statusbar_visible="draft,sent,progress,invoiced,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
-                </div>
+                </header>
                 <sheet string="Sales Order" layout="auto">
                     <group col="6" colspan="4" class="oe_form_header">
                         <group col="4" colspan="4">
diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index e760c453585..7d17d9eec50 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -8,10 +8,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string ="Configure Warehouse" layout="manual">
-                    <div class="oe_form_topbar">
+                    <header>
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
-                    </div>
+                    </header>
                     <sheet layout="auto">
                         <separator string="Traceability" colspan="4"/>
                         <field name="group_stock_production_lot"/>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index b47a7fa5999..e91d247b6d0 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -109,16 +109,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="action_confirm" states="draft" string="Confirm Inventory" type="object"/>
                     <button name="action_done" states="confirm" string="Validate Inventory" type="object"/>
                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
                     <button name="action_cancel_inventory" states="draft,confirm,done" string="Cancel Inventory" type="object"/>
-                    <div class="oe_right">
-                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
+                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
+                </header>
                 <sheet string="Physical Inventory" layout="auto">
                 <group class="oe_form_header">
                     <field name="name"/>
@@ -708,7 +705,7 @@
             <field eval="12" name="priority"/>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="draft_force_assign" states="draft" string="Confirm" type="object"/>
                     <button name="draft_validate" states="draft" string="Confirm &amp; Transfer" type="object"/>
                     <!-- <button name="action_assign" states="confirmed" string="Check Availability" type="object"/> -->
@@ -717,10 +714,8 @@
                     <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice"  attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}"  type="action" />
                     <button name="%(act_stock_return_picking)d" string="Reverse Transfer" states="done" type="action" />
                     <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel"/>
-                    <div class="oe_right">
-                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,assigned,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
-                    </div>
-                </div>
+                    <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,assigned,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
+                </header>
                 <sheet string="Internal Picking List" layout="auto">
                     <group colspan="4" col="6">
                         <group colspan="4" col="4">
@@ -928,18 +923,18 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="/form/div[@class='oe_form_topbar']/button[@name='%(act_stock_return_picking)d']" position="replace">
+                    <xpath expr="/form/header/button[@name='%(act_stock_return_picking)d']" position="replace">
                         <button name="%(report_picking_list_out)d" string="Print Delivery Slip" type="action" states="done"/>
                         <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" />
                     </xpath>
-                    <xpath expr="/form/div[@class='oe_form_topbar']/button[@name='draft_validate']" position="replace">
+                    <xpath expr="/form/header/button[@name='draft_validate']" position="replace">
                         <button name="draft_validate" states="draft" string="Confirm &amp; Deliver" type="object"/>
                         <button name="action_assign" states="confirmed" string="Check Availability" type="object"/>
                     </xpath>
-                    <xpath expr="/form/div[@class='oe_form_topbar']/button[@name='action_process']" position="replace">
+                    <xpath expr="/form/header/button[@name='action_process']" position="replace">
                         <button name="action_process" states="assigned" string="Deliver" type="object" icon="gtk-go-forward"/>
                     </xpath>
-                    <xpath expr="/form/div[@class='oe_form_topbar']/div[@class='oe_right']/field[@name='state']" position="replace">
+                    <xpath expr="/form/header/div[@class='oe_right']/field[@name='state']" position="replace">
                         <field name="state" nolabel="1" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
                     </xpath>
                     <xpath expr="/form/sheet/group/group/field[@name='partner_id']" position="replace">
@@ -1048,13 +1043,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="/form/div[@class='oe_form_topbar']/button[@name='%(act_stock_return_picking)d']" position="replace">
+                    <xpath expr="/form/header/button[@name='%(act_stock_return_picking)d']" position="replace">
                         <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" />
                     </xpath>
-                    <xpath expr="/form/div[@class='oe_form_topbar']/button[@name='draft_validate']" position="replace">
+                    <xpath expr="/form/header/button[@name='draft_validate']" position="replace">
                         <button name="draft_validate" states="draft" string="Confirm &amp; Receive" type="object"/>
                     </xpath>
-                    <xpath expr="/form/div[@class='oe_form_topbar']/button[@name='action_process']" position="replace">
+                    <xpath expr="/form/header/button[@name='action_process']" position="replace">
                         <button name="action_process" states="assigned" string="Receive" type="object"/>
                     </xpath>
                     <xpath expr="/form/sheet/group/group/field[@name='partner_id']" position="replace">
@@ -1187,16 +1182,13 @@
             <field eval="4" name="priority"/>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="action_confirm" states="draft" string="Process Later" type="object"/>
                     <button name="action_done" states="draft,assigned,confirmed" string="Process Now" type="object"/>
                     <button name="force_assign" states="confirmed" string="Set Available" type="object"/>
                     <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object"/>
-                    <div class="oe_right">
-                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
+                    <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
+                </header>
                 <sheet string="Stock Moves" layout="auto">
                     <group colspan="4" col="7">
                         <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
@@ -1373,13 +1365,13 @@
             <field eval="6" name="priority"/>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="action_confirm" states="draft" string="Process Later" type="object"/>
                     <button name="force_assign" states="confirmed" string="Set Available" type="object"/>
                     <button name="%(action_partial_move_server)d" string="Process" type="action" states="assigned"/>
                     <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
-                </div>
+                </header>
                 <sheet string="Receive Products" layout="auto">
                     <group colspan="4" col="7">
                         <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index cb07baaeaa3..1b5cd953027 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -13,11 +13,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="button_open" string="Open" states="draft" type="object"/>
                     <button name="button_close" string="Close" states="open" type="object"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,open"/>
-                </div>
+                </header>
                 <sheet string="Stock Periods" layout="auto">
                     <group class="oe_form_header">
                         <field name="name" colspan="2"/>
@@ -82,10 +82,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="action_validate" string="Approve" states="draft" type="object" />
                     <field name="state" widget="statusbar"/>
-                </div>
+                </header>
                 <sheet string="Stock and Sales Forecast" layout="auto">
                     <group colspan = "4" col = "4" class="oe_form_header">
                         <group colspan = "2" col="2" >
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index 343a8bc0ba4..b4c992dcbc4 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -14,12 +14,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="set_process" states="draft" string="Process" type="object"/>
                     <button name="set_done" states="running" string="Stop" type="object"/>
                     <button name="set_draft" states="done" string="Set to Draft" type="object"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,running"/>
-                </div>
+                </header>
                 <sheet string="Subscriptions" layout="auto">
                     <group col="6" colspan="4" class="oe_form_header">
                         <field name="name" select="1"/>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 621172e2860..96dc60ff447 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -19,12 +19,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="survey_open" string="Open" states="cancel,close" type="object"/>
                     <button name="survey_close" string="Close" states="open" type="object"/>
                     <button name="survey_cancel" string="Cancel" states="open" type="object"/>
                     <field name="state" widget="statusbar" statusbar_visible="open,close"/>
-                </div>
+                </header>
                 <sheet string="Survey" layout="auto">
                     <field name="title" select="1"/>
                     <group col="6" colspan="6">
@@ -1057,13 +1057,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="survey_req_draft" string="Set to Draft" states="cancel,done" type="object"/>
                     <button name="survey_req_waiting_answer" string="Waiting Answer" states="draft" type="object"/>
                     <button name="survey_req_done" string="Done" states="waiting_answer" type="object"/>
                     <button name="survey_req_cancel" string="Cancel" states="waiting_answer" type="object"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,waiting_answer"/>
-                </div>
+                </header>
                 <sheet string="Survey Request" layout="auto">
                     <group class="oe_form_header">
                     <field name="date_deadline"/>

From 344a602f31bbae22ef228fccdf27db1e8a66136c Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 4 Jun 2012 14:36:09 +0200
Subject: [PATCH 55/71] fixed some problems for m2m_kanban

bzr revid: nicolas.vanhoren@openerp.com-20120604123609-yo00px9dvr6mj2cc
---
 addons/web/static/src/js/view_form.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index db055879051..66586472462 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3558,6 +3558,7 @@ instance.web.form.Many2ManyQuickCreate = instance.web.Widget.extend({
         var self = this;
         self.$text.val("");
         self.trigger('added', id);
+        this.m2m.dataset_changed();
     },
 });
 }
@@ -3612,7 +3613,7 @@ instance.web.form.AbstractFormPopup = instance.web.OldWidget.extend({
             width: '90%',
             min_width: '800px',
             close: function() {
-                self.check_exit();
+                self.check_exit(true);
             },
             title: this.options.title || "",
         }, this.$element).open();
@@ -3670,9 +3671,10 @@ instance.web.form.AbstractFormPopup = instance.web.OldWidget.extend({
     },
     on_select_elements: function(element_ids) {
     },
-    check_exit: function() {
+    check_exit: function(no_destroy) {
         if (this.created_elements.length > 0) {
             this.on_select_elements(this.created_elements);
+            this.created_elements = [];
         }
         this.destroy();
     },

From 6ce3b6aeefd9c1fb1ead1e775942b8af29433a2d Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 4 Jun 2012 14:45:43 +0200
Subject: [PATCH 56/71] Removed ability to click to link in m2m_tags

bzr revid: nicolas.vanhoren@openerp.com-20120604124543-tc39k033k5ny1k42
---
 addons/web/static/src/css/base.css    |  3 +--
 addons/web/static/src/css/base.sass   |  1 -
 addons/web/static/src/js/view_form.js | 26 +-------------------------
 3 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index e2879011a72..1f568df46e8 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1,4 +1,4 @@
-@charset "UTF-8";
+@charset "utf-8";
 @font-face {
   font-family: "mnmliconsRegular";
   src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot");
@@ -1787,7 +1787,6 @@
   color: black;
   padding: 0px 3px 0px 3px;
   margin: 0 2px 2px 0;
-  cursor: pointer;
   height: 16px;
   font: 11px "lucida grande", tahoma, verdana, arial, sans-serif;
 }
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index eda410aa6ca..72cef4f52f7 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1429,7 +1429,6 @@ $colour4: #8a89ba
                 color: black
                 padding: 0px 3px 0px 3px
                 margin: 0 2px 2px 0
-                cursor: pointer
                 height: 16px
                 font: 11px "lucida grande", tahoma, verdana, arial, sans-serif
             .text-core .text-wrap .text-dropdown .text-list .text-suggestion em
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 66586472462..ec4861956b5 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3099,7 +3099,7 @@ instance.web.form.FieldMany2ManyTags = instance.web.form.AbstractField.extend(_.
         if (this.get("effective_readonly"))
             return;
         var self = this;
-        self. $text = $("textarea", this.$element);
+        self.$text = $("textarea", this.$element);
         self.$text.textext({
             plugins : 'tags arrow autocomplete',
             autocomplete: {
@@ -3151,19 +3151,6 @@ instance.web.form.FieldMany2ManyTags = instance.web.form.AbstractField.extend(_.
                     return _.extend(el, {index:i});
                 })});
             });
-        }).bind('tagClick', function(e, tag, value, callback) {
-            var pop = new instance.web.form.FormOpenPopup(self.view);
-            pop.show_element(
-                self.field.relation,
-                value.id,
-                self.build_context(),
-                {
-                    title: _t("Open: ") + (self.string || self.name)
-                }
-            );
-            pop.on_write_completed.add_last(function() {
-                self.render_value();
-            });
         }).bind('hideDropdown', function() {
             self._drop_shown = false;
         }).bind('showDropdown', function() {
@@ -3207,17 +3194,6 @@ instance.web.form.FieldMany2ManyTags = instance.web.form.AbstractField.extend(_.
                 self.tags.addTags(_.map(data, function(el) {return {name: el[1], id:el[0]};}));
             } else {
                 self.$element.html(QWeb.render("FieldMany2ManyTags.box", {elements: data}));
-                $(".oe_form_field_many2manytags_box", self.$element).click(function() {
-                    var index = Number($(this).data("index"));
-                    self.do_action({
-                        type: 'ir.actions.act_window',
-                        res_model: self.field.relation,
-                        res_id: self.get("value")[index],
-                        context: self.build_context(),
-                        views: [[false, 'form']],
-                        target: 'current'
-                    });
-                });
             }
         };
         if (! self.get('values') || self.get('values').length > 0) {

From 4971146eb4d6fa72848819fb891f2488d3a15736 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 4 Jun 2012 15:04:15 +0200
Subject: [PATCH 57/71] [FCK] When you merge fp's commits, don't forget to use
 --author 'Fabien Pinckaers'

bzr revid: fme@openerp.com-20120604130415-a5ka5xy1opot52ff
---
 addons/delivery/delivery_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 5eea9132f7c..6f6e614e676 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -266,7 +266,7 @@
             <field name="model">stock.picking</field>
             <field name="inherit_id" ref="stock.view_picking_out_form"/>
             <field name="arch" type="xml">
-                <header>
+                <xpath expr="/form/header/button[@string='Create Invoice']" position="after">
                     <button name="%(report_shipping)d" string="Delivery Order" states="done" type="action" icon="gtk-print"/>
                 </xpath>
             </field>

From 58416fcc095f7abb616b4812f0338f5845dd4247 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 4 Jun 2012 16:42:11 +0200
Subject: [PATCH 58/71] [IMP] Improved field type image's control buttons
 (makes them overlay)

bzr revid: fme@openerp.com-20120604144211-hoyz2bekmoc7hods
---
 addons/web/static/src/css/base.css    | 29 ++++++++++++++++++++++++++-
 addons/web/static/src/css/base.sass   | 24 +++++++++++++++++++++-
 addons/web/static/src/js/view_form.js | 15 +++++++-------
 addons/web/static/src/xml/base.xml    | 18 ++++++++---------
 4 files changed, 67 insertions(+), 19 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 47c047abb18..826465b1f36 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1928,8 +1928,35 @@
   margin: 0;
   padding: 0;
 }
-.openerp .oe_form .oe_binary_image {
+.openerp .oe_form .oe_form_field_image {
+  padding: 0;
+  position: relative;
   display: inline-block;
+  width: auto;
+  vertical-align: top;
+}
+.openerp .oe_form .oe_form_field_image > img {
+  min-width: 100px;
+}
+.openerp .oe_form .oe_form_field_image .oe_form_field_image_controls {
+  position: absolute;
+  top: 1px;
+  padding: 3px 0 0 0;
+  margin: 0 1px;
+  filter: alpha(opacity=70);
+  opacity: 0.7;
+  width: 99%;
+  text-align: center;
+  background: url(/web/static/src/img/form_sheetbg.png);
+  border-bottom: 1px dotted black;
+  -moz-box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+  -ms-box-sizing: border-box;
+  box-sizing: border-box;
+}
+.openerp .oe_form .oe_form_field_image:hover .oe_form_field_image_controls {
+  filter: alpha(opacity=100);
+  opacity: 1;
 }
 .openerp .oe_horizontal_border {
   border-bottom: 1px solid black;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 894e6ffded4..c0056097c9c 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1566,8 +1566,30 @@ $colour4: #8a89ba
             -ms-filter: "alpha(opacity=0)"
             margin: 0
             padding: 0
-        .oe_binary_image
+        .oe_form_field_image
+            > img
+                min-width: 100px
+            padding: 0
+            position: relative
             display: inline-block
+            width: auto
+            vertical-align: top
+            .oe_form_field_image_controls
+                position: absolute
+                top: 1px
+                padding: 3px 0 0 0
+                margin: 0 1px
+                @include opacity(0.7)
+                width: 99%
+                text-align: center
+                background: url(/web/static/src/img/form_sheetbg.png)
+                border-bottom: 1px dotted black
+                -moz-box-sizing: border-box
+                -webkit-box-sizing: border-box
+                -ms-box-sizing: border-box
+                box-sizing: border-box
+            &:hover .oe_form_field_image_controls
+                @include opacity(1)
     // }}}
     // FormView.separator {{{
     .oe_horizontal_border
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index be78ce8f006..9a674e709b2 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -4055,11 +4055,11 @@ instance.web.form.FieldBinaryImage = instance.web.form.FieldBinary.extend({
     template: 'FieldBinaryImage',
     initialize_content: function() {
         this._super();
-        this.$placeholder = $(".oe_form_field-binary-image-placeholder", this.$element);
-        if (!this.get("effective_readonly"))
-            this.$element.find('.oe-binary').show();
-        else
-            this.$element.find('.oe-binary').hide();
+        if (!this.get("effective_readonly")) {
+            this.$element.find('.oe_form_field_image_controls').show();
+        } else {
+            this.$element.find('.oe_form_field_image_controls').hide();
+        }
     },
     set_value: function(value_) {
         this._super.apply(this, arguments);
@@ -4075,8 +4075,9 @@ instance.web.form.FieldBinaryImage = instance.web.form.FieldBinary.extend({
         } else {
             url = "/web/static/src/img/placeholder.png";
         }
-        var rendered = QWeb.render("FieldBinaryImage-img", {widget: this, url: url});;
-        this.$placeholder.html(rendered);
+        var img = QWeb.render("FieldBinaryImage-img", { widget: this, url: url });
+        this.$element.find('> img').remove();
+        this.$element.prepend(img);
     },
     on_file_change: function() {
         this.render_value();
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 152fd2249e0..aaecd258412 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1042,9 +1042,8 @@
     <div class="oe_clear"/>
 </t>
 <t t-name="FieldBinaryImage">
-    <span class="oe_form_field oe_binary_image">
-        <div class="oe_form_field-binary-image-placeholder"></div>
-        <div class="oe-binary">
+    <span class="oe_form_field oe_form_field_image">
+        <div class="oe_form_field_image_controls">
             <div class="oe-binary-file-set">
                 <form class="oe-binary-form" t-att-target="widget.iframe"
                     method="post" enctype="multipart/form-data" action="/web/binary/upload">
@@ -1062,21 +1061,20 @@
             <button class="oe_button oe-binary-file-clear" type="button" title="Clear">
                 <img t-att-src='_s + "/web/static/src/img/icons/STOCK_MISSING_IMAGE.png"'/>
             </button>
+            <div class="oe-binary-progress" style="display: none">
+                <img t-att-src='_s + "/web/static/src/img/throbber.gif"' width="16" height="16"/>
+                <b>Uploading ...</b>
+            </div>
+            <iframe t-att-id="widget.iframe" t-att-name="widget.iframe" style="display: none"/>
         </div>
-        <div class="oe-binary-progress" style="display: none">
-            <img t-att-src='_s + "/web/static/src/img/throbber.gif"' width="16" height="16"/>
-            <b>Uploading ...</b>
-        </div>
-        <iframe t-att-id="widget.iframe" t-att-name="widget.iframe" style="display: none"/>
     </span>
 </t>
 <t t-name="FieldBinaryImage-img">
-    <img t-att-src='url' class="oe-binary-image field_image"
+    <img t-att-src='url'
         t-att-border="widget.readonly ? 0 : 1"
         t-att-name="widget.name"
         t-att-width="widget.node.attrs.img_width || widget.node.attrs.width"
         t-att-height="widget.node.attrs.img_height || widget.node.attrs.height"
-        t-att-style="'max-width: ' + (widget.$element.width() > 60 ? widget.$element.width() : 60) + 'px'"
     />
 </t>
 <t t-name="FieldBinaryFile">

From 9ab64b4414c81025c96ba7f469cb3ea41664a781 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Mon, 4 Jun 2012 17:31:18 +0200
Subject: [PATCH 59/71] [FIX] remove http sessions after 7 days of inactivity

bzr revid: chs@openerp.com-20120604153118-jcs04wy0kocr635a
---
 addons/web/common/http.py | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/addons/web/common/http.py b/addons/web/common/http.py
index 9294808fda4..3cc1a9e7175 100644
--- a/addons/web/common/http.py
+++ b/addons/web/common/http.py
@@ -332,9 +332,12 @@ def httprequest(f):
 # OpenERP Web werkzeug Session Managment wraped using with
 #----------------------------------------------------------
 STORES = {}
+SESSION_TIMEOUT = 7 * 24 * 60 * 60      # FIXME make it configurable ?
+SESSION_COUNTER = 0
 
 @contextlib.contextmanager
 def session_context(request, storage_path, session_cookie='sessionid'):
+    global SESSION_COUNTER
     session_store, session_lock = STORES.get(storage_path, (None, None))
     if not session_store:
         session_store = werkzeug.contrib.sessions.FilesystemSessionStore(
@@ -344,10 +347,22 @@ def session_context(request, storage_path, session_cookie='sessionid'):
 
     sid = request.cookies.get(session_cookie)
     with session_lock:
+
+        SESSION_COUNTER += 1
+        if SESSION_COUNTER % 100 == 0:
+            SESSION_COUNTER = 0
+            for s in session_store.list():
+                ss = session_store.get(s)
+                t = ss.get('timestamp')
+                if not t or t + SESSION_TIMEOUT < time.time():
+                    _logger.debug('deleting http session %s', s)
+                    session_store.delete(ss)
+
         if sid:
             request.session = session_store.get(sid)
         else:
             request.session = session_store.new()
+        request.session['timestamp'] = time.time()
 
     try:
         yield request.session
@@ -364,7 +379,7 @@ def session_context(request, storage_path, session_cookie='sessionid'):
                     and not value.jsonp_requests
                     # FIXME do not use a fixed value
                     and value._creation_time + (60*5) < time.time()):
-                _logger.debug('remove session %s', key)
+                _logger.debug('remove OpenERP session %s', key)
                 removed_sessions.add(key)
                 del request.session[key]
 

From eefd98c603f5bb66aaa7a267492deeef5d620f4a Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 4 Jun 2012 22:44:49 +0200
Subject: [PATCH 60/71] [FIX] layouting of groups when row with too fee cols

bzr revid: fp@tinyerp.com-20120604204449-ci68yf3p1837170h
---
 addons/web/static/src/js/view_form.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 9a674e709b2..810eef64b49 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1135,13 +1135,13 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
                         if ($child.attr('orientation') === 'vertical') {
                             $td.addClass('oe_vertical_separator').attr('width', '1');
                             $td.empty();
-                            row_cols--;
+                            row_cols-= $td.attr('colspan') || 1;
                         }
                         break;
                     case 'label':
                         if ($child.attr('for')) {
                             $td.attr('width', '1%').addClass('oe_form_group_cell_label');
-                            row_cols--;
+                            row_cols-= $td.attr('colspan') || 1;
                             total--;
                         }
                         break;
@@ -1158,15 +1158,15 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
                             }
                             $td.attr('width', width);
                             $child.removeAttr('width');
-                            row_cols--;
                         } else {
                             to_compute.push($td);
                         }
+                        row_cols-= $td.attr('colspan') || 1;
 
                 }
             });
             var unit = Math.floor(total / row_cols);
-            if (!$(this).is('.oe_form_group_row_incomplete')) {
+            if (!row_cols && !$(this).is('.oe_form_group_row_incomplete')) {
                 _.each(to_compute, function($td, i) {
                     var width = parseInt($td.attr('colspan'), 10) * unit;
                     $td.attr('width', ((i == to_compute.length - 1) ? total : width) + '%');

From 32002a68527caa2234c747157b9c3cb9a06c1a24 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 4 Jun 2012 23:00:31 +0200
Subject: [PATCH 61/71] [FIX] layouting of groups when row with too fee cols

bzr revid: fp@tinyerp.com-20120604210031-omhqeaim4g4gogsj
---
 addons/web/static/src/js/view_form.js | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 810eef64b49..f1115de0b54 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1136,6 +1136,7 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
                             $td.addClass('oe_vertical_separator').attr('width', '1');
                             $td.empty();
                             row_cols-= $td.attr('colspan') || 1;
+                            total--;
                         }
                         break;
                     case 'label':
@@ -1158,20 +1159,22 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
                             }
                             $td.attr('width', width);
                             $child.removeAttr('width');
+                            row_cols-= $td.attr('colspan') || 1;
                         } else {
                             to_compute.push($td);
                         }
-                        row_cols-= $td.attr('colspan') || 1;
 
                 }
             });
-            var unit = Math.floor(total / row_cols);
-            if (!row_cols && !$(this).is('.oe_form_group_row_incomplete')) {
-                _.each(to_compute, function($td, i) {
-                    var width = parseInt($td.attr('colspan'), 10) * unit;
-                    $td.attr('width', ((i == to_compute.length - 1) ? total : width) + '%');
-                    total -= width;
-                });
+            if (row_cols) {
+                var unit = Math.floor(total / row_cols);
+                if (!$(this).is('.oe_form_group_row_incomplete')) {
+                    _.each(to_compute, function($td, i) {
+                        var width = parseInt($td.attr('colspan'), 10) * unit;
+                        $td.attr('width', width + '%');
+                        total -= width;
+                    });
+                }
             }
         });
         _.each(children, function(el) {

From 91fbf8339064c3666796b481e6add7634f2a1ca1 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 4 Jun 2012 23:28:39 +0200
Subject: [PATCH 62/71] [IMP] css

bzr revid: fp@tinyerp.com-20120604212839-lun95emekq42hkju
---
 addons/web/static/src/css/base.css  | 11 +++++++++--
 addons/web/static/src/css/base.sass |  8 +++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 826465b1f36..b688b0d2b89 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;
@@ -1884,7 +1884,14 @@
   overflow: hidden;
 }
 .openerp .oe_form .oe_form_title {
-  width: 65%;
+  width: 55%;
+}
+.openerp .oe_form .oe_form_title:after {
+  content: ".";
+  display: block;
+  height: 0;
+  clear: both;
+  visibility: hidden;
 }
 .openerp .oe_form .oe_form_button_box {
   width: 200px;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index c0056097c9c..0c8f4253549 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1511,7 +1511,13 @@ $colour4: #8a89ba
                 overflow: hidden
 
         .oe_form_title
-            width: 65%
+            width: 55%
+        .oe_form_title:after
+            content: "."
+            display: block
+            height: 0
+            clear: both
+            visibility: hidden
         .oe_form_button_box
             width: 200px
             text-align: center

From 32943b32218d2ea0fb0c63bbeac3e75c0f4f2139 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 5 Jun 2012 05:07:06 +0000
Subject: [PATCH 63/71] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120605045422-xh0bki4gxwi1udit
bzr revid: launchpad_translations_on_behalf_of_openerp-20120605050706-i5cdrkj77zxk2ada
---
 addons/account/i18n/zh_TW.po          |   20 +-
 addons/account_sequence/i18n/sv.po    |  220 ++++
 addons/auth_openid/i18n/sv.po         |  114 ++
 addons/google_base_account/i18n/sv.po |  121 ++
 addons/import_base/i18n/sv.po         |  103 ++
 addons/plugin/i18n/sv.po              |   23 +
 addons/project_issue_sheet/i18n/sv.po |   77 ++
 addons/project_messages/i18n/sv.po    |  113 ++
 addons/share/i18n/sv.po               |  521 +++++++++
 addons/web/i18n/hu.po                 | 1544 +++++++++++++++++++++++++
 addons/web/i18n/nl_BE.po              |   10 +-
 addons/web_livechat/i18n/sv.po        |   28 +
 addons/web_uservoice/i18n/sv.po       |   23 +
 13 files changed, 2902 insertions(+), 15 deletions(-)
 create mode 100644 addons/account_sequence/i18n/sv.po
 create mode 100644 addons/auth_openid/i18n/sv.po
 create mode 100644 addons/google_base_account/i18n/sv.po
 create mode 100644 addons/import_base/i18n/sv.po
 create mode 100644 addons/plugin/i18n/sv.po
 create mode 100644 addons/project_issue_sheet/i18n/sv.po
 create mode 100644 addons/project_messages/i18n/sv.po
 create mode 100644 addons/share/i18n/sv.po
 create mode 100644 addons/web/i18n/hu.po
 create mode 100644 addons/web_livechat/i18n/sv.po
 create mode 100644 addons/web_uservoice/i18n/sv.po

diff --git a/addons/account/i18n/zh_TW.po b/addons/account/i18n/zh_TW.po
index f5aa3781e50..bcbea9aec5d 100644
--- a/addons/account/i18n/zh_TW.po
+++ b/addons/account/i18n/zh_TW.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-05-23 07:32+0000\n"
-"Last-Translator: VTTW <victso@gmail.com>\n"
+"PO-Revision-Date: 2012-06-05 02:38+0000\n"
+"Last-Translator: Boyce Huang <boyce.huang@cenoq.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-24 11:09+0000\n"
-"X-Generator: Launchpad (build 15288)\n"
+"X-Launchpad-Export-Date: 2012-06-05 04:54+0000\n"
+"X-Generator: Launchpad (build 15353)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -419,7 +419,7 @@ msgstr "貸方合計"
 #. module: account
 #: view:account.move.line.unreconcile.select:0
 msgid "Open for Unreconciliation"
-msgstr ""
+msgstr "開啟反核銷"
 
 #. module: account
 #: field:account.account.template,chart_template_id:0
@@ -2737,7 +2737,7 @@ msgstr "要設置期初餘額需在憑證簿設置中勾選合併選項"
 #: model:ir.actions.act_window,name:account.action_tax_code_list
 #: model:ir.ui.menu,name:account.menu_action_tax_code_list
 msgid "Tax Codes"
-msgstr ""
+msgstr "稅碼"
 
 #. module: account
 #: view:account.account:0
@@ -4593,7 +4593,7 @@ msgstr "已付"
 #. module: account
 #: view:account.period.close:0
 msgid "Are you sure?"
-msgstr ""
+msgstr "您確定嗎？"
 
 #. module: account
 #: help:account.move.line,statement_id:0
@@ -5930,7 +5930,7 @@ msgstr "銷售稅(%)"
 #. module: account
 #: view:account.addtmpl.wizard:0
 msgid "Create an Account Based on this Template"
-msgstr ""
+msgstr "根據這個範本建立使用者"
 
 #. module: account
 #: view:account.account.type:0
@@ -7868,7 +7868,7 @@ msgstr "反向輔助核算餘額 -"
 #. module: account
 #: view:account.move.bank.reconcile:0
 msgid "Open for Bank Reconciliation"
-msgstr ""
+msgstr "開啟銀行核銷"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -9126,7 +9126,7 @@ msgstr "為了對賬，您必須在賬簿中定義一個銀行帳號。"
 #. module: account
 #: view:account.move.line.reconcile:0
 msgid "Reconciliation Transactions"
-msgstr ""
+msgstr "核銷交易"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
diff --git a/addons/account_sequence/i18n/sv.po b/addons/account_sequence/i18n/sv.po
new file mode 100644
index 00000000000..cc0491fca54
--- /dev/null
+++ b/addons/account_sequence/i18n/sv.po
@@ -0,0 +1,220 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-06-04 17:24+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-05 04:54+0000\n"
+"X-Generator: Launchpad (build 15353)\n"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+#: model:ir.actions.act_window,name:account_sequence.action_account_seq_installer
+msgid "Account Sequence Application Configuration"
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move:0
+msgid ""
+"You can not create more than one move per period on centralized journal"
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "Company must be the same for its related account and period."
+msgstr "Bolaget måste överenstämma för alla konton och perioder."
+
+#. module: account_sequence
+#: help:account.move,internal_sequence_number:0
+#: help:account.move.line,internal_sequence_number:0
+msgid "Internal Sequence Number"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.sequence.installer,number_next:0
+msgid "Next number of this sequence"
+msgstr "Nästa nummer i sekvensen"
+
+#. module: account_sequence
+#: field:account.sequence.installer,number_next:0
+msgid "Next Number"
+msgstr "Nästa nummer"
+
+#. module: account_sequence
+#: field:account.sequence.installer,number_increment:0
+msgid "Increment Number"
+msgstr "Räkna upp nummer"
+
+#. module: account_sequence
+#: help:account.sequence.installer,number_increment:0
+msgid "The next number of the sequence will be incremented by this number"
+msgstr "Nästa nummer i sekvensen kommer att beräknas utgående från detta"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure Your Account Sequence Application"
+msgstr ""
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure"
+msgstr "Inställningar"
+
+#. module: account_sequence
+#: help:account.sequence.installer,suffix:0
+msgid "Suffix value of the record for the sequence"
+msgstr "Suffixvärde för löpnumret"
+
+#. module: account_sequence
+#: field:account.sequence.installer,company_id:0
+msgid "Company"
+msgstr "Bolag"
+
+#. module: account_sequence
+#: help:account.journal,internal_sequence_id:0
+msgid ""
+"This sequence will be used to maintain the internal number for the journal "
+"entries related to this journal."
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,padding:0
+msgid "Number padding"
+msgstr "Numerisk utfyllnad"
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_move_line
+msgid "Journal Items"
+msgstr "Transaktioner"
+
+#. module: account_sequence
+#: field:account.move,internal_sequence_number:0
+#: field:account.move.line,internal_sequence_number:0
+msgid "Internal Number"
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "You can not create journal items on an account of type view."
+msgstr "Du kan inte skapa transaktioner på rubrikkonton."
+
+#. module: account_sequence
+#: help:account.sequence.installer,padding:0
+msgid ""
+"OpenERP will automatically adds some '0' on the left of the 'Next Number' to "
+"get the required padding size."
+msgstr ""
+"OpenERP lägger automatiskt till några '0' till vänster på 'Nästa nummer' för "
+"att få rätt storlek."
+
+#. module: account_sequence
+#: field:account.sequence.installer,name:0
+msgid "Name"
+msgstr "Namn"
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "You can not create journal items on closed account."
+msgstr "Du kan inte skapa transaktioner på ett stängt konto."
+
+#. module: account_sequence
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr ""
+"Konfigurationsfel! Vald valuta bör delas mellan standard-konton också."
+
+#. module: account_sequence
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr "Fel kredit- eller debetvärde i bokföringstransaktionerna."
+
+#. module: account_sequence
+#: field:account.journal,internal_sequence_id:0
+msgid "Internal Sequence"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.sequence.installer,prefix:0
+msgid "Prefix value of the record for the sequence"
+msgstr "Prefix för löpnumret"
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_move
+msgid "Account Entry"
+msgstr "Kontotransaktion"
+
+#. module: account_sequence
+#: field:account.sequence.installer,suffix:0
+msgid "Suffix"
+msgstr "Suffix"
+
+#. module: account_sequence
+#: field:account.sequence.installer,config_logo:0
+msgid "Image"
+msgstr "Bild"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "title"
+msgstr "titel"
+
+#. module: account_sequence
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr "Journalnamnet måste vara unikt per företag!"
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid ""
+"The selected account of your Journal Entry forces to provide a secondary "
+"currency. You should remove the secondary currency on the account or select "
+"a multi-currency view on the journal."
+msgstr ""
+"Valt konto på verifikatet tvingar fram en sekundär valuta. Du kan ta bort "
+"den sekundära valutan på kontot eller välja en flervalutavy för journalen."
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid ""
+"The date of your Journal Entry is not in the defined period! You should "
+"change the date or remove this constraint from the journal."
+msgstr ""
+"Verifikatsdatumet är inte inom den definierade perioden! Du bör ändra datum "
+"eller ta bort denna begränsning från journalen."
+
+#. module: account_sequence
+#: field:account.sequence.installer,prefix:0
+msgid "Prefix"
+msgstr "Prefix"
+
+#. module: account_sequence
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "Journalkoden måste vara unik per företag!"
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_sequence_installer
+msgid "account.sequence.installer"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_journal
+msgid "Journal"
+msgstr "Journal"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "You can enhance the Account Sequence Application by installing ."
+msgstr ""
diff --git a/addons/auth_openid/i18n/sv.po b/addons/auth_openid/i18n/sv.po
new file mode 100644
index 00000000000..c89dcfe9d9e
--- /dev/null
+++ b/addons/auth_openid/i18n/sv.po
@@ -0,0 +1,114 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-06-04 10:13+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-05 04:54+0000\n"
+"X-Generator: Launchpad (build 15353)\n"
+
+#. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+#. module: auth_openid
+#. #-#-#-#-#  auth_openid.pot.web (PROJECT VERSION)  #-#-#-#-#
+#. openerp-web
+#: view:res.users:0
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:12
+msgid "OpenID"
+msgstr "OpenID"
+
+#. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+#. module: auth_openid
+#. #-#-#-#-#  auth_openid.pot.web (PROJECT VERSION)  #-#-#-#-#
+#. openerp-web
+#: field:res.users,openid_url:0
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:47
+msgid "OpenID URL"
+msgstr "OpenID URL"
+
+#. module: auth_openid
+#: help:res.users,openid_email:0
+msgid "Used for disambiguation in case of a shared OpenID URL"
+msgstr ""
+"Används för att skilja mellan olika användare  i fallet med en delad OpenID-"
+"URL"
+
+#. module: auth_openid
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Du kan inte ha två användare med samma användarid !"
+
+#. module: auth_openid
+#: field:res.users,openid_email:0
+msgid "OpenID Email"
+msgstr "OpenID-epost"
+
+#. module: auth_openid
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "Detta bolag är inte tillåtet för den här användaren"
+
+#. module: auth_openid
+#: field:res.users,openid_key:0
+msgid "OpenID Key"
+msgstr "OpenID Nyckel"
+
+#. module: auth_openid
+#: model:ir.model,name:auth_openid.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:8
+msgid "Password"
+msgstr "Lösenord"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:9
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:10
+msgid "Google"
+msgstr "Google"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:10
+msgid "Google Apps"
+msgstr "Google Apps"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:11
+msgid "Launchpad"
+msgstr "Launchpad"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:20
+msgid "Google Apps Domain:"
+msgstr "Google Apps Domän:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:24
+msgid "Username:"
+msgstr "Användarnamn:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:28
+msgid "OpenID URL:"
+msgstr "OpenID URL:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:35
+msgid "Google Apps Domain"
+msgstr "Google Apps Domän"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:41
+msgid "Username"
+msgstr "Användarnamn"
diff --git a/addons/google_base_account/i18n/sv.po b/addons/google_base_account/i18n/sv.po
new file mode 100644
index 00000000000..a90418cbfde
--- /dev/null
+++ b/addons/google_base_account/i18n/sv.po
@@ -0,0 +1,121 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-06-04 09:58+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-05 04:54+0000\n"
+"X-Generator: Launchpad (build 15353)\n"
+
+#. module: google_base_account
+#: field:res.users,gmail_user:0
+msgid "Username"
+msgstr "Användarnamn"
+
+#. module: google_base_account
+#: model:ir.actions.act_window,name:google_base_account.act_google_login_form
+msgid "Google Login"
+msgstr "Googleinloggning"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:29
+#, python-format
+msgid "Google Contacts Import Error!"
+msgstr "Google kontaktimportfel!"
+
+#. module: google_base_account
+#: view:res.users:0
+msgid " Synchronization "
+msgstr " Synkronisering "
+
+#. module: google_base_account
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Du kan inte ha två användare med samma användarid !"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:75
+#, python-format
+msgid "Error"
+msgstr "Fel"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "Google login"
+msgstr "Googleinloggning"
+
+#. module: google_base_account
+#: model:ir.model,name:google_base_account.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. module: google_base_account
+#: field:google.login,password:0
+msgid "Google Password"
+msgstr "Google-lösenord"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "_Cancel"
+msgstr "_Avbryt"
+
+#. module: google_base_account
+#: view:res.users:0
+msgid "Google Account"
+msgstr "Google-konto"
+
+#. module: google_base_account
+#: field:google.login,user:0
+msgid "Google Username"
+msgstr "Google-användarnamn"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:29
+#, python-format
+msgid ""
+"Please install gdata-python-client from http://code.google.com/p/gdata-"
+"python-client/downloads/list"
+msgstr ""
+"Vänligen installera gdata-python-client från http://code.google.com/p/gdata-"
+"python-client/downloads/list"
+
+#. module: google_base_account
+#: model:ir.model,name:google_base_account.model_google_login
+msgid "Google Contact"
+msgstr "Google-kontakt"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "_Login"
+msgstr "Logga _in"
+
+#. module: google_base_account
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "Detta bolag är inte tillåtet för den här användaren"
+
+#. module: google_base_account
+#: field:res.users,gmail_password:0
+msgid "Password"
+msgstr "Lösenord"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:75
+#, python-format
+msgid "Authentication fail check the user and password !"
+msgstr "Autenticering misslyckades, kontrollera användarid och lösenord !"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "ex: user@gmail.com"
+msgstr "ex: user@gmail.com"
diff --git a/addons/import_base/i18n/sv.po b/addons/import_base/i18n/sv.po
new file mode 100644
index 00000000000..b42d17376c0
--- /dev/null
+++ b/addons/import_base/i18n/sv.po
@@ -0,0 +1,103 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-06-04 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-05 04:54+0000\n"
+"X-Generator: Launchpad (build 15353)\n"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:434
+#, python-format
+msgid "Import failed due to an unexpected error"
+msgstr "Import misslyckades på grund av oväntat fel"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:461
+#, python-format
+msgid "started at %s and finished at %s \n"
+msgstr "Startade på %s och avslutade på %s \n"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:448
+#, python-format
+msgid "Import of your data finished at %s"
+msgstr "Importen av dina data avslutades på %s"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:463
+#, python-format
+msgid ""
+"but failed, in consequence no data were imported to keep database "
+"consistency \n"
+" error : \n"
+msgstr ""
+"men misslyckades, till följd att inga data importerades för att hålla "
+"databasen konsistent\n"
+"  fel: \n"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:477
+#, python-format
+msgid ""
+"The import of data \n"
+" instance name : %s \n"
+msgstr ""
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:470
+#, python-format
+msgid "%s has been successfully imported from %s %s, %s \n"
+msgstr ""
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:447
+#, python-format
+msgid "Data Import failed at %s due to an unexpected error"
+msgstr ""
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:436
+#, python-format
+msgid "Import finished, notification email sended"
+msgstr ""
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:190
+#, python-format
+msgid "%s is not a valid model name"
+msgstr ""
+
+#. module: import_base
+#: model:ir.ui.menu,name:import_base.menu_import_crm
+msgid "Import"
+msgstr "Import"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:467
+#, python-format
+msgid "with no warning"
+msgstr "utan varning"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:469
+#, python-format
+msgid "with warning : %s"
+msgstr "med varning: %s"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:191
+#, python-format
+msgid " fields imported : "
+msgstr " importerade fält: "
diff --git a/addons/plugin/i18n/sv.po b/addons/plugin/i18n/sv.po
new file mode 100644
index 00000000000..6d33164d1c4
--- /dev/null
+++ b/addons/plugin/i18n/sv.po
@@ -0,0 +1,23 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-06-04 15:14+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-05 04:54+0000\n"
+"X-Generator: Launchpad (build 15353)\n"
+
+#. module: plugin
+#: model:ir.model,name:plugin.model_plugin_handler
+msgid "plugin.handler"
+msgstr "plugin.handler"
diff --git a/addons/project_issue_sheet/i18n/sv.po b/addons/project_issue_sheet/i18n/sv.po
new file mode 100644
index 00000000000..f9b6304f43d
--- /dev/null
+++ b/addons/project_issue_sheet/i18n/sv.po
@@ -0,0 +1,77 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-04 10:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-05 04:54+0000\n"
+"X-Generator: Launchpad (build 15353)\n"
+
+#. module: project_issue_sheet
+#: model:ir.model,name:project_issue_sheet.model_account_analytic_line
+msgid "Analytic Line"
+msgstr "Objektrad"
+
+#. module: project_issue_sheet
+#: code:addons/project_issue_sheet/project_issue_sheet.py:57
+#, python-format
+msgid "The Analytic Account is in pending !"
+msgstr "Objektkontot är väntande"
+
+#. module: project_issue_sheet
+#: model:ir.model,name:project_issue_sheet.model_project_issue
+msgid "Project Issue"
+msgstr "Projektärenden"
+
+#. module: project_issue_sheet
+#: model:ir.model,name:project_issue_sheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Tidrapportrad"
+
+#. module: project_issue_sheet
+#: code:addons/project_issue_sheet/project_issue_sheet.py:57
+#: field:project.issue,analytic_account_id:0
+#, python-format
+msgid "Analytic Account"
+msgstr "Objektkonto"
+
+#. module: project_issue_sheet
+#: view:project.issue:0
+msgid "Worklogs"
+msgstr "Arbetslogg"
+
+#. module: project_issue_sheet
+#: field:account.analytic.line,create_date:0
+msgid "Create Date"
+msgstr "Registreringsdatum"
+
+#. module: project_issue_sheet
+#: view:project.issue:0
+#: field:project.issue,timesheet_ids:0
+msgid "Timesheets"
+msgstr "Tidkort"
+
+#. module: project_issue_sheet
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+msgstr "Du kan inte ändra en post i en bekräftad/färdig tidrapport !"
+
+#. module: project_issue_sheet
+#: field:hr.analytic.timesheet,issue_id:0
+msgid "Issue"
+msgstr "Ärende"
+
+#. module: project_issue_sheet
+#: constraint:account.analytic.line:0
+msgid "You can not create analytic line on view account."
+msgstr "Du kan inte skapa objekttransaktioner med rubrikkonton."
diff --git a/addons/project_messages/i18n/sv.po b/addons/project_messages/i18n/sv.po
new file mode 100644
index 00000000000..d298d5bcf8a
--- /dev/null
+++ b/addons/project_messages/i18n/sv.po
@@ -0,0 +1,113 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-04 10:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-05 04:54+0000\n"
+"X-Generator: Launchpad (build 15353)\n"
+
+#. module: project_messages
+#: field:project.messages,to_id:0
+msgid "To"
+msgstr "Till"
+
+#. module: project_messages
+#: model:ir.model,name:project_messages.model_project_messages
+msgid "project.messages"
+msgstr "project.messages"
+
+#. module: project_messages
+#: field:project.messages,from_id:0
+msgid "From"
+msgstr "Från"
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Group By..."
+msgstr "Gruppera på..."
+
+#. module: project_messages
+#: field:project.messages,create_date:0
+msgid "Creation Date"
+msgstr "Registeringsdatum"
+
+#. module: project_messages
+#: help:project.messages,to_id:0
+msgid "Keep this empty to broadcast the message."
+msgstr "Håll detta tomt för att sända meddelandet."
+
+#. module: project_messages
+#: model:ir.actions.act_window,name:project_messages.act_project_messages
+#: model:ir.actions.act_window,name:project_messages.action_view_project_editable_messages_tree
+#: view:project.messages:0
+#: view:project.project:0
+#: field:project.project,message_ids:0
+msgid "Messages"
+msgstr "Meddelanden"
+
+#. module: project_messages
+#: model:ir.model,name:project_messages.model_project_project
+#: view:project.messages:0
+#: field:project.messages,project_id:0
+msgid "Project"
+msgstr "Projekt"
+
+#. module: project_messages
+#: model:ir.actions.act_window,help:project_messages.messages_form
+msgid ""
+"An in-project messaging system allows for an efficient and trackable "
+"communication between project members. The messages are stored in the system "
+"and can be used for post analysis."
+msgstr ""
+"En inom-projektetmeddelandehanteringssystem möjliggör en effektiv och "
+"spårbar kommunikation mellan projektmedlemmar. De meddelanden som lagras i "
+"systemet och kan också användas för efter-analys."
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Today"
+msgstr "Idag"
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Message To"
+msgstr "Meddelande till"
+
+#. module: project_messages
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr "Fel! Du kan inte eskalera till samma projekt"
+
+#. module: project_messages
+#: view:project.messages:0
+#: field:project.messages,message:0
+msgid "Message"
+msgstr "Meddelande"
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Message From"
+msgstr "Meddelande från"
+
+#. module: project_messages
+#: model:ir.actions.act_window,name:project_messages.messages_form
+#: model:ir.ui.menu,name:project_messages.menu_messages_form
+#: view:project.messages:0
+msgid "Project Messages"
+msgstr "Projektmeddelanden"
+
+#. module: project_messages
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr "Fel! projektets startdatum måste föregå projekets slutdatum."
diff --git a/addons/share/i18n/sv.po b/addons/share/i18n/sv.po
new file mode 100644
index 00000000000..c704c8373eb
--- /dev/null
+++ b/addons/share/i18n/sv.po
@@ -0,0 +1,521 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-06-04 10:42+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-05 04:54+0000\n"
+"X-Generator: Launchpad (build 15353)\n"
+
+#. module: share
+#: field:share.wizard,embed_option_title:0
+msgid "Display title"
+msgstr "Visningstitel"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Access granted!"
+msgstr "Behörighet given!"
+
+#. module: share
+#: field:share.wizard,user_type:0
+msgid "Sharing method"
+msgstr "Delningsmetod"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Share with these People (one e-mail per line)"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,name:0
+msgid "Share Title"
+msgstr "Delningstitel"
+
+#. module: share
+#: model:ir.module.category,name:share.module_category_share
+msgid "Sharing"
+msgstr "Delning"
+
+#. module: share
+#: field:share.wizard,share_root_url:0
+msgid "Share Access URL"
+msgstr "Delnings URL"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:782
+#, python-format
+msgid "You may use your current login (%s) and password to view them.\n"
+msgstr ""
+"Du kan använda nuvarande inloggning (%s) och lösenord för att se dem.\n"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:601
+#, python-format
+msgid "(Modified)"
+msgstr "(Ändrad)"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:769
+#, python-format
+msgid ""
+"The documents are not attached, you can view them online directly on my "
+"OpenERP server at:"
+msgstr ""
+"Dokumenten är inte bilagda, du kan se dem online direkt på vår OpenERP-"
+"server på:"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:579
+#, python-format
+msgid "Sharing filter created by user %s (%s) for group %s"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,embed_url:0 field:share.wizard.result.line,share_url:0
+msgid "Share URL"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:776
+#, python-format
+msgid "These are your credentials to access this protected area:\n"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:643
+#, python-format
+msgid "You must be a member of the Share/User group to use the share wizard"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Access info"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Share"
+msgstr "Utdelning"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:551
+#, python-format
+msgid "(Duplicated for modified sharing permissions)"
+msgstr ""
+
+#. module: share
+#: help:share.wizard,domain:0
+msgid "Optional domain for further data filtering"
+msgstr ""
+
+#. module: share
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Du kan inte ha två användare med samma användarid !"
+
+#. module: share
+#: model:ir.model,name:share.model_ir_model_access
+msgid "ir.model.access"
+msgstr "ir.model.access"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Next"
+msgstr "Nästa"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:777
+#, python-format
+msgid "Username"
+msgstr "Användarnamn"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Sharing Options"
+msgstr "Utdelningsalternativ"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:765
+#, python-format
+msgid "Hello,"
+msgstr "Hej,"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Close"
+msgstr "Stäng"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:640
+#, python-format
+msgid "Action and Access Mode are required to create a shared access"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid ""
+"Please select the action that opens the screen containing the data you want "
+"to share."
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:781
+#, python-format
+msgid ""
+"The documents have been automatically added to your current OpenERP "
+"documents.\n"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Cancel"
+msgstr "Avbryt"
+
+#. module: share
+#: field:res.groups,share:0
+msgid "Share Group"
+msgstr "Delningsgrupp"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:763
+#, python-format
+msgid "Email required"
+msgstr "E-post krävs"
+
+#. module: share
+#: view:share.wizard:0
+msgid ""
+"Optionally, you may specify an additional domain restriction that will be "
+"applied to the shared data."
+msgstr ""
+
+#. module: share
+#: help:share.wizard,name:0
+msgid "Title for the share (displayed to users as menu and shortcut name)"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Options"
+msgstr "Alternativ"
+
+#. module: share
+#: view:res.groups:0
+msgid "Regular groups only (no share groups"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:787
+#, python-format
+msgid ""
+"OpenERP is a powerful and user-friendly suite of Business Applications (CRM, "
+"Sales, HR, etc.)\n"
+"It is open source and can be found on http://www.openerp.com."
+msgstr ""
+
+#. module: share
+#: field:share.wizard,action_id:0
+msgid "Action to share"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Optional: include a personal message"
+msgstr ""
+
+#. module: share
+#: field:res.users,share:0
+msgid "Share User"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:647
+#, python-format
+msgid "Please indicate the emails of the persons to share with, one per line"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,embed_code:0 field:share.wizard.result.line,user_id:0
+msgid "unknown"
+msgstr "okänd"
+
+#. module: share
+#: help:res.groups,share:0
+msgid "Group created to set access rights for sharing data with some users."
+msgstr ""
+
+#. module: share
+#: help:share.wizard,action_id:0
+msgid ""
+"The action that opens the screen containing the data you wish to share."
+msgstr ""
+
+#. module: share
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "Detta bolag är inte tillåtet för den här användaren"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:526
+#, python-format
+msgid "(Copy for sharing)"
+msgstr ""
+
+#. module: share
+#: field:share.wizard.result.line,newly_created:0
+msgid "Newly created"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:616
+#, python-format
+msgid "Indirect sharing filter created by user %s (%s) for group %s"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:767
+#, python-format
+msgid "I've shared %s with you!"
+msgstr ""
+
+#. module: share
+#: help:share.wizard,share_root_url:0
+msgid "Main access page for users that are granted shared access"
+msgstr ""
+
+#. module: share
+#: sql_constraint:res.groups:0
+msgid "The name of the group must be unique !"
+msgstr "Gruppens namn måsta vara unikt !"
+
+#. module: share
+#: model:res.groups,name:share.group_share_user
+msgid "User"
+msgstr "Användare"
+
+#. module: share
+#: view:res.groups:0
+msgid "Groups"
+msgstr "Grupper"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:636
+#, python-format
+msgid ""
+"Sorry, the current screen and filter you are trying to share are not "
+"supported at the moment.\n"
+"You may want to try a simpler filter."
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Use this Link"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:779
+#, python-format
+msgid "Database"
+msgstr "Databas"
+
+#. module: share
+#: field:share.wizard,domain:0
+msgid "Domain"
+msgstr "Domän"
+
+#. module: share
+#: view:share.wizard:0 field:share.wizard,result_line_ids:0
+msgid "Summary"
+msgstr "Sammandrag"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:493
+#, python-format
+msgid "Copied access for sharing"
+msgstr ""
+
+#. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard_step1
+msgid "Share your documents"
+msgstr "Dela dina dokument"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Or insert the following code where you want to embed your documents"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid ""
+"An e-mail notification with instructions has been sent to the following "
+"people:"
+msgstr ""
+
+#. module: share
+#: model:ir.model,name:share.model_share_wizard_result_line
+msgid "share.wizard.result.line"
+msgstr "share.wizard.result.line"
+
+#. module: share
+#: help:share.wizard,user_type:0
+msgid "Select the type of user(s) you would like to share data with."
+msgstr ""
+
+#. module: share
+#: field:share.wizard,view_type:0
+msgid "Current View Type"
+msgstr ""
+
+#. module: share
+#: selection:share.wizard,access_mode:0
+msgid "Can view"
+msgstr "Kan se"
+
+#. module: share
+#: selection:share.wizard,access_mode:0
+msgid "Can edit"
+msgstr "Kan ändra"
+
+#. module: share
+#: help:share.wizard,message:0
+msgid ""
+"An optional personal message, to be included in the e-mail notification."
+msgstr ""
+
+#. module: share
+#: model:ir.model,name:share.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:60
+#: code:addons/share/wizard/share_wizard.py:635
+#, python-format
+msgid "Sharing access could not be created"
+msgstr ""
+
+#. module: share
+#: help:res.users,share:0
+msgid ""
+"External user with limited access, created only for the purpose of sharing "
+"data."
+msgstr ""
+
+#. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard
+#: model:ir.model,name:share.model_share_wizard
+#: field:share.wizard.result.line,share_wizard_id:0
+msgid "Share Wizard"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:740
+#, python-format
+msgid "Shared access created!"
+msgstr ""
+
+#. module: share
+#: model:res.groups,comment:share.group_share_user
+msgid ""
+"\n"
+"Members of this groups have access to the sharing wizard, which allows them "
+"to invite external users to view or edit some of their documents."
+msgstr ""
+
+#. module: share
+#: model:ir.model,name:share.model_res_groups
+msgid "Access Groups"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:778
+#: field:share.wizard.result.line,password:0
+#, python-format
+msgid "Password"
+msgstr "Lösenord"
+
+#. module: share
+#: field:share.wizard,new_users:0
+msgid "Emails"
+msgstr "E-post"
+
+#. module: share
+#: field:share.wizard,embed_option_search:0
+msgid "Display search view"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:197
+#, python-format
+msgid "No e-mail address configured"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,message:0
+msgid "Personal Message"
+msgstr "Personligt meddelande"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:763
+#, python-format
+msgid ""
+"The current user must have an email address configured in User Preferences "
+"to be able to send outgoing emails."
+msgstr ""
+
+#. module: share
+#: field:share.wizard.result.line,login:0
+msgid "Login"
+msgstr "Inloggning"
+
+#. module: share
+#: view:res.users:0
+msgid "Regular users only (no share user)"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,access_mode:0
+msgid "Access Mode"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Sharing: preparation"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:198
+#, python-format
+msgid ""
+"You must configure your e-mail address in the user preferences before using "
+"the Share button."
+msgstr ""
+
+#. module: share
+#: help:share.wizard,access_mode:0
+msgid "Access rights to be granted on the shared documents."
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/share/static/src/xml/share.xml:8
+msgid "Link or embed..."
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/share/static/src/xml/share.xml:9
+msgid "Share with..."
+msgstr ""
+
+#~ msgid "Share with these people (one e-mail per line)"
+#~ msgstr "Dela med dessa personer (en e-post per rad)"
diff --git a/addons/web/i18n/hu.po b/addons/web/i18n/hu.po
new file mode 100644
index 00000000000..1bd7fa2ea13
--- /dev/null
+++ b/addons/web/i18n/hu.po
@@ -0,0 +1,1544 @@
+# Hungarian translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-14 15:27+0100\n"
+"PO-Revision-Date: 2012-06-04 12:04+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hungarian <hu@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-05 05:07+0000\n"
+"X-Generator: Launchpad (build 15353)\n"
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:172
+#: addons/web/static/src/js/chrome.js:198
+#: addons/web/static/src/js/chrome.js:414
+#: addons/web/static/src/js/view_form.js:419
+#: addons/web/static/src/js/view_form.js:1233
+#: addons/web/static/src/xml/base.xml:1695
+#: addons/web/static/src/js/view_form.js:424
+#: addons/web/static/src/js/view_form.js:1239
+msgid "Ok"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:180
+msgid "Send OpenERP Enterprise Report"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:194
+msgid "Dont send"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:256
+#, python-format
+msgid "Loading (%d)"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:288
+msgid "Invalid database name"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:483
+msgid "Backed"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:484
+msgid "Database backed up successfully"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:527
+msgid "Restored"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:527
+msgid "Database restored successfully"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:708
+#: addons/web/static/src/xml/base.xml:359
+msgid "About"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:787
+#: addons/web/static/src/xml/base.xml:356
+msgid "Preferences"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:790
+#: addons/web/static/src/js/search.js:239
+#: addons/web/static/src/js/search.js:288
+#: addons/web/static/src/js/view_editor.js:95
+#: addons/web/static/src/js/view_editor.js:836
+#: addons/web/static/src/js/view_editor.js:962
+#: addons/web/static/src/js/view_form.js:1228
+#: addons/web/static/src/xml/base.xml:738
+#: addons/web/static/src/xml/base.xml:1496
+#: addons/web/static/src/xml/base.xml:1506
+#: addons/web/static/src/xml/base.xml:1515
+#: addons/web/static/src/js/search.js:293
+#: addons/web/static/src/js/view_form.js:1234
+msgid "Cancel"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:791
+msgid "Change password"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:792
+#: addons/web/static/src/js/view_editor.js:73
+#: addons/web/static/src/js/views.js:962
+#: addons/web/static/src/xml/base.xml:737
+#: addons/web/static/src/xml/base.xml:1500
+#: addons/web/static/src/xml/base.xml:1514
+msgid "Save"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:811
+#: addons/web/static/src/xml/base.xml:226
+#: addons/web/static/src/xml/base.xml:1729
+msgid "Change Password"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:1096
+#: addons/web/static/src/js/chrome.js:1100
+msgid "OpenERP - Unsupported/Community Version"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:1131
+#: addons/web/static/src/js/chrome.js:1135
+msgid "Client Error"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/data_export.js:6
+msgid "Export Data"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/data_export.js:19
+#: addons/web/static/src/js/data_import.js:69
+#: addons/web/static/src/js/view_editor.js:49
+#: addons/web/static/src/js/view_editor.js:398
+#: addons/web/static/src/js/view_form.js:692
+#: addons/web/static/src/js/view_form.js:3044
+#: addons/web/static/src/js/views.js:963
+#: addons/web/static/src/js/view_form.js:698
+#: addons/web/static/src/js/view_form.js:3067
+msgid "Close"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/data_export.js:20
+msgid "Export To File"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/data_export.js:125
+msgid "Please enter save field list name"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/data_export.js:360
+msgid "Please select fields to save export list..."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/data_export.js:373
+msgid "Please select fields to export..."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/data_import.js:34
+msgid "Import Data"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/data_import.js:70
+msgid "Import File"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/data_import.js:105
+msgid "External ID"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/formats.js:300
+#: addons/web/static/src/js/view_page.js:245
+#: addons/web/static/src/js/formats.js:322
+#: addons/web/static/src/js/view_page.js:251
+msgid "Download"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/formats.js:305
+#: addons/web/static/src/js/formats.js:327
+#, python-format
+msgid "Download \"%s\""
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:191
+msgid "Filter disabled due to invalid syntax"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:237
+msgid "Filter Entry"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:242
+#: addons/web/static/src/js/search.js:291
+#: addons/web/static/src/js/search.js:296
+msgid "OK"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:286
+#: addons/web/static/src/xml/base.xml:1292
+#: addons/web/static/src/js/search.js:291
+msgid "Add to Dashboard"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:415
+#: addons/web/static/src/js/search.js:420
+msgid "Invalid Search"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:415
+#: addons/web/static/src/js/search.js:420
+msgid "triggered from search view"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:503
+#: addons/web/static/src/js/search.js:508
+#, python-format
+msgid "Incorrect value for field %(fieldname)s: [%(value)s] is %(message)s"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:839
+#: addons/web/static/src/js/search.js:844
+msgid "not a valid integer"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:853
+#: addons/web/static/src/js/search.js:858
+msgid "not a valid number"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:931
+#: addons/web/static/src/xml/base.xml:968
+#: addons/web/static/src/js/search.js:936
+msgid "Yes"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:932
+#: addons/web/static/src/js/search.js:937
+msgid "No"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1290
+#: addons/web/static/src/js/search.js:1295
+msgid "contains"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1291
+#: addons/web/static/src/js/search.js:1296
+msgid "doesn't contain"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1292
+#: addons/web/static/src/js/search.js:1306
+#: addons/web/static/src/js/search.js:1325
+#: addons/web/static/src/js/search.js:1344
+#: addons/web/static/src/js/search.js:1365
+#: addons/web/static/src/js/search.js:1297
+#: addons/web/static/src/js/search.js:1311
+#: addons/web/static/src/js/search.js:1330
+#: addons/web/static/src/js/search.js:1349
+#: addons/web/static/src/js/search.js:1370
+msgid "is equal to"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1293
+#: addons/web/static/src/js/search.js:1307
+#: addons/web/static/src/js/search.js:1326
+#: addons/web/static/src/js/search.js:1345
+#: addons/web/static/src/js/search.js:1366
+#: addons/web/static/src/js/search.js:1298
+#: addons/web/static/src/js/search.js:1312
+#: addons/web/static/src/js/search.js:1331
+#: addons/web/static/src/js/search.js:1350
+#: addons/web/static/src/js/search.js:1371
+msgid "is not equal to"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1294
+#: addons/web/static/src/js/search.js:1308
+#: addons/web/static/src/js/search.js:1327
+#: addons/web/static/src/js/search.js:1346
+#: addons/web/static/src/js/search.js:1367
+#: addons/web/static/src/js/search.js:1299
+#: addons/web/static/src/js/search.js:1313
+#: addons/web/static/src/js/search.js:1332
+#: addons/web/static/src/js/search.js:1351
+#: addons/web/static/src/js/search.js:1372
+msgid "greater than"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1295
+#: addons/web/static/src/js/search.js:1309
+#: addons/web/static/src/js/search.js:1328
+#: addons/web/static/src/js/search.js:1347
+#: addons/web/static/src/js/search.js:1368
+#: addons/web/static/src/js/search.js:1300
+#: addons/web/static/src/js/search.js:1314
+#: addons/web/static/src/js/search.js:1333
+#: addons/web/static/src/js/search.js:1352
+#: addons/web/static/src/js/search.js:1373
+msgid "less than"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1296
+#: addons/web/static/src/js/search.js:1310
+#: addons/web/static/src/js/search.js:1329
+#: addons/web/static/src/js/search.js:1348
+#: addons/web/static/src/js/search.js:1369
+#: addons/web/static/src/js/search.js:1301
+#: addons/web/static/src/js/search.js:1315
+#: addons/web/static/src/js/search.js:1334
+#: addons/web/static/src/js/search.js:1353
+#: addons/web/static/src/js/search.js:1374
+msgid "greater or equal than"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1297
+#: addons/web/static/src/js/search.js:1311
+#: addons/web/static/src/js/search.js:1330
+#: addons/web/static/src/js/search.js:1349
+#: addons/web/static/src/js/search.js:1370
+#: addons/web/static/src/js/search.js:1302
+#: addons/web/static/src/js/search.js:1316
+#: addons/web/static/src/js/search.js:1335
+#: addons/web/static/src/js/search.js:1354
+#: addons/web/static/src/js/search.js:1375
+msgid "less or equal than"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1360
+#: addons/web/static/src/js/search.js:1383
+#: addons/web/static/src/js/search.js:1365
+#: addons/web/static/src/js/search.js:1388
+msgid "is"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1384
+#: addons/web/static/src/js/search.js:1389
+msgid "is not"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1396
+#: addons/web/static/src/js/search.js:1401
+msgid "is true"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1397
+#: addons/web/static/src/js/search.js:1402
+msgid "is false"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:20
+#, python-format
+msgid "Manage Views (%s)"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:46
+#: addons/web/static/src/js/view_list.js:17
+#: addons/web/static/src/xml/base.xml:100
+#: addons/web/static/src/xml/base.xml:327
+#: addons/web/static/src/xml/base.xml:756
+msgid "Create"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:47
+#: addons/web/static/src/xml/base.xml:483
+#: addons/web/static/src/xml/base.xml:755
+msgid "Edit"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:48
+#: addons/web/static/src/xml/base.xml:1647
+msgid "Remove"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:71
+#, python-format
+msgid "Create a view (%s)"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:168
+msgid "Do you really want to remove this view?"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:364
+#, python-format
+msgid "View Editor %d - %s"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:367
+msgid "Inherited View"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:371
+msgid "Do you really wants to create an inherited view here?"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:381
+msgid "Preview"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:501
+msgid "Do you really want to remove this node?"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:815
+#: addons/web/static/src/js/view_editor.js:939
+msgid "Properties"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:818
+#: addons/web/static/src/js/view_editor.js:942
+msgid "Update"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:16
+msgid "Form"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:121
+#: addons/web/static/src/js/views.js:803
+msgid "Customize"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:123
+#: addons/web/static/src/js/view_form.js:686
+#: addons/web/static/src/js/view_form.js:692
+msgid "Set Default"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:469
+#: addons/web/static/src/js/view_form.js:475
+msgid ""
+"Warning, the record has been modified, your changes will be discarded."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:693
+#: addons/web/static/src/js/view_form.js:699
+msgid "Save default"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:754
+#: addons/web/static/src/js/view_form.js:760
+msgid "Attachments"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:792
+#: addons/web/static/src/js/view_form.js:798
+#, python-format
+msgid "Do you really want to delete the attachment %s?"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:822
+#: addons/web/static/src/js/view_form.js:828
+#, python-format
+msgid "Unknown operator %s in domain %s"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:830
+#: addons/web/static/src/js/view_form.js:836
+#, python-format
+msgid "Unknown field %s in domain %s"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:868
+#: addons/web/static/src/js/view_form.js:874
+#, python-format
+msgid "Unsupported operator %s in domain %s"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:1225
+#: addons/web/static/src/js/view_form.js:1231
+msgid "Confirm"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:1921
+#: addons/web/static/src/js/view_form.js:2578
+#: addons/web/static/src/js/view_form.js:2741
+#: addons/web/static/src/js/view_form.js:1933
+#: addons/web/static/src/js/view_form.js:2590
+#: addons/web/static/src/js/view_form.js:2760
+msgid "Open: "
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:2049
+#: addons/web/static/src/js/view_form.js:2061
+msgid "<em>   Search More...</em>"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:2062
+#: addons/web/static/src/js/view_form.js:2074
+#, python-format
+msgid "<em>   Create \"<strong>%s</strong>\"</em>"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:2068
+#: addons/web/static/src/js/view_form.js:2080
+msgid "<em>   Create and Edit...</em>"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:2101
+#: addons/web/static/src/js/views.js:675
+#: addons/web/static/src/js/view_form.js:2113
+msgid "Search: "
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:2101
+#: addons/web/static/src/js/view_form.js:2550
+#: addons/web/static/src/js/view_form.js:2113
+#: addons/web/static/src/js/view_form.js:2562
+msgid "Create: "
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:2661
+#: addons/web/static/src/xml/base.xml:750
+#: addons/web/static/src/xml/base.xml:772
+#: addons/web/static/src/xml/base.xml:1646
+#: addons/web/static/src/js/view_form.js:2680
+msgid "Add"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:2721
+#: addons/web/static/src/js/view_form.js:2740
+msgid "Add: "
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_list.js:8
+msgid "List"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_list.js:269
+msgid "Unlimited"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_list.js:305
+#: addons/web/static/src/js/view_list.js:309
+#, python-format
+msgid "[%(first_record)d to %(last_record)d] of %(records_count)d"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_list.js:524
+#: addons/web/static/src/js/view_list.js:528
+msgid "Do you really want to remove these records?"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_list.js:1230
+#: addons/web/static/src/js/view_list.js:1232
+msgid "Undefined"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_list.js:1327
+#: addons/web/static/src/js/view_list.js:1331
+#, python-format
+msgid "%(page)d/%(page_count)d"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_page.js:8
+msgid "Page"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_page.js:52
+msgid "Do you really want to delete this record?"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_tree.js:11
+msgid "Tree"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:565
+#: addons/web/static/src/xml/base.xml:480
+msgid "Fields View Get"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:573
+#, python-format
+msgid "View Log (%s)"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:600
+#, python-format
+msgid "Model %s fields"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:610
+#: addons/web/static/src/xml/base.xml:482
+msgid "Manage Views"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:611
+msgid "Could not find current view declaration"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:805
+msgid "Translate"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:807
+msgid "Technical translation"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:811
+msgid "Other Options"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:814
+#: addons/web/static/src/xml/base.xml:1736
+msgid "Import"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:817
+#: addons/web/static/src/xml/base.xml:1606
+msgid "Export"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:825
+msgid "Reports"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:825
+msgid "Actions"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:825
+msgid "Links"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:919
+msgid "You must choose at least one record."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:920
+msgid "Warning"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:957
+msgid "Translations"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:44
+#: addons/web/static/src/xml/base.xml:315
+msgid "Powered by"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:44
+#: addons/web/static/src/xml/base.xml:315
+#: addons/web/static/src/xml/base.xml:1813
+msgid "OpenERP"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:52
+msgid "Loading..."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:61
+msgid "CREATE DATABASE"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:68
+#: addons/web/static/src/xml/base.xml:211
+msgid "Master password:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:72
+#: addons/web/static/src/xml/base.xml:191
+msgid "New database name:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:77
+msgid "Load Demonstration data:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:81
+msgid "Default language:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:91
+msgid "Admin password:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:95
+msgid "Confirm password:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:109
+msgid "DROP DATABASE"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:116
+#: addons/web/static/src/xml/base.xml:150
+#: addons/web/static/src/xml/base.xml:301
+msgid "Database:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:128
+#: addons/web/static/src/xml/base.xml:162
+#: addons/web/static/src/xml/base.xml:187
+msgid "Master Password:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:132
+#: addons/web/static/src/xml/base.xml:328
+msgid "Drop"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:143
+msgid "BACKUP DATABASE"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:166
+#: addons/web/static/src/xml/base.xml:329
+msgid "Backup"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:175
+msgid "RESTORE DATABASE"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:182
+msgid "File:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:195
+#: addons/web/static/src/xml/base.xml:330
+msgid "Restore"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:204
+msgid "CHANGE MASTER PASSWORD"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:216
+msgid "New master password:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:221
+msgid "Confirm new master password:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:251
+msgid ""
+"Your version of OpenERP is unsupported. Support & maintenance services are "
+"available here:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:251
+msgid "OpenERP Entreprise"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:256
+msgid "OpenERP Enterprise Contract."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:257
+msgid "Your report will be sent to the OpenERP Enterprise team."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:259
+msgid "Summary:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:263
+msgid "Description:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:267
+msgid "What you did:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:297
+msgid "Invalid username or password"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:306
+msgid "Username"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:308
+#: addons/web/static/src/xml/base.xml:331
+msgid "Password"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:310
+msgid "Log in"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:314
+msgid "Manage Databases"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:332
+msgid "Back to Login"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:353
+msgid "Home"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:363
+msgid "LOGOUT"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:388
+msgid "Fold menu"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:389
+msgid "Unfold menu"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:454
+msgid "Hide this tip"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:455
+msgid "Disable all tips"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:463
+msgid "Add / Remove Shortcut..."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:471
+msgid "More…"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:477
+msgid "Debug View#"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:478
+msgid "View Log (perm_read)"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:479
+msgid "View Fields"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:483
+msgid "View"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:484
+msgid "Edit SearchView"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:485
+msgid "Edit Action"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:486
+msgid "Edit Workflow"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:491
+msgid "ID:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:494
+msgid "XML ID:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:497
+msgid "Creation User:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:500
+msgid "Creation Date:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:503
+msgid "Latest Modification by:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:506
+msgid "Latest Modification Date:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:542
+msgid "Field"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:632
+#: addons/web/static/src/xml/base.xml:758
+#: addons/web/static/src/xml/base.xml:1708
+msgid "Delete"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:757
+msgid "Duplicate"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:775
+msgid "Add attachment"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:801
+msgid "Default:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:818
+msgid "Condition:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:837
+msgid "Only you"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:844
+msgid "All users"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:851
+msgid "Unhandled widget"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:900
+msgid "Notebook Page \""
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:905
+#: addons/web/static/src/xml/base.xml:964
+msgid "Modifiers:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:931
+msgid "(nolabel)"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:936
+msgid "Field:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:940
+msgid "Object:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:944
+msgid "Type:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:948
+msgid "Widget:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:952
+msgid "Size:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:956
+msgid "Context:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:960
+msgid "Domain:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:968
+msgid "Change default:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:972
+msgid "On change:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:976
+msgid "Relation:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:980
+msgid "Selection:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1020
+msgid "Send an e-mail with your default e-mail client"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1034
+msgid "Open this resource"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1056
+msgid "Select date"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1090
+msgid "Open..."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1091
+msgid "Create..."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1092
+msgid "Search..."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1095
+msgid "..."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1155
+#: addons/web/static/src/xml/base.xml:1198
+msgid "Set Image"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1163
+#: addons/web/static/src/xml/base.xml:1213
+#: addons/web/static/src/xml/base.xml:1215
+#: addons/web/static/src/xml/base.xml:1272
+msgid "Clear"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1172
+#: addons/web/static/src/xml/base.xml:1223
+msgid "Uploading ..."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1200
+#: addons/web/static/src/xml/base.xml:1495
+msgid "Select"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1207
+#: addons/web/static/src/xml/base.xml:1209
+msgid "Save As"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1238
+msgid "Button"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1241
+msgid "(no string)"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1248
+msgid "Special:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1253
+msgid "Button Type:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1257
+msgid "Method:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1261
+msgid "Action ID:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1271
+msgid "Search"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1279
+msgid "Filters"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1280
+msgid "-- Filters --"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1289
+msgid "-- Actions --"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1290
+msgid "Add Advanced Filter"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1291
+msgid "Save Filter"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1293
+msgid "Manage Filters"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1298
+msgid "Filter Name:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1300
+msgid "(Any existing filter with the same name will be replaced)"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1305
+msgid "Select Dashboard to add this filter to:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1309
+msgid "Title of new Dashboard item:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1416
+msgid "Advanced Filters"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1426
+msgid "Any of the following conditions must match"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1427
+msgid "All the following conditions must match"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1428
+msgid "None of the following conditions must match"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1435
+msgid "Add condition"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1436
+msgid "and"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1503
+msgid "Save & New"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1504
+msgid "Save & Close"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1611
+msgid ""
+"This wizard will export all data that matches the current search criteria to "
+"a CSV file.\n"
+"            You can export all data or only the fields that can be "
+"reimported after modification."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1618
+msgid "Export Type:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1620
+msgid "Import Compatible Export"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1621
+msgid "Export all Data"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1624
+msgid "Export Formats"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1630
+msgid "Available fields"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1632
+msgid "Fields to export"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1634
+msgid "Save fields list"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1648
+msgid "Remove All"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1660
+msgid "Name"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1693
+msgid "Save as:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1700
+msgid "Saved exports:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1714
+msgid "Old Password:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1719
+msgid "New Password:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1724
+msgid "Confirm Password:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1742
+msgid "1. Import a .CSV file"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1743
+msgid ""
+"Select a .CSV file to import. If you need a sample of file to import,\n"
+"       you should use the export tool with the \"Import Compatible\" option."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1747
+msgid "CSV File:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1750
+msgid "2. Check your file format"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1753
+msgid "Import Options"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1757
+msgid "Does your file have titles?"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1763
+msgid "Separator:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1765
+msgid "Delimiter:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1769
+msgid "Encoding:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1772
+msgid "UTF-8"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1773
+msgid "Latin 1"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1776
+msgid "Lines to skip"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1776
+msgid ""
+"For use if CSV files have titles on multiple lines, skips more than a single "
+"line during import"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1803
+msgid "The import failed due to:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1805
+msgid "Here is a preview of the file we could not import:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1812
+msgid "Activate the developper mode"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1814
+msgid "Version"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1815
+msgid "Copyright © 2004-TODAY OpenERP SA. All Rights Reserved."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1816
+msgid "OpenERP is a trademark of the"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1817
+msgid "OpenERP SA Company"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1819
+msgid "Licenced under the terms of"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1820
+msgid "GNU Affero General Public License"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1822
+msgid "For more information visit"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1823
+msgid "OpenERP.com"
+msgstr ""
diff --git a/addons/web/i18n/nl_BE.po b/addons/web/i18n/nl_BE.po
index 33cf0c60387..77a2c3810ff 100644
--- a/addons/web/i18n/nl_BE.po
+++ b/addons/web/i18n/nl_BE.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-14 15:27+0100\n"
-"PO-Revision-Date: 2012-05-15 14:32+0000\n"
+"PO-Revision-Date: 2012-06-04 14:18+0000\n"
 "Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
 "Language-Team: Dutch (Belgium) <nl_BE@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-01 05:37+0000\n"
-"X-Generator: Launchpad (build 15342)\n"
+"X-Launchpad-Export-Date: 2012-06-05 05:07+0000\n"
+"X-Generator: Launchpad (build 15353)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:172
@@ -1330,7 +1330,7 @@ msgstr "Voorwaarde toevoegen"
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1436
 msgid "and"
-msgstr ""
+msgstr "en"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1503
@@ -1441,7 +1441,7 @@ msgstr "CSV Bestand:"
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1750
 msgid "2. Check your file format"
-msgstr ""
+msgstr "2. Controleer uw bestandsformaat"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1753
diff --git a/addons/web_livechat/i18n/sv.po b/addons/web_livechat/i18n/sv.po
new file mode 100644
index 00000000000..dd3ae799443
--- /dev/null
+++ b/addons/web_livechat/i18n/sv.po
@@ -0,0 +1,28 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-06-04 15:38+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-05 04:54+0000\n"
+"X-Generator: Launchpad (build 15353)\n"
+
+#. module: web_livechat
+#: sql_constraint:publisher_warranty.contract:0
+msgid "That contract is already registered in the system."
+msgstr "Det kontraktet har redan registrerats i systemet."
+
+#. module: web_livechat
+#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
+msgid "publisher_warranty.contract"
+msgstr "publisher_warranty.contract"
diff --git a/addons/web_uservoice/i18n/sv.po b/addons/web_uservoice/i18n/sv.po
new file mode 100644
index 00000000000..cf2af514acf
--- /dev/null
+++ b/addons/web_uservoice/i18n/sv.po
@@ -0,0 +1,23 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-06-04 15:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-05 04:54+0000\n"
+"X-Generator: Launchpad (build 15353)\n"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/web_uservoice/static/src/xml/web_uservoice.xml:6
+msgid "feedback"
+msgstr "återkoppling"

From 01ff2b0a6f1071dbd0ff82d73c074eff24935c0f Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 5 Jun 2012 13:34:35 +0200
Subject: [PATCH 64/71] [IMP] Improved subtotal classes for Sale Orders

bzr revid: fme@openerp.com-20120605113435-3uniireb1y6h8k36
---
 addons/web/static/src/css/base.css  | 20 ++++++++++----------
 addons/web/static/src/css/base.sass | 20 ++++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index b688b0d2b89..62391547040 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;
@@ -2097,27 +2097,27 @@
   padding-left: 8px;
 }
 .openerp .oe_form .oe_form_subtotal_footer {
+  width: auto;
   float: right;
 }
-.openerp .oe_form .oe_form_subtotal_footer > div {
+.openerp .oe_form .oe_form_subtotal_footer td.oe_form_group_cell {
   text-align: right;
-  padding: 3px;
+  padding: 0;
 }
-.openerp .oe_form .oe_form_subtotal_footer label {
-  font-weight: normal !important;
+.openerp .oe_form .oe_form_subtotal_footer td.oe_form_group_cell_label {
+  border: none;
 }
-.openerp .oe_form .oe_form_subtotal_footer span {
-  display: inline-block;
-  min-width: 80px;
-  text-align: right;
+.openerp .oe_form .oe_form_subtotal_footer .oe_form_field {
+  width: auto !important;
 }
 .openerp .oe_form .oe_form_subtotal_footer .oe_form_subtotal_footer_separator {
   border-top: 1px solid #cacaca;
   font-size: 120%;
   font-weight: bold;
 }
-.openerp .oe_form .oe_form_subtotal_footer .oe_form_subtotal_footer_separator label {
+.openerp .oe_form .oe_form_subtotal_footer label.oe_form_subtotal_footer_separator {
   font-weight: bold !important;
+  padding: 2px 8px 2px 0px !important;
 }
 .openerp .oe-listview-content {
   width: 100%;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 0c8f4253549..18026b60070 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1715,22 +1715,22 @@ $colour4: #8a89ba
         td.oe_form_group_cell + .oe_form_group_cell
             padding-left: 8px
         .oe_form_subtotal_footer
+            width: auto
             float: right
-            > div
-                text-align: right
-                padding: 3px
-            label
-                font-weight: normal !important
-            span
-                display: inline-block
-                min-width: 80px
+            td.oe_form_group_cell
                 text-align: right
+                padding: 0
+            td.oe_form_group_cell_label
+                border: none
+            .oe_form_field
+                width: auto !important
             .oe_form_subtotal_footer_separator
                 border-top: 1px solid #cacaca
                 font-size: 120%
                 font-weight: bold
-                label
-                    font-weight: bold !important
+            label.oe_form_subtotal_footer_separator
+                font-weight: bold !important
+                padding: 2px 8px 2px 0px !important
     // }}}
     // ListView {{{
     .oe-listview-content

From 0873f5d6f0e703713399ed2577c4500b77eb63bd Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 5 Jun 2012 13:42:50 +0200
Subject: [PATCH 65/71] [IMP] Improved sale order form view

bzr revid: fme@openerp.com-20120605114250-af29l55ak0vqfwri
---
 addons/sale/sale_view.xml               | 21 ++++++++-------------
 addons/sale_margin/sale_margin_view.xml |  8 +++-----
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 6c69dd38a75..c1f81cf521d 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -135,6 +135,7 @@
                     </group>
                     <notebook colspan="5">
                         <page string="Sales Order">
+                        <group col="4">
                             <field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1}" />
                             <field domain="[('parent_id','=',partner_id)]" name="partner_invoice_id" groups="sale.group_delivery_invoice_address" options='{"quick_create": false}'/>
                             <field domain="[('parent_id','=',partner_id)]" name="partner_shipping_id" groups="sale.group_delivery_invoice_address" options='{"quick_create": false}'/>
@@ -211,23 +212,17 @@
                                     <field name="price_subtotal" groups="base.group_sale_notes_subtotal"/>
                                 </tree>
                             </field>
-                            <group colspan="2" col="4" name="bellow_the_lines_hook">
+                            <group colspan="3" col="4" name="bellow_the_lines_hook">
+                            </group>
+                            <group class="oe_form_subtotal_footer" colspan="1" col="2">
+                                <field name="amount_untaxed" sum="Untaxed amount"/>
+                                <field name="amount_tax"/>
+                                <field name="amount_total" class="oe_form_subtotal_footer_separator"/>
                             </group>
-                            <div class="oe_form_subtotal_footer" colspan="2">
-                                <div>
-                                    <field name="amount_untaxed" sum="Untaxed amount"/>
-                                </div>
-                                <div>
-                                    <field name="amount_tax"/>
-                                </div>
-                                <div class="oe_form_subtotal_footer_separator">
-                                    <field name="amount_total"/>
-                                </div>
-                            </div>
-                            <div class="oe_clear"/>
 
                             <separator colspan="4" string="Notes"/>
                             <field colspan="4" name="note" nolabel="1" placeholder="Our quotation is valid for 30 days..."/>
+                        </group>
                         </page>
                         <page string="Other Information">
                             <group colspan="2" col="2" name="logistics">
diff --git a/addons/sale_margin/sale_margin_view.xml b/addons/sale_margin/sale_margin_view.xml
index a0b8f39565c..ad0b8440f19 100644
--- a/addons/sale_margin/sale_margin_view.xml
+++ b/addons/sale_margin/sale_margin_view.xml
@@ -8,11 +8,9 @@
         <field name="model">sale.order</field>
         <field name="inherit_id" ref="sale.view_order_form" />
         <field name="arch" type="xml">
-            <xpath expr="//div[@class='oe_form_subtotal_footer_separator']" position="after">
-                <div>
-                    <field name="margin"/>
-                </div>
-            </xpath>
+            <field name="amount_total" position="after">
+                <field name="margin"/>
+            </field>
         </field>
     </record>
     

From 8297268d3373ed310dc6e7776e93e7c706822e6e Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 5 Jun 2012 14:40:35 +0200
Subject: [PATCH 66/71] [FIX] Fix broken inherit against Sale Orders form view

bzr revid: fme@openerp.com-20120605124035-btg9r28ezy7ug9p2
---
 addons/sale_analytic_plans/sale_analytic_plans_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale_analytic_plans/sale_analytic_plans_view.xml b/addons/sale_analytic_plans/sale_analytic_plans_view.xml
index 2d4ff082288..0e2ccb41651 100644
--- a/addons/sale_analytic_plans/sale_analytic_plans_view.xml
+++ b/addons/sale_analytic_plans/sale_analytic_plans_view.xml
@@ -18,7 +18,7 @@
         <field name="type">form</field>
         <field name="inherit_id" ref="sale.view_order_form"/>
         <field name="arch" type="xml">
-           <xpath expr="/form/sheet/notebook/page/field[@name='order_line']/form/notebook/page/field[@name='delay']" position="after">
+           <xpath expr="//field[@name='order_line']/form//field[@name='delay']" position="after">
                <field name="analytics_id" domain="[('plan_id','&lt;&gt;',False)]" groups="analytic.group_analytic_accounting"/>
            </xpath>
         </field>

From 4d6fe3c10b539b73cefb597553dd1ba3c9fea125 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 5 Jun 2012 14:53:32 +0200
Subject: [PATCH 67/71] [IMP] FormRenderingEngine: generated labels inherits
 field's classes

bzr revid: fme@openerp.com-20120605125332-qp6n92jowajmc54y
---
 addons/web/static/src/js/view_form.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index f1115de0b54..017293f5d6d 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1048,6 +1048,7 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
             "modifiers": JSON.stringify({invisible: field_modifiers.invisible}),
             "string": $field.attr('string'),
             "help": $field.attr('help'),
+            "class": $field.attr('class'),
         });
         $label.insertBefore($field);
         if (field_colspan > 1) {

From 240943961e053f4ac51be638f9641c0a798274f4 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Tue, 5 Jun 2012 17:26:30 +0200
Subject: [PATCH 68/71] [IMP] log exceptions in safe_eval

bzr revid: chs@openerp.com-20120605152630-d4flr4c3mwl7wnvx
---
 openerp/tools/safe_eval.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/openerp/tools/safe_eval.py b/openerp/tools/safe_eval.py
index a542fa44a42..601fd95200a 100644
--- a/openerp/tools/safe_eval.py
+++ b/openerp/tools/safe_eval.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    Copyright (C) 2004-2010 OpenERP s.a. (<http://www.openerp.com>).
+#    Copyright (C) 2004-2012 OpenERP s.a. (<http://www.openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -238,6 +238,10 @@ def safe_eval(expr, globals_dict=None, locals_dict=None, mode="eval", nocopy=Fal
                 'set' : set
             }
     )
-    return eval(test_expr(expr,_SAFE_OPCODES, mode=mode), globals_dict, locals_dict)
+    try:
+        return eval(test_expr(expr, _SAFE_OPCODES, mode=mode), globals_dict, locals_dict)
+    except Exception:
+        _logger.exception('Cannot eval %r', expr)
+        raise
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From fdd78a5dcfb182d18d34da3ce82c712eda820a54 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 5 Jun 2012 18:16:10 +0200
Subject: [PATCH 69/71] [fix] small problem with visibility and reinitialize
 mixin

bzr revid: nicolas.vanhoren@openerp.com-20120605161610-vaokz5p7pz706lqj
---
 addons/web/static/src/js/view_form.js | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index e5b60c49a46..43094a97e66 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1382,15 +1382,15 @@ instance.web.form.InvisibilityChangerMixin = {
         _.bind(check, this)();
     },
     start: function() {
-        var check_visibility = function() {
-            if (this.get("effective_invisible")) {
-                this.$element.hide();
-            } else {
-                this.$element.show();
-            }
-        };
-        this.on("change:effective_invisible", this, check_visibility);
-        _.bind(check_visibility, this)();
+        this.on("change:effective_invisible", this, this._check_visibility);
+        this._check_visibility();
+    },
+    _check_visibility: function() {
+        if (this.get("effective_invisible")) {
+            this.$element.hide();
+        } else {
+            this.$element.show();
+        }
     },
 };
 
@@ -1737,6 +1737,8 @@ instance.web.form.AbstractField = instance.web.form.FormWidget.extend(_.extend({
             this.on("change:required", this, this._set_required);
             this._set_required();
         }
+        this._check_visibility();
+        this._check_css_flags();
     },
     /**
      * Private. Do not use.

From 6843f125fc64438d63dd5febc85167f67bdaf771 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 6 Jun 2012 04:36:53 +0000
Subject: [PATCH 70/71] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120606043653-bgc18qhud2ekjvi7
---
 openerp/addons/base/i18n/pt.po | 295 ++++++++++++++++-----------------
 1 file changed, 147 insertions(+), 148 deletions(-)

diff --git a/openerp/addons/base/i18n/pt.po b/openerp/addons/base/i18n/pt.po
index d766144ece3..e1a2df8c307 100644
--- a/openerp/addons/base/i18n/pt.po
+++ b/openerp/addons/base/i18n/pt.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:44+0000\n"
-"PO-Revision-Date: 2012-04-03 15:31+0000\n"
-"Last-Translator: tamnil <Unknown>\n"
+"PO-Revision-Date: 2012-06-05 10:01+0000\n"
+"Last-Translator: Tiago Rodrigues <tig.rodrigues@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-12 05:37+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-06 04:36+0000\n"
+"X-Generator: Launchpad (build 15353)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -24,7 +24,7 @@ msgstr "Santa Helena"
 #. module: base
 #: view:ir.actions.report.xml:0
 msgid "Other Configuration"
-msgstr "Outras configurações"
+msgstr "Outras Configurações"
 
 #. module: base
 #: selection:ir.property,type:0
@@ -85,12 +85,12 @@ msgstr "Código (ex:pt__PT)"
 #: field:workflow.transition,wkf_id:0
 #: field:workflow.workitem,wkf_id:0
 msgid "Workflow"
-msgstr "Fluxo de trabalho"
+msgstr "Fluxo de Trabalho"
 
 #. module: base
 #: selection:ir.sequence,implementation:0
 msgid "No gap"
-msgstr ""
+msgstr "Sem espaços"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -125,7 +125,7 @@ msgstr ""
 #. module: base
 #: view:ir.module.module:0
 msgid "Created Views"
-msgstr "Vistas criadas"
+msgstr "Vistas Criadas"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:532
@@ -201,7 +201,7 @@ msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
 "them through Python code, preferably through a custom addon!"
 msgstr ""
-"Propriedades de campos base não pode ser alterada desta forma! Por favor, "
+"Propriedades de campos base não podem ser alterados desta forma! Por favor, "
 "modifique-os pelo código Python, de preferência através de um addon "
 "personalizado!"
 
@@ -241,7 +241,7 @@ msgstr "Turquia - Contabilidade"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_mrp_subproduct
 msgid "MRP Subproducts"
-msgstr "Subprodutos MRP"
+msgstr "Sub artigos MRP"
 
 #. module: base
 #: code:addons/base/module/module.py:390
@@ -386,7 +386,7 @@ msgstr "Extra"
 #: code:addons/orm.py:2526
 #, python-format
 msgid "Invalid group_by"
-msgstr "Invalid group_by"
+msgstr "Inválido group_by"
 
 #. module: base
 #: field:ir.module.category,child_ids:0
@@ -648,7 +648,7 @@ msgid ""
 "The ISO country code in two chars.\n"
 "You can use this field for quick search."
 msgstr ""
-"O código ISO do país em dois caracteres.\n"
+"O código ISO do país em dois carateres.\n"
 "Pode usar este campo para procura rápida."
 
 #. module: base
@@ -1291,7 +1291,7 @@ msgstr "Referência do Recurso"
 #. module: base
 #: model:res.country,name:base.gs
 msgid "S. Georgia & S. Sandwich Isls."
-msgstr "Georgia do Sul & Ilhas Sandwich"
+msgstr "Ilhas S.Georgia e S.Sandwich"
 
 #. module: base
 #: field:ir.actions.url,url:0
@@ -1578,7 +1578,7 @@ msgstr ""
 #. module: base
 #: field:ir.actions.report.xml,report_rml:0
 msgid "Main report file path"
-msgstr "Relatório principal do arquivo"
+msgstr "Relatório principal do ficheiro"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_action_report_xml
@@ -2549,7 +2549,7 @@ msgstr ""
 #. module: base
 #: field:ir.mail_server,smtp_debug:0
 msgid "Debugging"
-msgstr ""
+msgstr "Depuração"
 
 #. module: base
 #: model:ir.module.module,description:base.module_crm_helpdesk
@@ -3320,7 +3320,7 @@ msgstr "Empresa Principal"
 #. module: base
 #: field:ir.ui.menu,web_icon_hover:0
 msgid "Web Icon File (hover)"
-msgstr "Ícone da Web de Arquivo (hover)"
+msgstr "Ícone da Web do Ficheiro (hover)"
 
 #. module: base
 #: model:ir.module.module,description:base.module_web_diagram
@@ -4096,7 +4096,7 @@ msgstr "Categorias"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_mobile
 msgid "OpenERP Web mobile"
-msgstr ""
+msgstr "OpenERP Web Móvel"
 
 #. module: base
 #: view:base.language.import:0
@@ -4106,7 +4106,7 @@ msgid ""
 "ones can be found on launchpad."
 msgstr ""
 "Se precisar de outro idioma que não está disponível, pode importar um pacote "
-"de idiomas a partir daqui. Outras línguas OpenERP do que os oficiais podem "
+"de idiomas a partir daqui. Outros idiomas OpenERP do que os oficiais podem "
 "ser encontrados na barra de lançamento."
 
 #. module: base
@@ -4627,7 +4627,7 @@ msgstr ""
 msgid ""
 "We suggest to reload the menu tab to see the new menus (Ctrl+T then Ctrl+R)."
 msgstr ""
-"Sugerimos que recarregue o menu, para ver os novos itens (Ctrl+T e depois "
+"Sugerimos que recarregue o menu, para ver os novos items (Ctrl+T e depois "
 "Ctrl+R)"
 
 #. module: base
@@ -5835,7 +5835,7 @@ msgstr "Testar"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_kanban
 msgid "Base Kanban"
-msgstr ""
+msgstr "Base Kanban"
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -6208,7 +6208,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_base_report_creator
 msgid "Query Builder"
-msgstr ""
+msgstr "Construtor de Pesquisas"
 
 #. module: base
 #: selection:ir.actions.todo,type:0
@@ -9599,7 +9599,7 @@ msgstr "Formatar papel"
 #: field:res.partner,lang:0
 #: field:res.users,context_lang:0
 msgid "Language"
-msgstr "Língua"
+msgstr "Idioma"
 
 #. module: base
 #: model:res.country,name:base.gm
@@ -13324,7 +13324,7 @@ msgstr ""
 #: selection:ir.actions.act_window.view,view_mode:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
-msgstr ""
+msgstr "Kanban"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:251
@@ -14722,8 +14722,8 @@ msgid ""
 "Supported file formats: *.csv (Comma-separated values) or *.po (GetText "
 "Portable Objects)"
 msgstr ""
-"Formatos de arquivo: *.csv (valores separados por vírgula) ou *.po "
-"(Objec«tos GetText Portateis)"
+"Formatos de ficheiro: *.csv (valores separados por vírgula) ou *.po (Objetos "
+"GetText Portateis)"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:534
@@ -15763,27 +15763,15 @@ msgstr ""
 msgid "Russian / русский язык"
 msgstr "Russo / русский язык"
 
-#~ msgid "Select Action Type"
-#~ msgstr "Seleccionar o tipo de acção"
-
 #~ msgid "Schedule Upgrade"
 #~ msgstr "Agendar actualização"
 
-#~ msgid "This field is not used, it only helps you to select the right action."
-#~ msgstr ""
-#~ "Este campo não é usado, ele somente o ajuda a seleccionar a acção correcta"
-
 #~ msgid "Keep 0 if the action must appear on all resources."
 #~ msgstr "Manter 0 se a acção tem de aparecer em todos os recursos."
 
 #~ msgid "Trigger Name"
 #~ msgstr "Accionar nome"
 
-#~ msgid ""
-#~ "Keep empty if you don't want the user to be able to connect on the system."
-#~ msgstr ""
-#~ "Mantenha vazio se você não quiser que o utilizador conecte-se no sistema"
-
 #~ msgid "Action To Launch"
 #~ msgstr "Acção a inicializar"
 
@@ -15825,9 +15813,6 @@ msgstr "Russo / русский язык"
 #~ msgid "Create Action"
 #~ msgstr "Criar Acção"
 
-#~ msgid "Objects"
-#~ msgstr "Objectos"
-
 #~ msgid "acc_number"
 #~ msgstr "Numero_acc"
 
@@ -15876,9 +15861,6 @@ msgstr "Russo / русский язык"
 #~ msgid "Action Source"
 #~ msgstr "Fonte da acção"
 
-#~ msgid "Is Object"
-#~ msgstr "É objecto"
-
 #~ msgid "Your Logo - Use a size of about 450x150 pixels."
 #~ msgstr "Seu logo - Use um tamanho de aproximadamente 450x150 pixels."
 
@@ -15891,30 +15873,9 @@ msgstr "Russo / русский язык"
 #~ msgid "BIC/Swift code"
 #~ msgstr "Código BIC/Swift"
 
-#, python-format
-#~ msgid "The unlink method is not implemented on this object !"
-#~ msgstr "O método remover (unlink) não está implementado neste objecto!"
-
 #~ msgid "client_action_multi, client_action_relate"
 #~ msgstr "client_action_multi, client_action_relate"
 
-#~ msgid ""
-#~ "Specify the message. You can use the fields from the object. e.g. `Dear [[ "
-#~ "object.partner_id.name ]]`"
-#~ msgstr ""
-#~ "Especifique a mensagem. Você pode usar os campos do objecto. ex: `Querido [[ "
-#~ "object.partner_id.name ]]`"
-
-#~ msgid "Select the Signal name that is to be used as the trigger."
-#~ msgstr "Seleccione o nome do sinal que será usado como gatilho"
-
-#~ msgid ""
-#~ "Specify the subject. You can use fields from the object, e.g. `Hello [[ "
-#~ "object.partner_id.name ]]`"
-#~ msgstr ""
-#~ "Especifique o assunto. Pode usar campos do objecto, ex. `Olá [[ "
-#~ "object.partner_id.name ]]`"
-
 #~ msgid ""
 #~ "Condition that is to be tested before action is executed, e.g. "
 #~ "object.list_price > object.cost_price"
@@ -15937,25 +15898,9 @@ msgstr "Russo / русский язык"
 #~ msgid "tree_but_action, client_print_multi"
 #~ msgstr "tree_but_action, client_print_multi"
 
-#~ msgid ""
-#~ "Provides the fields that will be used to fetch the email address, e.g. when "
-#~ "you select the invoice, then `object.invoice_address_id.email` is the field "
-#~ "which gives the correct address"
-#~ msgstr ""
-#~ "Fornece os campos que serão usados para encontrar o endereço de email, ex: "
-#~ "quando é selecciona uma factura, então `object.invoice_address_id.email` é o "
-#~ "campo que dá o endereço correcto"
-
 #~ msgid "Trigger On"
 #~ msgstr "Gatilho activo"
 
-#~ msgid "Select the object from the model on which the workflow will executed."
-#~ msgstr "Seleccione o objecto do modelo no qual o workflow será executado."
-
-#~ msgid "Easy to Refer action by name e.g. One Sales Order -> Many Invoices"
-#~ msgstr ""
-#~ "Fácil de referir acções pelo nome, ex: Uma ordem de venda -> Várias facturas"
-
 #~ msgid "Values for Event Type"
 #~ msgstr "Valores para Tipo de Evento"
 
@@ -15978,6 +15923,13 @@ msgstr "Russo / русский язык"
 #~ msgid "Partner Form"
 #~ msgstr "Formulário de Parceiros"
 
+#~ msgid ""
+#~ "Groups are used to define access rights on objects and the visibility of "
+#~ "screens and menus"
+#~ msgstr ""
+#~ "Os grupos são usados para definir direitos de acesso aos objetos e a "
+#~ "visibilidade dos ecrãs e menus"
+
 #~ msgid ""
 #~ "Sets the language for the user's user interface, when UI translations are "
 #~ "available"
@@ -16100,12 +16052,6 @@ msgstr "Russo / русский язык"
 #~ msgid "Emails"
 #~ msgstr "Correio Electrónico"
 
-#~ msgid ""
-#~ "Name of the method to be called on the object when this scheduler is "
-#~ "executed."
-#~ msgstr ""
-#~ "Nome do método do objecto a ser evocado, quando o planificador for executado."
-
 #~ msgid "Client Events"
 #~ msgstr "Eventos de clientes"
 
@@ -16129,10 +16075,6 @@ msgstr "Russo / русский язык"
 #~ msgid "Create User"
 #~ msgstr "Criar utilizador"
 
-#, python-format
-#~ msgid "The read method is not implemented on this object !"
-#~ msgstr "O método de leitura não está implementado neste objecto !"
-
 #, python-format
 #~ msgid "Not Implemented"
 #~ msgstr "Não implementado"
@@ -16147,20 +16089,6 @@ msgstr "Russo / русский язык"
 #~ msgid "res.config.users"
 #~ msgstr "res.config.users"
 
-#~ msgid "Workflow On"
-#~ msgstr "Fluxo de trabalho activo"
-
-#~ msgid ""
-#~ "Groups are used to define access rights on objects and the visibility of "
-#~ "screens and menus"
-#~ msgstr ""
-#~ "Os grupos são usados para definir direitos de acesso aos objectos e a "
-#~ "visibilidade dos ecrãs e menus"
-
-#, python-format
-#~ msgid "The search method is not implemented on this object !"
-#~ msgstr "O método de pesquisa não está implementado neste objecto!"
-
 #, python-format
 #~ msgid "Not implemented search_memory method !"
 #~ msgstr "Não implementado método search_memory!"
@@ -16176,27 +16104,6 @@ msgstr "Russo / русский язык"
 #~ "Exemplo: GLOBAL_RULE_1 AND GLOBAL_RULE_2 AND ( (GROUP_A_RULE_1 AND "
 #~ "GROUP_A_RULE_2) OR (GROUP_B_RULE_1 AND GROUP_B_RULE_2) )"
 
-#~ msgid ""
-#~ "Create additional users and assign them groups that will allow them to have "
-#~ "access to selected functionalities within the system. Click on 'Done' if you "
-#~ "do not wish to add more users at this stage, you can always do this later."
-#~ msgstr ""
-#~ "Criar utilizadores adicionais e atribuir-lhes grupos que lhes permitirá ter "
-#~ "acesso a funcionalidades seleccionadas dentro do sistema. Clique em 'Feito' "
-#~ "se não quiser adicionar mais utilizadores nesta fase, sempre pode fazer isto "
-#~ "mais tarde."
-
-#~ msgid ""
-#~ "Name of object whose function will be called when this scheduler will run. "
-#~ "e.g. 'res.partener'"
-#~ msgstr ""
-#~ "Nome do objecto cuja função será chamada quando esse programa for executar. "
-#~ "e.g. 'res.partener'"
-
-#, python-format
-#~ msgid "The perm_read method is not implemented on this object !"
-#~ msgstr "O método perm_read não é implementada sobre esse objecto!"
-
 #, python-format
 #~ msgid "Please check that all your lines have %d columns."
 #~ msgstr "Verifique que todas as suas linhas têm %d colunas."
@@ -16219,24 +16126,12 @@ msgstr "Russo / русский язык"
 #~ "Se o seu pagamento foi realizado após este e-mail ter sido enviado, por "
 #~ "favor considere-o como sem efeito."
 
-#, python-format
-#~ msgid "The write method is not implemented on this object !"
-#~ msgstr "O método de gravação não é implementada sobre este objecto!"
-
 #~ msgid "Configure Your Interface"
 #~ msgstr "Configure a interface"
 
 #~ msgid "Combination of rules"
 #~ msgstr "Combinação de regras"
 
-#, python-format
-#~ msgid "The create method is not implemented on this object !"
-#~ msgstr "O método de criar não é implementado sobre esse objecto!"
-
-#, python-format
-#~ msgid "The exists method is not implemented on this object !"
-#~ msgstr "O existente método não é implementado neste objecto!"
-
 #, python-format
 #~ msgid ""
 #~ "Invalid value for reference field \"%s\" (last part must be a non-zero "
@@ -16245,10 +16140,6 @@ msgstr "Russo / русский язык"
 #~ "Valor inválido para o campo de referência \"%s\" (última parte deve ser um "
 #~ "inteiro não-zero): \"%s\""
 
-#, python-format
-#~ msgid "The copy method is not implemented on this object !"
-#~ msgstr "O método de cópia não é implementada sobre esse objecto!"
-
 #, python-format
 #~ msgid "Couldn't find previous ir.actions.todo"
 #~ msgstr "Não foi encontrada a acção (ir.actions.todo) anterior"
@@ -16264,13 +16155,6 @@ msgstr "Russo / русский язык"
 #~ msgid "Maps to the ir_model_data for which this translation is provided."
 #~ msgstr "Mapas para o ir_model_data para o qual esta tradução é fornecida."
 
-#~ msgid "Object Identifiers"
-#~ msgstr "Identificadores de objecto"
-
-#, python-format
-#~ msgid "The read_group method is not implemented on this object !"
-#~ msgstr "O método read_group não é implementada sobre esse objecto!"
-
 #~ msgid ""
 #~ "Enable this if you want to execute missed occurences as soon as the server "
 #~ "restarts."
@@ -16341,3 +16225,118 @@ msgstr "Russo / русский язык"
 #~ "Se estiver a usar OpenERP pela primeira vez, aconselhamos que seleccione a "
 #~ "interface simplificada, que tem menos recursos, mas é mais fácil. Sempre "
 #~ "pode mudar depois nas preferências do utilizador."
+
+#~ msgid "Workflow On"
+#~ msgstr "Fluxo de Trabalho Ativo"
+
+#~ msgid "Select Action Type"
+#~ msgstr "Selecionar o tipo de ação"
+
+#, python-format
+#~ msgid "The read method is not implemented on this object !"
+#~ msgstr "O método de leitura não está implementado neste objeto !"
+
+#~ msgid ""
+#~ "Provides the fields that will be used to fetch the email address, e.g. when "
+#~ "you select the invoice, then `object.invoice_address_id.email` is the field "
+#~ "which gives the correct address"
+#~ msgstr ""
+#~ "Fornece os campos que serão usados para encontrar o endereço de email, ex: "
+#~ "quando é seleciona uma fatura, então `object.invoice_address_id.email` é o "
+#~ "campo que dá o endereço correto"
+
+#~ msgid "Select the Signal name that is to be used as the trigger."
+#~ msgstr "Selecione o nome do sinal que será usado como gatilho"
+
+#~ msgid ""
+#~ "Create additional users and assign them groups that will allow them to have "
+#~ "access to selected functionalities within the system. Click on 'Done' if you "
+#~ "do not wish to add more users at this stage, you can always do this later."
+#~ msgstr ""
+#~ "Criar utilizadores adicionais e atribuir-lhes grupos que lhes permitirá ter "
+#~ "acesso a funcionalidades selecionadas dentro do sistema. Clique em "
+#~ "'Concluído' se não quiser adicionar mais utilizadores nesta fase, sempre "
+#~ "pode fazer isto mais tarde."
+
+#~ msgid "This field is not used, it only helps you to select the right action."
+#~ msgstr ""
+#~ "Este campo não é usado, ele somente o ajuda a selecionar a ação correta"
+
+#~ msgid ""
+#~ "Specify the message. You can use the fields from the object. e.g. `Dear [[ "
+#~ "object.partner_id.name ]]`"
+#~ msgstr ""
+#~ "Especifique a mensagem. Pode usar os campos do objeto. ex: `Querido [[ "
+#~ "object.partner_id.name ]]`"
+
+#~ msgid ""
+#~ "Keep empty if you don't want the user to be able to connect on the system."
+#~ msgstr "Mantenha vazio se não quiser que o utilizador se conecte ao sistema"
+
+#, python-format
+#~ msgid "The unlink method is not implemented on this object !"
+#~ msgstr "O método remover (unlink) não está implementado neste objeto!"
+
+#, python-format
+#~ msgid "The search method is not implemented on this object !"
+#~ msgstr "O método de pesquisa não está implementado neste objeto!"
+
+#~ msgid ""
+#~ "Specify the subject. You can use fields from the object, e.g. `Hello [[ "
+#~ "object.partner_id.name ]]`"
+#~ msgstr ""
+#~ "Especifique o assunto. Pode usar campos do objeto, ex. `Excelentissímo(a) [[ "
+#~ "object.partner_id.name ]]`"
+
+#, python-format
+#~ msgid "The write method is not implemented on this object !"
+#~ msgstr "O método de gravação não é implementada sobre este objeto!"
+
+#, python-format
+#~ msgid "The perm_read method is not implemented on this object !"
+#~ msgstr "O método perm_read não é implementada sobre esse objeto!"
+
+#~ msgid ""
+#~ "Name of object whose function will be called when this scheduler will run. "
+#~ "e.g. 'res.partener'"
+#~ msgstr ""
+#~ "Nome do objeto cuja função será chamada quando esse programa for executar. "
+#~ "e.g. 'res.partener'"
+
+#, python-format
+#~ msgid "The exists method is not implemented on this object !"
+#~ msgstr "O existente método não é implementado neste objeto!"
+
+#~ msgid "Select the object from the model on which the workflow will executed."
+#~ msgstr "Selecione o objeto do modelo no qual o workflow será executado."
+
+#, python-format
+#~ msgid "The create method is not implemented on this object !"
+#~ msgstr "O método de criar não é implementado sobre esse objeto!"
+
+#~ msgid "Objects"
+#~ msgstr "Objetos"
+
+#~ msgid "Object Identifiers"
+#~ msgstr "Identificadores de objeto"
+
+#, python-format
+#~ msgid "The copy method is not implemented on this object !"
+#~ msgstr "O método de cópia não é implementada sobre esse objeto!"
+
+#~ msgid ""
+#~ "Name of the method to be called on the object when this scheduler is "
+#~ "executed."
+#~ msgstr ""
+#~ "Nome do método do objeto a ser evocado, quando o planificador for executado."
+
+#, python-format
+#~ msgid "The read_group method is not implemented on this object !"
+#~ msgstr "O método read_group não é implementada sobre esse objeto!"
+
+#~ msgid "Is Object"
+#~ msgstr "É objeto"
+
+#~ msgid "Easy to Refer action by name e.g. One Sales Order -> Many Invoices"
+#~ msgstr ""
+#~ "Fácil de referir ações pelo nome, ex: Uma ordem de venda -> Várias faturas"

From 3ba4a8bdbb3d23e11e1c465afc8cb5710d30a331 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 6 Jun 2012 05:04:25 +0000
Subject: [PATCH 71/71] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120606043744-2b4kmnweill1lcx2
bzr revid: launchpad_translations_on_behalf_of_openerp-20120606050425-byhnacqcmy2rg0vy
---
 addons/account/i18n/pt.po     | 14 +++---
 addons/account/i18n/zh_TW.po  |  2 +-
 addons/auction/i18n/pt.po     | 12 ++---
 addons/auth_openid/i18n/pt.po | 39 ++++++++-------
 addons/mrp/i18n/ja.po         |  8 +--
 addons/product/i18n/ja.po     | 94 +++++++++++++++++------------------
 addons/web_diagram/i18n/pt.po | 57 +++++++++++++++++++++
 7 files changed, 142 insertions(+), 84 deletions(-)
 create mode 100644 addons/web_diagram/i18n/pt.po

diff --git a/addons/account/i18n/pt.po b/addons/account/i18n/pt.po
index ce81967607a..69e36d5fc48 100644
--- a/addons/account/i18n/pt.po
+++ b/addons/account/i18n/pt.po
@@ -7,20 +7,20 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-05-31 15:04+0000\n"
-"Last-Translator: ThinkOpen Solutions <Unknown>\n"
+"PO-Revision-Date: 2012-06-05 09:38+0000\n"
+"Last-Translator: Tiago Rodrigues <tig.rodrigues@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-01 05:33+0000\n"
-"X-Generator: Launchpad (build 15342)\n"
+"X-Launchpad-Export-Date: 2012-06-06 04:37+0000\n"
+"X-Generator: Launchpad (build 15353)\n"
 
 #. module: account
 #: view:account.invoice.report:0
 #: view:analytic.entries.report:0
 msgid "last month"
-msgstr "mês anterior"
+msgstr ""
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -30,7 +30,7 @@ msgstr "Pagamento do sistema"
 #. module: account
 #: view:account.journal:0
 msgid "Other Configuration"
-msgstr "Outras configurações"
+msgstr "Outras Configurações"
 
 #. module: account
 #: help:account.tax.code,sequence:0
@@ -57,7 +57,7 @@ msgstr "Estatisticas da Conta"
 #. module: account
 #: view:account.invoice:0
 msgid "Proforma/Open/Paid Invoices"
-msgstr "Proforma/ Abrir / Faturas Pagas"
+msgstr "Proforma / Abrir / Faturas Pagas"
 
 #. module: account
 #: field:report.invoice.created,residual:0
diff --git a/addons/account/i18n/zh_TW.po b/addons/account/i18n/zh_TW.po
index bcbea9aec5d..9a935b5ab11 100644
--- a/addons/account/i18n/zh_TW.po
+++ b/addons/account/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-05 04:54+0000\n"
+"X-Launchpad-Export-Date: 2012-06-06 04:37+0000\n"
 "X-Generator: Launchpad (build 15353)\n"
 
 #. module: account
diff --git a/addons/auction/i18n/pt.po b/addons/auction/i18n/pt.po
index 8ecba7f56b6..9146e8cfb70 100644
--- a/addons/auction/i18n/pt.po
+++ b/addons/auction/i18n/pt.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-31 15:15+0000\n"
-"Last-Translator: ThinkOpen Solutions <Unknown>\n"
+"PO-Revision-Date: 2012-06-05 09:42+0000\n"
+"Last-Translator: Tiago Rodrigues <tig.rodrigues@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-01 05:33+0000\n"
-"X-Generator: Launchpad (build 15342)\n"
+"X-Launchpad-Export-Date: 2012-06-06 04:37+0000\n"
+"X-Generator: Launchpad (build 15353)\n"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_report_menu
@@ -242,7 +242,7 @@ msgstr "Total Adj."
 #. module: auction
 #: view:auction.lots.sms.send:0
 msgid "SMS - Gateway: clickatell','Bulk SMS Send"
-msgstr ""
+msgstr "Gateway de SMS: clickatell','Envio de SMS em massa"
 
 #. module: auction
 #: help:auction.lots,costs:0
@@ -1058,7 +1058,7 @@ msgstr "O meu leilão"
 #. module: auction
 #: help:auction.lots,gross_margin:0
 msgid "(Gross Revenue*100.0)/ Object Price"
-msgstr ""
+msgstr "(Rendimentos Brutos*100.0)/ Preço objecto"
 
 #. module: auction
 #: field:auction.bid,contact_tel:0
diff --git a/addons/auth_openid/i18n/pt.po b/addons/auth_openid/i18n/pt.po
index e3e24a4d8c3..ceea02965de 100644
--- a/addons/auth_openid/i18n/pt.po
+++ b/addons/auth_openid/i18n/pt.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-02-09 11:49+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-06-05 09:43+0000\n"
+"Last-Translator: Tiago Baptista <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-10 04:50+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
+"X-Launchpad-Export-Date: 2012-06-06 04:37+0000\n"
+"X-Generator: Launchpad (build 15353)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
@@ -24,7 +24,7 @@ msgstr ""
 #: view:res.users:0
 #: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:12
 msgid "OpenID"
-msgstr ""
+msgstr "OpenID"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
@@ -33,7 +33,7 @@ msgstr ""
 #: field:res.users,openid_url:0
 #: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:47
 msgid "OpenID URL"
-msgstr ""
+msgstr "OpenID URL"
 
 #. module: auth_openid
 #: help:res.users,openid_email:0
@@ -43,70 +43,71 @@ msgstr ""
 #. module: auth_openid
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "Não pode ter dois utilizadores com o mesmo login!"
 
 #. module: auth_openid
 #: field:res.users,openid_email:0
 msgid "OpenID Email"
-msgstr ""
+msgstr "Email OpenID"
 
 #. module: auth_openid
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
 msgstr ""
+"A empresa escolhida não está entre as permitidas para este utilizador"
 
 #. module: auth_openid
 #: field:res.users,openid_key:0
 msgid "OpenID Key"
-msgstr ""
+msgstr "OpenID Chave"
 
 #. module: auth_openid
 #: model:ir.model,name:auth_openid.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:8
 msgid "Password"
-msgstr ""
+msgstr "Password"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:9
 #: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:10
 msgid "Google"
-msgstr ""
+msgstr "Google"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:10
 msgid "Google Apps"
-msgstr ""
+msgstr "Google Apps"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:11
 msgid "Launchpad"
-msgstr ""
+msgstr "Launchpad"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:20
 msgid "Google Apps Domain:"
-msgstr ""
+msgstr "Domínio Google Apps:"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:24
 msgid "Username:"
-msgstr ""
+msgstr "Nome de utilizador:"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:28
 msgid "OpenID URL:"
-msgstr ""
+msgstr "OpenID URL:"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:35
 msgid "Google Apps Domain"
-msgstr ""
+msgstr "Domínio Google Apps"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:41
 msgid "Username"
-msgstr ""
+msgstr "Nome de utilizador"
diff --git a/addons/mrp/i18n/ja.po b/addons/mrp/i18n/ja.po
index b4316fe0196..6166dc4f854 100644
--- a/addons/mrp/i18n/ja.po
+++ b/addons/mrp/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:49+0000\n"
-"PO-Revision-Date: 2012-06-02 04:49+0000\n"
+"PO-Revision-Date: 2012-06-05 23:40+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-03 04:47+0000\n"
-"X-Generator: Launchpad (build 15342)\n"
+"X-Launchpad-Export-Date: 2012-06-06 04:37+0000\n"
+"X-Generator: Launchpad (build 15353)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -223,7 +223,7 @@ msgstr "改訂"
 msgid ""
 "Create a product form for everything you buy or sell. Specify a supplier if "
 "the product can be purchased."
-msgstr "購入または販売した全ての製品フォームを作成して下さい。製品を購入することがでできる場合、仕入先を指定して下さい。"
+msgstr "仕入または販売する全ての製品フォームを作成して下さい。製品を仕入れることができる場合、仕入先を指定して下さい。"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.next_id_77
diff --git a/addons/product/i18n/ja.po b/addons/product/i18n/ja.po
index 326bcce9365..78846b03a53 100644
--- a/addons/product/i18n/ja.po
+++ b/addons/product/i18n/ja.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-06-02 06:21+0000\n"
+"PO-Revision-Date: 2012-06-06 02:21+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-03 04:47+0000\n"
-"X-Generator: Launchpad (build 15342)\n"
+"X-Launchpad-Export-Date: 2012-06-06 04:37+0000\n"
+"X-Generator: Launchpad (build 15353)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
 msgid "DDR 512MB PC400"
-msgstr ""
+msgstr "DDRメモリ 512MB PC400"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -68,7 +68,7 @@ msgstr "販売可能"
 #. module: product
 #: model:product.template,name:product.product_product_mb2_product_template
 msgid "Mainboard ASUStek A7V8X-X"
-msgstr ""
+msgstr "マザーボード ASUStek A7V8X-X"
 
 #. module: product
 #: help:product.template,seller_qty:0
@@ -88,7 +88,7 @@ msgstr "単位"
 #. module: product
 #: model:product.template,name:product.product_product_pc2_product_template
 msgid "Basic+ PC (assembly on order)"
-msgstr ""
+msgstr "ベーシック＋ PC（注文生産）"
 
 #. module: product
 #: field:product.product,incoming_qty:0
@@ -149,17 +149,17 @@ msgstr "参照"
 msgid ""
 "The minimal quantity to trigger this rule, expressed in the supplier UoM if "
 "any or in the default UoM of the product otherrwise."
-msgstr ""
+msgstr "このルールを適用するための最小限の数量です。仕入先が明示した数量、そうでなければ製品のデフォルト数量となります。"
 
 #. module: product
 #: model:product.template,name:product.product_product_24_product_template
 msgid "Keyboard"
-msgstr ""
+msgstr "キーボード"
 
 #. module: product
 #: model:ir.model,name:product.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "パートナ"
 
 #. module: product
 #: code:addons/product/product.py:143
@@ -167,42 +167,42 @@ msgstr ""
 msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
 "both belong to different Category!."
-msgstr ""
+msgstr "それらは両方が異なった分類に属しているので、製品の単位 %s からデフォルト単位 %s への変換はできません。"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_dozen
 msgid "Dozen"
-msgstr ""
+msgstr "ダース"
 
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
-msgstr ""
+msgstr "平均価格"
 
 #. module: product
 #: help:product.pricelist.item,name:0
 msgid "Explicit rule name for this pricelist line."
-msgstr ""
+msgstr "この価格リスト"
 
 #. module: product
 #: model:product.template,name:product.product_product_cpu1_product_template
 msgid "Processor AMD Athlon XP 1800+"
-msgstr ""
+msgstr "プロセッサ AMD Athlon XP 1800+"
 
 #. module: product
 #: model:product.template,name:product.product_product_20_product_template
 msgid "HDD on demand"
-msgstr ""
+msgstr "HDDオンデマンド"
 
 #. module: product
 #: field:product.price_list,price_list:0
 msgid "PriceList"
-msgstr ""
+msgstr "価格リスト"
 
 #. module: product
 #: view:product.template:0
 msgid "UOM"
-msgstr ""
+msgstr "単位"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_unit
@@ -212,64 +212,64 @@ msgstr ""
 #. module: product
 #: view:product.template:0
 msgid "Miscelleanous"
-msgstr ""
+msgstr "その他"
 
 #. module: product
 #: model:product.template,name:product.product_product_worker0_product_template
 msgid "Worker"
-msgstr ""
+msgstr "作業員"
 
 #. module: product
 #: help:product.template,sale_ok:0
 msgid ""
 "Determines if the product can be visible in the list of product within a "
 "selection from a sale order line."
-msgstr ""
+msgstr "製品は販売オーダー行から選択された範囲内の製品リストの中に表示できるかどうかを判断します。"
 
 #. module: product
 #: model:product.pricelist.version,name:product.ver0
 msgid "Default Public Pricelist Version"
-msgstr ""
+msgstr "デフォルト公開価格リスト"
 
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Standard Price"
-msgstr ""
+msgstr "標準価格"
 
 #. module: product
 #: model:product.pricelist.type,name:product.pricelist_type_sale
 #: field:res.partner,property_product_pricelist:0
 msgid "Sale Pricelist"
-msgstr ""
+msgstr "販売価格リスト"
 
 #. module: product
 #: view:product.template:0
 #: field:product.template,type:0
 msgid "Product Type"
-msgstr ""
+msgstr "製品タイプ"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_form_config_action
 msgid ""
 "Create a product form for everything you buy or sell. Specify a supplier if "
 "the product can be purchased."
-msgstr ""
+msgstr "仕入または販売する全ての製品フォームを作成して下さい。製品を仕入れることができる場合、仕入先を指定して下さい。"
 
 #. module: product
 #: view:product.uom:0
 msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
-msgstr ""
+msgstr "  例： 1 ＊ （このユニット） ＝ レシオ ＊ （参照ユニット）"
 
 #. module: product
 #: code:addons/product/product.py:418
 #, python-format
 msgid "Products: "
-msgstr ""
+msgstr "製品： "
 
 #. module: product
 #: field:product.category,parent_id:0
 msgid "Parent Category"
-msgstr ""
+msgstr "親分類"
 
 #. module: product
 #: help:product.template,procure_method:0
@@ -277,12 +277,12 @@ msgid ""
 "'Make to Stock': When needed, take from the stock or wait until re-"
 "supplying. 'Make to Order': When needed, purchase or produce for the "
 "procurement request."
-msgstr ""
+msgstr "在庫する：必要な時に在庫から取り出すか再供給まで待ちます。オーダーする：必要な時に調達要求のために仕入れるか生産するかします。"
 
 #. module: product
 #: model:process.node,note:product.process_node_supplier0
 msgid "Supplier name, price, product code, ..."
-msgstr ""
+msgstr "仕入先名、価格、製品コードなど"
 
 #. module: product
 #: model:product.template,name:product.product_product_hdd3_product_template
@@ -297,7 +297,7 @@ msgstr ""
 #. module: product
 #: field:product.template,seller_id:0
 msgid "Main Supplier"
-msgstr ""
+msgstr "主仕入先"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_ul_form_action
@@ -307,67 +307,67 @@ msgstr ""
 #: view:product.product:0
 #: view:product.ul:0
 msgid "Packaging"
-msgstr ""
+msgstr "梱包"
 
 #. module: product
 #: view:product.product:0
 #: field:product.template,categ_id:0
 msgid "Category"
-msgstr ""
+msgstr "分類"
 
 #. module: product
 #: help:product.pricelist.item,min_quantity:0
 msgid ""
 "The rule only applies if the partner buys/sells more than this quantity."
-msgstr ""
+msgstr "パートナがこの数量よりも多く購入 / 販売した時にこのルールのみが適用されます。"
 
 #. module: product
 #: model:product.template,name:product.product_product_woodmm0_product_template
 msgid "Wood 2mm"
-msgstr ""
+msgstr "木材 2mm"
 
 #. module: product
 #: field:product.price_list,qty1:0
 msgid "Quantity-1"
-msgstr ""
+msgstr "数量-1"
 
 #. module: product
 #: help:product.packaging,ul_qty:0
 msgid "The number of packages by layer"
-msgstr ""
+msgstr "層別パッケージの数"
 
 #. module: product
 #: field:product.packaging,qty:0
 msgid "Quantity by Package"
-msgstr ""
+msgstr "パッケージの数量"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 #: field:product.template,state:0
 msgid "Status"
-msgstr ""
+msgstr "状態"
 
 #. module: product
 #: help:product.template,categ_id:0
 msgid "Select category for the current product"
-msgstr ""
+msgstr "現在の製品のために分類を選択して下さい。"
 
 #. module: product
 #: field:product.product,outgoing_qty:0
 msgid "Outgoing"
-msgstr ""
+msgstr "外に出て行く"
 
 #. module: product
 #: selection:product.uom,uom_type:0
 msgid "Reference UoM for this category"
-msgstr ""
+msgstr "この分類のための参照単位"
 
 #. module: product
 #: model:product.price.type,name:product.list_price
 #: field:product.product,lst_price:0
 msgid "Public Price"
-msgstr ""
+msgstr "公表価格"
 
 #. module: product
 #: field:product.price_list,qty5:0
@@ -907,7 +907,7 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_ram_product_template
 msgid "DDR 256MB PC400"
-msgstr ""
+msgstr "DDRメモリ 256MB PC400"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
@@ -1107,7 +1107,7 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_mb1_product_template
 msgid "Mainboard ASUStek A7N8X"
-msgstr ""
+msgstr "マザーボード ASUStek A7N8X"
 
 #. module: product
 #: field:product.product,packaging:0
@@ -1131,7 +1131,7 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_woodlintelm0_product_template
 msgid "Wood Lintel 4m"
-msgstr ""
+msgstr "木材横木 4m"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_normal_action
@@ -1512,7 +1512,7 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_woodmm10_product_template
 msgid "Wood 10mm"
-msgstr ""
+msgstr "木材 10mm"
 
 #. module: product
 #: selection:product.uom,uom_type:0
diff --git a/addons/web_diagram/i18n/pt.po b/addons/web_diagram/i18n/pt.po
new file mode 100644
index 00000000000..226045d7978
--- /dev/null
+++ b/addons/web_diagram/i18n/pt.po
@@ -0,0 +1,57 @@
+# Portuguese translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-06 17:33+0100\n"
+"PO-Revision-Date: 2012-06-05 19:47+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese <pt@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-06 05:04+0000\n"
+"X-Generator: Launchpad (build 15353)\n"
+
+#. openerp-web
+#: addons/web_diagram/static/src/js/diagram.js:11
+msgid "Diagram"
+msgstr ""
+
+#. openerp-web
+#: addons/web_diagram/static/src/js/diagram.js:208
+#: addons/web_diagram/static/src/js/diagram.js:224
+#: addons/web_diagram/static/src/js/diagram.js:257
+msgid "Activity"
+msgstr ""
+
+#. openerp-web
+#: addons/web_diagram/static/src/js/diagram.js:208
+#: addons/web_diagram/static/src/js/diagram.js:289
+#: addons/web_diagram/static/src/js/diagram.js:308
+msgid "Transition"
+msgstr ""
+
+#. openerp-web
+#: addons/web_diagram/static/src/js/diagram.js:214
+#: addons/web_diagram/static/src/js/diagram.js:262
+#: addons/web_diagram/static/src/js/diagram.js:314
+msgid "Create:"
+msgstr ""
+
+#. openerp-web
+#: addons/web_diagram/static/src/js/diagram.js:231
+#: addons/web_diagram/static/src/js/diagram.js:232
+#: addons/web_diagram/static/src/js/diagram.js:296
+msgid "Open: "
+msgstr ""
+
+#. openerp-web
+#: addons/web_diagram/static/src/xml/base_diagram.xml:5
+#: addons/web_diagram/static/src/xml/base_diagram.xml:6
+msgid "New Node"
+msgstr ""