FIX link to print when there is a search on multiselect fields

This commit is contained in:
Laurent Destailleur 2024-01-13 11:15:17 +01:00
parent f46512c626
commit b053b55e2f
2 changed files with 15 additions and 4 deletions

View File

@ -2158,14 +2158,25 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
$toprightmenu .= $form->textwithtooltip('', $langs->trans("ModuleBuilder"), 2, 1, $text, 'login_block_elem', 2);
}
// Link to print main content area
// Link to print main content area (optioncss=print)
if (empty($conf->global->MAIN_PRINT_DISABLELINK) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
$qs = dol_escape_htmltag($_SERVER["QUERY_STRING"]);
if (isset($_POST) && is_array($_POST)) {
foreach ($_POST as $key => $value) {
if ($key !== 'action' && $key !== 'password' && !is_array($value)) {
$qs .= '&'.$key.'='.urlencode($value);
if (in_array($key, array('action', 'massaction', 'password'))) {
continue;
}
if (!is_array($value)) {
if ($value !== '') {
$qs .= '&'.$key.'='.urlencode($value);
}
} else {
foreach ($value as $value2) {
if ($value2 !== '') {
$qs .= '&'.$key.'[]='.urlencode($value2);
}
}
}
}
}

View File

@ -427,7 +427,7 @@ if (!empty($search_fk_warehouse)) {
}
}
if ($productid > 0) {
$param .= '&productid='.$productid;
$param .= '&productid='.(int) $productid;
}
if (GETPOST('dateday', 'int') > 0) {
$param .= '&dateday='.GETPOST('dateday', 'int');