diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 3d3b27d744a..a352bd63668 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -169,7 +169,7 @@
                             <separator string="Purchase Description"/>
                             <field colspan="4" name="description_purchase" nolabel="1"/>
                         </page>
-                        <page groups="base.group_extended" string="Packaging">
+                        <page groups="base.group_stock_packaging" string="Packaging">
                             <field colspan="4" name="packaging" nolabel="1">
                                 <form string="Packaging">
                                     <field name="ean"/>
@@ -494,7 +494,7 @@
             <field name="help">Create and manage your packaging dimensions and types you want to be maintained in your system.</field>
         </record>
         <menuitem
-            action="product_ul_form_action" groups="base.group_extended" id="menu_product_ul_form_action" parent="prod_config_main" sequence="3"/>
+            action="product_ul_form_action" groups="base.group_stock_packaging" id="menu_product_ul_form_action" parent="prod_config_main" sequence="3"/>
 
         <record id="product_packaging_tree_view" model="ir.ui.view">
             <field name="name">product.packaging.tree.view</field>
diff --git a/addons/product/security/product_security.xml b/addons/product/security/product_security.xml
index 3c80de554bf..66229c90210 100644
--- a/addons/product/security/product_security.xml
+++ b/addons/product/security/product_security.xml
@@ -34,7 +34,7 @@
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
 
-    <record id="group_packaging" model="res.groups">
+    <record id="base.group_stock_packaging" model="res.groups">
         <field name="name">Manage Product Packaging</field>
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
diff --git a/addons/stock/__init__.py b/addons/stock/__init__.py
index 0a241209593..0f1e96a9c67 100644
--- a/addons/stock/__init__.py
+++ b/addons/stock/__init__.py
@@ -24,5 +24,6 @@ import partner
 import product
 import report
 import wizard
+import res_config
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index 8bca2dc82f0..88ddead6645 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -81,6 +81,7 @@ Thanks to the double entry management, the inventory controlling is powerful and
         "report/report_stock_move_view.xml",
         "report/report_stock_view.xml",
         "board_warehouse_view.xml",
