From 084c5d9289e914bf871c5b01802b4e44c164f16b Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Mon, 12 Dec 2011 14:49:38 +0100
Subject: [IMP] hr, idea, knowledge, lunch: add group categories

bzr revid: rco@openerp.com-20111212134938-xwfnq4d3ks1awuu9
---
 addons/knowledge/security/knowledge_security.xml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'addons/knowledge/security')

diff --git a/addons/knowledge/security/knowledge_security.xml b/addons/knowledge/security/knowledge_security.xml
index b4c7bb99c1b..80bce33e7e4 100644
--- a/addons/knowledge/security/knowledge_security.xml
+++ b/addons/knowledge/security/knowledge_security.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 <data noupdate="0">
-            <record id="base.group_sale_manager" model="res.groups">
-                <field name="name">Sales / Manager</field>
-            </record>
 
-            <record id="base.group_document_user" model="res.groups">
-                <field name="name">Knowledge / User</field>
-            </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_document_user" model="res.groups">
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_knowledge_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/knowledge/security/knowledge_security.xml | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'addons/knowledge/security')

diff --git a/addons/knowledge/security/knowledge_security.xml b/addons/knowledge/security/knowledge_security.xml
index 80bce33e7e4..560fdce0506 100644
--- a/addons/knowledge/security/knowledge_security.xml
+++ b/addons/knowledge/security/knowledge_security.xml
@@ -2,11 +2,6 @@
 <openerp>
 <data noupdate="0">
 
-    <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_document_user" model="res.groups">
         <field name="name">User</field>
         <field name="category_id" ref="base.module_category_knowledge_management"/>
-- 
cgit v1.2.3


From f27318c8af85955ef23b709f5fe7f87ee0974bb3 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 12 Dec 2011 19:11:13 +0100
Subject: [IMP] Security Rule: removed duplicates due to inheritancies of
 groups

bzr revid: fp@tinyerp.com-20111212181113-mhnnbps3ip8ls6pp
---
 addons/knowledge/security/ir.model.access.csv | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'addons/knowledge/security')

diff --git a/addons/knowledge/security/ir.model.access.csv b/addons/knowledge/security/ir.model.access.csv
index 7a057fcfcbe..34255019afe 100644
--- a/addons/knowledge/security/ir.model.access.csv
+++ b/addons/knowledge/security/ir.model.access.csv
@@ -1,4 +1,3 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_ir_attachment_sale_manager","ir_attachment manager","base.model_ir_attachment","base.group_sale_manager",1,1,1,1
-"access_ir_attachment_partner_manager","ir_attachment_partner manager","base.model_ir_attachment","base.group_partner_manager",1,1,1,1
-
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_ir_attachment_sale_manager,ir_attachment manager,base.model_ir_attachment,base.group_sale_manager,1,1,1,1
+access_ir_attachment_partner_manager,ir_attachment_partner manager,base.model_ir_attachment,base.group_partner_manager,1,1,1,1
-- 
cgit v1.2.3