From 8064fdb5c7ceaa384f583d75f3a2e6917b7df8b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Sat, 2 Apr 2016 15:36:11 +0200
Subject: [PATCH] Don't override action context by current context

issue4303
review17211002
---
 tryton/action/main.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tryton/action/main.py b/tryton/action/main.py
index 7d095c3de1..64900ea474 100644
--- a/tryton/action/main.py
+++ b/tryton/action/main.py
@@ -100,10 +100,11 @@ class Action(object):
             ctx.update(rpc.CONTEXT)
             ctx['_user'] = rpc._USER
             decoder = PYSONDecoder(ctx)
-            action_ctx = decoder.decode(action.get('pyson_context') or '{}')
+            action_ctx = context.copy()
+            action_ctx.update(
+                decoder.decode(action.get('pyson_context') or '{}'))
             ctx.update(action_ctx)
             ctx.update(context)
-            action_ctx.update(context)
 
             ctx['context'] = ctx
             decoder = PYSONDecoder(ctx)