[MERGE] branch merged with lp:openobject-addons

bzr revid: jap@tinyerp.com-20111221065553-k0h0ksnnr29mklna

4 files changed, 9 insertions, 12 deletions

diff --git a/addons/knowledge/__openerp__.py b/addons/knowledge/__openerp__.py
index 2ca58e9861f..e37419ffcaf 100644
--- a/addons/knowledge/__openerp__.py
+++ b/addons/knowledge/__openerp__.py
@@ -21,11 +21,11 @@
 
 
 {
-    "name" : "Knowledge Management System",
+    "name" : "Document Management System",
     "version" : "1.0",
     "depends" : ["base","base_setup"],
     "author" : "OpenERP SA",
-    "category": 'Hidden',
+    'category': 'Hidden/Dependency',
     'complexity': "easy",
     "description": """
 Installer for knowledge-based Hidden.
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

diff --git a/addons/knowledge/security/knowledge_security.xml b/addons/knowledge/security/knowledge_security.xml
index b4c7bb99c1b..560fdce0506 100644
--- a/addons/knowledge/security/knowledge_security.xml
+++ b/addons/knowledge/security/knowledge_security.xml
@@ -1,13 +1,11 @@
 <?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_document_user" model="res.groups">
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_knowledge_management"/>
+    </record>
 
 </data>
 </openerp>
diff --git a/addons/knowledge/static/src/img/icon.png b/addons/knowledge/static/src/img/icon.png
new file mode 100644
index 00000000000..cc38e1c0348
--- /dev/null
+++ b/addons/knowledge/static/src/img/icon.png