diff options
| author | Sanjay Gohel (Open ERP) <sgo@tinyerp.com> | 2012-08-06 11:12:19 +0530 |
|---|---|---|
| committer | Sanjay Gohel (Open ERP) <sgo@tinyerp.com> | 2012-08-06 11:12:19 +0530 |
| commit | 2cc02f84d245871402dabfdba67dee62bdb30fa2 (patch) | |
| tree | b39f15bc7b70e89347768b3ebacf3f7e27a23984 /addons/document_ftp | |
| parent | c494b78f7776f64bde8d4cdefa82f7cdda867548 (diff) | |
| parent | 1da7ac2448a5e29bb43994286d3fbb8d90576d54 (diff) | |
[MERGE]merge with lp:~openerp-dev/openobject-addons/trunk-message-sub-type-apa
bzr revid: sgo@tinyerp.com-20120806054219-yxe9cwx4yguz7t55
Diffstat (limited to 'addons/document_ftp')
| -rwxr-xr-x | addons/document_ftp/ftpserver/ftpserver.py | 2 | ||||
| -rw-r--r-- | addons/document_ftp/res_config_view.xml | 1 | ||||
| -rw-r--r-- | addons/document_ftp/wizard/ftp_configuration_view.xml | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/addons/document_ftp/ftpserver/ftpserver.py b/addons/document_ftp/ftpserver/ftpserver.py index bd727427541..48ec4ad5ea0 100755 --- a/addons/document_ftp/ftpserver/ftpserver.py +++ b/addons/document_ftp/ftpserver/ftpserver.py @@ -5,7 +5,7 @@ # pyftpdlib is released under the MIT license, reproduced below: # ====================================================================== # Copyright (C) 2007 Giampaolo Rodola' <g.rodola@gmail.com> -# Hacked by Fabien Pinckaers (C) 2008 <fp@tinyerp.com> +# Hacked by Fabien Pinckaers (C) 2008 <fp@openerp.com> # # All Rights Reserved # diff --git a/addons/document_ftp/res_config_view.xml b/addons/document_ftp/res_config_view.xml index 66f1c4ae944..a44d7af0c79 100644 --- a/addons/document_ftp/res_config_view.xml +++ b/addons/document_ftp/res_config_view.xml @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> <openerp> <data> <record id="view_document_ftp_configuration" model="ir.ui.view"> diff --git a/addons/document_ftp/wizard/ftp_configuration_view.xml b/addons/document_ftp/wizard/ftp_configuration_view.xml index ed52a730023..95528b75594 100644 --- a/addons/document_ftp/wizard/ftp_configuration_view.xml +++ b/addons/document_ftp/wizard/ftp_configuration_view.xml @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> <openerp> <data> <record model="ir.actions.url" id="action_document_browse"> @@ -35,10 +36,9 @@ <field name="view_mode">form</field> <field name="target">new</field> </record> - + <record model="ir.actions.todo" id="config_auto_directory"> <field name="action_id" ref="action_config_auto_directory"/> - <field name="category_id" ref="document.category_knowledge_mgmt_config"/> <field name="type">automatic</field> </record> </data> |