From 53cfaebe3ff6d5bc5bea6a80523679d2899f23ed Mon Sep 17 00:00:00 2001
From: "AMP(Open ERP)" <>
Date: Fri, 13 Aug 2010 11:36:34 +0530
Subject: [PATCH] [MOD/IMP]
 survey,account,email_template,idea,lunch,marketing_campaign,sale,stock_planning
 : Improvements in access rights

bzr revid: vir@tinyerp.com-20100813060634-laq3wb2d660wcrrp
---
 addons/account/account_menuitem.xml           | 12 ++---
 addons/account/security/ir.model.access.csv   |  5 +-
 .../security/ir.model.access.csv              |  2 +-
 .../security/ir.model.access.csv              |  2 +
 .../email_template_account_view.xml           |  8 ++--
 addons/idea/__openerp__.py                    |  5 +-
 addons/idea/idea_view.xml                     |  2 +-
 addons/idea/report/report_vote_view.xml       |  2 +-
 addons/idea/security/idea_security.xml        |  4 +-
 addons/idea/security/ir.model.access.csv      | 21 ++++----
 addons/lunch/security/ir.model.access.csv     | 14 +++---
 addons/lunch/security/lunch_security.xml      |  4 +-
 .../security/ir.model.access.csv              |  3 ++
 addons/sale/sale_view.xml                     |  2 +-
 addons/stock_planning/stock_planning_view.xml |  2 +-
 .../subscription/security/ir.model.access.csv |  8 ++--
 .../security/subcription_security.xml         |  4 +-
 addons/survey/security/ir.model.access.csv    | 48 +++++++++----------
 addons/survey/security/survey_security.xml    |  4 +-
 addons/survey/survey_view.xml                 | 18 +++----
 addons/survey/wizard/survey_browse_answer.xml |  2 +-
 addons/survey/wizard/survey_print.xml         |  2 +-
 addons/survey/wizard/survey_print_answer.xml  |  2 +-
 .../survey/wizard/survey_print_statistics.xml |  2 +-
 .../survey/wizard/survey_send_invitation.py   |  2 +-
 25 files changed, 97 insertions(+), 83 deletions(-)

diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index e5912a8b763..c8b0dd2c132 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -7,14 +7,14 @@
         <menuitem id="menu_finance_payables" name="Payables" parent="menu_finance" sequence="2" groups="group_account_user,group_account_manager,base.group_system"/>
         <menuitem id="menu_finance_bank_and_cash" name="Bank and Cash" parent="menu_finance" sequence="3"/>
 <!--        <menuitem id="menu_accounting" name="Accounting" parent="menu_finance" sequence="5"/>-->
-        <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="8" groups="group_account_user,group_account_manager,base.group_system"/>
-        <menuitem id="periodical_processing_journal_entries_validation" name="Entries to Review" parent="menu_finance_periodical_processing"/>
+        <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="8"/>
+        <menuitem id="periodical_processing_journal_entries_validation" name="Entries to Review" parent="menu_finance_periodical_processing" groups="group_account_user,group_account_manager,base.group_system"/>
         <menuitem id="periodical_processing_reconciliation" name="Reconciliation" parent="menu_finance_periodical_processing"/>
 <!--            <menuitem id="periodical_processing_recurrent_entries" name="Recurrent Entries" parent="menu_finance_periodical_processing"/>-->
         <menuitem id="periodical_processing_invoicing" name="Invoicing" parent="menu_finance_periodical_processing"/>
 <!--            <menuitem id="periodical_processing_end_of_period" name="End of Period" parent="menu_finance_periodical_processing"/>-->
         <menuitem id="menu_finance_charts" name="Charts" parent="menu_finance" sequence="5" groups="base.group_system"/>
-        <menuitem id="menu_finance_reporting" name="Reporting" parent="account.menu_finance" sequence="12" groups="base.group_system"/>
+        <menuitem id="menu_finance_reporting" name="Reporting" parent="account.menu_finance" sequence="12" groups="base.group_system,group_account_invoice,group_account_manager,group_account_user"/>
         <menuitem id="menu_finance_reporting_budgets" name="Budgets" parent="menu_finance_reporting"/>
         <menuitem id="menu_finance_legal_statement" name="Legal Reports" parent="menu_finance_reporting"/>
         <menuitem id="menu_finance_management_belgian_reports" name="Belgian Reports" parent="menu_finance_reporting"/>
@@ -31,17 +31,17 @@
 <!--        <menuitem id="menu_analytic_accounting1" name="Analytic Accounting" parent="menu_finance_configuration" sequence="80"/>-->
 
 <!--        <menuitem id="menu_finance_reporting11" name="Reporting" parent="account.menu_finance"  sequence="80"/>-->
