diff options
| author | rpa (Open ERP) <rpa@tinyerp.com> | 2010-12-16 11:23:48 +0530 |
|---|---|---|
| committer | rpa (Open ERP) <rpa@tinyerp.com> | 2010-12-16 11:23:48 +0530 |
| commit | 7d5e28fbb8d49b8a2825bfdd525938d99574e234 (patch) | |
| tree | c1e90a7757ef2b3fee2190a44a4f7d448707d23b /addons/document_webdav | |
| parent | 953a15d2a7391370414462402198780b06d45243 (diff) | |
| parent | 4e307d022c8fbdba848b8a4f57d668a4b6bd036f (diff) | |
[MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons2
bzr revid: rpa@tinyerp.com-20101216055348-7yrvv48hjq15grv9
Diffstat (limited to 'addons/document_webdav')
| -rw-r--r-- | addons/document_webdav/document_webdav.py | 2 | ||||
| -rw-r--r-- | addons/document_webdav/i18n/document_webdav.pot | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/addons/document_webdav/document_webdav.py b/addons/document_webdav/document_webdav.py index 2e1eb8cabd2..d2107e4f927 100644 --- a/addons/document_webdav/document_webdav.py +++ b/addons/document_webdav/document_webdav.py @@ -45,7 +45,7 @@ class document_davdir(osv.osv): else: raise ValueError("dir node for %s type", dbro.type) - def _prepare_context(self, cr, uid, nctx, context): + def _prepare_context(self, cr, uid, nctx, context=None): nctx.node_file_class = nodes.node_file # We can fill some more fields, but avoid any expensive function # that might be not worth preparing. diff --git a/addons/document_webdav/i18n/document_webdav.pot b/addons/document_webdav/i18n/document_webdav.pot index 639e07570a3..95b1d17fb25 100644 --- a/addons/document_webdav/i18n/document_webdav.pot +++ b/addons/document_webdav/i18n/document_webdav.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 6.0.0-rc1\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2010-12-03 15:43:30+0000\n" -"PO-Revision-Date: 2010-12-03 15:43:30+0000\n" +"POT-Creation-Date: 2010-12-15 15:05:17+0000\n" +"PO-Revision-Date: 2010-12-15 15:05:17+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" |