Merge lp:~openerp-commiter/openobject-server/trunk-bug-927669-rma into lp:openobject-server

[Randhir Mayatra (OpenERP)]

Hello,
Merge Proposal contains bug fix of lp:927669 ;trace-back when open the Planing of users in Project Module

Steps to reproduce a problem:
---------------------------
- Install Project Module
- add a user in Planning of users in a project phase.
- Go in gantt view (in Planning of users)
- Ids of users are displayed instead of name of the planning we we're adding the lines on.

Kindly review this.
Thank You

[lp:~openerp-commiter/openobject-server/trunk-bug-927669-rma]

4182. By Turkesh Patel (openERP) on 2012-09-21

[MRG] merge with lp:openobject-server

Unmerged revisions

4182. By Turkesh Patel (openERP) on 2012-09-21

[MRG] merge with lp:openobject-server

4181. By Randhir Mayatra (OpenERP) on 2012-05-31

[FIX] base : name_get() gives error in project, planing of users

4180. By Randhir Mayatra (OpenERP) on 2012-05-31

[FIX] base : name_get() gives error in project, planing of users

=== modified file 'openerp/osv/orm.py'
--- openerp/osv/orm.py	2012-09-20 14:55:19 +0000
+++ openerp/osv/orm.py	2012-09-21 06:56:19 +0000
@@ -2290,14 +2290,16 @@
             return []
         if isinstance(ids, (int, long)):
             ids = [ids]
-
-        if self._rec_name in self._all_columns:
-            rec_name_column = self._all_columns[self._rec_name].column
-            return [(r['id'], rec_name_column.as_display_name(cr, user, self, r[self._rec_name], context=context))
-                        for r in self.read(cr, user, ids, [self._rec_name],
-                                       load='_classic_write', context=context)]
-        return [(id, "%s,%s" % (self._name, id)) for id in ids]
-
+        result = []
+        for res in self.read(cr, user, ids, [self._rec_name], context, load = '_classic_write'):
+            if self._columns.get(self._rec_name) and self._columns.get(self._rec_name)._type =='many2one':
+                obj_pool = self.pool.get(self._columns.get(self._rec_name)._obj)
+                read = obj_pool.read(cr, user, int(res[self._rec_name]), [obj_pool._rec_name], context, load = '_classic_write')
+                result.append((res['id'], read[obj_pool._rec_name]))
+            else :
+                result.append((res['id'], res[self._rec_name]))
+        return result
+        
     def name_search(self, cr, user, name='', args=None, operator='ilike', context=None, limit=100):
         """Search for records that have a display name matching the given ``name`` pattern if compared
            with the given ``operator``, while also matching the optional search domain (``args``).