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

Zeiterfassung Update

Browse Source 
* Neues Genehmigungsverfahren für Buchhaltung eingeführt
* Buchungsarten für Mitarbeiter erweitert Arztbesuch/Behörde/Weiterbildung
* Neues Flag in Personaladministration für von Buchhaltung zu genehmigen
This commit is contained in:
Daniel Spitzer
2025-10-28 17:54:18 +01:00
parent 6bc1096700
commit 21326d4757
12 changed files with 435 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/TimerecordingReport/TimerecordingReportController.php
View File

@@ -433,9 +433,9 @@ class TimerecordingReportController extends mfBaseController
$day = $daysgerm[date("w", $timerecording->start)];
}
if ($timerecording->timerecordingCategory->approval == 1 && $timerecording->approved == 0) {
if (($timerecording->timerecordingCategory->approval == 1 && $timerecording->approved == 0 )|| ($timerecording->timerecordingCategory->approval_fibu == 1 && $timerecording->approved == 0)) {
$state = '<i class="fa-regular fa-clock mr-1"></i>';
} else if ($timerecording->timerecordingCategory->approval == 1 && $timerecording->approved == 1) {
} else if (($timerecording->timerecordingCategory->approval == 1 && $timerecording->approved == 1) || ($timerecording->timerecordingCategory->approval_fibu == 1 && $timerecording->approved == 1 )) {
$state = '<i class="fa-regular fa-circle-check mr-1"></i>';
}
$edit = "";