lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix 3 weekend holiday behavior after adding support to Friday as a holiday.

Browse Source
This commit is contained in:
Ahmad Hadeed 2021-04-05 22:05:22 +03:00
parent caa2facd47
commit f2f2aed6cd
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -658,7 +658,7 @@ function getGMTEasterDatetime($year)
} }
/** /**
* Return the number of non working days including saturday and sunday (or not) between 2 dates in timestamp. * Return the number of non working days including Friday, Saturday and Sunday (or not) between 2 dates in timestamp.
* Dates must be UTC with hour, min, sec to 0. * Dates must be UTC with hour, min, sec to 0.
* Called by function num_open_day() * Called by function num_open_day()
* *
@ -687,7 +687,7 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
$country_code = $mysoc->country_code; $country_code = $mysoc->country_code;
} }
if ($includefriday < 0) { if ($includefriday < 0) {
$includefriday = (isset($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_FRIDAY) ? $conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_FRIDAY : 1); $includefriday = (isset($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_FRIDAY) ? $conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_FRIDAY : 0);
} }
if ($includesaturday < 0) { if ($includesaturday < 0) {
$includesaturday = (isset($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY) ? $conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY : 1); $includesaturday = (isset($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY) ? $conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY : 1);
@ -839,7 +839,7 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
} }
//print "ferie=".$ferie."\n"; //print "ferie=".$ferie."\n";
// If we have to include saturday and sunday // If we have to include Friday, Saturday and Sunday
if (!$ferie) { if (!$ferie) {
if ($includefriday || $includesaturday || $includesunday) { if ($includefriday || $includesaturday || $includesunday) {
$jour_julien = unixtojd($timestampStart); $jour_julien = unixtojd($timestampStart);