+        "res_config_view.xml",
     ],
     'test': [
         'test/opening_stock.yml',
diff --git a/addons/stock/partner_view.xml b/addons/stock/partner_view.xml
index 04cd0207dd3..6ac3c190e83 100644
--- a/addons/stock/partner_view.xml
+++ b/addons/stock/partner_view.xml
@@ -12,10 +12,10 @@
       <field name="inherit_id" ref="base.view_partner_form"/>
       <field name="arch" type="xml">
         <page string="Sales &amp; Purchases" position="inside">
-          <group colspan="2" col="2" groups="base.group_extended">
+          <group colspan="2" col="2" groups="base.group_stock_inventory_properties">
             <separator string="Inventory Properties" colspan="2"/>
-            <field name="property_stock_customer" domain="[('usage','=','customer')]" groups="base.group_extended" />
-            <field name="property_stock_supplier" domain="[('usage','=','supplier')]" groups="base.group_extended"/>
+            <field name="property_stock_customer" domain="[('usage','=','customer')]" groups="base.group_stock_inventory_properties" />
+            <field name="property_stock_supplier" domain="[('usage','=','supplier')]" groups="base.group_stock_inventory_properties"/>
           </group>
         </page>
       </field>
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index bded802dfe6..8cbea604b05 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -42,10 +42,10 @@
             <field name="arch" type="xml">
                  <page position="after" string="Information">
                     <page string="Properties">
-                        <separator string="Counter-Part Locations Properties" colspan="4"/>
-                        <field name="property_stock_procurement" domain="[('usage','=','procurement')]"/>
-                        <field name="property_stock_production" domain="[('usage','=','production')]"/>
-                        <field name="property_stock_inventory" domain="[('usage','=','inventory')]"/>
+                        <separator string="Counter-Part Locations Properties" groups="base.group_stock_counterpart_location" colspan="4"/>
+                        <field name="property_stock_procurement" domain="[('usage','=','procurement')]" groups="base.group_stock_counterpart_location"/>
+                        <field name="property_stock_production" domain="[('usage','=','production')]" groups="base.group_stock_counterpart_location"/>
+                        <field name="property_stock_inventory" domain="[('usage','=','inventory')]" groups="base.group_stock_counterpart_location"/>
                         <separator string="Accounting Entries" colspan="4"/>
                         <field name="property_stock_account_input" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                         <field name="property_stock_account_output" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
@@ -116,11 +116,11 @@
                         <field name="incoming_qty"/>
                         <field name="outgoing_qty"/>
                     </group>
-                    <group colspan="2" col="2" name="lot" groups="base.group_extended">
+                    <group colspan="2" col="2" name="lot" groups="base.group_stock_tracking_lot,base.group_stock_production_lot">
                         <separator string="Lots" colspan="4"/>
-                        <field name="track_production" />
-                        <field name="track_incoming" />
-                        <field name="track_outgoing" />
+                        <field name="track_production" groups="base.group_stock_production_lot"/>
+                        <field name="track_incoming" groups="base.group_stock_tracking_lot"/>
+                        <field name="track_outgoing" groups="base.group_stock_tracking_lot"/>
                     </group>
                 </group>
             </field>
@@ -169,7 +169,7 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <group name="store" position="after">
-                    <group col="2" colspan="2" name="store" groups="base.group_extended">
+                    <group col="2" colspan="2" name="store" groups="base.group_stock_counterpart_location">
                         <separator string="Counter-Part Locations Properties" colspan="2"/>
                         <field name="property_stock_procurement" attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','procurement')]"/>
                         <field name="property_stock_production" attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','production')]"/>
diff --git a/addons/stock/res_config.py b/addons/stock/res_config.py
new file mode 100644
index 00000000000..6c86cdaa7d8
--- /dev/null
+++ b/addons/stock/res_config.py
@@ -0,0 +1,71 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+
+class warehouse_configuration(osv.osv_memory):
+    _name = 'warehouse.configuration'
+    _inherit = 'res.config.settings'
+
+    _columns = {
+        'module_stock_no_autopicking': fields.boolean("Allow an intermediate picking process to provide raw materials to production orders",
+                        help="""This module allows an intermediate picking process to provide raw materials to production orders.
+                        For example to manage production made by your
+                        suppliers (sub-contracting). To achieve this, set the assembled product
+                        which is sub-contracted to "No Auto-Picking" and put the location of the
+                        supplier in the routing of the assembly operation.
+                        It installs the stock_no_autopicking module."""),
+        'module_claim_from_delivery': fields.boolean("Track claim issue from delivery ",
+                        help="""Adds a Claim link to the delivery order.
+                        It installs the claim_from_delivery module."""),
+        'module_stock_invoice_directly': fields.boolean("Invoice picking right after delivery",
+                        help="""This allows to automatically launch
+                        the invoicing wizard if the delivery is to be invoiced When you send or deliver goods.
+                        It installs the stock_invoice_directly module."""),
+        'module_product_expiry': fields.boolean("Allow to manage expiry date on product",
+                        help="""Track different dates on products and production lots.
+                        Following dates can be tracked:
+                        - end of life
+                        - best before date
+                        - removal date
+                        - alert date.
+                        It installs the product_expiry module."""),
+        'group_stock_production_lot':fields.boolean("Track production lot",group='base.group_user', implied_group='base.group_stock_production_lot',
+                           help="""This allows you to manage products produced by you using production lots (serial numbers).
+                            When you select a lot, you can get the upstream or downstream traceability of the products contained in lot.
+                           It assigns the "Production Lots" group to employee."""),
+        'group_stock_tracking_lot':fields.boolean("Track lot of your incoming and outgoing products ",group='base.group_user', implied_group='base.group_stock_tracking_lot',
+                           help="""Allows you to get the upstream or downstream traceability of the products contained in lot.
+                           It assigns the "Tracking lots" group to employee."""),
+        'group_stock_inventory_valuation':fields.boolean("Track inventory valuation by products ",group='base.group_user', implied_group='base.group_stock_inventory_valuation',
+                           help="""This allows to split stock inventory lines according to production lot.
+                           It assigns the "Inventory valuation" group to employee."""),
+        'group_stock_counterpart_location':fields.boolean("Manage your stock counterpart by products",group='base.group_user', implied_group='base.group_stock_counterpart_location',
+                           help="""This allows to use different stock locations instead of the default one for procurement, production and inventory.
+                           It assigns the "Counter-Part Locations" group to employee."""),
+        'group_stock_inventory_properties':fields.boolean("Define stock locations",group='base.group_user', implied_group='base.group_stock_inventory_properties',
+                           help="""This allows you to set destination location for goods you send to partner or goods you receive from the current partner.
+                           It assigns the "Inventory properties in partner form" group to employee."""),
+    }
+
+warehouse_configuration()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
new file mode 100644
index 00000000000..00b8cbe6438
--- /dev/null
+++ b/addons/stock/res_config_view.xml
@@ -0,0 +1,70 @@
+<openerp>
+    <data>
+
+        <record id="view_warehouse_configuration" model="ir.ui.view">
+            <field name="name">Warehouse Application</field>
+            <field name="model">warehouse.configuration</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+	        <form string ="Warehouse Application">
+	            <separator string="Traceability" colspan="4"/>
+                   <group  colspan="2" col="4">
+                       <newline/>
+                       <field name="group_stock_production_lot"/>
+                       <newline/>
+                       <field name="group_stock_tracking_lot"/>
+                       <newline/>
+                       <field name="module_product_expiry"/>
+                   </group>
+
+	            <separator string="Logistic" colspan="4"/>
+                   <group  colspan="2" col="4">
+                       <newline/>
+                       <field name="module_stock_no_autopicking"/>
+                       <newline/>
+                       <field name="module_stock_invoice_directly"/>
+                       <newline/>
+                   </group>
+
+                   <separator string="Products" colspan="4"/>
+                   <group colspan="4" col="8">
+                       <group  colspan="2" col="4">
+                          <field name="group_stock_packaging"/>
+                          <newline/>
+                          <field name="group_sale_uom_per_product"/>
+                          <newline/>
+                       </group>
+                       <group colspan="2" col="4">
+                           <newline/>
+                           <field name="group_stock_inventory_valuation"/>
+                           <newline/>
+                           <field name="group_stock_counterpart_location"/>
+                           <newline/>
+                       </group>
+                   </group>
+
+	            <separator string="Partners" colspan="4"/>
+                   <group  colspan="2" col="4">
+                       <newline/>
+                    <field name="group_stock_inventory_properties"/>
+                    <newline/>
+                    <field name="module_claim_from_delivery"/>
+                    <newline/>
+                   </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_warehouse_configuration" model="ir.actions.act_window">
+            <field name="name">Configure Warehouse Application</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">warehouse.configuration</field>
+            <field name="view_id" ref="view_warehouse_configuration"/>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+        </record>
+
+        <menuitem id="menu_warehouse_configuration" name="Warehouse" parent="base.menu_config" sequence="1" action="action_warehouse_configuration"/>
+
+    </data>
+</openerp>
diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml
index f83a5d362ab..692c72ac690 100644
--- a/addons/stock/security/stock_security.xml
+++ b/addons/stock/security/stock_security.xml
@@ -12,6 +12,31 @@
         <field name="implied_ids" eval="[(4, ref('group_stock_user'))]"/>
     </record>
 
+    <record id="base.group_stock_production_lot" model="res.groups">
+        <field name="name">Production Lots</field>
+        <field name="category_id" ref="base.module_category_hidden"/>
+    </record>
+
+    <record id="base.group_stock_tracking_lot" model="res.groups">
+        <field name="name">Tracking lots</field>
+        <field name="category_id" ref="base.module_category_hidden"/>
+    </record>
+
+    <record id="base.group_stock_inventory_valuation" model="res.groups">
+        <field name="name">Inventory valuation </field>
+        <field name="category_id" ref="base.module_category_hidden"/>
+    </record>
+
+    <record id="base.group_stock_counterpart_location" model="res.groups">
+        <field name="name">Counter-Part Locations</field>
+        <field name="category_id" ref="base.module_category_hidden"/>
+    </record>
+
+    <record id="base.group_stock_inventory_properties" model="res.groups">
+        <field name="name">Inventory properties in partner form</field>
+        <field name="category_id" ref="base.module_category_hidden"/>
+    </record>
+
 <!-- multi -->
 
     <record model="ir.rule" id="stock_picking_rule">
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 4264a488436..2ba57c7aa0b 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -22,11 +22,11 @@
             action="product.product_category_action_form" id="menu_product_category_config_stock"
             parent="stock.menu_product_in_config_stock" sequence="0"/>
         <menuitem
-            action="product.product_ul_form_action" groups="base.group_extended"
+            action="product.product_ul_form_action" groups="base.group_stock_packaging"
             id="menu_product_packaging_stock_action" parent="stock.menu_product_in_config_stock" sequence="1"/>
          <menuitem
             id="menu_stock_unit_measure_stock" name="Units of Measure"
-            parent="stock.menu_product_in_config_stock"  sequence="2"/>
+            parent="stock.menu_product_in_config_stock"  sequence="2" groups="product.group_uom"/>
          <menuitem
              action="product.product_uom_categ_form_action" id="menu_stock_uom_categ_form_action"
              parent="stock.menu_stock_unit_measure_stock" sequence="0"/>
@@ -42,10 +42,10 @@
                 <tree string="Stock Inventory Lines">
                     <field name="product_id"/>
                     <field name="product_qty"/>
-                    <field name="product_uom"/>
-                    <field name="prod_lot_id" groups="base.group_extended"/>
+                    <field name="product_uom" groups="product.group_uom"/>
+                    <field name="prod_lot_id" groups="base.group_stock_production_lot"/>
                     <button name="%(stock.action_view_stock_inventory_line_split)d"
-                            string="Split inventory lines" groups="base.group_extended"
+                            string="Split inventory lines" groups="base.group_stock_inventory_valuation"
                             type="action" icon="gtk-justify-fill"/>
                     <field name="location_id"/>
                 </tree>
@@ -59,11 +59,11 @@
                 <form string="Stock Inventory Lines">
                     <field context="{'location':location_id, 'uom':product_uom, 'to_date':parent.date}" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom,parent.date)" select="1" domain="[('type','&lt;&gt;','service')]"/>
                     <field name="product_qty"/>
