Merge branch 'spidev' into 'master'
Zeiterfassung Update See merge request fronk/thetool!353
This commit is contained in:
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user