Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-05 09:08:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

code simplification (#33355)

Browse Source 
see https://github.com/Dolibarr/dolibarr/pull/33347
This commit is contained in:
dolibarr95
2025-03-06 14:00:17 +01:00
committed by GitHub
parent f29f7035c2
commit 781abe8615
1 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
htdocs/core/lib/date.lib.php
View File

@@ -979,25 +979,17 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
$jour_julien = unixtojd($timestampStart);
$jour_semaine = jddayofweek($jour_julien, 0);
//Monday (1), Friday (5), Saturday (6) and Sunday (0)
if ($includefriday) {
if ($jour_semaine == 5) {
$ferie = true;
}
if ($includefriday && $jour_semaine == 5) {
$ferie = true;
}
if ($includesaturday) {
if ($jour_semaine == 6) {
$ferie = true;
}
if ($includesaturday && $jour_semaine == 6) {
$ferie = true;
}
if ($includesunday) {
if ($jour_semaine == 0) {
$ferie = true;
}
if ($includesunday && $jour_semaine == 0) {
$ferie = true;
}
if ($includemonday) {
if ($jour_semaine == 1) {
$ferie = true;
}
if ($includemonday && $jour_semaine == 1) {
$ferie = true;
}
}
}