lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX : several debug

Browse Source
This commit is contained in:
Gauthier PC portable 024 2021-10-04 14:08:11 +02:00
parent 76ec8e0f25
commit 0dd3681e50
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/core/menus/standard/eldy.lib.php
View File

@ -1853,7 +1853,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
if (!empty($conf->hrm->enabled)) {
// Skills
$newmenu->add("/hrm/skill_list.php?mainmenu=hrm&leftmenu=hrm", $langs->trans("Skill"), 0, $user->rights->hrm->all->read, '', $mainmenu, 'hrm', 0, '', '', '', img_picto('', 'shapes', 'class="pictofixedwidth"'));
$newmenu->add("/hrm/skill_list.php?mainmenu=hrm&leftmenu=hrm", $langs->trans("skill"), 0, $user->rights->hrm->all->read, '', $mainmenu, 'hrm', 0, '', '', '', img_picto('', 'shapes', 'class="pictofixedwidth"'));
$newmenu->add("/hrm/skill_card.php?mainmenu=hrm&leftmenu=hrm&action=create", $langs->trans("NewSkill"), 1, $user->rights->hrm->all->write);
$newmenu->add("/hrm/skill_list.php?mainmenu=hrm&leftmenu=hrm", $langs->trans("List"), 1, $user->rights->hrm->all->read);
@ -1864,6 +1864,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
// Position
$newmenu->add("/hrm/position_list.php?mainmenu=hrm&leftmenu=hrm", $langs->trans("Position"), 0, $user->rights->hrm->all->read, '', $mainmenu, 'hrm', 0, '', '', '', img_picto('', 'user-cog', 'class="pictofixedwidth"'));
$newmenu->add("/hrm/position.php?mainmenu=hrm&leftmenu=hrm&action=create", $langs->transnoentities("NewObject", $langs->trans("Position")), 1, $user->rights->hrm->all->write);
$newmenu->add("/hrm/position_list.php?mainmenu=hrm&leftmenu=hrm", $langs->trans("List"), 1, $user->rights->hrm->all->read);
// Evaluation

2
htdocs/hrm/core/tpl/objectline_title.tpl.php
View File

@ -62,7 +62,7 @@ print '<td class="linecollabel">'.$langs->trans('Label').'</td>';
print '<td class="linecoldescription">'.$langs->trans('Description').'</td>';
// Note
print '<td class="linecolrank right" style="width: 80px">'.$langs->trans('Rank').'</td>';
print '<td class="linecolrank right" style="width: 80px">'.$langs->trans('rank').'</td>';
//print '<td class="linecoledit"></td>'; // No width to allow autodim

11
htdocs/hrm/evaluation_card.php
View File

@ -282,7 +282,9 @@ $formproject = new FormProjets($db);
$title = $langs->trans("Evaluation");
$help_url = '';
llxHeader('', $title, $help_url);
$css = array();
$css[] = '/hrm/css/style.css';
llxHeader('', $title, $help_url, '', 0, 0, '', $css);
print '<script type="text/javascript" language="javascript">
$(document).ready(function() {
@ -295,12 +297,11 @@ print '<script type="text/javascript" language="javascript">
url: form.attr("action"),
data: form.serialize(),
dataType: "json"
}).always(function() {
window.location.href = "'.dol_buildpath('/hrm/evaluation_card.php', 1).'?id='.$id.'&action=validate&token='.newToken().'";
return false;
});
window.location.href = "'.dol_buildpath('/hrm/evaluation_card.php', 2).'?id='.$id.'&action=validate&token='.newToken().'";
return false;
});
});
</script>';

6
htdocs/hrm/position.php
View File

@ -166,7 +166,11 @@ if (empty($reshook)) {
if (empty($fk_job) && (($action != 'add' && $action != 'create') || $cancel)) {
$backtopage = $backurlforlist;
} else {
$backtopage = dol_buildpath('/hrm/position.php', 1) . '?fk_job=' . ($fk_job > 0 ? $fk_job : '__ID__');
if($fk_job > 0) {
$backtopage = dol_buildpath('/hrm/position.php', 1) . '?fk_job=' . ($fk_job > 0 ? $fk_job : '__ID__');
} else {
$backtopage = dol_buildpath('/hrm/position_card.php', 1) . '?id=__ID__';
}
}
}
}