-                    <field name="product_uom"/>
-                    <field name="prod_lot_id" groups="base.group_extended"/>
+                    <field name="product_uom" groups="product.group_uom"/>
+                    <field name="prod_lot_id" groups="base.group_stock_production_lot"/>
                     <field colspan="4" domain="[('usage','=','internal')]" name="location_id" select="1"/>
                         <button name="%(stock.action_view_stock_inventory_line_split)d"
-                            string="Split inventory lines" groups="base.group_extended"
+                            string="Split inventory lines" groups="base.group_stock_inventory_valuation"
                             type="action" icon="terp-stock_effects-object-colorize"/>
                 </form>
             </field>
@@ -119,10 +119,10 @@
                                 <field domain="[('usage','=','internal')]" name="location_id"/>
                                 <field context="{'location':location_id, 'uom':product_uom, 'to_date':parent.date}" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom,parent.date)"  domain="[('type','&lt;&gt;','service')]"/>
                                 <field name="product_qty"/>
-                                <field name="product_uom"/>
-                                <field name="prod_lot_id" groups="base.group_extended"/>
+                                <field name="product_uom" groups="product.group_uom"/>
+                                <field name="prod_lot_id" groups="base.group_stock_production_lot"/>
                                 <button name="%(stock.action_view_stock_inventory_line_split)d"