-        <menuitem id="menu_finance_generic_reporting" name="Generic Reporting" parent="menu_finance_reporting" sequence="100"/>
+        <menuitem id="menu_finance_generic_reporting" name="Generic Reporting" parent="menu_finance_reporting" sequence="100" groups="base.group_system,group_account_manager"/>
 <!--        <menuitem id="menu_finance_legal_statement1" name="Legal Statements" parent="account.menu_finance_reporting" sequence="200"/>-->
 
         <menuitem id="menu_finance_entries" name="Accounting" parent="menu_finance" sequence="4"
         groups="group_account_user,group_account_manager,base.group_system"/>
-        <menuitem id="account.menu_finance_recurrent_entries" name="Recurring Entries" parent="menu_finance_periodical_processing" sequence="15"/>
+        <menuitem id="account.menu_finance_recurrent_entries" name="Recurring Entries" parent="menu_finance_periodical_processing" sequence="15" groups="group_account_user,group_account_manager,base.group_system"/>
 
 <!--        <menuitem id="menu_finance_periodical_processing11" name="Periodical Processing" parent="account.menu_finance"-->
 <!--            sequence="3"-->
 <!--            groups="group_account_user"/>-->
-        <menuitem id="menu_account_end_year_treatments" name="End of Period" parent="menu_finance_periodical_processing"/>
+        <menuitem id="menu_account_end_year_treatments" name="End of Period" parent="menu_finance_periodical_processing" groups="group_account_user,group_account_manager,base.group_system"/>
 
         <menuitem id="menu_finance_statistic_report_statement" name="Statistic Reports" parent="menu_finance_reporting" sequence="300" groups="account.group_account_manager"/>
 
diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv
index c43a1edebeb..890d4f505ea 100644
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@@ -38,7 +38,6 @@
 "access_account_invoice_uinvoice","account.invoice","model_account_invoice","account.group_account_invoice",1,1,1,1
 "access_account_invoice_line_uinvoice","account.invoice.line","model_account_invoice_line","account.group_account_invoice",1,1,1,1
 "access_account_invoice_tax_uinvoice","account.invoice.tax","model_account_invoice_tax","account.group_account_invoice",1,1,1,1
-"access_account_analytic_line_uinvoice","account.analytic.line","model_account_analytic_line","account.group_account_manager",1,0,0,0
 "access_account_move_uinvoice","account.move","model_account_move","account.group_account_invoice",1,0,0,0
 "access_account_move_line_uinvoice","account.move.line invoice","model_account_move_line","account.group_account_invoice",1,1,1,1
 "access_account_move_reconcile_uinvoice","account.move.reconcile","model_account_move_reconcile","account.group_account_invoice",1,1,1,1
@@ -155,3 +154,7 @@
 "access_res_partner_address_invoice","res.partner.address invoice","base.model_res_partner_address","account.group_account_invoice",1,1,1,1
 "access_account_invoice_line_system","account.invoice.line system","model_account_invoice_line","base.group_system",1,0,0,0
 "access_account_analytic_accountant","account.analytic.account accountant","analytic.model_account_analytic_account","account.group_account_user",1,1,1,1
+"access_account_account_type_invoice","account.account.type invoice","model_account_account_type","account.group_account_invoice",1,1,1,1
+"access_report_account_receivable_invoice","report.account.receivable.invoice","model_report_account_receivable","account.group_account_invoice",1,1,1,1
+"access_report_account_receivable_user","report.account.receivable.user","model_report_account_receivable","account.group_account_user",1,1,1,1
+"access_account_sequence_fiscal_year_invoice","account.sequence.fiscalyear invoice","model_account_sequence_fiscalyear","account.group_account_invoice",1,1,1,1
diff --git a/addons/account_followup/security/ir.model.access.csv b/addons/account_followup/security/ir.model.access.csv
index 3e62e778b7c..ccf257b3ecf 100644
--- a/addons/account_followup/security/ir.model.access.csv
+++ b/addons/account_followup/security/ir.model.access.csv
@@ -1,5 +1,4 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_account_followup_stat","account_followup.stat","model_account_followup_stat","account.group_account_user",1,0,0,0
 "access_account_followup_followup","account_followup.followup","model_account_followup_followup","base.group_system",1,1,1,1
 "access_account_followup_followup_line","account_followup.followup.line","model_account_followup_followup_line","account.group_account_user",1,0,0,0
 "access_account_followup_stat_manager","account_followup.stat.manager","model_account_followup_stat","account.group_account_manager",1,1,1,1
@@ -7,3 +6,4 @@
 "access_account_followup_followup_line_manager","account_followup.followup.line.manager","model_account_followup_followup_line","account.group_account_manager",1,1,1,1
 "access_account_followup_followup_line_system","account_followup.followup.line system","model_account_followup_followup_line","base.group_system",1,1,1,1
 "access_account_followup_followup_accountant","account_followup.followup user","model_account_followup_followup","account.group_account_user",1,0,0,0
