Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Merge branch 'spidev' into 'master'

Browse Source 
Zeiterfassung Update

See merge request fronk/thetool!353
This commit is contained in:
Daniel Spitzer
2024-05-07 07:34:15 +00:00
parent e182fa09d3 eaaaeb1581
commit d03a0e0be0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/TimerecordingBilling/TimerecordingBillingController.php
+2 -2
View File
@@ -527,10 +527,10 @@ class TimerecordingBillingController extends mfBaseController
$data['transfer_plushours'] = $data['transfer_plushours'] + ($diff - $maxplushours); $data['transfer_plushours'] = $data['transfer_plushours'] + ($diff - $maxplushours);
} }
if ($timerecording['employee_id'] == "12") {
$data['transfer_plushours'] = $data['transfer_plushours'] - $data['overtime50free'] ; $data['transfer_plushours'] = $data['transfer_plushours'] - $data['overtime50free'] ;
$data['overtime50free'] = 0; $data['overtime50free'] = 0;
}
if ($data['transfer_plushours'] > 0) { if ($data['transfer_plushours'] > 0) {