Merge branch 'develop' into extrafields_object_filter

This commit is contained in:
Frédéric FRANCE
2024-12-19 20:36:32 +01:00
committed by GitHub
260 changed files with 3322 additions and 2866 deletions

View File

@@ -2059,7 +2059,6 @@ class ExtraFields
}
//if ($computed) $value = // $value is already calculated into $value before calling this method
$showsize = 0;
if ($type == 'date') {
$showsize = 10;
@@ -2087,9 +2086,9 @@ class ExtraFields
} elseif ($type == 'double') {
if (!empty($value)) {
//$value=price($value);
$sizeparts = explode(",", $size);
$number_decimals = array_key_exists(1, $sizeparts) ? $sizeparts[1] : 0;
$value = price($value, 0, $outputlangs, 0, 0, $number_decimals, '');
//$sizeparts = explode(",", $size);
//$number_decimals = array_key_exists(1, $sizeparts) ? $sizeparts[1] : 0;
$value = price($value, 0, $outputlangs, 0, 0, -2, '');
}
} elseif ($type == 'boolean') {
$checked = '';