From 7e5f560ea17118c2aff8a776b0c19c7d20893fe3 Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Mon, 9 Aug 2010 16:14:09 +0530
Subject: [PATCH] [MOD] product_*: usability improvement in access rights

bzr revid: amp@tinyerp.com-20100809104409-dong1mdsmm3bzjle
---
 addons/product/product_view.xml               | 6 +++---
 addons/product/security/ir.model.access.csv   | 4 +++-
 addons/product/security/product_security.xml  | 7 -------
 addons/product_margin/product_margin_view.xml | 2 +-
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index d582ed10c03..e50d8f81bcb 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -197,7 +197,7 @@
         </record>
 
         <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9" />
-        <menuitem action="product.product_normal_action" id="product.menu_products" parent="base.menu_product" sequence="1" groups="base.group_sale_salesman,base.group_sale_manager"/>
+        <menuitem action="product.product_normal_action" id="product.menu_products" parent="base.menu_product" sequence="1" groups="base.group_sale_salesman,base.group_sale_manager,base.group_system,product.group_product_manager"/>
 
         <record id="product_normal_action_puchased" model="ir.actions.act_window">
             <field name="name">Products</field>
@@ -266,7 +266,7 @@
             <field name="view_id" ref="product_category_list_view"/>
         </record>
         <menuitem action="product_category_action_form"
-            groups="base.group_extended"
+            groups="base.group_extended,base.group_system"
             id="menu_product_category_action_form"
             parent="prod_config_main" sequence="2"/>
 
@@ -399,7 +399,7 @@
             <field name="view_mode">tree,form</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_extended,base.group_system" 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/ir.model.access.csv b/addons/product/security/ir.model.access.csv
index 65b55f2af72..1e1572a3c0a 100644
--- a/addons/product/security/ir.model.access.csv
+++ b/addons/product/security/ir.model.access.csv
@@ -37,4 +37,6 @@
 "access_product_pricelist_item","product.pricelist.item ","model_product_pricelist_item","base.group_system",1,1,1,1
 "access_product_uom_categ","product.uom.categ","model_product_uom_categ","base.group_system",1,1,1,1
 "access_product_uom","product.uom","model_product_uom","base.group_system",1,1,1,1
-"access_product_ul","product.ul","model_product_ul","base.group_system",1,1,1,1
+"access_product_ul_system","product.ul system","model_product_ul","base.group_system",1,1,1,1
+"access_product_product_system","product.product system","model_product_product","base.group_system",1,0,0,0
+"access_product_category_system","product.category.system","model_product_category","base.group_system",1,1,1,1
diff --git a/addons/product/security/product_security.xml b/addons/product/security/product_security.xml
index a0d3d774004..171cf523b8b 100644
--- a/addons/product/security/product_security.xml
+++ b/addons/product/security/product_security.xml
@@ -27,12 +27,5 @@
         <field name="name">Useability / Product Variant</field>
     </record>
 
-    <record id="base.group_sale_manager" model="res.groups">
-        <field name="name">Sales / Manager</field>
-    </record>
-    <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">Sales / User</field>
-    </record>
-
 </data>
 </openerp>
diff --git a/addons/product_margin/product_margin_view.xml b/addons/product_margin/product_margin_view.xml
index 5c8e25b52a5..7ebd5f34588 100644
--- a/addons/product_margin/product_margin_view.xml
+++ b/addons/product_margin/product_margin_view.xml
@@ -84,7 +84,7 @@
             </field>
         </record>
 
-  <menuitem icon="STOCK_JUSTIFY_FILL" action="product_margin_act_window" id="menu_action_product_margin" name="Product Margins" sequence="5" parent="base.menu_product" groups="base.group_sale_salesman,base.group_sale_manager"/>
+  <menuitem icon="STOCK_JUSTIFY_FILL" action="product_margin_act_window" id="menu_action_product_margin" name="Product Margins" sequence="5" parent="base.menu_product" groups="base.group_sale_salesman,base.group_sale_manager,product.group_product_manager,base.group_system"/>
 
 </data>
 </openerp>