[MERGE] merged with trunk-development-branch

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

3 files changed, 4 insertions, 3 deletions

diff --git a/addons/edi/__openerp__.py b/addons/edi/__openerp__.py
index 4d96780b10c..07b189e501d 100644
--- a/addons/edi/__openerp__.py
+++ b/addons/edi/__openerp__.py
@@ -37,6 +37,7 @@ technical OpenERP documentation at http://doc.openerp.com
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base', 'email_template'],
+    'icon': '/edi/static/src/img/knowledge.png',
     'data': [
         'security/ir.model.access.csv',
     ],
diff --git a/addons/edi/security/ir.model.access.csv b/addons/edi/security/ir.model.access.csv
index f1942397ac5..b1f470d80ae 100644
--- a/addons/edi/security/ir.model.access.csv
+++ b/addons/edi/security/ir.model.access.csv
@@ -1,3 +1,3 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_ir_edi_all_read","access_ir_edi_all_read","model_edi_document",,1,0,0,0
-"access_ir_edi_employee_create","access_ir_edi_employee_create","model_edi_document","base.group_user",1,0,1,0
\ No newline at end of file
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

+access_ir_edi_all_read,access_ir_edi_all_read,model_edi_document,,1,0,0,0

+access_ir_edi_employee_create,access_ir_edi_employee_create,model_edi_document,base.group_user,1,0,1,0

diff --git a/addons/edi/static/src/img/knowledge.png b/addons/edi/static/src/img/knowledge.png
new file mode 100644
index 00000000000..35c8d5706fd
--- /dev/null
+++ b/addons/edi/static/src/img/knowledge.png