[MERGE] merged with trunk-development-branch

bzr revid: hmo@tinyerp.com-20111214122924-izzibrz1yz67rt7g

2 files changed, 29 insertions, 39 deletions

diff --git a/addons/survey/security/ir.model.access.csv b/addons/survey/security/ir.model.access.csv
index 85bd76ba4be..1566a32aa28 100644
--- a/addons/survey/security/ir.model.access.csv
+++ b/addons/survey/security/ir.model.access.csv
@@ -1,37 +1,25 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_survey_res_partner_manager","survey.res.partner.manager","base.model_res_partner","base.group_tool_manager",1,1,1,1
-"access_survey_type_manager","survey.type.manager","model_survey_type","base.group_tool_manager",1,1,1,1
-"access_survey_manager","survey.manager","model_survey","base.group_tool_manager",1,1,1,1
-"access_survey_page_manager","survey.page manager","model_survey_page","base.group_tool_manager",1,1,1,1
-"access_survey_question_manager","survey.question manager","model_survey_question","base.group_tool_manager",1,1,1,1
-"access_survey_answer_manager","survey.answer manager","model_survey_answer","base.group_tool_manager",1,1,1,1
-"access_survey_response_manager","survey.response manager","model_survey_response","base.group_tool_manager",1,1,1,1
-"access_survey_response_answer_manager","survey.response.answer manager","model_survey_response_answer","base.group_tool_manager",1,1,1,1
-"access_survey_history_manager","survey.history.manager","model_survey_history","base.group_tool_manager",1,1,1,1
-"access_survey_question_column_heading_manager","survey.question.column.heading manager","model_survey_question_column_heading","base.group_tool_manager",1,1,1,1
-"access_survey_request_manager","survey.request manager","model_survey_request","base.group_tool_manager",1,1,1,1
-"access_survey_tbl_column_heading_manager","survey.tbl.column.heading manager","model_survey_tbl_column_heading","base.group_tool_manager",1,1,1,1
-"access_survey_response_line_manager","survey.response.line manager","model_survey_response_line","base.group_tool_manager",1,1,1,1
-"access_survey_res_partner_address_manager","survey.res.partner.address.manager","base.model_res_partner_address","base.group_tool_manager",1,1,1,0
-"access_survey_res_partner_manager","survey.res.partner.manager","base.model_res_partner","base.group_tool_manager",1,1,1,1
-"access_survey_res_partner_user","survey.res.partner.user","base.model_res_partner","base.group_tool_user",1,1,1,1
-"access_survey_user","survey.user","model_survey","base.group_tool_user",1,1,1,1
-"access_survey_page_user","survey.page user","model_survey_page","base.group_tool_user",1,1,1,1
-"access_survey_question_user","survey.question user","model_survey_question","base.group_tool_user",1,1,1,1
-"access_survey_answer_user","survey.answer user","model_survey_answer","base.group_tool_user",1,1,1,1
-"access_survey_response_user","survey.response user","model_survey_response","base.group_tool_user",1,1,1,1
-"access_survey_response_answer_user","survey.response.answer user","model_survey_response_answer","base.group_tool_user",1,1,1,1
-"access_survey_history_user","survey.history.user","model_survey_history","base.group_tool_user",1,1,1,1
-"access_survey_response_line_user","survey.response.line user","model_survey_response_line","base.group_tool_user",1,1,1,1
-"access_survey_res_partner_address_user","survey.res.partner.address.user","base.model_res_partner_address","base.group_tool_user",1,1,1,0
-"access_survey_res_partner_user","survey.res.partner.user","base.model_res_partner","base.group_tool_user",1,1,1,1
-"access_survey_survey_user","survey.survey.user","model_survey","base.group_survey_user",1,1,1,1
-"access_survey_page_survey_user","survey.page.survey.user","model_survey_page","base.group_survey_user",1,1,1,1
-"access_survey_question_survey_user","survey.question.survey.user","model_survey_question","base.group_survey_user",1,1,1,1
-"access_survey_answer_survey_user","survey.answer.survey.user","model_survey_answer","base.group_survey_user",1,1,1,1
-"access_survey_response_survey_user","survey.response.survey.user","model_survey_response","base.group_survey_user",1,1,1,1
-"access_survey_response_answer_survey_user","survey.response.answer.survey.user","model_survey_response_answer","base.group_survey_user",1,1,1,1
-"access_survey_history_survey_user","survey.history.survey.user","model_survey_history","base.group_survey_user",1,1,1,1
-"access_survey_response_line_survey_user","survey.response.line.survey.user","model_survey_response_line","base.group_survey_user",1,1,1,1
-"access_survey_question_column_heading_survey_user","survey.question.column.heading.survey.user","model_survey_question_column_heading","base.group_survey_user",1,0,0,0
-"access_survey_question_column_heading_user","survey.question.column.heading user","model_survey_question_column_heading","base.group_tool_user",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

