diff --git a/addons/product/product.py b/addons/product/product.py
index ca808064e59..6f823b2cd23 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -683,8 +683,8 @@ class product_product(osv.osv):
         'product_tmpl_id': fields.many2one('product.template', 'Product Template', required=True, ondelete="cascade", select=True),
         'ean13': fields.char('EAN13 Barcode', size=13, help="International Article Number used for product identification."),
         '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('Product Price')),
-        'price_margin': fields.float('Variant Price Margin', digits_compute=dp.get_precision('Product Price')),
+        'price_extra': fields.float('Variant Price Extra', digits_compute=dp.get_precision('Product Price'), help="Price Extra: Extra price for the variant on sale price. eg. 200 price extra, 1000 + 200 = 1200."),
+        'price_margin': fields.float('Variant Price Margin', digits_compute=dp.get_precision('Product Price'), help="Price Margin: Margin in percentage on sale price for the variant. eg. 10% price margin, 1000 + 10% = 1100."),
         'pricelist_id': fields.dummy(string='Pricelist', relation='product.pricelist', type='many2one'),
         'name_template': fields.related('product_tmpl_id', 'name', string="Template Name", type='char', size=128, store={
             'product.template': (_get_name_template_ids, ['name'], 10),
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 2c143ede784..0d4145d14bc 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -23,7 +23,7 @@
                        <filter string='Default Unit of Measure' icon="terp-mrp" domain="[]" context="{'group_by' : 'uom_id'}"/>
                        <filter string='Type' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'type'}"/>
                        <filter string='Company' icon="terp-go-home" domain="[]" context="{'group_by' : 'company_id'}" groups="base.group_multi_company"/>
-                       <filter string='Template' name="template_id" domain="[]" context="{'group_by' : 'product_tmpl_id'}"/>
+                       <filter string='Template' name="template_id" domain="[]" context="{'group_by' : 'product_tmpl_id'}" groups="product.group_product_variant"/>
                    </group>
                 </search>
             </field>
@@ -37,7 +37,7 @@
                 <tree colors="red:virtual_available&lt;0;blue:virtual_available&gt;=0 and state in ('draft', 'end', 'obsolete');black:virtual_available&gt;=0 and state not in ('draft', 'end', 'obsolete')" string="Products">
                     <field name="default_code"/>
                     <field name="name"/>
-                    <field name="variants"/>
+                    <field name="variants" groups="product.group_product_variant"/>
                     <field name="categ_id" invisible="1"/>
                     <field name="type" invisible="1"/>
                     <field name="uom_id" string="Unit of Measure" groups="product.group_uom"/>
@@ -297,8 +297,8 @@
         </record>
 
         <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9"/>
-        <menuitem action="product.product_normal_action_sell" id="product.menu_products" parent="base.menu_product" sequence="1"/>
-        <menuitem action="product.product_action_template" id="product.menu_products_bytemplate" parent="base.menu_product" groups="product.group_product_variant"/>
+        <menuitem action="product.product_normal_action_sell" id="product.menu_products" parent="base.menu_product" sequence="0"/>
+        <menuitem action="product.product_action_template" id="product.menu_products_bytemplate" parent="base.menu_product" groups="product.group_product_variant" sequence="2"/>
 
         <record id="product_normal_action_puchased" model="ir.actions.act_window">
             <field name="name">Products</field>
@@ -395,7 +395,7 @@
             action="product_category_action"
             id="product.menu_products_category"
             parent="base.menu_product"
-            sequence="0" groups="base.group_no_one"/>
+            sequence="1" groups="base.group_no_one"/>
         <record id="product_category_action_form" model="ir.actions.act_window">
             <field name="name">Product Categories</field>
             <field name="type">ir.actions.act_window</field>
@@ -609,7 +609,7 @@
             </field>
         </record>
         <menuitem
-            action="product_ul_form_action" groups="product.group_stock_packaging" id="menu_product_ul_form_action" parent="prod_config_main" sequence="3"/>
+            action="product_ul_form_action" groups="product.group_stock_packaging" id="menu_product_ul_form_action" parent="prod_config_main" sequence="5"/>
 
         <record id="product_packaging_tree_view" model="ir.ui.view">
             <field name="name">product.packaging.tree.view</field>
@@ -704,6 +704,7 @@
             <field name="model">product.product</field>
             <field name="arch" type="xml">
                 <search string="Product Variant">
+                   <field name="product_tmpl_id"/>
                    <field name="name" string="Product" filter_domain="['|','|',('name','ilike',self),('default_code','ilike',self),('variants','ilike',self)]"/>
                    <group  expand='0' string='Group by...'>
                        <filter string='Template' name="template_id" domain="[]" context="{'group_by' : 'product_tmpl_id'}"/>
@@ -774,7 +775,7 @@
             <field name="view_id" ref="product_variant_form_view"/>
             <field name="act_window_id" ref="product_variant_action"/>
         </record>
-        <menuitem action="product.product_variant_action" id="product.menu_variant_product" parent="prod_config_main" sequence="100" groups="product.group_product_variant"/>
+        <menuitem action="product.product_variant_action" id="product.menu_variant_product" parent="prod_config_main" sequence="4" groups="product.group_product_variant"/>
 
         <!-- templates -->
 
@@ -850,7 +851,7 @@
                                 <group colspan="4" string="Product Variants">
                                     <field colspan="4" name="product_variant_ids" nolabel="1">
                                         <tree string="Product Variants" editable="bottom">
-                                            <field name="variants" required="1"/>
+                                            <field name="variants"/>
                                             <field name="price_margin" string="Variant Price Margin(%%)"/>
                                             <field name="price_extra"/>
                                             <field name="lst_price" string="Sale Price"/>
diff --git a/addons/product/security/product_security.xml b/addons/product/security/product_security.xml
index 3cb54f84d47..b711720f49c 100644
--- a/addons/product/security/product_security.xml
+++ b/addons/product/security/product_security.xml
@@ -5,7 +5,7 @@
     DO NOT CHANGE IT IN TRUNK -->
 
     <record id="group_product_variant" model="res.groups">
-        <field name="name">Product Variant (not supported)</field>
+        <field name="name">Manage Product Variant</field>
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
 
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index c48a7cf0f2b..f74a536ca19 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -23,9 +23,15 @@
         <menuitem
             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_variant_action" id="menu_product_variant_config_stock"
+            parent="stock.menu_product_in_config_stock" groups="product.group_product_variant" sequence="2"/>
+        <menuitem
+            action="product.product_template_action" id="menu_product_template_config_stock"
+            parent="stock.menu_product_in_config_stock" groups="product.group_product_variant" sequence="1"/>
         <menuitem
             action="product.product_ul_form_action" groups="product.group_stock_packaging"
-            id="menu_product_packaging_stock_action" parent="stock.menu_product_in_config_stock" sequence="1"/>
+            id="menu_product_packaging_stock_action" parent="stock.menu_product_in_config_stock" sequence="3"/>
         <menuitem
             id="menu_stock_unit_measure_stock" name="Units of Measure"
             parent="stock.menu_product_in_config_stock"  sequence="35" groups="product.group_uom"/>