Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop

This commit is contained in:
Laurent Destailleur
2023-08-09 15:00:52 +02:00
13 changed files with 84 additions and 65 deletions

View File

@@ -1734,11 +1734,12 @@ class ExtraFields
$translabel = '';
if (!empty($obj->$field_toshow)) {
$translabel = $langs->trans($obj->$field_toshow);
}
if ($translabel != $obj->$field_toshow) {
$value .= dol_trunc($translabel, 24).' ';
} else {
$value .= $obj->$field_toshow.' ';
if ($translabel != $obj->$field_toshow) {
$value .= dol_trunc($translabel, 24).' ';
} else {
$value .= $obj->$field_toshow.' ';
}
}
}
} else {