[FIX]Import failed

bzr revid: dle@openerp.com-20121219171308-5sdy52hpyn9gxpv7

diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py
index 9f67740..759d676 100644 (file)
--- a/addons/document_webdav/dav_fs.py
+++ b/addons/document_webdav/dav_fs.py
@@ -39,7 +39,10 @@ except ImportError:
 import openerp
 from openerp import pooler, sql_db, netsvc
 from openerp.tools import misc
-from openerp.addons.document.dict_tools import dict_merge2
+try:
+    from tools.dict_tools import dict_merge2
+except ImportError:
+    from document.dict_tools import dict_merge2
 
 from cache import memoize
 from webdav import mk_lock_response