-                                    string="Split inventory lines" groups="base.group_extended"
+                                    string="Split inventory lines" groups="base.group_stock_inventory_valuation"
                                     type="action" icon="terp-stock_effects-object-colorize" states="draft,confirm"/>
                                 <field name="state" invisible="True"/>
                             </tree>
@@ -131,11 +131,11 @@
                                 <newline/>
                                 <field context="{'location':location_id, 'uom':product_uom, 'to_date':parent.date}" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom,parent.date)"  domain="[('type','&lt;&gt;','service')]"/>
                                 <field name="product_qty"/>
-                                <field name="product_uom"/>
+                                <field name="product_uom" groups="product.group_uom"/>
                                 <group colspan="2" col="4">
-                                <field name="prod_lot_id" groups="base.group_extended"/>
+                                <field name="prod_lot_id" groups="base.group_stock_production_lot"/>
                                     <button name="%(stock.action_view_stock_inventory_line_split)d"
-                                        string="Split inventory lines" groups="base.group_extended"
+                                        string="Split inventory lines" groups="base.group_stock_inventory_valuation"
                                         type="action" icon="terp-stock_effects-object-colorize"/>
                                 </group>
                             </form>
@@ -145,17 +145,17 @@
                                 <tree string="Stock Moves">
                                     <field name="product_id"/>
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                                    <field name="product_uom" string="UoM"/>
-                                    <field name="prodlot_id" groups="base.group_extended"/>
+                                    <field name="product_uom" string="UoM" groups="product.group_uom"/>
+                                    <field name="prodlot_id" groups="base.group_stock_production_lot"/>
                                      <button name="%(track_line)d" string="Split in production lots" type="action"
                                         icon="terp-stock_effects-object-colorize"
                                         attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
                                         states="draft,done,cancel"
                                         context="{'inventory_id':parent.id}"
-                                        groups="base.group_extended"/>
-                                     <field groups="base.group_extended" name="tracking_id"/>
+                                        groups="base.group_stock_production_lot"/>
+                                     <field groups="base.group_stock_tracking_lot" name="tracking_id"/>
                                      <button name="%(split_into)d" string="Put in a new pack" type="action"
-                                        groups="base.group_extended"
+                                        groups="base.group_stock_tracking_lot"
                                         icon="terp-stock_effects-object-colorize"
                                         context="{'inventory_id':parent.id}"
                                         states="draft,done,cancel"/>
@@ -206,14 +206,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Packs">
-                    <group col="2" colspan="2">
+                    <group col="2" colspan="2" groups="base.group_stock_packaging">
                         <separator string="Pack Identification" colspan="2"/>
                         <field name="name"/>
                         <field name="serial"/>
                         <field name="date"/>
-                        <field name="active" groups="base.group_extended"/>
+                        <field name="active"/>
                     </group>
-                    <group col="2" colspan="2">
+                    <group col="2" colspan="2" groups="base.group_stock_tracking_lot">
                         <separator string="Traceability" colspan="4"/>
                         <button name="action_traceability" icon="gtk-go-up" string="Upstream traceability" type="object"
                              colspan="2"/>
@@ -250,7 +250,7 @@
         </record>
         <menuitem id="menu_traceability" name="Traceability" parent="menu_stock_root" sequence="3"/>
         <menuitem action="action_tracking_form" id="menu_action_tracking_form"
-            groups="base.group_extended"
+            groups="base.group_stock_tracking_lot"
             sequence="6"
             parent="menu_traceability"/>
 
@@ -346,10 +346,10 @@
                                     <field name="partner_id"/>
                                     <field name="product_id"/>
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                                    <field name="product_uom" string="UoM"/>
-                                    <field name="tracking_id"/>
+                                    <field name="product_uom" string="UoM" groups="product.group_uom"/>
+                                    <field name="tracking_id" groups="base.group_stock_tracking_lot"/>
                                     <field name="date"/>
-                                    <field name="prodlot_id" groups="base.group_extended"/>
+                                    <field name="prodlot_id"/>
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
                                     <field name="state"/>
@@ -410,7 +410,7 @@
             <field name="help">This is the list of all the production lots (serial numbers) you recorded. When you select a lot, you can get the upstream or downstream traceability of the products contained in lot. By default, the list is filtred on the serial numbers that are available in your warehouse but you can uncheck the 'Available' button to get all the lots you produced, received or delivered to customers.</field>
         </record>
         <menuitem action="action_production_lot_form" id="menu_action_production_lot_form"
-            parent="menu_traceability" groups="base.group_extended"
+            parent="menu_traceability" groups="base.group_stock_production_lot"
             sequence="1"/>
 
         #
@@ -425,10 +425,10 @@
                 <tree colors="grey:state == 'cancel'" string="Moves">
                     <field name="product_id" />
                     <field name="product_qty" />
