From 7ced36c9919f5f2b77bb1cc733ba8ce1022f9b7c Mon Sep 17 00:00:00 2001 From: ldestailleur Date: Tue, 23 Sep 2025 12:37:57 +0200 Subject: [PATCH] Fix delete of 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 87a5d8886ab..f7a257b1c30 100644 --- a/htdocs/holiday/card.php +++ b/htdocs/holiday/card.php @@ -132,7 +132,7 @@ $candelete = 0; if ($user->hasRight('holiday', 'delete')) { $candelete = 1; } -if ($object->status == Holiday::STATUS_DRAFT && $user->hasRight('holiday', 'write') && in_array($object->fk_user, $childids)) { +if (($object->status == Holiday::STATUS_DRAFT || $object->status == Holiday::STATUS_CANCELED || $object->status == Holiday::STATUS_REFUSED) && $user->hasRight('holiday', 'write') && in_array($object->fk_user, $childids)) { $candelete = 1; } @@ -1642,7 +1642,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') { if (($permissiontoadd || $permissiontoaddall) && $object->status == Holiday::STATUS_CANCELED) { print ''.$langs->trans("SetToDraft").''; } - if ($candelete && ($object->status == Holiday::STATUS_DRAFT || $object->status == Holiday::STATUS_CANCELED || $object->status == Holiday::STATUS_REFUSED)) { // If draft or canceled or refused + if ($candelete) { // If draft or canceled or refused print ''.$langs->trans("DeleteCP").''; }