|
@@ -360,7 +360,7 @@ foreach($cumul_week as &$r) {
|
|
|
if ($daynumofweek<=$floornbworkday) {
|
|
|
$date_workday = 1;
|
|
|
}
|
|
|
- elseif ($daynumofweek<$ceilnbworkday) {
|
|
|
+ elseif ($daynumofweek<=$ceilnbworkday) {
|
|
|
$date_workday = $employ['days'] - $floornbworkday;
|
|
|
}
|
|
|
$r['weekly'] += $date_workday*$employ['daily'];
|
|
@@ -445,7 +445,7 @@ foreach($cumul_mois as &$r) {
|
|
|
if ($daynumofweek<=$floornbworkday) {
|
|
|
$d += $date_workday = 1;
|
|
|
}
|
|
|
- elseif ($daynumofweek<$ceilnbworkday) {
|
|
|
+ elseif ($daynumofweek<=$ceilnbworkday) {
|
|
|
$d += $date_workday = $employ['days'] - $floornbworkday;
|
|
|
}
|
|
|
$r['monthly'] += $date_workday*$employ['daily'];
|
|
@@ -522,7 +522,7 @@ for ($i=1;$i<=$month_number;$i++) {
|
|
|
if ($daynumofweek<=$floornbworkday) {
|
|
|
$month_workdays += $date_workday = 1;
|
|
|
}
|
|
|
- elseif ($daynumofweek<$ceilnbworkday) {
|
|
|
+ elseif ($daynumofweek<=$ceilnbworkday) {
|
|
|
$month_workdays += $date_workday = $employ['days'] - $floornbworkday;
|
|
|
}
|
|
|
}
|
|
@@ -584,7 +584,7 @@ foreach($holidays as $ddate) {
|
|
|
if ($daynumofweek<=$floornbworkday) {
|
|
|
$date_workday = 1;
|
|
|
}
|
|
|
- elseif ($daynumofweek<$ceilnbworkday) {
|
|
|
+ elseif ($daynumofweek<=$ceilnbworkday) {
|
|
|
$date_workday = $employ['days'] - $floornbworkday;
|
|
|
}
|
|
|
if ($lmonth==$month)
|
|
@@ -715,7 +715,7 @@ if ($q) {
|
|
|
if ($daynumofweek<=$floornbworkday) {
|
|
|
$date_workday = 1;
|
|
|
}
|
|
|
- elseif ($daynumofweek<$ceilnbworkday) {
|
|
|
+ elseif ($daynumofweek<=$ceilnbworkday) {
|
|
|
$date_workday = $employ['days'] - $floornbworkday;
|
|
|
}
|
|
|
|
|
@@ -949,7 +949,7 @@ if ($q) {
|
|
|
if ($daynumofweek<=$floornbworkday) {
|
|
|
$date_workday = 1;
|
|
|
}
|
|
|
- elseif ($daynumofweek<$ceilnbworkday) {
|
|
|
+ elseif ($daynumofweek<=$ceilnbworkday) {
|
|
|
$date_workday = $employ['days'] - $floornbworkday;
|
|
|
}
|
|
|
|