diff --git a/Layout/default/TimerecordingReportExport/Index.php b/Layout/default/TimerecordingReportExport/Index.php index 42919b1ac..fc211e2db 100644 --- a/Layout/default/TimerecordingReportExport/Index.php +++ b/Layout/default/TimerecordingReportExport/Index.php @@ -5,6 +5,12 @@ type="text/css"/>
@@ -36,7 +42,8 @@

Hier wird eine XLS Auswertung pro Mitarbeiter generiert mit Urlaub, Mehrstunden und Gutstunden zum Stichtag X
- Zur Zeit ist der Stichtag auf den letzten Tag des ausgewählten Monats gesetzt.
+ Zur Zeit ist der Stichtag auf den + letzten Tag des ausgewählten Monats gesetzt.

diff --git a/application/TimerecordingReportExport/TimerecordingReportExportController.php b/application/TimerecordingReportExport/TimerecordingReportExportController.php index ffb55b610..254c619ed 100644 --- a/application/TimerecordingReportExport/TimerecordingReportExportController.php +++ b/application/TimerecordingReportExport/TimerecordingReportExportController.php @@ -104,8 +104,8 @@ class TimerecordingReportExportController extends mfBaseController $sheet->setCellValue('B' . $row, $employee_number); $sheet->setCellValue('C' . $row, $timerecordingbillingsemployee->timerecordingEmployee->user->name); $sheet->setCellValue('D' . $row, $holidays[$timerecordingbillingsemployee->timerecordingEmployee->user_id]); - $sheet->setCellValue('E' . $row, number_format(round(($timerecordingbillingsemployee->plushours_all + $timerecordingbillingsemployee->transfer_plushours) / 3600, 2), "2", ",", ".")); - $sheet->setCellValue('F' . $row, number_format(round(($timerecordingbillingsemployee->timerecordingEmployee->overtime_now + $overtimediff) / 3600, 2), "2", ",", ".")); + $sheet->setCellValue('E' . $row, round(($timerecordingbillingsemployee->plushours_all + $timerecordingbillingsemployee->transfer_plushours) / 3600, 2)); + $sheet->setCellValue('F' . $row, round(($timerecordingbillingsemployee->timerecordingEmployee->overtime_now + $overtimediff) / 3600, 2)); $oldEmployee_id = $timerecordingbillingsemployee->timerecordingEmployee_id; $row++; @@ -116,6 +116,7 @@ class TimerecordingReportExportController extends mfBaseController $sheet->getStyle('A2:A' . $row)->getNumberFormat()->setFormatCode('@'); $sheet->getStyle('C2:C' . $row)->getNumberFormat()->setFormatCode($number_format_code); + $sheet->getStyle('E2:E' . $row)->getNumberFormat()->setFormatCode($number_format_code); $sheet->getStyle('F2:F' . $row)->getNumberFormat()->setFormatCode($number_format_code); $sheet->getStyle('G2:G' . $row)->getNumberFormat()->setFormatCode($number_format_code); $sheet->getStyle('H2:H' . $row)->getNumberFormat()->setFormatCode($number_format_code);