diff --git a/htdocs/admin/hrm.php b/htdocs/admin/hrm.php index 685f2db64c8..c214e9676a5 100644 --- a/htdocs/admin/hrm.php +++ b/htdocs/admin/hrm.php @@ -151,7 +151,7 @@ if ($action == 'update') { '@phan-var-force CommonDocGenerator $module'; if ($module->write_file($tmpobject, $langs) > 0) { - header("Location: ".DOL_URL_ROOT."/document.php?modulepart=".strtolower($tmpobjectkey)."&file=SPECIMEN.pdf"); + header("Location: ".DOL_URL_ROOT."/document.php?modulepart=hrm&file=evaluation/SPECIMEN.pdf"); return; } else { setEventMessages($module->error, null, 'errors'); @@ -368,8 +368,9 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) { dol_print_error($db); } - print "\n"; - print "\n"; + print '
'; // You can use div-table-responsive-no-min if you don't need reserved height for your table + print '
'."\n"; + print ''."\n"; print ''; print ''; print '\n"; @@ -484,6 +485,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) { } print '
'.$langs->trans("Name").''.$langs->trans("Description").''.$langs->trans("Status")."
'; + print ''; } } diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php index 7f9a959f594..8b318d895a6 100644 --- a/htdocs/core/lib/files.lib.php +++ b/htdocs/core/lib/files.lib.php @@ -3254,7 +3254,6 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity, if ($fuser->hasRight('banque', $lire) || preg_match('/^specimen/i', $original_file)) { $accessallowed = 1; } - $original_file = $conf->bank->dir_output.'/checkdeposits/'.$original_file; // original_file should contains relative path so include the get_exdir result } elseif (($modulepart == 'banque' || $modulepart == 'bank') && !empty($conf->bank->dir_output)) { // Wrapping for bank diff --git a/htdocs/document.php b/htdocs/document.php index 2090fe89838..e204956acd3 100644 --- a/htdocs/document.php +++ b/htdocs/document.php @@ -103,7 +103,7 @@ $original_file = GETPOST('file', 'alphanohtml'); $hashp = GETPOST('hashp', 'aZ09'); $modulepart = GETPOST('modulepart', 'alpha'); $urlsource = GETPOST('urlsource', 'alpha'); -$entity = GETPOSTINT('entity') ?GETPOSTINT('entity') : $conf->entity; +$entity = GETPOSTINT('entity', $conf->entity); // Security check if (empty($modulepart) && empty($hashp)) {