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

Fix error management on HR modules

Browse Source
This commit is contained in:
Laurent Destailleur 2020-10-10 16:35:30 +02:00
parent b36b9170b2
commit 0b619f63f3
2 changed files with 40 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
htdocs/expensereport/card.php
View File

@ -214,6 +214,8 @@ if (empty($reshook))
if ($action == 'add' && $user->rights->expensereport->creer) if ($action == 'add' && $user->rights->expensereport->creer)
{ {
$error = 0;
$object = new ExpenseReport($db); $object = new ExpenseReport($db);
$object->date_debut = $date_start; $object->date_debut = $date_start;
@ -222,6 +224,19 @@ if (empty($reshook))
$object->fk_user_author = GETPOST('fk_user_author', 'int'); $object->fk_user_author = GETPOST('fk_user_author', 'int');
if (!($object->fk_user_author > 0)) $object->fk_user_author = $user->id; if (!($object->fk_user_author > 0)) $object->fk_user_author = $user->id;
// Check that expense report is for a user inside the hierarchy or advanced permission for all is set
if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->expensereport->creer)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->expensereport->writeall_advance))) {
$error++;
setEventMessages($langs->trans("NotEnoughPermission"), null, 'errors');
} else {
if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance)) {
if (! in_array($object->fk_user_author, $childids)) {
$error++;
setEventMessages($langs->trans("UserNotInHierachy"), null, 'errors');
}
}
}
$fuser = new User($db); $fuser = new User($db);
$fuser->fetch($object->fk_user_author); $fuser->fetch($object->fk_user_author);

36
htdocs/holiday/card.php
View File

@ -147,12 +147,26 @@ if (empty($reshook))
$valideur = GETPOST('valideur', 'int'); $valideur = GETPOST('valideur', 'int');
$description = trim(GETPOST('description', 'restricthtml')); $description = trim(GETPOST('description', 'restricthtml'));
// Check that leave is for a user inside the hierarchy or advanced permission for all is set
if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->expensereport->creer)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->expensereport->writeall_advance))) {
$error++;
setEventMessages($langs->trans("NotEnoughPermission"), null, 'errors');
} else {
if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance)) {
if (! in_array($fuserid, $childids)) {
$error++;
setEventMessages($langs->trans("UserNotInHierachy"), null, 'errors');
$action = 'create';
}
}
}
// If no type // If no type
if ($type <= 0) if ($type <= 0)
{ {
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors'); setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
$error++; $error++;
$action = 'add'; $action = 'create';
} }
// If no start date // If no start date
@ -160,21 +174,21 @@ if (empty($reshook))
{ {
setEventMessages($langs->trans("NoDateDebut"), null, 'errors'); setEventMessages($langs->trans("NoDateDebut"), null, 'errors');
$error++; $error++;
$action = 'add'; $action = 'create';
} }
// If no end date // If no end date
if (empty($date_fin)) if (empty($date_fin))
{ {
setEventMessages($langs->trans("NoDateFin"), null, 'errors'); setEventMessages($langs->trans("NoDateFin"), null, 'errors');
$error++; $error++;
$action = 'add'; $action = 'create';
} }
// If start date after end date // If start date after end date
if ($date_debut > $date_fin) if ($date_debut > $date_fin)
{ {
setEventMessages($langs->trans("ErrorEndDateCP"), null, 'errors'); setEventMessages($langs->trans("ErrorEndDateCP"), null, 'errors');
$error++; $error++;
$action = 'add'; $action = 'create';
} }
// Check if there is already holiday for this period // Check if there is already holiday for this period
@ -183,16 +197,16 @@ if (empty($reshook))
{ {
setEventMessages($langs->trans("alreadyCPexist"), null, 'errors'); setEventMessages($langs->trans("alreadyCPexist"), null, 'errors');
$error++; $error++;
$action = 'add'; $action = 'create';
} }
// If there is no Business Days within request // If there is no Business Days within request
$nbopenedday = num_open_day($date_debut_gmt, $date_fin_gmt, 0, 1, $halfday); $nbopenedday = num_open_day($date_debut_gmt, $date_fin_gmt, 0, 1, $halfday);
if ($nbopenedday < 0.5) if ($nbopenedday < 0.5)
{ {
setEventMessages($langs->trans("ErrorDureeCP"), null, 'errors'); setEventMessages($langs->trans("ErrorDureeCP"), null, 'errors'); // No working day
$error++; $error++;
$action = 'add'; $action = 'create';
} }
// If no validator designated // If no validator designated
@ -868,15 +882,15 @@ llxHeader('', $langs->trans('CPTitreMenu'));
if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add')
{ {
// Si l'utilisateur n'a pas le droit de faire une demande // If user has no permission to create a leave
if (($fuserid == $user->id && empty($user->rights->holiday->write)) || ($fuserid != $user->id && (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->holiday->writeall_advance)))) if ((in_array($fuserid, $childids) && empty($user->rights->holiday->write)) || (!in_array($fuserid, $childids) && (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->holiday->writeall_advance))))
{ {
$errors[] = $langs->trans('CantCreateCP'); $errors[] = $langs->trans('CantCreateCP');
} else { } else {
// Formulaire de demande de congés payés // Form to add a leave request
print load_fiche_titre($langs->trans('MenuAddCP'), '', 'title_hrm.png'); print load_fiche_titre($langs->trans('MenuAddCP'), '', 'title_hrm.png');
// Si il y a une erreur // Error management
if (GETPOST('error')) { if (GETPOST('error')) {
switch (GETPOST('error')) { switch (GETPOST('error')) {
case 'datefin' : case 'datefin' :