odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX]Import failed 

bzr revid: dle@openerp.com-20121219171308-5sdy52hpyn9gxpv7
This commit is contained in:
dle@openerp.com 2012-12-19 18:13:08 +01:00
parent 7a627b5810
commit eabc5b0dde
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/document_webdav/dav_fs.py
View File

@ -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