Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0

Browse Source
This commit is contained in:
Laurent Destailleur
2023-01-18 21:21:49 +01:00
parent c60a40f245 8a12f337ab
commit cd5009d8a4
19 changed files with 59 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/core/class/extrafields.class.php
View File

@@ -1494,15 +1494,15 @@ class ExtraFields
$labeltoshow = dol_trunc($labeltoshow, 45);
if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
$labeltoshow = '';
foreach ($fields_label as $field_toshow) {
$translabel = $langs->trans($obj->$field_toshow);
if ($translabel != $obj->$field_toshow) {
$labeltoshow = dol_trunc($translabel, 18).' ';
$labeltoshow .= ' '.dol_trunc($translabel, 18).' ';
} else {
$labeltoshow = dol_trunc($obj->$field_toshow, 18).' ';
$labeltoshow .= ' '.dol_trunc($obj->$field_toshow, 18).' ';
}
}
$data[$obj->rowid] = $labeltoshow;
} else {
if (!$notrans) {
@@ -1823,17 +1823,20 @@ class ExtraFields
$fields_label = explode('|', $InfoFieldList[1]);
if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
if (is_array($fields_label) && count($fields_label) > 1) {
$label = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">';
foreach ($fields_label as $field_toshow) {
$translabel = '';
if (!empty($obj->$field_toshow)) {
$translabel = $langs->trans($obj->$field_toshow);
}
if ($translabel != $field_toshow) {
$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">'.dol_trunc($translabel, 18).'</li>';
$label .= ' '.dol_trunc($translabel, 18);
} else {
$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">'.$obj->$field_toshow.'</li>';
$label .= ' '.$obj->$field_toshow;
}
}
$label .= '</li>';
$toprint[] = $label;
} else {
$translabel = '';
if (!empty($obj->{$InfoFieldList[1]})) {