From df5aa330221445ca2bec5842b88e99e7d97e9bdf Mon Sep 17 00:00:00 2001 From: Eric Date: Sun, 20 Jan 2019 15:25:24 +0100 Subject: [PATCH] =?UTF-8?q?add=20html=5Fentity=5Fdecode=20on=20fields=20fo?= =?UTF-8?q?r=20export=20process=20(for=20example=20´=20->=20=C3=A9)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/accountancy/journal/bankjournal.php | 25 +++++++++++----------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php index 40fca78ab3b..0a80dc85ef9 100644 --- a/htdocs/accountancy/journal/bankjournal.php +++ b/htdocs/accountancy/journal/bankjournal.php @@ -8,7 +8,8 @@ * Copyright (C) 2013-2014 Florian Henry * Copyright (C) 2013-2014 Olivier Geffroy * Copyright (C) 2017-2018 Frédéric France - * Copyright (C) 2018 Ferran Marcet + * Copyright (C) 2018 Ferran Marcet + * Copyright (C) 2018 Eric Seigne * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -785,17 +786,17 @@ if ($action == 'exportcsv') { // ISO and not UTF8 ! include DOL_DOCUMENT_ROOT . '/accountancy/tpl/export_journal.tpl.php'; // CSV header line - print '"' . $langs->trans("BankId").'"' . $sep; - print '"' . $langs->trans("Date") . '"' . $sep; - print '"' . $langs->trans("PaymentMode") . '"' . $sep; - print '"' . $langs->trans("AccountAccounting") . '"' . $sep; - print '"' . $langs->trans("LedgerAccount") . '"' . $sep; - print '"' . $langs->trans("SubledgerAccount") . '"' . $sep; - print '"' . $langs->trans("Label"). '"' . $sep; - print '"' . $langs->trans("Debit") . '"' . $sep; - print '"' . $langs->trans("Credit") . '"' . $sep; - print '"' . $langs->trans("Journal") . '"' . $sep; - print '"' . $langs->trans("Note") . '"' . $sep; + print '"' . html_entity_decode($langs->trans("BankId")).'"' . $sep; + print '"' . html_entity_decode($langs->trans("Date")) . '"' . $sep; + print '"' . html_entity_decode($langs->trans("PaymentMode")) . '"' . $sep; + print '"' . html_entity_decode($langs->trans("AccountAccounting")) . '"' . $sep; + print '"' . html_entity_decode($langs->trans("LedgerAccount")) . '"' . $sep; + print '"' . html_entity_decode($langs->trans("SubledgerAccount")) . '"' . $sep; + print '"' . html_entity_decode($langs->trans("Label")). '"' . $sep; + print '"' . html_entity_decode($langs->trans("Debit")) . '"' . $sep; + print '"' . html_entity_decode($langs->trans("Credit")) . '"' . $sep; + print '"' . html_entity_decode($langs->trans("Journal")) . '"' . $sep; + print '"' . html_entity_decode($langs->trans("Note")) . '"' . $sep; print "\n";