Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Laurent Destailleur 2024-01-13 11:17:28 +01:00
commit 8c4ed9f14c
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
htdocs/main.inc.php
View File

@ -2183,14 +2183,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 (!getDolGlobalString('MAIN_PRINT_DISABLELINK') && !getDolGlobalString('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);
}
}
}
}
}

2
htdocs/product/stock/stockatdate.php
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');