-                    <field name="product_uom"  string="UOM"/>
-                    <field name="prodlot_id"  groups="base.group_extended"/>
-                    <field groups="base.group_extended" name="tracking_id"/>
-                    <field name="product_packaging" domain="[('product_id','=',product_id)]" groups="base.group_extended"/>
+                    <field name="product_uom"  string="UOM" groups="product.group_uom"/>
+                    <field name="prodlot_id"  groups="base.group_stock_production_lot"/>
+                    <field name="tracking_id" groups="base.group_stock_tracking_lot"/>
+                    <field name="product_packaging" domain="[('product_id','=',product_id)]" groups="base.group_stock_packaging"/>
                     <field name="picking_id"/>
                     <field name="location_id" />
                     <field name="location_dest_id" />
@@ -449,10 +449,10 @@
                 <tree colors="grey:state == 'cancel'" string="Moves">
                     <field name="product_id" />
                     <field name="product_qty" />
-                    <field name="product_uom"  string="UOM"/>
-                    <field name="prodlot_id"  groups="base.group_extended"/>
-                    <field groups="base.group_extended" name="tracking_id"/>
-                    <field name="product_packaging" domain="[('product_id','=',product_id)]" groups="base.group_extended"/>
+                    <field name="product_uom"  string="UOM" groups="product.group_uom"/>
+                    <field name="prodlot_id"  groups="base.group_stock_production_lot"/>
+                    <field name="tracking_id" groups="base.group_stock_tracking_lot"/>
+                    <field name="product_packaging" domain="[('product_id','=',product_id)]" groups="base.group_stock_packaging"/>
                     <field name="picking_id"/>
                     <field name="location_id" />
                     <field name="location_dest_id" />
@@ -712,7 +712,7 @@
                                 <tree colors="grey:scrapped == True" string="Stock Moves">
                                     <field name="product_id"/>
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                                    <field name="product_uom" string="UoM"/>
+                                    <field name="product_uom" string="UoM" groups="product.group_uom"/>
                                     <field name="product_uos" groups="product.group_uos"/>
                                     <button name="%(stock.move_scrap)d"
                                         string="Scrap Products" type="action"
@@ -720,21 +720,21 @@
                                         states="draft,waiting,confirmed,assigned"
                                         groups="base.group_extended"/>
                                     <field name="scrapped" invisible="1"/>
-                                    <field name="prodlot_id" groups="base.group_extended"/>
+                                    <field name="prodlot_id" groups="base.group_stock_production_lot"/>
                                     <button
                                         name="%(stock.track_line)d"
                                         string="Split in production lots"
-                                        groups="base.group_extended"
+                                        groups="base.group_stock_production_lot"
                                         type="action" icon="terp-stock_effects-object-colorize"
                                         states="draft,waiting,confirmed,assigned" />
-                                    <field groups="base.group_extended" name="tracking_id"/>
+                                    <field groups="base.group_stock_tracking_lot" name="tracking_id"/>
                                     <button name="setlast_tracking" string="Put in current pack" type="object"
                                         attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
                                         icon="terp-stock_effects-object-colorize"
-                                        groups="base.group_extended"
+                                        groups="base.group_stock_tracking_lot"
                                         states="draft,assigned,confirmed"/>
                                     <button name="%(split_into)d" string="Put in a new pack" type="action"
-                                        groups="base.group_extended"
+                                        groups="base.group_stock_packaging"
                                         icon="terp-stock_effects-object-colorize"
                                         states="draft,assigned,confirmed"/>
                                     <field name="location_dest_id"/>
@@ -751,10 +751,10 @@
                                                 string="Scrap" type="action" groups="base.group_extended"
                                                 icon="gtk-convert" context="{'scrap': True}"
                                                 states="draft,waiting,confirmed,assigned" colspan="1"/>
-                                        <field name="product_uom" string="Unit Of Measure" colspan="4"/>
+                                        <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" colspan="4"/>
                                         <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" colspan="4"/>
                                         <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="4"/>
-                                        <field groups="base.group_extended" name="product_packaging"  domain="[('product_id','=',product_id)]" colspan="4"/>
+                                        <field name="product_packaging" groups="base.group_stock_packaging" domain="[('product_id','=',product_id)]" colspan="4"/>
                                     </group>
 
                                     <group colspan="2" col="2">
@@ -770,19 +770,19 @@
                                         <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
                                     </group>
 
-                                    <group colspan="2" col="4" groups="base.group_extended">
-                                        <separator string="Traceability" colspan="4" groups="base.group_extended"/>
-                                        <field name="tracking_id" groups="base.group_extended"  colspan="3"/>
+                                    <group colspan="2" col="4" groups="base.group_stock_tracking_lot">
+                                        <separator string="Traceability" colspan="4" groups="base.group_stock_tracking_lot"/>
+                                        <field name="tracking_id" groups="base.group_stock_tracking_lot"  colspan="3"/>
                                         <button name="%(split_into)d" string="New pack" type="action"
-                                              groups="base.group_extended"
+                                              groups="base.group_stock_packaging"
                                               icon="terp-stock_effects-object-colorize"
                                               states="draft,assigned,confirmed"  colspan="1"/>
