diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php index 2f5b983c468..bba1f48a48b 100644 --- a/htdocs/core/lib/date.lib.php +++ b/htdocs/core/lib/date.lib.php @@ -642,21 +642,21 @@ function num_public_holiday($timestampStart, $timestampEnd, $countrycode='FR') date("m", $date_paques), date("d", $date_paques) + 38, date("Y", $date_paques) - ); + ); $jour_ascension = date("d", $date_ascension); $mois_ascension = date("m", $date_ascension); if($jour_ascension == $jour && $mois_ascension == $mois) $ferie=true; //Ascension // Calcul de Pentecote (11 jours apres Paques) - $date_pentecote = mktime( + $date_pentecote = mktime( date("H", $date_ascension), date("i", $date_ascension), date("s", $date_ascension), date("m", $date_ascension), date("d", $date_ascension) + 11, date("Y", $date_ascension) - ); + ); $jour_pentecote = date("d", $date_pentecote); $mois_pentecote = date("m", $date_pentecote); if($jour_pentecote == $jour && $mois_pentecote == $mois) $ferie=true; diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index d683a09bd75..d63104c5fe6 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -373,18 +373,18 @@ function dol_string_unaccent($str) { $string = strtr( $str, - "\xC0\xC1\xC2\xC3\xC5\xC7 - \xC8\xC9\xCA\xCB\xCC\xCD\xCE\xCF\xD0\xD1 - \xD2\xD3\xD4\xD5\xD8\xD9\xDA\xDB\xDD - \xE0\xE1\xE2\xE3\xE5\xE7\xE8\xE9\xEA\xEB - \xEC\xED\xEE\xEF\xF0\xF1\xF2\xF3\xF4\xF5\xF8 - \xF9\xFA\xFB\xFD\xFF", - "AAAAAC - EEEEIIIIDN - OOOOOUUUY - aaaaaceeee - iiiidnooooo - uuuyy" + "\xC0\xC1\xC2\xC3\xC5\xC7 + \xC8\xC9\xCA\xCB\xCC\xCD\xCE\xCF\xD0\xD1 + \xD2\xD3\xD4\xD5\xD8\xD9\xDA\xDB\xDD + \xE0\xE1\xE2\xE3\xE5\xE7\xE8\xE9\xEA\xEB + \xEC\xED\xEE\xEF\xF0\xF1\xF2\xF3\xF4\xF5\xF8 + \xF9\xFA\xFB\xFD\xFF", + "AAAAAC + EEEEIIIIDN + OOOOOUUUY + aaaaaceeee + iiiidnooooo + uuuyy" ); $string = strtr($string, array("\xC4"=>"Ae", "\xC6"=>"AE", "\xD6"=>"Oe", "\xDC"=>"Ue", "\xDE"=>"TH", "\xDF"=>"ss", "\xE4"=>"ae", "\xE6"=>"ae", "\xF6"=>"oe", "\xFC"=>"ue", "\xFE"=>"th")); return $string;