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

Merge pull request #33187 from mdeweerd/fix/ci.2025.02.22

Browse Source 
Fix ci - customreports, list_print_total
This commit is contained in:
Laurent Destailleur
2025-02-23 16:40:12 +01:00
committed by GitHub
parent 0221204cd1 7ee4956653
commit 22dfa59dca
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/core/customreports.php
View File

@@ -39,8 +39,11 @@
* @var Translate $langs
* @var User $user
*
* @var array $toselect
* @var ?int[] $toselect Items selected on page, only used to see if not empty here
*/
'
@phan-var-force ?int[] $toselect
';
// Initialise values
$search_groupby = array();

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

@@ -24,10 +24,10 @@
* @var Translate $langs
*
* @var int $trforbreaknobg
* @var array{nbfield:int,type?:array<int,string>,pos?:array<int,int>,val?:array<int,float>} $totalarray
* @var array{nbfield:int,type?:array<int,string>,pos?:array<int,string>,val?:array<int,float>} $totalarray
*/
'
@phan-var-force array{nbfield:int,type?:array<int,string>,pos?:array<int,int>,val?:array<int,float>} $totalarray
@phan-var-force array{nbfield:int,type?:array<int,string>,pos?:array<int,string>,val?:array<int,float>} $totalarray
@phan-var-force ?string $sqlfields
';
@@ -86,7 +86,7 @@ if (isset($totalarray['pos'])) {
while ($i < $totalarray['nbfield']) {
$i++;
if (!empty($totalarray['pos'][$i])) {
printTotalValCell($totalarray['type'][$i] ?? '', empty($totalarray['val'][$totalarray['pos'][$i]]) ? 0 : $totalarray['val'][$totalarray['pos'][$i]]);
printTotalValCell($totalarray['type'][$i] ?? '', empty($totalarray['val'][$totalarray['pos'][$i]]) ? '0' : (string) $totalarray['val'][$totalarray['pos'][$i]]);
} else {
if ($i == 1) {
if ((is_null($limit) || $num < $limit) && empty($offset)) {