Merge lp:~openerp-dev/openobject-server/6.0-opw-5961-rha into lp:openobject-server/6.0

[Rifakat Husen (OpenERP)]

report: resolved printing problem for child company in multi company environment

[Jay Vora (Serpent Consulting Services) (jayvora)]

review: Approve

=== modified file 'bin/report/report_sxw.py'
--- bin/report/report_sxw.py	2011-01-10 13:28:32 +0000
+++ bin/report/report_sxw.py	2011-06-09 11:49:24 +0000
@@ -230,16 +230,7 @@
         self.lang_dict_called = False
         for obj in self.objects:
             obj._context['lang'] = lang
-            for table in obj._cache:
-                for id in obj._cache[table]:
-                    self._lang_cache.setdefault(obj._context['lang'], {}).setdefault(table,
-                            {}).update(obj._cache[table][id])
-                    if lang in self._lang_cache \
-                            and table in self._lang_cache[lang] \
-                            and id in self._lang_cache[lang][table]:
-                        obj._cache[table][id] = self._lang_cache[lang][table][id]
-                    else:
-                        obj._cache[table][id] = {'id': id}
+        return True
 
     def _get_lang_dict(self):
         pool_lang = self.pool.get('res.lang')