[MERGE] merged with trunk-development-branch

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

2 files changed, 15 insertions, 39 deletions

diff --git a/addons/event/security/event_security.xml b/addons/event/security/event_security.xml
deleted file mode 100644
index c3c70c94d93..00000000000
--- a/addons/event/security/event_security.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-  <data>
-
-    <record id="marketing.group_marketing_user" model="res.groups">
-        <field name="name">Marketing / User</field>
-    </record>
-
-    <record id="marketing.group_marketing_manager" model="res.groups">
-        <field name="name">Marketing / Manager</field>
-        <field name="implied_ids" eval="[(4, ref('marketing.group_marketing_user'))]"/>
-    </record>
-
-    <record id="base.group_sale_manager" model="res.groups">
-        <field name="name">Sales / Manager</field>
-    </record>
-
-    <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">Sales / User</field>
-    </record>
-  </data>
-</openerp>
-
diff --git a/addons/event/security/ir.model.access.csv b/addons/event/security/ir.model.access.csv
index 59651dfa007..f79d141f148 100644
--- a/addons/event/security/ir.model.access.csv
+++ b/addons/event/security/ir.model.access.csv
@@ -1,16 +1,15 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_event_type","event.type","model_event_type","marketing.group_marketing_user",1,0,0,0
-"access_event_type_manager","event.type manager","model_event_type","marketing.group_marketing_manager",1,1,1,1
-"access_event_event","event.event","model_event_event","marketing.group_marketing_user",1,1,1,0
-"access_event_registration","event.registration","model_event_registration","marketing.group_marketing_user",1,1,1,0
-"access_report_event_registration","report.event.registration","model_report_event_registration","marketing.group_marketing_user",1,1,1,1
-"access_event_event_manager","event.event manager","model_event_event","marketing.group_marketing_manager",1,0,0,0
-"access_event_registration_manager","event.registration manager","model_event_registration","marketing.group_marketing_manager",1,0,0,0
-"access_crm_case_section_manager","crm.case.section manager","crm.model_crm_case_section","marketing.group_marketing_manager",1,1,1,1
-"access_product_product","product.product.product manager","product.model_product_product","marketing.group_marketing_manager",1,1,1,1
-"access_report_event_registration","report.event.registration","model_report_event_registration","marketing.group_marketing_manager",1,1,1,1
-"access_event_registration_badge_manager","event.registration.badge manager","model_event_registration_badge","marketing.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_account_account_invoice_manager","account.account.invoice","account.model_account_invoice","marketing.group_marketing_manager",1,0,0,0
-"access_event_registration_badge","event.registration.badge","model_event_registration_badge","marketing.group_marketing_user",1,0,0,0
-"access_event_registration_sale_user","event.registration.sale.user","model_event_registration","base.group_sale_salesman",1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

+access_event_type,event.type,model_event_type,marketing.group_marketing_user,1,0,0,0

+access_event_type_manager,event.type manager,model_event_type,marketing.group_marketing_manager,1,1,1,1

+access_event_event,event.event,model_event_event,marketing.group_marketing_user,1,1,1,0

+access_event_registration,event.registration,model_event_registration,marketing.group_marketing_user,1,1,1,0

+access_report_event_registration,report.event.registration,model_report_event_registration,marketing.group_marketing_user,1,1,1,1

+access_event_event_manager,event.event manager,model_event_event,marketing.group_marketing_manager,1,0,0,0

+access_event_registration_manager,event.registration manager,model_event_registration,marketing.group_marketing_manager,1,0,0,0

+access_crm_case_section_manager,crm.case.section manager,crm.model_crm_case_section,marketing.group_marketing_manager,1,1,1,1

+access_product_product,product.product.product manager,product.model_product_product,marketing.group_marketing_manager,1,1,1,1

+access_event_registration_badge_manager,event.registration.badge manager,model_event_registration_badge,marketing.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_account_account_invoice_manager,account.account.invoice,account.model_account_invoice,marketing.group_marketing_manager,1,0,0,0

+access_event_registration_badge,event.registration.badge,model_event_registration_badge,marketing.group_marketing_user,1,0,0,0

+access_event_registration_sale_user,event.registration.sale.user,model_event_registration,base.group_sale_salesman,1,0,0,0