Merge lp:~unifield-team/unifield-server/uf-868 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/base/res/res_log.py'
--- bin/addons/base/res/res_log.py	2012-01-09 08:49:34 +0000
+++ bin/addons/base/res/res_log.py	2012-05-15 14:51:24 +0000
@@ -28,6 +28,7 @@
         'user_id': fields.many2one('res.users','User'),
         'res_model': fields.char('Object', size=128, select=1),
         'context': fields.text('Context'),
+        'domain': fields.text('Domain'),
         'res_id': fields.integer('Object ID'),
         'secondary': fields.boolean('Secondary Log', help='Do not display this log if it belongs to the same object the user is working on'),
         'create_date': fields.datetime('Creation Date', readonly=True, select=1),
@@ -36,6 +37,7 @@
     _defaults = {
         'user_id': lambda self,cr,uid,ctx: uid,
         'context': "{}",
+        'domain': "[]",
         'read': False,
     }
     _order='create_date desc'
@@ -61,9 +63,8 @@
     def get(self, cr, uid, context=None):
         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','context'],
-            context=context)
+        list_of_fields = ['name','res_model','res_id','context', 'domain']
+        res = self.read(cr, uid, unread_log_ids, list_of_fields, context=context)
         res.reverse()
         result = []
         res_dict = {}