From 0ecb71f390bfdd1416e37aeb647b120fe8f86f63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Thu, 23 Jun 2011 16:47:21 +0200
Subject: [PATCH] Fix multi-company of Property when using root

If user is root, we must use the user in context

issue2054
review41006
---
 company.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/company.py b/company.py
index dd5d782046..07496be936 100644
--- a/company.py
+++ b/company.py
@@ -207,7 +207,10 @@ class Property(ModelSQL, ModelView):
 
     def _set_values(self, name, model, res_id, val, field_id):
         user_obj = self.pool.get('res.user')
-        user = user_obj.browse(Transaction().user)
+        user_id = Transaction().user
+        if user_id == 0:
+            user_id = Transaction().context.get('user', user_id)
+        user = user_obj.browse(user_id)
         res = super(Property, self)._set_values(name, model, res_id, val, 
                 field_id)
         if user: