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

Debug v14

Browse Source
This commit is contained in:
Laurent Destailleur
2021-06-05 15:27:49 +02:00
parent 1e657b8621
commit fb0d2cdddc
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/core/class/html.form.class.php
View File

@@ -6840,9 +6840,12 @@ class Form
$obj = $this->db->fetch_object($resql);
$label = '';
$tmparray = explode(',', $fieldstoshow);
$oldvalueforshowoncombobox = 0;
foreach ($tmparray as $key => $val) {
$val = preg_replace('/t\./', '', $val);
$label .= (($label && $obj->$val) ? ' - ' : '').$obj->$val;
$label .= (($label && $obj->$val) ? ($oldvalueforshowoncombobox != $objecttmp->fields[$val]['showoncombobox'] ? ' - ' : ' ') : '');
$label .= $obj->$val;
$oldvalueforshowoncombobox = $objecttmp->fields[$val]['showoncombobox'];
}
if (empty($outputmode)) {
if ($preselectedvalue > 0 && $preselectedvalue == $obj->rowid) {