lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix contact firstname lastname extrafields

Browse Source
This commit is contained in:
GregM 2023-01-18 17:36:05 +01:00
parent af7570a2cd
commit a3d4eb404d
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1457,15 +1457,15 @@ class ExtraFields
$labeltoshow = dol_trunc($labeltoshow, 45); $labeltoshow = dol_trunc($labeltoshow, 45);
if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) { if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
$labeltoshow = '';
foreach ($fields_label as $field_toshow) { foreach ($fields_label as $field_toshow) {
$translabel = $langs->trans($obj->$field_toshow); $translabel = $langs->trans($obj->$field_toshow);
if ($translabel != $obj->$field_toshow) { if ($translabel != $obj->$field_toshow) {
$labeltoshow = dol_trunc($translabel, 18).' '; $labeltoshow .= ' '.dol_trunc($translabel, 18).' ';
} else { } else {
$labeltoshow = dol_trunc($obj->$field_toshow, 18).' '; $labeltoshow .= ' '.dol_trunc($obj->$field_toshow, 18).' ';
} }
} }
$data[$obj->rowid] = $labeltoshow; $data[$obj->rowid] = $labeltoshow;
} else { } else {
if (!$notrans) { if (!$notrans) {
@ -1774,17 +1774,20 @@ class ExtraFields
$fields_label = explode('|', $InfoFieldList[1]); $fields_label = explode('|', $InfoFieldList[1]);
if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) { if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
if (is_array($fields_label) && count($fields_label) > 1) { 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) { foreach ($fields_label as $field_toshow) {
$translabel = ''; $translabel = '';
if (!empty($obj->$field_toshow)) { if (!empty($obj->$field_toshow)) {
$translabel = $langs->trans($obj->$field_toshow); $translabel = $langs->trans($obj->$field_toshow);
} }
if ($translabel != $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 { } 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 { } else {
$translabel = ''; $translabel = '';
if (!empty($obj->{$InfoFieldList[1]})) { if (!empty($obj->{$InfoFieldList[1]})) {