From c11323148a41da89b2ba1448731e707681f7014d Mon Sep 17 00:00:00 2001
From: Yannick Tivisse <yti@odoo.com>
Date: Tue, 8 Sep 2015 14:02:16 +0200
Subject: [PATCH] [FIX] stock : layout issue between 'weight' and 'tracking'
 field

---
 addons/product/product_view.xml | 2 +-
 addons/stock/product_view.xml   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 30e123d387f..e400f991d51 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -126,7 +126,7 @@
                                     </group>
                                     <group name="group_lots_and_weight">
                                         <label for="weight"/>
-                                        <div class="o_row">
+                                        <div class="o_row" name="weight">
                                             <field digits="(14, 3)" name="weight" string="Weight"
                                             attrs="{'invisible':[('type', 'not in', ['product', 'consu'])]}"/>
                                             <span>kg</span>
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 073b3557f22..20c2f7a745a 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -99,9 +99,9 @@
             <field name="model">product.template</field>
             <field name="inherit_id" ref="product.product_template_form_view"/>
             <field name="arch" type="xml">
-                <field name="weight" position="after">
+                <div name="weight" position="after">
                     <field name="tracking" on_change="onchange_tracking(tracking)" widget="radio" attrs="{'invisible':[('type', 'in', ['service', 'digital'])]}" groups="stock.group_production_lot"/>
-                </field>
+                </div>
                 <field name="company_id" position="after">
                     <field name="route_ids" widget="many2many_checkboxes" attrs="{'invisible':[('type', 'in', ['service', 'digital'])]}"/>
                     <field name="route_from_categ_ids" widget="many2many_tags" readonly="1" attrs="{'invisible':[('route_from_categ_ids', '=', [])]}"/>