lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use transnoentitiesnoconv instead of html_entity_decode

Browse Source
This commit is contained in:
Eric 2019-01-20 20:55:59 +01:00
parent 88efc830fe
commit 71f7aa9503
2 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
htdocs/accountancy/journal/bankjournal.php
View File

@ -786,17 +786,17 @@ if ($action == 'exportcsv') { // ISO and not UTF8 !
include DOL_DOCUMENT_ROOT . '/accountancy/tpl/export_journal.tpl.php'; include DOL_DOCUMENT_ROOT . '/accountancy/tpl/export_journal.tpl.php';
// CSV header line // CSV header line
print '"' . html_entity_decode($langs->trans("BankId")).'"' . $sep; print '"' . $langs->transnoentitiesnoconv("BankId").'"' . $sep;
print '"' . html_entity_decode($langs->trans("Date")) . '"' . $sep; print '"' . $langs->transnoentitiesnoconv("Date") . '"' . $sep;
print '"' . html_entity_decode($langs->trans("PaymentMode")) . '"' . $sep; print '"' . $langs->transnoentitiesnoconv("PaymentMode") . '"' . $sep;
print '"' . html_entity_decode($langs->trans("AccountAccounting")) . '"' . $sep; print '"' . $langs->transnoentitiesnoconv("AccountAccounting") . '"' . $sep;
print '"' . html_entity_decode($langs->trans("LedgerAccount")) . '"' . $sep; print '"' . $langs->transnoentitiesnoconv("LedgerAccount") . '"' . $sep;
print '"' . html_entity_decode($langs->trans("SubledgerAccount")) . '"' . $sep; print '"' . $langs->transnoentitiesnoconv("SubledgerAccount") . '"' . $sep;
print '"' . html_entity_decode($langs->trans("Label")). '"' . $sep; print '"' . $langs->transnoentitiesnoconv("Label"). '"' . $sep;
print '"' . html_entity_decode($langs->trans("Debit")) . '"' . $sep; print '"' . $langs->transnoentitiesnoconv("Debit") . '"' . $sep;
print '"' . html_entity_decode($langs->trans("Credit")) . '"' . $sep; print '"' . $langs->transnoentitiesnoconv("Credit") . '"' . $sep;
print '"' . html_entity_decode($langs->trans("Journal")) . '"' . $sep; print '"' . $langs->transnoentitiesnoconv("Journal") . '"' . $sep;
print '"' . html_entity_decode($langs->trans("Note")) . '"' . $sep; print '"' . $langs->transnoentitiesnoconv("Note") . '"' . $sep;
print "\n"; print "\n";

13
htdocs/accountancy/journal/expensereportsjournal.php
View File

@ -434,13 +434,12 @@ if ($action == 'exportcsv') { // ISO and not UTF8 !
include DOL_DOCUMENT_ROOT . '/accountancy/tpl/export_journal.tpl.php'; include DOL_DOCUMENT_ROOT . '/accountancy/tpl/export_journal.tpl.php';
// CSV header line // CSV header line
print '"' . $langs->trans("Date") . '"' . $sep; print '"' . $langs->transnoentitiesnoconv("Date") . '"' . $sep;
print '"' . html_entity_decode($langs->trans("Piece")) . '"' . $sep; print '"' . $langs->transnoentitiesnoconv("Piece") . '"' . $sep;
print '"' . html_entity_decode($langs->trans("AccountAccounting")) . '"' . $sep; print '"' . $langs->transnoentitiesnoconv("AccountAccounting") . '"' . $sep;
// print '"' . html_entity_decode($langs->trans("SubledgerAccount")) . '"' . $sep; print '"' . $langs->transnoentitiesnoconv("LabelOperation") . '"' . $sep;
print '"' . html_entity_decode($langs->trans("LabelOperation")) . '"' . $sep; print '"' . $langs->transnoentitiesnoconv("Debit") . '"' . $sep;
print '"' . html_entity_decode($langs->trans("Debit")) . '"' . $sep; print '"' . $langs->transnoentitiesnoconv("Credit") . '"' . $sep;
print '"' . html_entity_decode($langs->trans("Credit")) . '"' . $sep;
print "\n"; print "\n";
foreach ( $taber as $key => $val ) { foreach ( $taber as $key => $val ) {