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

Add holiday for India

Browse Source
This commit is contained in:
Laurent Destailleur 2018-10-23 12:49:48 +02:00
parent f65df9e541
commit e0b20c2632
1 changed files with 15 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -585,6 +585,7 @@ function num_public_holiday($timestampStart, $timestampEnd, $countrycode='FR', $
{ {
$ferie=false; $ferie=false;
$countryfound=0; $countryfound=0;
$includesaturdayandsunday=1;
$jour = date("d", $timestampStart); $jour = date("d", $timestampStart);
$mois = date("m", $timestampStart); $mois = date("m", $timestampStart);
@ -671,12 +672,6 @@ function num_public_holiday($timestampStart, $timestampEnd, $countrycode='FR', $
$mois_pentecote = date("m", $date_pentecote); $mois_pentecote = date("m", $date_pentecote);
if($jour_pentecote == $jour && $mois_pentecote == $mois) $ferie=true; if($jour_pentecote == $jour && $mois_pentecote == $mois) $ferie=true;
// "Pentecote" // "Pentecote"
// Calul des samedis et dimanches
$jour_julien = unixtojd($timestampStart);
$jour_semaine = jddayofweek($jour_julien, 0);
if($jour_semaine == 0 || $jour_semaine == 6) $ferie=true;
// Samedi (6) et dimanche (0)
} }
// Pentecoste and Ascensione in Italy go to the sunday after: isn't holiday. // Pentecoste and Ascensione in Italy go to the sunday after: isn't holiday.
@ -703,12 +698,18 @@ function num_public_holiday($timestampStart, $timestampEnd, $countrycode='FR', $
$mois_paques = date("m", $date_paques); $mois_paques = date("m", $date_paques);
if($jour_paques == $jour && $mois_paques == $mois) $ferie=true; if($jour_paques == $jour && $mois_paques == $mois) $ferie=true;
// Paques // Paques
}
// Calul des samedis et dimanches if ($countrycode == 'IN')
$jour_julien = unixtojd($timestampStart); {
$jour_semaine = jddayofweek($jour_julien, 0); $countryfound=1;
if($jour_semaine == 0 || $jour_semaine == 6) $ferie=true;
//Samedi (6) et dimanche (0) if($jour == 1 && $mois == 1) $ferie=true; // New Year's Day
if($jour == 26 && $mois == 1) $ferie=true; // Republic Day
if($jour == 1 && $mois == 5) $ferie=true; // May Day
if($jour == 15 && $mois == 8) $ferie=true; // Independence Day
if($jour == 2 && $mois == 10) $ferie=true; // Gandhi Jayanti
if($jour == 25 && $mois == 12) $ferie=true; // Christmas
} }
if ($countrycode == 'ES') if ($countrycode == 'ES')
@ -746,12 +747,6 @@ function num_public_holiday($timestampStart, $timestampEnd, $countrycode='FR', $
$mois_viernes = date("m", $date_viernes); $mois_viernes = date("m", $date_viernes);
if($jour_viernes == $jour && $mois_viernes == $mois) $ferie=true; if($jour_viernes == $jour && $mois_viernes == $mois) $ferie=true;
//Viernes Santo //Viernes Santo
// Calul des samedis et dimanches
$jour_julien = unixtojd($timestampStart);
$jour_semaine = jddayofweek($jour_julien, 0);
if($jour_semaine == 0 || $jour_semaine == 6) $ferie=true;
//Samedi (6) et dimanche (0)
} }
if ($countrycode == 'AT') if ($countrycode == 'AT')
@ -833,22 +828,15 @@ function num_public_holiday($timestampStart, $timestampEnd, $countrycode='FR', $
$mois_fronleichnam = date("m", $date_fronleichnam); $mois_fronleichnam = date("m", $date_fronleichnam);
if($jour_fronleichnam == $jour && $mois_fronleichnam == $mois) $ferie=true; if($jour_fronleichnam == $jour && $mois_fronleichnam == $mois) $ferie=true;
// Fronleichnam // Fronleichnam
// Calul des samedis et dimanches
$jour_julien = unixtojd($timestampStart);
$jour_semaine = jddayofweek($jour_julien, 0);
if($jour_semaine == 0 || $jour_semaine == 6) $ferie=true;
//Samedi (6) et dimanche (0)
} }
// Cas pays non defini // If we have to include saturday and sunday
if (! $countryfound) if ($includesaturdayandsunday)
{ {
// Calul des samedis et dimanches
$jour_julien = unixtojd($timestampStart); $jour_julien = unixtojd($timestampStart);
$jour_semaine = jddayofweek($jour_julien, 0); $jour_semaine = jddayofweek($jour_julien, 0);
if($jour_semaine == 0 || $jour_semaine == 6) $ferie=true; if($jour_semaine == 0 || $jour_semaine == 6) $ferie=true;
//Samedi (6) et dimanche (0) //Saturday (6) and Sunday (0)
} }
// On incremente compteur // On incremente compteur