+"access_account_followup_stat_invoice","account_followup.stat.invoice","model_account_followup_stat","account.group_account_invoice",1,1,1,1
diff --git a/addons/account_payment/security/ir.model.access.csv b/addons/account_payment/security/ir.model.access.csv
index 168083eb9de..fca15213f1d 100644
--- a/addons/account_payment/security/ir.model.access.csv
+++ b/addons/account_payment/security/ir.model.access.csv
@@ -11,3 +11,5 @@
 "access_payment_order_system","payment.order system","model_payment_order","base.group_system",1,0,0,0
 "access_payment_mode_system","payment.mode system","model_payment_mode","base.group_system",1,1,1,1
 "access_payment_type_system","payment.type system","model_payment_type","base.group_system",1,1,1,1
+"access_payment_order_invoice","payment.order invoice","model_payment_order","account.group_account_invoice",1,1,1,1
+"access_payment_line_invoice","payment.line invoice","model_payment_line","account.group_account_invoice",1,1,1,1
diff --git a/addons/email_template/email_template_account_view.xml b/addons/email_template/email_template_account_view.xml
index 6ef2d04e57f..d164645aca7 100644
--- a/addons/email_template/email_template_account_view.xml
+++ b/addons/email_template/email_template_account_view.xml
@@ -2,8 +2,8 @@
 <openerp>
     <data>
 
-        <menuitem name="Tools" id="base.menu_tools" icon="STOCK_PREFERENCES" sequence="28"/>
-        <menuitem name="Emails" id="base.menu_emails" parent="base.menu_tools" sequence="5"/>
+        <menuitem name="Marketing" icon="terp-crm" id="base.marketing_menu" sequence="17" groups="base.group_system,base.res_groups_email_template_admin"/>
+        <menuitem name="Emails" id="base.menu_emails" parent="base.marketing_menu" sequence="5"/>
         <menuitem name="Email Template" id="menu_email_template" parent="base.menu_emails"/>
 
         <record model="ir.ui.view" id="email_template_account_form">
@@ -96,8 +96,8 @@
             <field name="search_view_id" ref="view_email_template_account_search"/>
         </record>
 
-        <menuitem name="Configuration" parent="base.menu_tools"
-         id="base.menu_lunch_survey_root" sequence="20"/>
+        <menuitem name="Configuration" parent="base.marketing_menu"
+         id="base.menu_lunch_survey_root" sequence="20" groups="base.group_system"/>
         <menuitem name="Emails" id="menu_email_template_configuration" parent="base.menu_lunch_survey_root" />
 
         <menuitem name="Email Accounts" id="menu_email_template_account_all" parent="menu_email_template_configuration" action="action_email_template_account_tree_all"/>
