From 3108df45f3bbfade61e8b88c7dcc55c83b20cf29 Mon Sep 17 00:00:00 2001
From: "sma@tinyerp.com" <>
Date: Thu, 21 Oct 2010 16:45:46 +0200
Subject: [PATCH] [IMP] orm,res.log: better handling of context in res.log
 entries

bzr revid: odo@openerp.com-20101021144546-1vetgysw0cljvppc
---
 bin/addons/base/res/res_log.py |  2 +-
 bin/osv/orm.py                 | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/bin/addons/base/res/res_log.py b/bin/addons/base/res/res_log.py
index 3b78063bdf4..8ac53acae6b 100644
--- a/bin/addons/base/res/res_log.py
+++ b/bin/addons/base/res/res_log.py
@@ -55,7 +55,7 @@ class res_log(osv.osv):
         unread_log_ids = self.search(cr, uid,
             [('user_id','=',uid), ('read', '=', False)], context=context)
         res = self.read(cr, uid, unread_log_ids,
-            ['name','res_model','res_id'],
+            ['name','res_model','res_id','context'],
             context=context)
         res.reverse()
         result = []
diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 5f31771c90b..da06f5ff823 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -386,11 +386,14 @@ class orm_template(object):
 
     CONCURRENCY_CHECK_FIELD = '__last_update'
     def log(self, cr, uid, id, message, secondary=False, context=None):
-        return self.pool.get('res.log').create(cr, uid, {
-            'name': message,
-            'res_model': self._name,
-            'secondary': secondary,
-            'res_id': id},
+        return self.pool.get('res.log').create(cr, uid,
+                {
+                    'name': message,
+                    'res_model': self._name,
+                    'secondary': secondary,
+                    'res_id': id,
+                    'context': context,
+                },
                 context=context
         )