+access_survey_type_manager,survey.type.manager,model_survey_type,base.group_tool_manager,1,1,1,1

+access_survey_request_manager,survey.request manager,model_survey_request,base.group_tool_manager,1,1,1,1

+access_survey_tbl_column_heading_manager,survey.tbl.column.heading manager,model_survey_tbl_column_heading,base.group_tool_manager,1,1,1,1

+access_survey_res_partner_user,survey.res.partner.user,base.model_res_partner,base.group_tool_user,1,1,1,1

+access_survey_user,survey.user,model_survey,base.group_tool_user,1,1,1,1

+access_survey_page_user,survey.page user,model_survey_page,base.group_tool_user,1,1,1,1

+access_survey_question_user,survey.question user,model_survey_question,base.group_tool_user,1,1,1,1

+access_survey_answer_user,survey.answer user,model_survey_answer,base.group_tool_user,1,1,1,1

+access_survey_response_user,survey.response user,model_survey_response,base.group_tool_user,1,1,1,1

+access_survey_response_answer_user,survey.response.answer user,model_survey_response_answer,base.group_tool_user,1,1,1,1

+access_survey_history_user,survey.history.user,model_survey_history,base.group_tool_user,1,1,1,1

+access_survey_response_line_user,survey.response.line user,model_survey_response_line,base.group_tool_user,1,1,1,1

+access_survey_res_partner_address_user,survey.res.partner.address.user,base.model_res_partner_address,base.group_tool_user,1,1,1,0

+access_survey_res_partner_user,survey.res.partner.user,base.model_res_partner,base.group_tool_user,1,1,1,1

+access_survey_survey_user,survey.survey.user,model_survey,base.group_survey_user,1,1,1,1

+access_survey_page_survey_user,survey.page.survey.user,model_survey_page,base.group_survey_user,1,1,1,1

+access_survey_question_survey_user,survey.question.survey.user,model_survey_question,base.group_survey_user,1,1,1,1

+access_survey_answer_survey_user,survey.answer.survey.user,model_survey_answer,base.group_survey_user,1,1,1,1

+access_survey_response_survey_user,survey.response.survey.user,model_survey_response,base.group_survey_user,1,1,1,1

+access_survey_response_answer_survey_user,survey.response.answer.survey.user,model_survey_response_answer,base.group_survey_user,1,1,1,1

+access_survey_history_survey_user,survey.history.survey.user,model_survey_history,base.group_survey_user,1,1,1,1

+access_survey_response_line_survey_user,survey.response.line.survey.user,model_survey_response_line,base.group_survey_user,1,1,1,1

+access_survey_question_column_heading_survey_user,survey.question.column.heading.survey.user,model_survey_question_column_heading,base.group_survey_user,1,0,0,0

+access_survey_question_column_heading_user,survey.question.column.heading user,model_survey_question_column_heading,base.group_tool_user,1,1,1,1

diff --git a/addons/survey/security/survey_security.xml b/addons/survey/security/survey_security.xml
index 7b6c43ed2bc..c44a35e3ee9 100644
--- a/addons/survey/security/survey_security.xml
+++ b/addons/survey/security/survey_security.xml
@@ -2,10 +2,12 @@
 <openerp>
     <data noupdate="0">
         <record model="res.groups" id="base.group_tool_user">
-            <field name="name">Tools / User</field>
+            <field name="name">User</field>
+            <field name="category_id" ref="base.module_category_tools"/>
         </record>
         <record model="res.groups" id="base.group_tool_manager">
-            <field name="name">Tools / Manager</field>
+            <field name="name">Manager</field>
+            <field name="category_id" ref="base.module_category_tools"/>
             <field name="implied_ids" eval="[(4, ref('base.group_tool_user'))]"/>
         </record>
         <record model="res.groups" id="base.group_survey_user">