Merge lp:~therp-nl/therp-backports/server61-lp950948-allow_crafted_export_xml_ids into lp:therp-backports/server-6.1

[Stefan Rijnhart (Opener)]

[lp:~therp-nl/therp-backports/server61-lp950948-allow_crafted_export_xml_ids]

4291. By Stefan Rijnhart (Opener) on 2012-10-14

[FIX] Crafted export xml ids are based on table names, not model names

=== modified file 'openerp/osv/orm.py'
--- openerp/osv/orm.py	2012-09-24 14:00:07 +0000
+++ openerp/osv/orm.py	2012-10-14 19:12:21 +0000
@@ -1265,7 +1265,15 @@
                     module, xml_id = id.rsplit('.', 1)
                 else:
                     module, xml_id = current_module, id
-                record_id = ir_model_data_obj._get_id(cr, uid, module, xml_id)
+                try:                  
+                    record_id = ir_model_data_obj._get_id(cr, uid, module, xml_id)
+                except ValueError, e:
+                    id_parts = xml_id.split('_')
+                    obj_model = self.pool.get(model_name)
+                    if not (module == '__export__' and
+                            obj_model._table == '_'.join(id_parts[:-1])):
+                        raise
+                    return _get_id(model_name, id_parts[-1], mode='.id')
                 ir_model_data = ir_model_data_obj.read(cr, uid, [record_id], ['res_id'])
                 if not ir_model_data:
                     raise ValueError('No references to %s.%s' % (module, xml_id))