Merge lp:~therp-nl/openerp-web/6.1-fix988438-export_all_data_give_name_get into lp:openerp-web/6.1

[Stefan Rijnhart (Opener)]

'Export all data' to give the result of name_get(), not the xml id

Unmerged revisions

2457. By Stefan Rijnhart (Opener) on 2012-09-13

[FIX] 'Export all data' to give name_get() of related records, not xml id

=== modified file 'addons/web/controllers/main.py'
--- addons/web/controllers/main.py	2012-08-31 11:34:18 +0000
+++ addons/web/controllers/main.py	2012-09-13 09:58:21 +0000
@@ -1620,7 +1620,8 @@
 
             if len(name.split('/')) < 3 and 'relation' in field:
                 ref = field.pop('relation')
-                record['value'] += '/id'
+                if import_compat:
+                    record['value'] += '/id'
                 record['params'] = {'model': ref, 'prefix': id, 'name': name}
 
                 if not import_compat or field['type'] == 'one2many':