summaryrefslogtreecommitdiff
path: root/addons/document
diff options
context:
space:
mode:
authorRandhir Mayatra (OpenERP) <rma@tinyerp.com>2012-11-19 16:38:24 +0530
committerRandhir Mayatra (OpenERP) <rma@tinyerp.com>2012-11-19 16:38:24 +0530
commitd23c5c8dca985dd0fde280c9237dee85b7bb4d7a (patch)
treecf03bc2a74a1d9e93b5ef571fb78070c09c9857b /addons/document
parentf4ab81afb8285a8157258232c5fb2a6745ae7f72 (diff)
parent66afff1b52b7ab6ab8c340e18960fb6367cfb714 (diff)
[MERGE]merge with trunk
bzr revid: rma@tinyerp.com-20121119110824-rj4y32rfbszqln7g
Diffstat (limited to 'addons/document')
-rw-r--r--addons/document/nodes.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/addons/document/nodes.py b/addons/document/nodes.py
index 6bcb2237a9e..aeb2e64fc97 100644
--- a/addons/document/nodes.py
+++ b/addons/document/nodes.py
@@ -823,6 +823,7 @@ class node_res_dir(node_class):
uid = self.context.uid
ctx = self.context.context.copy()
ctx.update(self.dctx)
+ ctx.update(self.context.extra_ctx)
where = []
if self.domain:
app = safe_eval(self.domain, ctx)