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

Fix: fonction dolibarr_mktime inadapt car retourne une valeur null lorsqu'on change d'anne

Browse Source
This commit is contained in:
Regis Houssin
2007-12-27 10:12:03 +00:00
parent f1b4debfe2
commit e55c5d323f
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/lib/functions.inc.php
View File

@@ -3020,7 +3020,7 @@ function num_public_holiday($timestampStart, $timestampEnd, $countrycode='FR')
// Paques // Paques
// Calcul du jour de l ascension (38 jours apres Paques) // Calcul du jour de l ascension (38 jours apres Paques)
$date_ascension = dolibarr_mktime(date("H", $date_paques), $date_ascension = mktime(date("H", $date_paques),
date("i", $date_paques), date("i", $date_paques),
date("s", $date_paques), date("s", $date_paques),
date("m", $date_paques), date("m", $date_paques),
@@ -3033,7 +3033,7 @@ function num_public_holiday($timestampStart, $timestampEnd, $countrycode='FR')
//Ascension //Ascension
// Calcul de Pentecote (11 jours apres Paques) // Calcul de Pentecote (11 jours apres Paques)
$date_pentecote = dolibarr_mktime(date("H", $date_ascension), $date_pentecote = mktime(date("H", $date_ascension),
date("i", $date_ascension), date("i", $date_ascension),
date("s", $date_ascension), date("s", $date_ascension),
date("m", $date_ascension), date("m", $date_ascension),
@@ -3070,7 +3070,7 @@ function num_public_holiday($timestampStart, $timestampEnd, $countrycode='FR')
// Incrementation du nombre de jour (on avance dans la boucle) // Incrementation du nombre de jour (on avance dans la boucle)
$jour++; $jour++;
$timestampStart=dolibarr_mktime(0,0,0,$mois,$jour,$annee); $timestampStart=mktime(0,0,0,$mois,$jour,$annee);
} }
return $nbFerie; return $nbFerie;
@@ -3111,15 +3111,9 @@ function num_between_day($timestampStart, $timestampEnd, $lastday=0)
function num_open_day($timestampStart, $timestampEnd,$inhour=0,$lastday=0) function num_open_day($timestampStart, $timestampEnd,$inhour=0,$lastday=0)
{ {
if ($timestampStart < $timestampEnd) if ($timestampStart < $timestampEnd)
{
if ($lastday == 1)
{
$bit = 1;
}
else
{ {
$bit = 0; $bit = 0;
} if ($lastday == 1) $bit = 1;
$nbOpenDay = num_between_day($timestampStart, $timestampEnd, $bit) - num_public_holiday($timestampStart, $timestampEnd); $nbOpenDay = num_between_day($timestampStart, $timestampEnd, $bit) - num_public_holiday($timestampStart, $timestampEnd);
if ($inhour == 1) $nbOpenDay = $nbOpenDay*24; if ($inhour == 1) $nbOpenDay = $nbOpenDay*24;
} }