From 857e45e84ce4adf2636686f368da674c901a658d Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Mon, 12 Dec 2011 14:43:54 +0100
Subject: [IMP] base_contact, crm, document, event: add group categories

bzr revid: rco@openerp.com-20111212134354-49p2gyf93qozplll
---
 addons/event/security/event_security.xml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'addons/event/security/event_security.xml')

diff --git a/addons/event/security/event_security.xml b/addons/event/security/event_security.xml
index c3c70c94d93..091aaef03a1 100644
--- a/addons/event/security/event_security.xml
+++ b/addons/event/security/event_security.xml
@@ -3,20 +3,24 @@
   <data>
 
     <record id="marketing.group_marketing_user" model="res.groups">
-        <field name="name">Marketing / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_marketing"/>
     </record>
 
     <record id="marketing.group_marketing_manager" model="res.groups">
-        <field name="name">Marketing / Manager</field>
+        <field name="name">Manager</field>
+        <field name="category_id" ref="base.module_category_marketing"/>
         <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>
+        <field name="name">Manager</field>
+        <field name="category_id" ref="base.module_category_sales_management"/>
     </record>
 
     <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">Sales / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_sales_management"/>
     </record>
   </data>
 </openerp>
-- 
cgit v1.2.3


From 70bb0dd8109a5fba81ebb13175a3c03398d7a73a Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Mon, 12 Dec 2011 15:51:28 +0100
Subject: [IMP] base_contact, event, knowledge, product, project, sale_mrp:
 avoid redefinition of sale groups

bzr revid: rco@openerp.com-20111212145128-zx64v0uwf8n0lwyu
---
 addons/event/security/event_security.xml | 27 ---------------------------
 1 file changed, 27 deletions(-)
 delete mode 100644 addons/event/security/event_security.xml

(limited to 'addons/event/security/event_security.xml')

diff --git a/addons/event/security/event_security.xml b/addons/event/security/event_security.xml
deleted file mode 100644
index 091aaef03a1..00000000000
--- a/addons/event/security/event_security.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-  <data>
-
-    <record id="marketing.group_marketing_user" model="res.groups">
-        <field name="name">User</field>
-        <field name="category_id" ref="base.module_category_marketing"/>
-    </record>
-
-    <record id="marketing.group_marketing_manager" model="res.groups">
-        <field name="name">Manager</field>
-        <field name="category_id" ref="base.module_category_marketing"/>
-        <field name="implied_ids" eval="[(4, ref('marketing.group_marketing_user'))]"/>
-    </record>
-
-    <record id="base.group_sale_manager" model="res.groups">
-        <field name="name">Manager</field>
-        <field name="category_id" ref="base.module_category_sales_management"/>
-    </record>
-
-    <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">User</field>
-        <field name="category_id" ref="base.module_category_sales_management"/>
-    </record>
-  </data>
-</openerp>
-
-- 
cgit v1.2.3