From 4845b56f3623ec618e33e4941edb33a97296867e Mon Sep 17 00:00:00 2001
From: Sergi Almacellas Abellana <sergi@koolpi.com>
Date: Mon, 27 Nov 2017 10:38:12 +0100
Subject: [PATCH] Use translated values when exporting Reference and Selection
 fields

issue6961
review37841002
---
 CHANGELOG     |  2 ++
 src/window.js | 11 ++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 8633156e39..cfeac1589e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,5 @@
+* Use translated values when exporting Reference and Selection fields
+
 Version 4.6.0 - 2017-10-30
 * Bug fixes (see mercurial logs for details)
 * Allow to export model and record name of Reference fields
diff --git a/src/window.js b/src/window.js
index bc65269d2a..f73881813d 100644
--- a/src/window.js
+++ b/src/window.js
@@ -1328,8 +1328,17 @@
             this.context = context;
             Sao.Window.Export._super.init.call(this,
                 Sao.i18n.gettext('Export to CSV')).then(function() {
+                    var fields = this.screen.model.fields;
                     names.forEach(function(name) {
-                        this.sel_field(name);
+                        var type = fields[name].description.type;
+                        if (type == 'selection') {
+                            this.sel_field(name + '.translated');
+                        } else if (type == 'reference') {
+                            this.sel_field(name + '.translated');
+                            this.sel_field(name + '/rec_name');
+                        } else {
+                            this.sel_field(name);
+                        }
                     }.bind(this));
                 }.bind(this));