-                                        <field name="prodlot_id" groups="base.group_extended"
+                                        <field name="prodlot_id" groups="base.group_stock_production_lot"
                                             context="{'location_id':location_id, 'product_id':product_id}"
                                             domain="[('product_id','=?',product_id)]"
                                             on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)"  colspan="3"/>
                                         <button name="%(track_line)d"
-                                            groups="base.group_extended"
+                                            groups="base.group_stock_tracking_lot"
                                             states="draft,waiting,confirmed,assigned"
                                             string="Split" type="action" icon="terp-stock_effects-object-colorize" colspan="1" />
                                     </group>
@@ -905,27 +905,27 @@
                                 <tree colors="grey:scrapped==True" string="Stock Moves">
                                     <field name="product_id"/>
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                                    <field name="product_uom" string="UoM"/>
+                                    <field name="product_uom" string="UoM" groups="product.group_uom"/>
                                     <field name="product_uos" groups="product.group_uos"/>
                                     <button name="%(stock.move_scrap)d"
                                         string="Scrap Products" type="action"
                                         icon="gtk-convert" context="{'scrap': True}"
                                         states="draft,waiting,confirmed,assigned" />
                                     <field name="scrapped" invisible="1"/>
-                                    <field name="prodlot_id" groups="base.group_extended"/>
+                                    <field name="prodlot_id" groups="base.group_stock_production_lot"/>
                                     <button name="%(track_line)d" string="Split in production lots" type="action"
                                         icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
                                         states="draft,assigned,confirmed"
-                                        groups="base.group_extended"/>
-                                    <field name="tracking_id" groups="base.group_extended"/>
+                                        groups="base.group_stock_production_lot"/>
+                                    <field name="tracking_id" groups="base.group_stock_tracking_lot"/>
                                     <button name="setlast_tracking" string="Put in current pack" type="object"
                                         attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
-                                        groups="base.group_extended"
+                                        groups="base.group_stock_tracking_lot"
                                         icon="terp-stock_effects-object-colorize"
                                         states="draft,assigned,confirmed"/>
                                     <button name="%(split_into)d" string="Put in a new pack" type="action"
                                         icon="terp-stock_effects-object-colorize"
-                                        groups="base.group_extended"
+                                        groups="base.group_stock_packaging"
                                         states="draft,assigned,confirmed"/>
                                     <field name="location_id"/>
                                     <field name="date"/>
@@ -942,10 +942,10 @@
                                                 string="Scrap" type="action"
                                                 icon="gtk-convert" context="{'scrap': True}"
                                                 states="draft,waiting,confirmed,assigned" colspan="1" groups="base.group_extended"/>
-                                        <field name="product_uom" string="Unit Of Measure" colspan="4" />
+                                        <field name="product_uom" string="Unit Of Measure" colspan="4" groups="product.group_uom"/>
                                         <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" colspan="4" />
                                         <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="4" />
-                                        <field groups="base.group_extended" name="product_packaging"  domain="[('product_id','=',product_id)]" colspan="4" />
+                                        <field name="product_packaging" groups="base.group_stock_packaging" domain="[('product_id','=',product_id)]" colspan="4" />
                                     </group>
 
                                     <group colspan="2" col="2">
@@ -961,19 +961,19 @@
                                         <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
                                     </group>
 
-                                    <group colspan="2" col="4" groups="base.group_extended">
-                                        <separator string="Traceability" colspan="4" groups="base.group_extended"/>
-                                        <field name="tracking_id" groups="base.group_extended" colspan="3" />
+                                    <group colspan="2" col="4">
+                                        <separator string="Traceability" colspan="4" groups="base.group_stock_tracking_lot"/>
+                                        <field name="tracking_id" groups="base.group_stock_tracking_lot" colspan="3" />
                                           <button name="%(split_into)d" string="New pack" type="action"
-                                              groups="base.group_extended"
+                                              groups="base.group_stock_tracking_lot"
                                               icon="terp-stock_effects-object-colorize"
                                               states="draft,assigned,confirmed" colspan="1"/>
-                                        <field name="prodlot_id" groups="base.group_extended"
+                                        <field name="prodlot_id" groups="base.group_stock_production_lot"
                                             context="{'location_id':location_id, 'product_id':product_id}"
                                             domain="[('product_id','=?',product_id)]"
                                             on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" colspan="3"/>
                                         <button name="%(track_line)d"
-                                              groups="base.group_extended"
+                                              groups="base.group_stock_tracking_lot"
                                               states="draft,waiting,confirmed,assigned"
                                               string="Split" type="action" icon="terp-stock_effects-object-colorize" colspan="1" />
                                     </group>
@@ -1126,27 +1126,27 @@
                                 <tree colors="grey:scrapped==True" string="Stock Moves">
                                     <field name="product_id" />
                                     <field name="product_qty" />
-                                    <field name="product_uom" string="UoM" />
+                                    <field name="product_uom" string="UoM" groups="product.group_uom"/>
                                     <button name="%(stock.move_scrap)d"
                                         string="Scrap Products" type="action"
                                         icon="gtk-convert" context="{'scrap': True}"
                                         states="draft,waiting,confirmed,assigned"
                                         groups="base.group_extended"/>
                                     <field name="scrapped" invisible="1"/>
