summaryrefslogtreecommitdiff
path: root/addons/document_ftp
diff options
context:
space:
mode:
authorksa (OpenERP) <ksa@tinyerp.com>2012-01-25 16:12:30 +0530
committerksa (OpenERP) <ksa@tinyerp.com>2012-01-25 16:12:30 +0530
commitb48a5d8fdecb2e77efe00584ec70b9b67df85cd6 (patch)
treea170e1118e6c625c64b4f87211715c06de4c37df /addons/document_ftp
parentd9099165a3ebb11e0078c046a814ae4c51940cde (diff)
parent1f8536a33459d732a9ad372f0da78d0606bbc053 (diff)
[MERGE]:with latest addons
bzr revid: ksa@tinyerp.com-20120125104230-jflz8eoj5w1uvfqg
Diffstat (limited to 'addons/document_ftp')
-rw-r--r--addons/document_ftp/wizard/ftp_browse.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/document_ftp/wizard/ftp_browse.py b/addons/document_ftp/wizard/ftp_browse.py
index e8f127c3c3b..b1120bc6511 100644
--- a/addons/document_ftp/wizard/ftp_browse.py
+++ b/addons/document_ftp/wizard/ftp_browse.py
@@ -21,7 +21,7 @@
from osv import osv, fields
# from tools.translate import _
-from document_ftp import ftpserver
+from .. import ftpserver
class document_ftp_browse(osv.osv_memory):
_name = 'document.ftp.browse'