Zeiterfassung Update Monatsabschluss/Verrechnung
* Berechnungen aller Ü50/Ü100/M25 sowie Steuerfrei und Pflichtig * Transfer Mehrstunden auf Ü50/Ü100/M25 * Anpassungen der Exports LZs MehrstundenGL ÜGL Ü50,Ü100,M25 * Autoberechnung der anteiligen Mehrstunden * automatische Ü100 Rausrechnung laut gesetzlichen Vorgaben Bugfixes: * Start und Enddatum eines Mitarbeiters werden nun überall berücksichtigt. * Textuelle Bereinigungen * Umfangreiche Testscenarien Verechnung/Exports
This commit is contained in:
@@ -97,14 +97,26 @@ class TimerecordingEmployeeController extends mfBaseController
|
||||
}
|
||||
}
|
||||
$plushours = $r->plushours;
|
||||
$plushours = str_replace(',', '.', $plushours);
|
||||
if (is_numeric($plushours)) {
|
||||
$plushours = $plushours * 3600;
|
||||
if ($plushours) {
|
||||
$plushours = str_replace(',', '.', $plushours);
|
||||
if (is_numeric($plushours)) {
|
||||
$plushours = $plushours * 3600;
|
||||
} else {
|
||||
$plushours = 0;
|
||||
}
|
||||
} else {
|
||||
$plushours = 0;
|
||||
}
|
||||
$overtime = $r->overtime;
|
||||
$overtime = str_replace(',', '.', $overtime);
|
||||
if (is_numeric($overtime)) {
|
||||
$overtime = $overtime * 3600;
|
||||
if ($overtime) {
|
||||
$overtime = str_replace(',', '.', $overtime);
|
||||
if (is_numeric($overtime)) {
|
||||
$overtime = $overtime * 3600;
|
||||
} else {
|
||||
$overtime = 0;
|
||||
}
|
||||
} else {
|
||||
$overtime = 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -119,7 +131,9 @@ class TimerecordingEmployeeController extends mfBaseController
|
||||
$data['bmd_active'] = trim($r->bmd_active);
|
||||
$data['overtime'] = $overtime;
|
||||
|
||||
|
||||
if (!$data['holidays']) {
|
||||
$data['holidays'] = 0;
|
||||
}
|
||||
if ($r->bpahours) {
|
||||
$bpahours = $r->bpahours;
|
||||
$bpahours = str_replace(',', '.', $bpahours);
|
||||
|
||||
Reference in New Issue
Block a user