-                                    <field name="prodlot_id" groups="base.group_extended"/>
+                                    <field name="prodlot_id" groups="base.group_stock_production_lot"/>
                                     <button
                                            name="%(stock.track_line)d"
                                            string="Split in production lots"
-                                           groups="base.group_extended"
+                                           groups="base.group_stock_production_lot"
                                            type="action" icon="terp-stock_effects-object-colorize"
                                            states="draft,waiting,confirmed,assigned" />
-                                    <field name="tracking_id" groups="base.group_extended"/>
+                                    <field name="tracking_id" groups="base.group_stock_tracking_lot"/>
                                     <button name="setlast_tracking" string="Put in current pack" type="object"
-                                        groups="base.group_extended"
+                                        groups="base.group_stock_tracking_lot"
                                         icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
                                         states="draft,assigned,confirmed"/>
                                     <button name="%(split_into)d" string="Put in a new pack" type="action"
-                                        groups="base.group_extended"
+                                        groups="base.group_stock_packaging"
                                         icon="terp-stock_effects-object-colorize"
                                         states="draft,assigned,confirmed"/>
                                     <field name="location_dest_id"/>
@@ -1162,10 +1162,10 @@
                                                 string="Scrap" type="action" groups="base.group_extended"
                                                 icon="gtk-convert" context="{'scrap': True}"
                                                 states="draft,waiting,confirmed,assigned" colspan="1"/>
-                                        <field name="product_uom" string="Unit Of Measure" colspan="4"/>
+                                        <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" colspan="4"/>
                                         <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" colspan="4"/>
                                         <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="4"/>
-                                        <field groups="base.group_extended" name="product_packaging"  domain="[('product_id','=',product_id)]" colspan="4"/>
+                                        <field name="product_packaging" groups="base.group_stock_packaging" domain="[('product_id','=',product_id)]" colspan="4"/>
                                     </group>
 
                                     <group colspan="2" col="2">
@@ -1181,19 +1181,19 @@
                                         <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
                                     </group>
 
-                                    <group colspan="2" col="4" groups="base.group_extended">
-                                        <separator string="Traceability" colspan="4" groups="base.group_extended"/>
-                                        <field name="tracking_id" groups="base.group_extended" colspan="3" />
+                                    <group colspan="2" col="4">
+                                        <separator string="Traceability" colspan="4" groups="base.group_stock_tracking_lot"/>
+                                        <field name="tracking_id" groups="base.group_stock_tracking_lot" colspan="3" />
                                         <button name="%(split_into)d" string="New pack" type="action"
-                                              groups="base.group_extended"
+                                              groups="base.group_stock_packaging"
                                               icon="terp-stock_effects-object-colorize"
                                               states="draft,assigned,confirmed" colspan="1"/>
-                                        <field name="prodlot_id" groups="base.group_extended"
+                                        <field name="prodlot_id" groups="base.group_stock_production_lot"
                                             context="{'location_id':location_id, 'product_id':product_id}"
                                             domain="[('product_id','=?',product_id)]"
                                             on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" colspan="3"/>
                                         <button name="%(track_line)d"
-                                              groups="base.group_extended"
+                                              groups="base.group_stock_tracking_lot"
                                               states="draft,waiting,confirmed,assigned"
                                               string="Split" type="action" icon="terp-stock_effects-object-colorize" colspan="1" />
                                     </group>
@@ -1370,25 +1370,25 @@
                     <field name="partner_id"/>
                     <field name="product_id"/>
                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                    <field name="product_uom" string="UoM"/>
+                    <field name="product_uom" string="UoM" groups="product.group_uom"/>
                     <field name="product_uos" groups="product.group_uos"/>
                     <button name="%(stock.move_scrap)d"
                         string="Scrap Products" type="action"
                         icon="gtk-convert" context="{'scrap': True}"
                         states="draft,waiting,confirmed,assigned"
                         groups="base.group_extended"/>
-                    <field name="prodlot_id" groups="base.group_extended"/>
+                    <field name="prodlot_id" groups="base.group_stock_production_lot"/>
                     <button name="%(track_line)d" string="Split in production lots" type="action"
                         icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
                         states="draft,waiting,confirmed,assigned,done"
-                        groups="base.group_extended"/>
-                    <field groups="base.group_extended" name="tracking_id"/>
+                        groups="base.group_stock_tracking_lot"/>
+                    <field name="tracking_id" groups="base.group_stock_tracking_lot"/>
                     <button name="setlast_tracking" string="Put in current pack" type="object"
-                        groups="base.group_extended"
+                        groups="base.group_stock_packaging"
                         icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
                         states="draft,assigned,confirmed,done"/>
                     <button name="%(split_into)d" string="Put in a new pack" type="action"
-                        groups="base.group_extended"
+                        groups="base.group_stock_packaging"
                         icon="terp-stock_effects-object-colorize"
                         states="draft,assigned,confirmed,done"/>
                     <field name="location_id"/>
@@ -1413,7 +1413,7 @@
                     <group colspan="4" col="7">
                         <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
                         <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                        <field name="product_uom" string="Unit Of Measure"/>
+                        <field name="product_uom" string="Unit Of Measure" groups="product.group_uom"/>
                         <button name="%(stock.move_scrap)d" groups="base.group_extended"
                                 string="Scrap" type="action"
                                 icon="gtk-convert" context="{'scrap': True}"
