diff options
| author | dle@openerp.com <> | 2012-12-19 18:13:08 +0100 |
|---|---|---|
| committer | dle@openerp.com <> | 2012-12-19 18:13:08 +0100 |
| commit | eabc5b0dde75d176e7abae4be40b68479d9ba294 (patch) | |
| tree | 540dc7a5e5e20fbb20f5d3c182599682a9e20a15 /addons/document_webdav | |
| parent | 7a627b581062ea55178448480d7ed9f7ee36a6e0 (diff) | |
[FIX]Import failed
bzr revid: dle@openerp.com-20121219171308-5sdy52hpyn9gxpv7
Diffstat (limited to 'addons/document_webdav')
| -rw-r--r-- | addons/document_webdav/dav_fs.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py index 9f677400dd8..759d6764b47 100644 --- 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 |