Merge branch 'spidev' into 'master'
Zeiterfassung neues Feature: See merge request fronk/thetool!1096
This commit is contained in:
@@ -778,7 +778,14 @@ class TimerecordingReportController extends mfBaseController
|
||||
} else {
|
||||
$overtimes = $this->checkOvertime($timerecording);
|
||||
$isSecondscleanarray[$timerecording->timerecordingCategory->short] = $isSecondscleanarray[$timerecording->timerecordingCategory->short] - $overtimes['sum'];
|
||||
if ($employee->only_admin!=1)
|
||||
{
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
$isSeconds = $isSeconds - $overtimes['sum'];
|
||||
}
|
||||
$O100pfl = $O100pfl + $overtimes['O100pfl'];
|
||||
$O100free = $O100free + $overtimes['O100free'];
|
||||
$O50free = $O50free + $overtimes['O50free'];
|
||||
|
||||
Reference in New Issue
Block a user