@@ -1446,17 +1446,17 @@
 
                     <group colspan="2" col="4" groups="base.group_extended">
                         <separator string="Traceability" colspan="4" groups="base.group_extended"/>
-                        <field name="tracking_id" colspan="3" groups="base.group_extended"/>
+                        <field name="tracking_id" colspan="3" groups="base.group_stock_tracking_lot"/>
                         <button name="%(split_into)d" string="New pack" type="action"
-                              groups="base.group_extended"
+                              groups="base.group_stock_packaging"
                               icon="terp-stock_effects-object-colorize"
                               states="draft,assigned,confirmed" colspan="1"/>
-                        <field name="prodlot_id" groups="base.group_extended"
+                        <field name="prodlot_id" groups="base.group_stock_production_lot"
                             context="{'location_id':location_id, 'product_id':product_id}"
                             domain="[('product_id','=?',product_id)]"
                             on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" colspan="3"/>
                         <button name="%(track_line)d"
-                              groups="base.group_extended"
+                              groups="base.group_stock_tracking_lot"
                               states="draft,waiting,confirmed,assigned"
                               string="Split" type="action" icon="terp-stock_effects-object-colorize" colspan="1"/>
                     </group>
@@ -1544,24 +1544,24 @@
                     <field name="partner_id" string="Partner"/>
                     <field name="product_id"/>
                     <field name="product_qty" />
-                    <field name="product_uom" string="UoM"/>
+                    <field name="product_uom" string="UoM" groups="product.group_uom"/>
                     <button name="%(stock.move_scrap)d"
                         string="Scrap Products" type="action"
                         icon="gtk-convert" context="{'scrap': True}"
                         states="draft,waiting,confirmed,assigned" groups="base.group_extended"/>
-                    <field name="prodlot_id" groups="base.group_extended"/>
+                    <field name="prodlot_id" groups="base.group_stock_production_lot"/>
                     <button name="%(track_line)d" string="Split in production lots" type="action"
                         icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
                        states="draft,waiting,confirmed,assigned,done"
-                        groups="base.group_extended"/>
-                    <field name="tracking_id" groups="base.group_extended"/>
+                        groups="base.group_stock_tracking_lot"/>
+                    <field name="tracking_id" groups="base.group_stock_tracking_lot"/>
                     <button name="setlast_tracking" string="Put in current pack" type="object"
                         attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
-                        groups="base.group_extended"
+                        groups="base.group_stock_packaging"
                         icon="terp-stock_effects-object-colorize"
                         states="draft,assigned,confirmed,done"/>
                     <button name="%(split_into)d" string="Put in a new pack" type="action"
-                        groups="base.group_extended"
+                        groups="base.group_stock_packaging"
                         icon="terp-stock_effects-object-colorize"
                         states="draft,assigned,confirmed,done"/>
                     <field name="date"/>
@@ -1583,7 +1583,7 @@
                     <field name="partner_id" string="Partner"/>
                     <field name="product_id"/>
                     <field name="product_qty" />
-                    <field name="product_uom" string="UoM"/>
+                    <field name="product_uom" string="UoM" groups="product.group_uom"/>
                     <field name="date"/>
                     <button name="action_done" states="confirmed,assigned" string="Process" type="object" icon="gtk-go-forward"/>
                 </tree>
@@ -1601,7 +1601,7 @@
                     <group colspan="4" col="7">
                         <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
                         <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                        <field name="product_uom" string="Unit Of Measure"/>
+                        <field name="product_uom" string="Unit Of Measure" groups="product.group_uom"/>
                         <button name="%(stock.move_scrap)d" groups="base.group_extended"
                                 string="Scrap" type="action"
                                 icon="gtk-convert" context="{'scrap': True}"
@@ -1632,19 +1632,19 @@
                         <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
                     </group>
 
-                    <group colspan="2" col="4" groups="base.group_extended">
-                        <separator string="Traceability" colspan="4" groups="base.group_extended"/>
-                        <field name="tracking_id" colspan="3" groups="base.group_extended"/>
+                    <group colspan="2" col="4">
+                        <separator string="Traceability" colspan="4" groups="base.group_stock_tracking_lot"/>
+                        <field name="tracking_id" colspan="3" groups="base.group_stock_tracking_lot"/>
                         <button name="%(split_into)d" string="New pack" type="action"
-                              groups="base.group_extended"
+                              groups="base.group_stock_packaging"
                               icon="terp-stock_effects-object-colorize"
                               states="draft,assigned,confirmed,done" colspan="1"/>
-                        <field name="prodlot_id" groups="base.group_extended"
+                        <field name="prodlot_id" groups="base.group_stock_production_lot"
                             context="{'location_id':location_id, 'product_id':product_id}"
                             domain="[('product_id','=?',product_id)]"
                             on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" colspan="3"/>
                         <button name="%(track_line)d"
-                              groups="base.group_extended"
+                              groups="base.group_stock_tracking_lot"
                               states="draft,waiting,confirmed,assigned,done"
                               string="Split" type="action" icon="terp-stock_effects-object-colorize" colspan="1"/>
                     </group>