summaryrefslogtreecommitdiff
path: root/addons/document
diff options
context:
space:
mode:
authorThibault Delavallée <tde@openerp.com>2012-11-12 11:50:22 +0100
committerThibault Delavallée <tde@openerp.com>2012-11-12 11:50:22 +0100
commite45a70df87e22b2c6fb09bbfc471abf74ef5acfc (patch)
treec04e0a47ad83d5263789f03a7d1d2c220e23344e /addons/document
parent6bf37ebb14efb38b1514b5b5cab809713c20ab6e (diff)
parentf033fddba04e192f7607bf3adb0652b9520b8332 (diff)
[MERGE] Sync with trunk.
bzr revid: tde@openerp.com-20121112105022-lnr1cx6mmxlertoe
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)