From ebe7abde2607dfccb233550e11da32ff77194458 Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Wed, 25 Nov 2009 09:06:39 +0100
Subject: [PATCH] [IMP] product: menu reorganisation

bzr revid: olt@tinyerp.com-20091125080639-c340axc8wj0j0zqr
---
 addons/product/pricelist_view.xml            | 24 ++++++++++----------
 addons/product/product_view.xml              |  6 ++---
 addons/product/security/product_security.xml |  4 ++++
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index c42521357fa..71520ee0e72 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        
-        <menuitem groups="base.group_extended" id="menu_product_pricelist_main" name="Pricelists" parent="product.menu_main_product" sequence="2"/>
-        
+
+        <menuitem groups="base.group_extended" id="menu_product_pricelist_main" name="Pricelists" parent="product.menu_config_product" sequence="2"/>
+
         <record id="product_pricelist_version_form_view" model="ir.ui.view">
             <field name="name">product.pricelist.version.form</field>
             <field name="model">product.pricelist.version</field>
@@ -32,7 +32,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="product_pricelist_action" model="ir.actions.act_window">
             <field name="name">Pricelist Versions</field>
             <field name="type">ir.actions.act_window</field>
@@ -41,7 +41,7 @@
             <field name="view_id" ref="product_pricelist_version_tree_view"/>
         </record>
         <menuitem action="product_pricelist_action" id="menu_product_pricelist_action" parent="product.menu_product_pricelist_main" sequence="2"/>
-        
+
         <record id="product_pricelist_item_tree_view" model="ir.ui.view">
             <field name="name">product.pricelist.item.tree</field>
             <field name="model">product.pricelist.item</field>
@@ -57,7 +57,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="product_pricelist_item_form_view" model="ir.ui.view">
             <field name="name">product.pricelist.item.form</field>
             <field name="model">product.pricelist.item</field>
@@ -73,7 +73,7 @@
                     <field name="min_quantity"/>
                     <field name="sequence"/>
                     <separator colspan="4" string="Price Computation"/>
-                    
+
                     <field name="base"/>
                     <field name="base_pricelist_id" attrs="{'required': [('base','=', -1)], 'readonly': [('base','!=', -1)]}"/>
                     <group col="6" colspan="5">
@@ -88,11 +88,11 @@
                         <field name="price_min_margin" string="Min. Margin"/>
                         <field name="price_max_margin" string="Max. Margin"/>
                     </group>
-                    
+
                 </form>
             </field>
         </record>
-        
+
         <record id="product_pricelist_view_tree" model="ir.ui.view">
             <field name="name">product.pricelist.tree</field>
             <field name="model">product.pricelist</field>
@@ -141,7 +141,7 @@
             <field name="view_mode">tree,form</field>
         </record>
         <menuitem action="product_pricelist_action2" id="menu_product_pricelist_action2" parent="product.menu_product_pricelist_main" sequence="1"/>
-        
+
         <record id="product_price_type_view" model="ir.ui.view">
             <field name="name">product.price.type.form</field>
             <field name="model">product.price.type</field>
@@ -164,7 +164,7 @@
         </record>
         <menuitem name="Prices Computations" id="menu_price" parent="product.menu_config_product"/>
         <menuitem action="product_price_type_action" groups="base.group_extended" id="menu_product_price_type_action" parent="menu_price"/>
-        
+
         <record id="product_pricelist_type_view" model="ir.ui.view">
             <field name="name">product.pricelist.type.form</field>
             <field name="model">product.pricelist.type</field>
@@ -184,6 +184,6 @@
             <field name="view_mode">tree,form</field>
         </record>
         <menuitem action="product_pricelist_type_action" groups="base.group_extended" id="menu_product_pricelist_type_action" parent="menu_price"/>
-        
+
     </data>
 </openerp>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 2018f982caf..6d79a5c9952 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -2,7 +2,6 @@
 <openerp>
     <data>
         <menuitem icon="terp-product" id="menu_main_product" name="Products"/>
-        <menuitem id="menu_products_products" name="Products" parent="product.menu_main_product" sequence="18" />
         <menuitem
             id="menu_config_product"
             name="Configuration"
@@ -195,7 +194,7 @@
             <field name="search_view_id" ref="product_search_form_view"/>
         </record>
 
-        <menuitem action="product_normal_action" id="menu_products" parent="product.menu_products_products" sequence="1"/>
+        <menuitem action="product_normal_action" id="menu_products" parent="product.menu_main_product" sequence="1"/>
 
         <record id="product_category_form_view" model="ir.ui.view">
             <field name="name">product.category.form</field>
@@ -593,7 +592,8 @@
             <field name="view_id" ref="product_template_tree_view"/>
         </record>
 
-        <menuitem action="product_template_action_tree" id="menu_templates" parent="product.menu_products_products" sequence="2"/>
+        <menuitem action="product_template_action_tree" id="menu_templates" parent="product.menu_main_product" sequence="2"
+                  groups="product.group_product_variant" />
 
         <record id="company_wise_cost_price_form_view" model="ir.ui.view">
             <field name="name">company.wise.cost.price.form</field>
diff --git a/addons/product/security/product_security.xml b/addons/product/security/product_security.xml
index 89530976a32..7347c61d1bc 100644
--- a/addons/product/security/product_security.xml
+++ b/addons/product/security/product_security.xml
@@ -9,5 +9,9 @@
         <field name="name">Product / Manager</field>
     </record>
 
+    <record id="group_product_variant" model="res.groups">
+        <field name="name">Product / Variant</field>
+    </record>
+
 </data>
 </openerp>