[MERGE] trunk

bzr revid: al@openerp.com-20121218140311-1rw9bqc1nwztfobb

7 files changed, 12 insertions, 14 deletions

diff --git a/addons/document_ftp/ftpserver/__init__.py b/addons/document_ftp/ftpserver/__init__.py
index 59aff85c633..b5ada070c84 100644
--- a/addons/document_ftp/ftpserver/__init__.py
+++ b/addons/document_ftp/ftpserver/__init__.py
@@ -24,7 +24,7 @@ import ftpserver
 import authorizer
 import abstracted_fs
 import logging
-from tools import config
+from openerp.tools import config
 _logger = logging.getLogger(__name__)
 def start_server():
     HOST = config.get('ftp_server_host', '127.0.0.1')
diff --git a/addons/document_ftp/ftpserver/abstracted_fs.py b/addons/document_ftp/ftpserver/abstracted_fs.py
index dd393f1b1e9..a9efac5819c 100644
--- a/addons/document_ftp/ftpserver/abstracted_fs.py
+++ b/addons/document_ftp/ftpserver/abstracted_fs.py
@@ -9,12 +9,10 @@ import errno
 import glob
 import fnmatch
 
-import pooler
-import netsvc
-import sql_db
+from openerp import pooler, netsvc, sql_db
+from openerp.service import security
+from openerp.osv import osv
 
-from service import security
-from osv import osv
 from document.document import get_node_context
 
 def _get_month_name(month):
diff --git a/addons/document_ftp/i18n/it.po b/addons/document_ftp/i18n/it.po
index 3cffb9d41be..9d611f8fc69 100644
--- a/addons/document_ftp/i18n/it.po
+++ b/addons/document_ftp/i18n/it.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-16 04:48+0000\n"
+"X-Launchpad-Export-Date: 2012-12-17 04:47+0000\n"
 "X-Generator: Launchpad (build 16372)\n"
 
 #. module: document_ftp
diff --git a/addons/document_ftp/res_config.py b/addons/document_ftp/res_config.py
index 374368d60bd..93b3aa69974 100644
--- a/addons/document_ftp/res_config.py
+++ b/addons/document_ftp/res_config.py
@@ -19,8 +19,8 @@
 #
 ##############################################################################
 
-from osv import fields, osv
-from tools import config
+from openerp.osv import fields, osv
+from openerp.tools import config
 
 class documnet_ftp_setting(osv.osv_memory):
     _name = 'knowledge.config.settings'
diff --git a/addons/document_ftp/test_easyftp.py b/addons/document_ftp/test_easyftp.py
index bb4e5ea6648..1ab808c3acc 100644
--- a/addons/document_ftp/test_easyftp.py
+++ b/addons/document_ftp/test_easyftp.py
@@ -25,7 +25,7 @@
 """
 
 from ftplib import FTP
-from tools import config
+from openerp.tools import config
 
 def get_plain_ftp(timeout=10.0):
     ftp = FTP()
diff --git a/addons/document_ftp/wizard/ftp_browse.py b/addons/document_ftp/wizard/ftp_browse.py
index 8260424d653..ceb7d1a60e5 100644
--- a/addons/document_ftp/wizard/ftp_browse.py
+++ b/addons/document_ftp/wizard/ftp_browse.py
@@ -19,8 +19,8 @@
 #
 ##############################################################################
 
-from osv import osv, fields
-# from tools.translate import _
+from openerp.osv import fields, osv
+# from openerp.tools.translate import _
 from .. import ftpserver
 
 class document_ftp_browse(osv.osv_memory):
diff --git a/addons/document_ftp/wizard/ftp_configuration.py b/addons/document_ftp/wizard/ftp_configuration.py
index d0679973c5a..87aaa2331b4 100644
--- a/addons/document_ftp/wizard/ftp_configuration.py
+++ b/addons/document_ftp/wizard/ftp_configuration.py
@@ -19,8 +19,8 @@
 #
 ##############################################################################
 
-from osv import osv, fields
-from tools import config
+from openerp.osv import fields, osv
+from openerp.tools import config
 
 class document_ftp_configuration(osv.osv_memory):