Zeiterfassung Update
* Gehnemigte Buchungen können jetzt von der Buchhaltung verändert werden
This commit is contained in:
@@ -471,7 +471,7 @@ class TimerecordingReportController extends mfBaseController
|
|||||||
|
|
||||||
|
|
||||||
if ($timerecording->completed == 0):
|
if ($timerecording->completed == 0):
|
||||||
if ($timerecording->approved == 0) :
|
if ($timerecording->approved == 0 || $timerecording->approved == 1) :
|
||||||
$ddays = $timerecording->days;
|
$ddays = $timerecording->days;
|
||||||
if ($timerecording->timerecordingCategory->hourday == 8) {
|
if ($timerecording->timerecordingCategory->hourday == 8) {
|
||||||
$ddays = round($timerecording->hours_bpa / 60 / 60, 2);
|
$ddays = round($timerecording->hours_bpa / 60 / 60, 2);
|
||||||
@@ -1096,7 +1096,7 @@ class TimerecordingReportController extends mfBaseController
|
|||||||
|
|
||||||
|
|
||||||
if ($timerecording->completed == 0 && $timerecording->timerecordingCategory->only_admin == 0):
|
if ($timerecording->completed == 0 && $timerecording->timerecordingCategory->only_admin == 0):
|
||||||
if ($timerecording->approved == 0) :
|
if ($timerecording->approved == 0 || $timerecording->approved == 1) :
|
||||||
$edit = '<i class="far fa-edit edit-button" data-id="' . $timerecording->id . '"
|
$edit = '<i class="far fa-edit edit-button" data-id="' . $timerecording->id . '"
|
||||||
data-date="' . $datadate . '"
|
data-date="' . $datadate . '"
|
||||||
data-category="' . $timerecording->timerecordingCategory->id . '"
|
data-category="' . $timerecording->timerecordingCategory->id . '"
|
||||||
|
|||||||
Reference in New Issue
Block a user