diff options
| author | Harry (OpenERP) <hmo@tinyerp.com> | 2011-12-13 13:11:29 +0530 |
|---|---|---|
| committer | Harry (OpenERP) <hmo@tinyerp.com> | 2011-12-13 13:11:29 +0530 |
| commit | 359f0b42e22e69e9965462c8e8d5b8c57239d2f8 (patch) | |
| tree | 64412070716c5949d6c8703e5f2bd83235177ce1 /addons/document_ftp | |
| parent | eb4c08585db4868fbf03dc0a019a383e9e653e7e (diff) | |
| parent | 78f56f29f2469f2e4a398d7d6cbdcafaa622341c (diff) | |
[MERGE] merged with trunk development branch.
bzr revid: hmo@tinyerp.com-20111213074129-0frej7vvaefubybe
Diffstat (limited to 'addons/document_ftp')
| -rw-r--r-- | addons/document_ftp/__openerp__.py | 1 | ||||
| -rw-r--r-- | addons/document_ftp/security/ir.model.access.csv | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/addons/document_ftp/__openerp__.py b/addons/document_ftp/__openerp__.py index a7b5a65e227..499a928c077 100644 --- a/addons/document_ftp/__openerp__.py +++ b/addons/document_ftp/__openerp__.py @@ -49,7 +49,6 @@ FTP client. ], 'installable': True, 'active': False, - 'application': True, 'certificate': '00934787762705016005', 'images': ['images/1_configure_ftp.jpeg','images/2_document_browse.jpeg','images/3_document_ftp.jpeg'], 'post_load': 'post_load', diff --git a/addons/document_ftp/security/ir.model.access.csv b/addons/document_ftp/security/ir.model.access.csv index 0a6c192eb56..4a08a4aa60d 100644 --- a/addons/document_ftp/security/ir.model.access.csv +++ b/addons/document_ftp/security/ir.model.access.csv @@ -1,2 +1 @@ -"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" - +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
|