diff --git a/htdocs/barcode/codeinit.php b/htdocs/barcode/codeinit.php
index ef3c23eff2b..1a5f99b27ee 100644
--- a/htdocs/barcode/codeinit.php
+++ b/htdocs/barcode/codeinit.php
@@ -286,7 +286,7 @@ if ($conf->product->enabled || $conf->product->service) {
print '';
$moretags2 = (($nbno == $nbtotal) ? ' disabled' : '');
print ' ';
- print '';
+ print '';
print '
';
}
diff --git a/htdocs/core/boxes/box_members_by_type.php b/htdocs/core/boxes/box_members_by_type.php
index 4bbf20e9cbf..23542999b47 100644
--- a/htdocs/core/boxes/box_members_by_type.php
+++ b/htdocs/core/boxes/box_members_by_type.php
@@ -173,27 +173,34 @@ class box_members_by_type extends ModeleBoxes
$line = 0;
$this->info_box_contents[$line][] = array(
'td' => 'class=""',
- 'text' => $langs->trans("MembersTypes"),
+ 'text' => '',
);
+ $labelstatus = $staticmember->LibStatut($staticmember::STATUS_DRAFT, 0, 0, 1);
$this->info_box_contents[$line][] = array(
- 'td' => 'class="right"',
- 'text' => $langs->trans("MembersStatusToValid"), // Draft
+ 'td' => 'class="right tdoverflowmax100" width="15%" title="'.dol_escape_htmltag($labelstatus).'"',
+ 'text' => $labelstatus
);
+ $labelstatus = $langs->trans("UpToDate");
+ $labelstatus = $staticmember->LibStatut($staticmember::STATUS_VALIDATED, 1, dol_now() + 86400, 1);
$this->info_box_contents[$line][] = array(
- 'td' => 'class="right"',
- 'text' => $langs->trans("UpToDate"),
+ 'td' => 'class="right tdoverflowmax100" width="15%" title="'.dol_escape_htmltag($labelstatus).'"',
+ 'text' => $labelstatus,
);
+ $labelstatus = $langs->trans("OutOfDate");
+ $labelstatus = $staticmember->LibStatut($staticmember::STATUS_VALIDATED, 1, dol_now() - 86400, 1);
$this->info_box_contents[$line][] = array(
- 'td' => 'class="right"',
- 'text' => $langs->trans("OutOfDate"),
+ 'td' => 'class="right tdoverflowmax100" width="15%" title="'.dol_escape_htmltag($labelstatus).'"',
+ 'text' => $labelstatus
);
+ $labelstatus = $staticmember->LibStatut($staticmember::STATUS_EXCLUDED, 0, 0, 1);
$this->info_box_contents[$line][] = array(
- 'td' => 'class="right"',
- 'text' => $langs->trans("MembersStatusExcluded"),
+ 'td' => 'class="right tdoverflowmax100" width="15%" title="'.dol_escape_htmltag($labelstatus).'"',
+ 'text' => $labelstatus
);
+ $labelstatus = $staticmember->LibStatut($staticmember::STATUS_RESILIATED, 0, 0, 1);
$this->info_box_contents[$line][] = array(
- 'td' => 'class="right"',
- 'text' => $langs->trans("MembersStatusResiliated"),
+ 'td' => 'class="right tdoverflowmax100" width="15%" title="'.dol_escape_htmltag($labelstatus).'"',
+ 'text' => $labelstatus
);
$line++;
foreach ($AdherentType as $key => $adhtype) {
diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php
index 246bec42ba4..910e6d3ca77 100644
--- a/htdocs/core/boxes/modules_boxes.php
+++ b/htdocs/core/boxes/modules_boxes.php
@@ -222,7 +222,7 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
// Show box title
if (!empty($head['text']) || !empty($head['sublink']) || !empty($head['subpicto'])) {
$out .= '