From 67f5837072bdcd63b769ece06d6daeaec4dbee73 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 9 Mar 2021 19:51:11 +0100
Subject: [PATCH] Fix permission to create a holiday when advanced permissions
 are set

---
 htdocs/holiday/card.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index bbd5a1ac9d4..40d127496a4 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -148,7 +148,10 @@ if (empty($reshook))
 			$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->holiday->write)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->holiday->writeall_advance))) {
+			if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->holiday->write))
+				|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->id == $fuserid && empty($user->rights->holiday->write))
+				|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->id != $fuserid && empty($user->rights->holiday->writeall_advance))
+				) {
 				$error++;
 				setEventMessages($langs->trans("NotEnoughPermission"), null, 'errors');
 			} else {