From e55c5d323f0e8a989f732983447aadda8b275c5c Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Thu, 27 Dec 2007 10:12:03 +0000 Subject: [PATCH] =?UTF-8?q?Fix:=20fonction=20dolibarr=5Fmktime=20inadapt?= =?UTF-8?q?=E9=20car=20retourne=20une=20valeur=20null=20lorsqu'on=20change?= =?UTF-8?q?=20d'ann=E9e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/lib/functions.inc.php | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/htdocs/lib/functions.inc.php b/htdocs/lib/functions.inc.php index 23aefbddbc6..2c433cbfa01 100644 --- a/htdocs/lib/functions.inc.php +++ b/htdocs/lib/functions.inc.php @@ -3020,7 +3020,7 @@ function num_public_holiday($timestampStart, $timestampEnd, $countrycode='FR') // 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("s", $date_paques), date("m", $date_paques), @@ -3033,7 +3033,7 @@ function num_public_holiday($timestampStart, $timestampEnd, $countrycode='FR') //Ascension // 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("s", $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) $jour++; - $timestampStart=dolibarr_mktime(0,0,0,$mois,$jour,$annee); + $timestampStart=mktime(0,0,0,$mois,$jour,$annee); } return $nbFerie; @@ -3112,14 +3112,8 @@ function num_open_day($timestampStart, $timestampEnd,$inhour=0,$lastday=0) { 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); if ($inhour == 1) $nbOpenDay = $nbOpenDay*24; }