diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 4ad5aaba356..34b78e4eb80 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -2028,15 +2028,14 @@ else
print dol_getIdFromCode($db, $line->fk_c_exp_tax_cat, 'c_exp_tax_cat', 'rowid', 'label');
print '';
}
- // print '
'.$langs->trans("TF_".strtoupper(empty($objp->type_fees_libelle)?'OTHER':$objp->type_fees_libelle)).' | ';
- print '';
+ print ' | ';
$labeltype = ($langs->trans(($line->type_fees_code)) == $line->type_fees_code ? $line->type_fees_libelle : $langs->trans($line->type_fees_code));
print $labeltype;
print ' | ';
- print ''.$line->comments.' | ';
+ print ''.dol_escape_htmltag($line->comments).' | ';
print ''.vatrate($line->vatrate,true).' | ';
print ''.price($line->value_unit).' | ';
- print ''.$line->qty.' | ';
+ print ''.dol_escape_htmltag($line->qty).' | ';
if ($action != 'editline')
{
@@ -2096,7 +2095,7 @@ else
// Add comments
print '';
- print '';
+ print '';
print ' | ';
// VAT
@@ -2147,7 +2146,7 @@ else
print ' | ';
print '';
- print '';
+ print '
';
print ' | ';
@@ -2179,7 +2178,7 @@ else
// Add comments
print '';
- print '';
+ print '';
print ' | ';
// Select VAT
diff --git a/htdocs/expensereport/note.php b/htdocs/expensereport/note.php
index 8376733d634..a715d85f6a6 100644
--- a/htdocs/expensereport/note.php
+++ b/htdocs/expensereport/note.php
@@ -19,9 +19,9 @@
*/
/**
- * \file htdocs/commande/note.php
- * \ingroup commande
- * \brief Fiche de notes sur une commande
+ * \file htdocs/expensereport/note.php
+ * \ingroup expensereport
+ * \brief Tab for notes on expense reports
*/
require '../main.inc.php';
@@ -90,7 +90,7 @@ if ($id > 0 || ! empty($ref))
print '';
print '
';
-
+var_dump($value_public);
$cssclass="titlefield";
include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';