Merge branch 'spidev' into 'master'

Zeiterfassung Update

See merge request fronk/thetool!353
This commit is contained in:
Daniel Spitzer
2024-05-07 07:34:15 +00:00

View File

@@ -527,10 +527,10 @@ class TimerecordingBillingController extends mfBaseController
$data['transfer_plushours'] = $data['transfer_plushours'] + ($diff - $maxplushours);
}
if ($timerecording['employee_id'] == "12") {
$data['transfer_plushours'] = $data['transfer_plushours'] - $data['overtime50free'] ;
$data['overtime50free'] = 0;
}
if ($data['transfer_plushours'] > 0) {