Merge lp:~openerp-dev/openobject-server/6.0-opw-575229-cbi into lp:openobject-server/6.0

[Chris Biersbach (OpenERP)]

Bugfix: Changed copy_translations in orm.py to correctly pick the ID of the object correpsonding to an inherited field when copying the translations.
This bug is also present from 5.0 onwards

To reproduce the bug (in 5.0):

1) Install event module
2) Choose Belgium PCMN
3) Load an official translation: French
4) Change french translation of an event
5) Duplicate event
    -> Translation was not duplicated!

Unmerged revisions

3636. By Chris Biersbach (OpenERP) on 2012-08-31

[FIX] OPW 575229: ORM: Fixed copy_translations to take ID of _inherits field instead of object ID (forward-port of 5.0 fix)

=== modified file 'bin/osv/orm.py'
--- bin/osv/orm.py	2012-06-19 08:29:38 +0000
+++ bin/osv/orm.py	2012-08-31 11:03:05 +0000
@@ -4202,20 +4202,23 @@
             # and for translatable fields we keep them for copy
             elif field_def.get('translate'):
                 trans_name = ''
+                old_id_to_copy, new_id_to_copy = old_id, new_id
                 if field_name in self._columns:
                     trans_name = self._name + "," + field_name
                 elif field_name in self._inherit_fields:
                     trans_name = self._inherit_fields[field_name][0] + "," + field_name
+                    parent_field = self._inherit_fields[field_name][1]
+                    old_parent_id, new_parent_id = self.read(cr, uid, [old_id, new_id], [parent_field])
+                    old_id_to_copy, new_id_to_copy = old_parent_id[parent_field][0], new_parent_id[parent_field][0]
                 if trans_name:
                     trans_ids = trans_obj.search(cr, uid, [
                             ('name', '=', trans_name),
-                            ('res_id', '=', old_id)
-                    ])
-                    translation_records.extend(trans_obj.read(cr, uid, trans_ids, context=context))
+                            ('res_id','=', old_id_to_copy)                    ])
+                    trans_records = trans_obj.read(cr,uid,trans_ids,context=context)
+                    translation_records.extend(dict(t, res_id=new_id_to_copy) for t in trans_records) 
 
         for record in translation_records:
             del record['id']
-            record['res_id'] = new_id
             trans_obj.create(cr, uid, record, context=context)