tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-30 09:15:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-13376-error-500-informe-inventory-software' into 'develop'

Browse Source 
Ent 13376 Error 500 informe inventory > Software

See merge request artica/pandorafms!7148
This commit is contained in:
Jose Martin 2024-04-09 14:37:04 +00:00
commit c965b46856
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/include/functions_inventory.php
View File

@ -99,9 +99,9 @@ function inventory_get_data(
// Prepare pagination. // Prepare pagination.
$url = sprintf( $url = sprintf(
'?sec=estado&sec2=operation/inventory/inventory&agent_id=%s&agent=%s&id_group=%s&export=%s&module_inventory_general_view=%s&search_string=%s&utimestamp=%s&period=%s&order_by_agent=%s&submit_filter=%d', '?sec=estado&sec2=operation/inventory/inventory&agent_id=%s&agent=%s&id_group=%s&export=%s&module_inventory_general_view=%s&search_string=%s&utimestamp=%s&period=%s&order_by_agent=%s&submit_filter=%d',
$pagination_url_parameters['inventory_id_agent'], (isset($pagination_url_parameters['inventory_id_agent']) ?? ''),
$pagination_url_parameters['inventory_agent'], (isset($pagination_url_parameters['inventory_agent']) ?? ''),
$pagination_url_parameters['inventory_id_group'], (isset($pagination_url_parameters['inventory_id_group']) ?? ''),
$export_csv, $export_csv,
$inventory_module_name, $inventory_module_name,
$inventory_search_string, $inventory_search_string,

5
pandora_console/include/functions_reporting.php
View File

@ -3352,8 +3352,8 @@ function reporting_inventory($report, $content, $type)
$date, $date,
'', '',
false, false,
'csv',
false, false,
'csv',
'', '',
[], [],
$inventory_regular_expression $inventory_regular_expression
@ -3367,12 +3367,13 @@ function reporting_inventory($report, $content, $type)
$date, $date,
'', '',
false, false,
'hash',
false, false,
'hash',
'', '',
[], [],
$inventory_regular_expression $inventory_regular_expression
); );
break; break;
} }

2
pandora_console/include/functions_reporting_html.php
View File

@ -2644,7 +2644,7 @@ function reporting_html_inventory($table, $item, $pdf=0)
} else { } else {
// Grouped type inventory. // Grouped type inventory.
$type_modules = array_reduce( $type_modules = array_reduce(
$item['data'], ($item['data'] ?? []),
function ($carry, $it) { function ($carry, $it) {
$carry[$it['name']][] = $it; $carry[$it['name']][] = $it;
return $carry; return $carry;