diff --git a/addons/idea/__openerp__.py b/addons/idea/__openerp__.py
index 28ab76e8d5e..b376f35b0c2 100644
--- a/addons/idea/__openerp__.py
+++ b/addons/idea/__openerp__.py
@@ -36,12 +36,13 @@
     'depends': ['base'],
     'init_xml': [],
     'update_xml': [
+        'security/idea_security.xml',
+        'security/ir.model.access.csv',
         'wizard/idea_post_vote_view.xml',
         'idea_view.xml',
         'idea_workflow.xml',
         'report/report_vote_view.xml',
-        'security/idea_security.xml',
-        'security/ir.model.access.csv',
+
     ],
     'demo_xml': [
         "idea_data.xml"
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 1020e2d03c1..97f48e5b6f6 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -383,7 +383,7 @@
     <menuitem name="Idea" parent="base.menu_lunch_reporting" id="menu_idea_reporting" sequence="3"/>
 
     <menuitem name="Vote Statistics" parent="menu_idea_reporting"
-        id="menu_idea_vote_stat" action="action_idea_vote_stat" />
+        id="menu_idea_vote_stat" action="action_idea_vote_stat" groups="base.group_tool_manager,base.group_tool_user,base.group_system"/>
 
     <!-- Vote For Idea Action  -->
     <record model="ir.actions.act_window" id="action_idea_vote">
diff --git a/addons/idea/report/report_vote_view.xml b/addons/idea/report/report_vote_view.xml
index b78c8c0648c..bdd3ce133c1 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" groups="base.group_survey_manager"/>
+        <menuitem action="action_report_vote_all" id="menu_report_vote_all" parent="menu_idea_reporting" sequence="1" groups="base.group_tool_manager,base.group_system"/>
     </data>
 </openerp>
 
diff --git a/addons/idea/security/idea_security.xml b/addons/idea/security/idea_security.xml
index 29afc0c875f..2bdad417c2f 100644
--- a/addons/idea/security/idea_security.xml
+++ b/addons/idea/security/idea_security.xml
@@ -13,10 +13,10 @@
         <field name="name">Sales / User</field>
     </record>
 
-   	<record model="res.groups" id="base.group_survey_manager">
+   	<record model="res.groups" id="base.group_tool_manager">
         	<field name="name">Tools / Manager</field>
    		</record>
-   	<record model="res.groups" id="base.group_survey_user">
+   	<record model="res.groups" id="base.group_tool_user">
         	<field name="name">Tools / User</field>
    	</record>
 
diff --git a/addons/idea/security/ir.model.access.csv b/addons/idea/security/ir.model.access.csv
index cd6f56cf60e..dae5127cc90 100644
--- a/addons/idea/security/ir.model.access.csv
+++ b/addons/idea/security/ir.model.access.csv
@@ -9,14 +9,17 @@
 "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_category_user","idea.category user","model_idea_category","base.group_tool_user",1,1,1,1
+"access_idea_idea_user","idea.idea user","model_idea_idea","base.group_tool_user",1,1,1,1
+"access_idea_vote_user","idea.vote user","model_idea_vote","base.group_tool_user",1,1,1,1
+"access_idea_category_manager","idea.category manager","model_idea_category","base.group_tool_manager",1,0,0,0
+"access_idea_idea_manager","idea.idea manager","model_idea_idea","base.group_tool_manager",1,0,0,0
+"access_idea_vote_manager","idea.vote manager","model_idea_vote","base.group_tool_manager",1,0,0,0
+"access_idea_vote_stat_user","idea.vote.stat user","model_idea_vote_stat","base.group_tool_user",1,1,1,1
+"access_idea_comment_user","idea.comment user","model_idea_comment","base.group_tool_user",1,1,1,1
+"access_report_vote_manager","report.vote manager","model_report_vote","base.group_tool_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
+"access_report_vote_system","report.vote system","model_report_vote","base.group_system",1,0,0,0
+"access_idea_vote_stat_manager","idea.vote.stat manager","model_idea_vote_stat","base.group_tool_manager",1,1,1,1
+"access_idea_vote_stat_system","idea.vote.stat system","model_idea_vote_stat","base.group_system",1,1,1,1
diff --git a/addons/lunch/security/ir.model.access.csv b/addons/lunch/security/ir.model.access.csv
index 5d5ab895aa0..e27fba4530f 100644
--- a/addons/lunch/security/ir.model.access.csv
+++ b/addons/lunch/security/ir.model.access.csv
@@ -6,14 +6,16 @@
 "access_lunch_order","lunch.order","model_lunch_order","base.group_user",1,1,1,1
 "access_report_lunch_amount","report.lunch.amount","model_report_lunch_amount","base.group_user",1,1,1,1
 "access_lunch_order_sale_salesman","lunch.order.sale","model_lunch_order","base.group_sale_salesman",1,1,1,1
-"access_lunch_order_user","lunch.order user","model_lunch_order","base.group_survey_user",1,1,1,1
-"access_lunch_order_manager","lunch.order manager","model_lunch_order","base.group_survey_manager",1,0,0,0
-"access_lunch_cashmove_user","lunch.cashmove user","model_lunch_cashmove","base.group_survey_user",1,1,1,1
-"access_lunch_cashmove_manager","lunch.cashmove manager","model_lunch_cashmove","base.group_survey_manager",1,0,0,0
-"access_report_lunch_amount_manager","report.lunch.amount manager","model_report_lunch_amount","base.group_survey_manager",1,1,1,1
+"access_lunch_order_user","lunch.order user","model_lunch_order","base.group_tool_user",1,1,1,1
+"access_lunch_order_manager","lunch.order manager","model_lunch_order","base.group_tool_manager",1,0,0,0
+"access_lunch_cashmove_user","lunch.cashmove user","model_lunch_cashmove","base.group_tool_user",1,1,1,1
+"access_lunch_cashmove_manager","lunch.cashmove manager","model_lunch_cashmove","base.group_tool_manager",1,0,0,0
+"access_report_lunch_amount_manager","report.lunch.amount manager","model_report_lunch_amount","base.group_tool_manager",1,1,1,1
 "access_lunch_category_system","lunch.category system","model_lunch_category","base.group_system",1,1,1,1
 "access_lunch_product_system","lunch.product system","model_lunch_product","base.group_system",1,1,1,1
 "access_lunch_cashbox_system","lunch.cashbox system","model_lunch_cashbox","base.group_system",1,1,1,1
 "access_lunch_order_system","lunch.order system","model_lunch_order","base.group_system",1,0,0,0
 "access_lunch_cashmove_system","lunch.cashmove system","model_lunch_cashmove","base.group_system",1,0,0,0
-"access_report_lunch_order_manager","report.lunch.order manager","model_report_lunch_order","base.group_survey_manager",1,1,1,1
+"access_report_lunch_order_manager","report.lunch.order manager","model_report_lunch_order","base.group_tool_manager",1,1,1,1
+"access_lunch_product_user","lunch.product user","model_lunch_product","base.group_tool_user",1,1,1,1
+"access_lunch_cashbox_user","lunch.cashbox user","model_lunch_cashbox","base.group_tool_user",1,1,1,1
diff --git a/addons/lunch/security/lunch_security.xml b/addons/lunch/security/lunch_security.xml
index c87ace64801..6c3559fa138 100644
--- a/addons/lunch/security/lunch_security.xml
+++ b/addons/lunch/security/lunch_security.xml
@@ -5,10 +5,10 @@
     <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">
+   	<record model="res.groups" id="base.group_tool_manager">
         	<field name="name">Tools / Manager</field>
    		</record>
-   	<record model="res.groups" id="base.group_survey_user">
+   	<record model="res.groups" id="base.group_tool_user">
         	<field name="name">Tools / User</field>
    	</record>
 
diff --git a/addons/marketing_campaign/security/ir.model.access.csv b/addons/marketing_campaign/security/ir.model.access.csv
index 903ca7ac72a..ae5cad3d706 100644
--- a/addons/marketing_campaign/security/ir.model.access.csv
+++ b/addons/marketing_campaign/security/ir.model.access.csv
@@ -8,3 +8,6 @@
 "access_marketing_campaign_workitem_all","marketing.campaign.workitem","model_marketing_campaign_workitem","base.group_user",1,0,0,0
 "access_email_template_user","email.template","model_email_template","base.res_groups_email_template_admin",1,1,1,1
 "access_email_template_account_user","email_template.account.user","email_template.model_email_template_account","base.res_groups_email_template_admin",1,1,1,1
+"access_marketing_campaign_system","marketing.campaign system","model_marketing_campaign","base.group_system",1,0,0,0
+"access_marketing_campaign_segment_system","marketing.campaign.segment system","model_marketing_campaign_segment","base.group_system",1,0,0,0
+"access_marketing_campaign_workitem_system","marketing.campaign.workitem system","model_marketing_campaign_workitem","base.group_system",1,0,0,0
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index bb32cfc8f83..e7fe2a6fe7d 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" groups="base.group_sale_salesman,base.group_sale_manager,base.group_system"/>
+        <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" groups="base.group_sale_salesman,base.group_sale_manager,base.group_system,base.group_partner_manager"/>
         <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/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index 9b8b6afd506..0a89573e2f7 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -182,7 +182,7 @@
         <!-- Forecast section -->
         
         <menuitem id="menu_stock_sale_forecast" name="Sales Forecasts" 
-                parent="base.menu_base_partner" sequence="6"/>
+                parent="base.menu_base_partner" sequence="6" groups="base.group_extended,base.group_system"/>
 
         <record id="view_stock_sale_forecast_filter" model="ir.ui.view">
             <field name="name">stock.sale.forecast.list.select</field>
diff --git a/addons/subscription/security/ir.model.access.csv b/addons/subscription/security/ir.model.access.csv
index 33ab0881c52..e19fdde993b 100644
--- a/addons/subscription/security/ir.model.access.csv
+++ b/addons/subscription/security/ir.model.access.csv
@@ -3,8 +3,8 @@ access_subscription_document,subscription.document,model_subscription_document,b
 access_subscription_document_fields,subscription.document.fields,model_subscription_document_fields,base.group_system,1,1,1,1
 access_subscription_subscription,subscription.subscription,model_subscription_subscription,base.group_user,1,1,1,1
 access_subscription_subscription_history,subscription.subscription.history,model_subscription_subscription_history,base.group_user,1,1,1,1
-access_subscription_subscription_user,subscription.subscription user,model_subscription_subscription,base.group_survey_user,1,1,1,1
-access_subscription_subscription_manager,subscription.subscription manager,model_subscription_subscription,base.group_survey_manager,1,0,0,0
-access_subscription_subscription_history_user,subscription.subscription.history user,model_subscription_subscription_history,base.group_survey_user,1,1,1,1
+access_subscription_subscription_user,subscription.subscription user,model_subscription_subscription,base.group_tool_user,1,1,1,1
+access_subscription_subscription_manager,subscription.subscription manager,model_subscription_subscription,base.group_tool_manager,1,0,0,0
+access_subscription_subscription_history_user,subscription.subscription.history user,model_subscription_subscription_history,base.group_tool_user,1,1,1,1
 access_subscription_subscription_system,subscription.subscription system,model_subscription_subscription,base.group_system,1,0,0,0
-access_subscription_document_user,subscription.document user,model_subscription_document,base.group_survey_user,1,1,1,1
+access_subscription_document_user,subscription.document user,model_subscription_document,base.group_tool_user,1,1,1,1
diff --git a/addons/subscription/security/subcription_security.xml b/addons/subscription/security/subcription_security.xml
index 86f0e2c6069..0014f38182b 100644
--- a/addons/subscription/security/subcription_security.xml
+++ b/addons/subscription/security/subcription_security.xml
@@ -2,10 +2,10 @@
 <openerp>
 <data noupdate="0">
 
-   	<record model="res.groups" id="base.group_survey_manager">
+   	<record model="res.groups" id="base.group_tool_manager">
         	<field name="name">Tools / Manager</field>
    		</record>
-   	<record model="res.groups" id="base.group_survey_user">
+   	<record model="res.groups" id="base.group_tool_user">
         	<field name="name">Tools / User</field>
    	</record>
 
diff --git a/addons/survey/security/ir.model.access.csv b/addons/survey/security/ir.model.access.csv
index 9944a84996d..8d50471fd03 100644
--- a/addons/survey/security/ir.model.access.csv
+++ b/addons/survey/security/ir.model.access.csv
@@ -1,30 +1,30 @@
 "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_survey_manager",1,1,1,1
-"access_survey_type_user","survey.type user","model_survey_type","base.group_survey_user",1,1,1,1
-"access_survey_manager","survey","model_survey","base.group_survey_manager",1,0,0,0
+"access_survey_type_manager","survey.type manager","model_survey_type","base.group_tool_manager",1,1,1,1
+"access_survey_type_user","survey.type user","model_survey_type","base.group_tool_user",1,1,1,1
+"access_survey_manager","survey","model_survey","base.group_tool_manager",1,0,0,0
 "access_survey_system","survey","model_survey","base.group_system",1,0,0,0
-"access_survey_user","survey","model_survey","base.group_survey_user",1,1,1,1
-"access_survey_page_manager","survey.page manager","model_survey_page","base.group_survey_manager",1,0,0,0
+"access_survey_user","survey","model_survey","base.group_tool_user",1,1,1,1
+"access_survey_page_manager","survey.page manager","model_survey_page","base.group_tool_manager",1,0,0,0
 "access_survey_page_system","survey.page system","model_survey_page","base.group_system",1,0,0,0
-"access_survey_page_user","survey.page user","model_survey_page","base.group_survey_user",1,1,1,1
-"access_survey_question_manager","survey.question manager","model_survey_question","base.group_survey_manager",1,1,1,1
-"access_survey_question_user","survey.question user","model_survey_question","base.group_survey_user",1,1,1,1
-"access_survey_answer_manager","survey.answer manager","model_survey_answer","base.group_survey_manager",1,1,1,1
-"access_survey_answer_user","survey.answer user","model_survey_answer","base.group_survey_user",1,1,1,1
-"access_survey_response_manager","survey.response manager","model_survey_response","base.group_survey_manager",1,1,1,1
-"access_survey_response_user","survey.response user","model_survey_response","base.group_survey_user",1,1,1,1
-"access_survey_response_answer_manager","survey.response.answer manager","model_survey_response_answer","base.group_survey_manager",1,1,1,1
-"access_survey_response_answer_user","survey.response.answer user","model_survey_response_answer","base.group_survey_user",1,1,1,1
-"access_survey_history_user","survey.history.user","model_survey_history","base.group_survey_user",1,1,1,1
-"access_survey_question_column_heading_manager","survey.question.column.heading manager","model_survey_question_column_heading","base.group_survey_manager",1,1,1,1
-"access_survey_question_column_heading_user","survey.question.column.heading user","model_survey_question_column_heading","base.group_survey_user",1,0,0,0
-"access_survey_request_manager","survey.request manager","model_survey_request","base.group_survey_manager",1,0,0,0
-"access_survey_request_user","survey.request user","model_survey_request","base.group_survey_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_manager","survey.question manager","model_survey_question","base.group_tool_manager",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_manager","survey.answer manager","model_survey_answer","base.group_tool_manager",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_manager","survey.response manager","model_survey_response","base.group_tool_manager",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_manager","survey.response.answer manager","model_survey_response_answer","base.group_tool_manager",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_question_column_heading_manager","survey.question.column.heading manager","model_survey_question_column_heading","base.group_tool_manager",1,1,1,1
+"access_survey_question_column_heading_user","survey.question.column.heading user","model_survey_question_column_heading","base.group_tool_user",1,0,0,0
+"access_survey_request_manager","survey.request manager","model_survey_request","base.group_tool_manager",1,0,0,0
+"access_survey_request_user","survey.request user","model_survey_request","base.group_tool_user",1,1,1,1
 "access_survey_request_system","survey.request system","model_survey_request","base.group_system",1,0,0,0
-"access_survey_tbl_column_heading_manager","survey.tbl.column.heading manager","model_survey_tbl_column_heading","base.group_survey_manager",1,1,1,1
-"access_survey_tbl_column_heading_user","survey.tbl.column.heading user","model_survey_tbl_column_heading","base.group_survey_user",1,1,1,1
-"access_survey_response_line_manager","survey.response.line manager","model_survey_response_line","base.group_survey_manager",1,1,1,1
-"access_survey_response_line_manager","survey.response.line manager","model_survey_response_line","base.group_survey_user",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_tbl_column_heading_user","survey.tbl.column.heading user","model_survey_tbl_column_heading","base.group_tool_user",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_response_line_manager","survey.response.line manager","model_survey_response_line","base.group_tool_user",1,1,1,1
 "access_survey_type","survey.type","model_survey_type","base.group_hr_manager",1,1,1,1
 "access_survey","survey","model_survey","base.group_hr_manager",1,1,1,1
 "access_survey_history_manager","survey.history","model_survey_history","base.group_hr_manager",1,1,1,1
@@ -38,7 +38,7 @@
 "access_survey_response_answer","survey.response.answer","model_survey_response_answer","base.group_hr_manager",1,1,1,1
 "access_survey_res_users","res.users","base.model_res_users","base.group_hr_manager",1,1,1,1
 "access_survey_request","survey.request","model_survey_request","base.group_hr_manager",1,1,1,1
-"access_survey_history_survey_manager","survey.history manager","model_survey_history","base.group_survey_manager",1,0,0,0
+"access_survey_history_survey_manager","survey.history manager","model_survey_history","base.group_tool_manager",1,0,0,0
 "access_survey_type_system","survey.type system","model_survey_type","base.group_system",1,0,0,0
 "access_survey_question_system","survey.question system","model_survey_question","base.group_system",1,0,0,0
 "access_survey_history_system","survey.history.system","model_survey_history","base.group_system",1,0,0,0
diff --git a/addons/survey/security/survey_security.xml b/addons/survey/security/survey_security.xml
index 8c50d72496c..7172fdf615e 100644
--- a/addons/survey/security/survey_security.xml
+++ b/addons/survey/security/survey_security.xml
@@ -11,10 +11,10 @@
     <record id="base.group_hr_user" model="res.groups">
         <field name="name">Human Resources / User</field>
     </record>
-   	<record model="res.groups" id="base.group_survey_manager">
+   	<record model="res.groups" id="base.group_tool_manager">
         	<field name="name">Tools / Manager</field>
    		</record>
-   	<record model="res.groups" id="base.group_survey_user">
+   	<record model="res.groups" id="base.group_tool_user">
         	<field name="name">Tools / User</field>
    	</record>
 
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index f45eab0bf9d..890d674a408 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -2,15 +2,15 @@
 <openerp>
     <data>
 
-            <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="28" groups="base.group_system,base.group_survey_manager,base.group_survey_user"/>
+            <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="28" groups="base.group_system,base.group_tool_manager,base.group_tool_user"/>
             <menuitem name="Surveys" id="menu_surveys" parent="base.menu_tools"
-                        groups="base.group_survey_manager,base.group_survey_user,base.group_system" sequence="2"/>
+                        groups="base.group_tool_manager,base.group_tool_user,base.group_system" sequence="2"/>
             <menuitem name="Define Surveys" id="menu_define_survey"
-                 groups="base.group_survey_manager,base.group_survey_user,base.group_system"
+                 groups="base.group_tool_manager,base.group_tool_user,base.group_system"
                  parent="menu_surveys" />
-            <menuitem id="menu_answer_surveys" name="Answer Surveys" parent="menu_surveys" groups="base.group_survey_manager,base.group_survey_user,base.group_system"/>
+            <menuitem id="menu_answer_surveys" name="Answer Surveys" parent="menu_surveys" groups="base.group_tool_manager,base.group_tool_user,base.group_system"/>
             <menuitem name="Reporting" parent="base.menu_tools"
-                id="base.menu_lunch_reporting" groups="base.group_survey_manager" sequence="6"/>
+                id="base.menu_lunch_reporting" sequence="6"/>
             <menuitem name="Surveys" id="menu_reporting" parent="base.menu_lunch_reporting" sequence="2"/>
         <!--
             Survey
@@ -291,7 +291,7 @@
 
         <menuitem name="Surveys" id="menu_survey_form"
             action="action_survey_form1" parent="menu_define_survey"
-            groups="base.group_survey_manager,base.group_survey_user,base.group_system"/>
+            groups="base.group_tool_manager,base.group_tool_user,base.group_system"/>
 
         <!--
             Survey Pages
@@ -491,7 +491,7 @@
 
         <menuitem name="Pages" id="menu_survey_page_form1"
             action="action_survey_page_form" parent='menu_define_survey'
-            groups="base.group_survey_manager,base.group_survey_user,base.group_system"/>
+            groups="base.group_tool_manager,base.group_tool_user,base.group_system"/>
 
         <record model="ir.ui.view" id="survey_page_wizard_test1">
             <field name="name">survey_page_wizard_test</field>
@@ -1116,7 +1116,7 @@
 
         <menuitem name="Survey Requests" id="menu_survey_type_form1"
             action="action_survey_request_tree" parent='menu_answer_surveys'
-            groups="base.group_survey_manager,base.group_survey_user,base.group_system"/>
+            groups="base.group_tool_manager,base.group_tool_user,base.group_system"/>
 
         <!--
             Survey Type
@@ -1191,7 +1191,7 @@
 
         <menuitem name="Answer a Survey" id="menu_run_survey_form" sequence="2"
             action="action_view_survey_name" parent="menu_answer_surveys"
-            groups="base.group_survey_manager,base.group_survey_user,base.group_system" icon="STOCK_INDEX"/>
+            groups="base.group_tool_manager,base.group_tool_user,base.group_system" icon="STOCK_INDEX"/>
 
     </data>
 </openerp>
diff --git a/addons/survey/wizard/survey_browse_answer.xml b/addons/survey/wizard/survey_browse_answer.xml
index 1a0da339483..7e02e067f2c 100644
--- a/addons/survey/wizard/survey_browse_answer.xml
+++ b/addons/survey/wizard/survey_browse_answer.xml
@@ -35,7 +35,7 @@
 
 		<menuitem name="Browse Answers" id="menu_browse_survey_response"
 			action="action_browse_survey_response" parent="menu_reporting"
-			groups="base.group_survey_manager" icon="STOCK_PRINT_PREVIEW"/>
+			groups="base.group_tool_manager" icon="STOCK_PRINT_PREVIEW"/>
 
 	</data>
 </openerp>
diff --git a/addons/survey/wizard/survey_print.xml b/addons/survey/wizard/survey_print.xml
index 719eaa309e8..d9f3ae6fe1e 100644
--- a/addons/survey/wizard/survey_print.xml
+++ b/addons/survey/wizard/survey_print.xml
@@ -37,7 +37,7 @@
 
         <menuitem name="Surveys" id="menu_print_survey_form" sequence="1"
             action="action_view_survey_print" parent="menu_reporting"
-            groups="base.group_survey_manager" icon="STOCK_PRINT"/>
+            groups="base.group_tool_manager" icon="STOCK_PRINT"/>
 
 	</data>
 </openerp>
diff --git a/addons/survey/wizard/survey_print_answer.xml b/addons/survey/wizard/survey_print_answer.xml
index e7a05dff6c4..9a0ea6dd83f 100644
--- a/addons/survey/wizard/survey_print_answer.xml
+++ b/addons/survey/wizard/survey_print_answer.xml
@@ -37,7 +37,7 @@
 		</record>
 
 		<menuitem name="Surveys Answers" action="action_view_survey_print_answer" id="menu_print_survey_answer"
-			parent="menu_reporting" icon="STOCK_PRINT" groups="base.group_survey_manager"/>
+			parent="menu_reporting" icon="STOCK_PRINT" groups="base.group_tool_manager"/>
 
 	</data>
 </openerp>
diff --git a/addons/survey/wizard/survey_print_statistics.xml b/addons/survey/wizard/survey_print_statistics.xml
index abb11336b90..9bd729db010 100644
--- a/addons/survey/wizard/survey_print_statistics.xml
+++ b/addons/survey/wizard/survey_print_statistics.xml
@@ -31,7 +31,7 @@
 		</record>
 
 		<menuitem name="Surveys Statistics" action="action_view_survey_print_statistics" id="menu_print_survey_statistics"
-			parent="menu_reporting" icon="STOCK_PRINT" groups="base.group_survey_manager"/>
+			parent="menu_reporting" icon="STOCK_PRINT" groups="base.group_tool_manager"/>
 
 	</data>
 </openerp>
diff --git a/addons/survey/wizard/survey_send_invitation.py b/addons/survey/wizard/survey_send_invitation.py
index 1e5a0e01831..b34d97c6b03 100644
--- a/addons/survey/wizard/survey_send_invitation.py
+++ b/addons/survey/wizard/survey_send_invitation.py
@@ -100,7 +100,7 @@ class survey_send_invitation(osv.osv_memory):
         survey_ref= self.pool.get('survey')
 
         model_data_obj = self.pool.get('ir.model.data')
-        group_id = model_data_obj._get_id(cr, uid, 'survey', 'group_survey_user')
+        group_id = model_data_obj._get_id(cr, uid, 'survey', 'base.group_tool_user')
         group_id = model_data_obj.browse(cr, uid, group_id, context=context).res_id
 
         act_id = self.pool.get('ir.actions.act_window')