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

Merge branch 'develop' into fix/getChildrenOfLine/array_merge

Browse Source
This commit is contained in:
Laurent Destailleur
2024-03-11 15:22:44 +01:00
committed by GitHub
parent c333075776 39ea68ace4
commit 1178b858d8
39 changed files with 189 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/class/commonobject.class.php
View File

@@ -7392,7 +7392,7 @@ abstract class CommonObject
$isDependList = 1;
}
$tmpselect .= (!empty($parent) ? ' parent="'.$parent.'"' : '');
$tmpselect .= '>'.$valb.'</option>';
$tmpselect .= '>'.$langs->trans($valb).'</option>';
}
$out .= '<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '').'>';
@@ -8022,7 +8022,7 @@ abstract class CommonObject
} elseif ($type == 'select') {
$value = isset($param['options'][$value]) ? $param['options'][$value] : '';
if (strpos($value, "|") !== false) {
$value = explode('|', $value)[0];
$value = $langs->trans(explode('|', $value)[0]);
}
} elseif ($type == 'sellist') {
$param_list = array_keys($param['options']);