From 00a8ad9207067b71cdee054c51a8071f82c6a4ae Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 27 Dec 2023 16:42:50 +0100 Subject: [PATCH] Fix test to cancel holiday --- htdocs/holiday/card.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php index 2f101b1bdf6..9b4b750a6c9 100644 --- a/htdocs/holiday/card.php +++ b/htdocs/holiday/card.php @@ -1541,7 +1541,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') { // Button Cancel (because we can't approve) if ($cancreate || $cancreateall) { - if (($object->date_debut > dol_now()) || !empty($user->admin)) { + if (($object->date_fin > dol_now()) || !empty($user->admin)) { print ''.$langs->trans("ActionCancelCP").''; } else { print 'trans("NotAllowed").'">'.$langs->trans("ActionCancelCP").''; @@ -1551,7 +1551,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') { } if ($object->statut == Holiday::STATUS_APPROVED) { // If validated and approved if ($user->id == $object->fk_validator || $user->id == $object->fk_user_approve || $cancreate || $cancreateall) { - if (($object->date_debut > dol_now()) || !empty($user->admin) || $user->id == $object->fk_user_approve) { + if (($object->date_fin > dol_now()) || !empty($user->admin) || $user->id == $object->fk_user_approve) { print ''.$langs->trans("ActionCancelCP").''; } else { print 'trans("NotAllowed").'">'.$langs->trans("ActionCancelCP").'';