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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2022-02-06 13:24:02 +01:00
commit e022b00d1e
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/core/tpl/list_print_total.tpl.php
View File

@ -13,7 +13,13 @@ if (isset($totalarray['pos'])) {
while ($i < $totalarray['nbfield']) { while ($i < $totalarray['nbfield']) {
$i++; $i++;
if (!empty($totalarray['pos'][$i])) { if (!empty($totalarray['pos'][$i])) {
print '<td class="right">'.price(!empty($totalarray['val'][$totalarray['pos'][$i]])?$totalarray['val'][$totalarray['pos'][$i]]:0).'</td>'; print '<td class="right">';
if ($totalarray['type'][$i] == 'duration') {
print (!empty($totalarray['val'][$totalarray['pos'][$i]])?convertSecondToTime($totalarray['val'][$totalarray['pos'][$i]], 'allhourmin'):0);
} else {
print price(!empty($totalarray['val'][$totalarray['pos'][$i]])?$totalarray['val'][$totalarray['pos'][$i]]:0);
}
print '</td>';
} else { } else {
if ($i == 1) { if ($i == 1) {
if (is_null($limit) || $num < $limit) { if (is_null($limit) || $num < $limit) {

2
htdocs/fichinter/list.php
View File

@ -7,6 +7,7 @@
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr> * Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
* Copyright (C) 2018 Ferran Marcet <fmarcet@2byte.es> * Copyright (C) 2018 Ferran Marcet <fmarcet@2byte.es>
* Copyright (C) 2021 Frédéric France <frederic.france@netlogic.fr> * Copyright (C) 2021 Frédéric France <frederic.france@netlogic.fr>
* Copyright (C) 2022 Charlène Benke <charlene@patas-monkey.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -739,6 +740,7 @@ if ($resql) {
$totalarray['nbfield']++; $totalarray['nbfield']++;
} }
if (!$i) { if (!$i) {
$totalarray['type'][$totalarray['nbfield']] = 'duration';
$totalarray['pos'][$totalarray['nbfield']] = 'fd.duree'; $totalarray['pos'][$totalarray['nbfield']] = 'fd.duree';
} }
$totalarray['val']['fd.duree'] += $obj->duree; $totalarray['val']['fd.duree'] += $obj->duree;