From 5d42b703b54c034f762b79431d60f8ecc6e24374 Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Fri, 6 Aug 2010 19:23:58 +0530
Subject: [PATCH] [MOD] event: usability improvement in access rights

bzr revid: amp@tinyerp.com-20100806135358-yapv8rqd34ac6oms
---
 addons/event/event_view.xml                   |  4 +--
 .../report/report_event_registration_view.xml |  2 +-
 addons/event/security/event_security.xml      | 13 ++++----
 addons/event/security/ir.model.access.csv     | 30 +++++++++++--------
 4 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 4c347a11a4d..fcabd668146 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -35,8 +35,8 @@
             <field name="res_model">event.type</field>
             <field name="view_type">form</field>
         </record>
-        <menuitem name="Configuration" id="base.menu_event_config" parent="base.marketing_menu" sequence="30" groups="base.group_extended"/>
-        <menuitem name="Types of Events" id="menu_event_type" action="action_event_type" parent="base.menu_event_config" groups="base.group_extended,base.group_sale_manager"/>
+        <menuitem name="Configuration" id="base.menu_event_config" parent="base.marketing_menu" sequence="30" groups="base.group_extended,base.group_system"/>
+        <menuitem name="Types of Events" id="menu_event_type" action="action_event_type" parent="base.menu_event_config" groups="base.group_extended,base.group_sale_manager,base.group_system"/>
 
     <!-- Events Organisation/CONFIGURATION/EVENTS -->
 
diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml
index f6af4429ad5..d62332af156 100644
--- a/addons/event/report/report_event_registration_view.xml
+++ b/addons/event/report/report_event_registration_view.xml
@@ -124,7 +124,7 @@
        </record>
 
         <!--<menuitem parent="menu_report_event" action="action_event_registration" id="menu_report_event_registration"/>-->
-        <menuitem parent="base.menu_report_association" action="action_report_event_registration" id="menu_report_event_registration" sequence="3"/>
+        <menuitem parent="base.menu_report_association" action="action_report_event_registration" id="menu_report_event_registration" sequence="3" groups="base.group_system,base.group_marketing_manager"/>
  
     <!-- end...  -->
     </data>
diff --git a/addons/event/security/event_security.xml b/addons/event/security/event_security.xml
index 788fc922f48..9cc311c5b09 100644
--- a/addons/event/security/event_security.xml
+++ b/addons/event/security/event_security.xml
@@ -3,13 +3,16 @@
 	<data>
 	
 	
-    <record id="group_event_manager" model="res.groups">
-        <field name="name">EVENT / Manager</field>
+    <record id="base.group_marketing_manager" model="res.groups">
+        <field name="name">Marketing / Manager</field>
+    </record>
+    <record id="base.res_groups_email_template_admin" model="res.groups">
+        <field name="name">Marketing / User</field>
     </record>
 
-    <record id="group_event_subscriber" model="res.groups">
-        <field name="name">EVENT / Subscriber</field>
-    </record>
+<!--    <record id="group_event_subscriber" model="res.groups">-->
+<!--        <field name="name">EVENT / Subscriber</field>-->
+<!--    </record>-->
 
     <record id="base.group_sale_manager" model="res.groups">
         <field name="name">Sales / Manager</field>
diff --git a/addons/event/security/ir.model.access.csv b/addons/event/security/ir.model.access.csv
index 9fcc2d39d62..747f12a479c 100644
--- a/addons/event/security/ir.model.access.csv
+++ b/addons/event/security/ir.model.access.csv
@@ -1,14 +1,20 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_event_type","event.type","model_event_type","event.group_event_subscriber",1,0,0,0
-"access_event_type_manager","event.type manager","model_event_type","event.group_event_manager",1,1,1,1
-"access_event_event","event.event","model_event_event","event.group_event_subscriber",1,1,1,0
-"access_event_registration","event.registration","model_event_registration","event.group_event_subscriber",1,1,1,0
-"access_report_event_registration","report.event.registration","model_report_event_registration","event.group_event_subscriber",1,0,0,0
-"access_event_event_manager","event.event manager","model_event_event","event.group_event_manager",1,1,1,1
-"access_event_registration_manager","event.registration manager","model_event_registration","event.group_event_manager",1,1,1,1
-"access_crm_case_section_manager","crm.case.section manager","crm.model_crm_case_section","event.group_event_manager",1,1,1,1
-"access_product_product","product.product.product manager","product.model_product_product","event.group_event_manager",1,1,1,1
-"access_report_event_registration","report.event.registration","model_report_event_registration","event.group_event_manager",1,1,1,1
-"access_event_registration_badge","event.registration.badge","model_event_registration_badge","event.group_event_subscriber",1,1,1,1
-"access_event_registration_badge","event.registration.badge","model_event_registration_badge","event.group_event_manager",1,1,1,1
+"access_event_type","event.type","model_event_type","base.res_groups_email_template_admin",1,0,0,0
+"access_event_type_manager","event.type manager","model_event_type","base.group_marketing_manager",1,1,1,1
+"access_event_event","event.event","model_event_event","base.res_groups_email_template_admin",1,1,1,0
+"access_event_registration","event.registration","model_event_registration","base.res_groups_email_template_admin",1,1,1,0
+"access_report_event_registration","report.event.registration","model_report_event_registration","base.res_groups_email_template_admin",1,1,1,1
+"access_event_event_manager","event.event manager","model_event_event","base.group_marketing_manager",1,0,0,0
+"access_event_registration_manager","event.registration manager","model_event_registration","base.group_marketing_manager",1,0,0,0
+"access_crm_case_section_manager","crm.case.section manager","crm.model_crm_case_section","base.group_marketing_manager",1,1,1,1
+"access_product_product","product.product.product manager","product.model_product_product","base.group_marketing_manager",1,1,1,1
+"access_report_event_registration","report.event.registration","model_report_event_registration","base.group_marketing_manager",1,1,1,1
+"access_event_registration_badge","event.registration.badge","model_event_registration_badge","base.res_groups_email_template_admin",1,1,1,1
+"access_event_registration_badge","event.registration.badge","model_event_registration_badge","base.group_marketing_manager",1,1,1,1
 "access_event_event_sale_salesman","event.event.sale","model_event_event","base.group_sale_salesman",1,0,0,0
+"access_event_event_system","event.event system","model_event_event","base.group_system",1,0,0,0
+"access_event_registration_system","event.registration system","model_event_registration","base.group_system",1,0,0,0
+"access_report_event_registration_system","report.event.registration system","model_report_event_registration","base.group_system",1,1,1,1
+"access_account_account_invoice_system","account.account.invoice","account.model_account_invoice","base.group_system",1,0,0,0
+"access_event_type_sytem","event.type system","model_event_type","base.group_system",1,1,1,1
+"access_account_account_invoice_manager","account.account.invoice","account.model_account_invoice","base.group_marketing_manager",1,0,0,0