summaryrefslogtreecommitdiff
path: root/addons/document/directory_content.py
diff options
context:
space:
mode:
authorrpa (Open ERP) <rpa@tinyerp.com>2010-12-20 13:52:55 +0530
committerrpa (Open ERP) <rpa@tinyerp.com>2010-12-20 13:52:55 +0530
commit4e307d022c8fbdba848b8a4f57d668a4b6bd036f (patch)
tree249f8361bac695c0bec0c844d964194202d680a0 /addons/document/directory_content.py
parent6e34e7c52a3f37876b627fb5c80ac79d3c614807 (diff)
parentc2f85df411949653257c5b51f1578a1e40709510 (diff)
[MERGE]: Merge with lp:openobject-addons
bzr revid: rpa@tinyerp.com-20101215042654-04ccazkz5v57ml3j bzr revid: rpa@tinyerp.com-20101216043335-ji5h61dra451cml4 bzr revid: rpa@tinyerp.com-20101220082255-1g3ea50rkjlacwqw
Diffstat (limited to 'addons/document/directory_content.py')
-rw-r--r--addons/document/directory_content.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/document/directory_content.py b/addons/document/directory_content.py
index 685df7910f3..e690e50d4b4 100644
--- a/addons/document/directory_content.py
+++ b/addons/document/directory_content.py
@@ -44,7 +44,7 @@ class document_directory_content(osv.osv):
_name = 'document.directory.content'
_description = 'Directory Content'
_order = "sequence"
- def _extension_get(self, cr, uid, context={}):
+ def _extension_get(self, cr, uid, context=None):
cr.execute('select code,name from document_directory_content_type where active')
res = cr.fetchall()
return res
@@ -112,7 +112,7 @@ class document_directory_content(osv.osv):
def process_read(self, cr, uid, node, context=None):
if node.extension != '.pdf':
raise Exception("Invalid content: %s" % node.extension)
- report = self.pool.get('ir.actions.report.xml').browse(cr, uid, node.report_id)
+ report = self.pool.get('ir.actions.report.xml').browse(cr, uid, node.report_id, context=context)
srv = netsvc.Service._services['report.'+report.report_name]
ctx = node.context.context.copy()
ctx.update(node.dctx)