diff --git a/addons/document_ftp/__init__.py b/addons/document_ftp/__init__.py index 7ba25cb0540..e7e4a647563 100644 --- a/addons/document_ftp/__init__.py +++ b/addons/document_ftp/__init__.py @@ -18,9 +18,11 @@ # along with this program. If not, see . # ############################################################################## + import ftpserver import wizard import res_config + post_load = ftpserver.start_server # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/document_ftp/res_config.py b/addons/document_ftp/res_config.py index 724b59afafe..ccde965b7ae 100644 --- a/addons/document_ftp/res_config.py +++ b/addons/document_ftp/res_config.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- ############################################################################## # -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2010 Tiny SPRL (). +# OpenERP, Open Source Business Applications +# Copyright (C) 2004-2012 OpenERP S.A. (). # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -26,8 +26,8 @@ class documnet_ftp_setting(osv.osv_memory): _name = 'knowledge.configuration' _inherit = 'knowledge.configuration' _columns = { - 'url': fields.char('Browse Documents',size=64, - help ="""It allow to browse the document from the relative URL""", readonly=True), + 'document_ftp_url': fields.char('Browse Documents',size=64, + help ="""It allow to browse the document from the relative URL""", readonly=True), } def get_default_ftp_config(self, cr, uid, ids, context=None): @@ -45,5 +45,6 @@ class documnet_ftp_setting(osv.osv_memory): url = url[:-1] else: url = '%s:%s' %(ftpserver.HOST, ftpserver.PORT) - return {'url':'ftp://%s@%s'%(current_user.login, url)} -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file + return {'document_ftp_url':'ftp://%s@%s'%(current_user.login, url)} + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/document_ftp/res_config_view.xml b/addons/document_ftp/res_config_view.xml index 159c0cf1025..19a152b5688 100644 --- a/addons/document_ftp/res_config_view.xml +++ b/addons/document_ftp/res_config_view.xml @@ -1,17 +1,14 @@ - Knowledge Application knowledge.configuration form - + - - - - - + + +