diff options
| author | Purnendu Singh (OpenERP) <psi@tinyerp.com> | 2012-08-06 11:41:13 +0530 |
|---|---|---|
| committer | Purnendu Singh (OpenERP) <psi@tinyerp.com> | 2012-08-06 11:41:13 +0530 |
| commit | 2bbdc47dc8d791cd502c8fc37ec9a5273ee10292 (patch) | |
| tree | bc8dbba2cad6cc3eb2d9b343b1552d53698b6987 /addons/document_ftp | |
| parent | d72386f18fff4abc3e7dcd2b9223a25028375a19 (diff) | |
| parent | 0d2d7ee5855ecbd463ccc6fd902f3af54c504410 (diff) | |
[MERGE] merge with main addons
bzr revid: psi@tinyerp.com-20120806061113-1ck1nrda2sdq06im
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> |