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

This commit is contained in:
Laurent Destailleur 2023-06-28 15:43:33 +02:00
commit 693c48460e
2 changed files with 5 additions and 3 deletions

View file

@ -8,6 +8,8 @@ dist: focal
language: generic
scan_logs: false
git:
depth: 1

View file

@ -734,12 +734,12 @@ foreach ($listofreferent as $key => $value) {
}
$name = $langs->trans($value['name']);
$qualified = $value['test'];
$margin = empty($value['margin']) ? 0 : $value['margin'];
$margin = empty($value['margin']) ? '' : $value['margin'];
if ($qualified && isset($margin)) { // If this element must be included into profit calculation ($margin is 'minus' or 'add')
if ($margin == 'add') {
if ($margin === 'add') {
$tooltiponprofitplus .= ' &gt; '.$name." (+)<br>\n";
}
if ($margin == 'minus') {
if ($margin === 'minus') {
$tooltiponprofitminus .= ' &gt; '.$name." (-)<br>\n";
}
}