From ab8a993c85d3248d943e79b89b77dcda0f264cd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Sun, 7 May 2023 10:08:24 +0200
Subject: [PATCH] Use locale timezone to export CSV in locale format

Closes #12224
---
 sao/CHANGELOG                          | 1 +
 sao/src/window.js                      | 4 +++-
 tryton/CHANGELOG                       | 1 +
 tryton/tryton/gui/window/win_export.py | 1 +
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/sao/CHANGELOG b/sao/CHANGELOG
index 5202d920ae..0e7c42fc6f 100644
--- a/sao/CHANGELOG
+++ b/sao/CHANGELOG
@@ -1,3 +1,4 @@
+* Use locale timezone for CSV in locale format
 
 Version 6.8.0 - 2023-05-01
 --------------------------
diff --git a/sao/src/window.js b/sao/src/window.js
index 98ff6a0e94..9dc762a0e8 100644
--- a/sao/src/window.js
+++ b/sao/src/window.js
@@ -2250,7 +2250,7 @@
         line.forEach(function(val, i) {
             if (locale_format) {
                 if (val.isDateTime) {
-                    val = val.format(
+                    val = val.local().format(
                         Sao.common.date_format() + ' ' +
                         Sao.common.moment_format('%X'));
                 } else if (val.isDate) {
@@ -2265,6 +2265,8 @@
                             'maximumFractionDigits': 20,
                         });
                 }
+            } else if (val.isDateTime) {
+                val = val.utc();
             } else if (val.isTimeDelta) {
                 val = val.asSeconds();
             } else if (typeof(val) == 'boolean') {
diff --git a/tryton/CHANGELOG b/tryton/CHANGELOG
index 8a8dc26ac1..a684949667 100644
--- a/tryton/CHANGELOG
+++ b/tryton/CHANGELOG
@@ -1,3 +1,4 @@
+* Use locale timezone for CSV in locale format
 * Display sum on column header
 
 Version 6.8.0 - 2023-05-01
diff --git a/tryton/tryton/gui/window/win_export.py b/tryton/tryton/gui/window/win_export.py
index e4e3faaf5c..a2783dc5df 100644
--- a/tryton/tryton/gui/window/win_export.py
+++ b/tryton/tryton/gui/window/win_export.py
@@ -433,6 +433,7 @@ class WinExport(WinCSV):
                 if isinstance(val, Number):
                     val = locale.str(val)
                 elif isinstance(val, datetime.datetime):
+                    val = common.timezoned_date(val)
                     val = val.strftime(common.date_format() + ' %X')
                 elif isinstance(val, datetime.date):
                     val = val.strftime(common.date_format())