diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php index c3fbb55a866..5a7d8d77aba 100644 --- a/htdocs/accountancy/bookkeeping/listbyaccount.php +++ b/htdocs/accountancy/bookkeeping/listbyaccount.php @@ -200,19 +200,19 @@ if (empty($search_date_start) && empty($search_date_end) && !GETPOSTISSET('searc $arrayfields = array( // 't.subledger_account'=>array('label'=>$langs->trans("SubledgerAccount"), 'checked'=>1), - 't.piece_num' => array('label' => $langs->trans("TransactionNumShort"), 'checked' => '1'), - 't.code_journal' => array('label' => $langs->trans("Codejournal"), 'checked' => '1'), - 't.doc_date' => array('label' => $langs->trans("Docdate"), 'checked' => '1'), - 't.doc_ref' => array('label' => $langs->trans("Piece"), 'checked' => '1'), - 't.label_operation' => array('label' => $langs->trans("Label"), 'checked' => '1'), - 't.lettering_code' => array('label' => $langs->trans("Lettering"), 'checked' => '1'), - 't.debit' => array('label' => $langs->trans("AccountingDebit"), 'checked' => '1'), - 't.credit' => array('label' => $langs->trans("AccountingCredit"), 'checked' => '1'), - 't.balance' => array('label' => $langs->trans("Balance"), 'checked' => '1'), - 't.date_export' => array('label' => $langs->trans("DateExport"), 'checked' => '-1'), - 't.date_validated' => array('label' => $langs->trans("DateValidation"), 'checked' => '-1', 'enabled' => (string) (int) !getDolGlobalString("ACCOUNTANCY_DISABLE_CLOSURE_LINE_BY_LINE")), - 't.date_lim_reglement' => array('label' => $langs->trans("DateDue"), 'checked' => '0'), - 't.import_key' => array('label' => $langs->trans("ImportId"), 'checked' => '-1', 'position' => 1100), + 't.piece_num' => array('label' => "TransactionNumShort", 'checked' => '1'), + 't.code_journal' => array('label' => "Codejournal", 'checked' => '1'), + 't.doc_date' => array('label' => "Docdate", 'checked' => '1'), + 't.doc_ref' => array('label' => "Piece", 'checked' => '1'), + 't.label_operation' => array('label' => "Label", 'checked' => '1'), + 't.lettering_code' => array('label' => "Lettering", 'checked' => '1'), + 't.debit' => array('label' => "AccountingDebit", 'checked' => '1'), + 't.credit' => array('label' => "AccountingCredit", 'checked' => '1'), + 't.balance' => array('label' => "Balance", 'checked' => '1'), + 't.date_export' => array('label' => "DateExport", 'checked' => '-1'), + 't.date_validated' => array('label' => "DateValidation", 'checked' => '-1', 'enabled' => (string) (int) !getDolGlobalString("ACCOUNTANCY_DISABLE_CLOSURE_LINE_BY_LINE")), + 't.date_lim_reglement' => array('label' => "DateDue", 'checked' => '0'), + 't.import_key' => array('label' => "ImportId", 'checked' => '-1', 'position' => 1100), ); if (!getDolGlobalString('ACCOUNTING_ENABLE_LETTERING')) { diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 4c3406cacfc..5f1f9496d5f 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -6562,7 +6562,7 @@ function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin $tagstart = '<'.$tag.' class="'.$prefix.$liste_titre.'" '.$moreattrib; //$out .= (($field && empty($conf->global->MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE) && preg_match('/^[a-zA-Z_0-9\s\.\-:&;]*$/', $name)) ? ' title="'.dol_escape_htmltag($langs->trans($name)).'"' : ''); - $tagstart .= ($name && !getDolGlobalString('MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE') && empty($forcenowrapcolumntitle) && !dol_textishtml($name)) ? ' title="'.dol_escape_htmltag($langs->trans($name)).'"' : ''; + $tagstart .= ($name && !getDolGlobalString('MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE') && empty($forcenowrapcolumntitle) && !dol_textishtml($name)) ? ' title="'.dolPrintHTMLForAttribute($langs->trans($name)).'"' : ''; $tagstart .= '>'; if (empty($thead) && $field && empty($disablesortlink)) { // If this is a sort field