From 2611a3bc98b7922aca69cdd8ef00da99de56d4d9 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 29 Jun 2010 11:59:26 +0200
Subject: [PATCH] [IMP] sale, crm: access rights fix

bzr revid: odo@openerp.com-20100629095926-n72makcn7ed3tt4o
---
 addons/crm/crm_view.xml                |  5 +----
 addons/crm/security/crm_security.xml   | 14 +++++++-------
 addons/sale/sale_view.xml              |  1 -
 addons/sale/security/sale_security.xml |  4 ++++
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index ab9e5aa0162..e1544d640d1 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <record model="ir.ui.menu" id="base.menu_base_config">
-	        <field eval="[(4, ref('crm.group_crm_manager'))]" name="groups_id"/>
-	    </record>
-    
+
         <menuitem id="base.menu_crm_config_sales" name="Sales"
             parent="base.menu_base_config" sequence="1"/>
 
diff --git a/addons/crm/security/crm_security.xml b/addons/crm/security/crm_security.xml
index 8799dc7aa2c..d72847c44e3 100644
--- a/addons/crm/security/crm_security.xml
+++ b/addons/crm/security/crm_security.xml
@@ -9,14 +9,14 @@
     <record id="group_crm_user" model="res.groups">
         <field name="name">CRM / User</field>
     </record>
-<!---->
-<!--    <record model='ir.ui.menu' id='menu_crm'>-->
-<!--        <field name="groups_id" eval="[(6,0,[ref('group_crm_manager'),ref('group_crm_user')])]"/>-->
-<!--    </record>-->
 
-<!--    <record model='ir.ui.menu' id='menu_crm_configuration'>-->
-<!--        <field name="groups_id" eval="[(6,0,[ref('group_crm_manager')])]"/>-->
-<!--    </record>-->
+    <record model='ir.ui.menu' id='base.menu_base_partner'>
+        <field name="groups_id" eval="[(4,ref('group_crm_manager')),(4,ref('group_crm_user'))]"/>
+    </record>
+
+    <record model="ir.ui.menu" id="base.menu_base_config">
+        <field eval="[(4, ref('crm.group_crm_manager'))]" name="groups_id"/>
+    </record>
 
     </data>
 </openerp>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 4bb3d603ce7..8a618a173d3 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" groups="sale.group_sale_user"/> 
         <menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="1"/>
 
         <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9"/>
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index 8e5c8360d07..6eb4315fcd2 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -12,6 +12,10 @@
     <record model='ir.ui.menu' id='menu_action_shop_form'>
         <field name="groups_id" eval="[(6,0,[ref('group_sale_manager')])]"/>
     </record>
+    
+    <record model="ir.ui.menu" id="base.menu_base_partner">
+        <field eval="[(4, ref('sale.group_sale_user'))]" name="groups_id"/>
+    </record>
 
     <record model="ir.rule" id="sale_order_comp_rule">
         <field name="name">Sale Order multi-company</field>