diff --git a/htdocs/compta/sociales/note.php b/htdocs/compta/sociales/note.php
index f7850287c1e..cf9d0cbdec5 100644
--- a/htdocs/compta/sociales/note.php
+++ b/htdocs/compta/sociales/note.php
@@ -101,7 +101,7 @@ if ($id > 0 || !empty($ref)) {
$proj->fetch($object->fk_project);
$morehtmlref .= ' : '.$proj->getNomUrl(1);
if ($proj->title) {
- $morehtmlref .= ' - '.$proj->title;
+ $morehtmlref .= ' - '.dol_escape_htmltag($proj->title);
}
} else {
$morehtmlref .= '';
@@ -113,7 +113,7 @@ if ($id > 0 || !empty($ref)) {
// ------------------------------------------------------------
$linkback = ''.$langs->trans("BackToList").'';
- $object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status
+ //$object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status
dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlright);
diff --git a/htdocs/core/lib/tax.lib.php b/htdocs/core/lib/tax.lib.php
index c8c7ee86e85..cab5d434d53 100644
--- a/htdocs/core/lib/tax.lib.php
+++ b/htdocs/core/lib/tax.lib.php
@@ -66,16 +66,29 @@ function tax_prepare_head(ChargeSociales $object)
$head[$h][2] = 'documents';
$h++;
+
$head[$h][0] = DOL_URL_ROOT.'/compta/sociales/info.php?id='.$object->id;
$head[$h][1] = $langs->trans("Info");
$head[$h][2] = 'info';
$h++;
+
+ $nbNote = 0;
+ if (!empty($object->note_private)) {
+ $nbNote++;
+ }
+ if (!empty($object->note_public)) {
+ $nbNote++;
+ }
$head[$h][0] = DOL_URL_ROOT.'/compta/sociales/note.php?id='.$object->id;
- $head[$h][1] = $langs->trans("Notes");
+ $head[$h][1] = $langs->trans('Notes');
+ if ($nbNote > 0) {
+ $head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? ''.$nbNote.'' : '');
+ }
$head[$h][2] = 'note';
$h++;
+
complete_head_from_modules($conf, $langs, $object, $head, $h, 'tax', 'remove');
return $head;