[MERGE]

bzr revid: uco@tinyerp.com-20100809123622-hpw9djl5wtu80ccp
bzr revid: uco@tinyerp.com-20100810043605-rnht1jq7lx1pazah

4 files changed, 28 insertions, 2 deletions

diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 309cc824cb7..1020e2d03c1 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -65,7 +65,7 @@
     </record>
 
     <menuitem name="Configuration" parent="base.menu_tools"
-         id="base.menu_lunch_survey_root" sequence="20"/>
+         id="base.menu_lunch_survey_root" sequence="20" groups="base.group_system"/>
 
     <menuitem name="Ideas" parent="base.menu_lunch_survey_root" id="menu_ideas" sequence="3"/>
 
diff --git a/addons/idea/report/report_vote_view.xml b/addons/idea/report/report_vote_view.xml
index d2a4006a7e0..b78c8c0648c 100644
--- a/addons/idea/report/report_vote_view.xml
+++ b/addons/idea/report/report_vote_view.xml
@@ -84,7 +84,7 @@
             <field name="context">{'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
         </record>
 
-        <menuitem action="action_report_vote_all" id="menu_report_vote_all" parent="menu_idea_reporting" sequence="1"/>
+        <menuitem action="action_report_vote_all" id="menu_report_vote_all" parent="menu_idea_reporting" sequence="1" groups="base.group_survey_manager"/>
     </data>
 </openerp>
 
diff --git a/addons/idea/security/idea_security.xml b/addons/idea/security/idea_security.xml
index 6fd4b290086..29afc0c875f 100644
--- a/addons/idea/security/idea_security.xml
+++ b/addons/idea/security/idea_security.xml
@@ -8,6 +8,19 @@
 <!--		<record id="idea.menu_reporting" model="ir.ui.menu">-->
 <!--			<field name="groups_id" eval="[(6,0,[ref('base.group_system')])]"/>-->
 <!--		</record>-->
+
+    <record id="base.group_sale_salesman" model="res.groups">
+        <field name="name">Sales / User</field>
+    </record>
+
+   	<record model="res.groups" id="base.group_survey_manager">
+        	<field name="name">Tools / Manager</field>
+   		</record>
+   	<record model="res.groups" id="base.group_survey_user">
+        	<field name="name">Tools / User</field>
+   	</record>
+
+
 	</data>
 </openerp>
 
diff --git a/addons/idea/security/ir.model.access.csv b/addons/idea/security/ir.model.access.csv
index 6c15c223c06..cd6f56cf60e 100644
--- a/addons/idea/security/ir.model.access.csv
+++ b/addons/idea/security/ir.model.access.csv
@@ -7,3 +7,16 @@
 "access_idea_comment","idea.comment","model_idea_comment","base.group_system",1,1,1,1
 "access_idea_comment_user","idea.comment","model_idea_comment","base.group_user",1,1,1,0
 "access_report_vote","report.vote","model_report_vote","base.group_user",1,1,1,1
+"access_idea_idea_sale_salesman","idea.idea.sale","model_idea_idea","base.group_sale_salesman",1,1,1,1
+"access_idea_vote_sale_salesman","idea.vote.sale","model_idea_vote","base.group_sale_salesman",1,1,1,1
+"access_idea_category_user","idea.category user","model_idea_category","base.group_survey_user",1,1,1,1
+"access_idea_idea_user","idea.idea user","model_idea_idea","base.group_survey_user",1,1,1,1
+"access_idea_vote_user","idea.vote user","model_idea_vote","base.group_survey_user",1,1,1,1
+"access_idea_category_manager","idea.category manager","model_idea_category","base.group_survey_manager",1,0,0,0
+"access_idea_idea_manager","idea.idea manager","model_idea_idea","base.group_survey_manager",1,0,0,0
+"access_idea_vote_manager","idea.vote manager","model_idea_vote","base.group_survey_manager",1,0,0,0
+"access_idea_vote_stat_user","idea.vote.stat user","model_idea_vote_stat","base.group_survey_user",1,1,1,1
+"access_idea_comment_user","idea.comment user","model_idea_comment","base.group_survey_user",1,1,1,1
+"access_report_vote_manager","report.vote manager","model_report_vote","base.group_survey_manager",1,1,1,1
+"access_idea_idea_system","idea.idea system","model_idea_idea","base.group_system",1,0,0,0
+"access_idea_vote_system","idea.vote system","model_idea_vote","base.group_system",1,0,0,0