From 5d775dcb5d004320eb0498e96d91fe0ee09f7bf3 Mon Sep 17 00:00:00 2001 From: dolibarr95 <24292300+dolibarr95@users.noreply.github.com> Date: Thu, 6 Mar 2025 08:44:39 +0100 Subject: [PATCH] Add $includemonday var Related to https://www.dolibarr.fr/forum/t/erreur-sur-calcul-de-conges/48690/43?u=dolibarr95 --- htdocs/core/lib/date.lib.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php index 181ce34976d..02e33450c72 100644 --- a/htdocs/core/lib/date.lib.php +++ b/htdocs/core/lib/date.lib.php @@ -975,24 +975,30 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '', // If we have to include Friday, Saturday and Sunday if (!$ferie) { - if ($includefriday || $includesaturday || $includesunday) { + if ($includefriday || $includesaturday || $includesunday || $includemonday) { $jour_julien = unixtojd($timestampStart); $jour_semaine = jddayofweek($jour_julien, 0); - if ($includefriday) { //Friday (5), Saturday (6) and Sunday (0) + //Monday (1), Friday (5), Saturday (6) and Sunday (0) + if ($includefriday) { if ($jour_semaine == 5) { $ferie = true; } } - if ($includesaturday) { //Friday (5), Saturday (6) and Sunday (0) + if ($includesaturday) { if ($jour_semaine == 6) { $ferie = true; } } - if ($includesunday) { //Friday (5), Saturday (6) and Sunday (0) + if ($includesunday) { if ($jour_semaine == 0) { $ferie = true; } } + if ($includemonday) { + if ($jour_semaine == 1) { + $ferie = true; + } + } } } //print "ferie=".$ferie."\n";