Zeiterfassung neues Feature:
Features für Project 7832: * Das Pickerldatum Zusatzfeld * Auftrennen PKW und Anhänger * Dokumente Upload * Standardsortierung * Ausgeschieden Flag mit Datum * zusätzliche migration
This commit is contained in:
@@ -123,6 +123,10 @@
|
||||
}
|
||||
$initialApproval = date("Y-m-d H:i:s", $timerecordingcar->initial_approval);
|
||||
$initialApprovalMonth = date("m", $timerecordingcar->initial_approval);
|
||||
if ($timerecordingcar->override_approval) {
|
||||
$overrideApproval = date("Y-m-d H:i:s", $timerecordingcar->override_approval);
|
||||
$initialApprovalMonth = date("m", $timerecordingcar->override_approval);
|
||||
}
|
||||
$firstApproval = strtotime('+' . $timerecordingcar->first_approval . 'years', strtotime($initialApproval));
|
||||
if ($firstApproval < time()) {
|
||||
$firstApproval = strtotime(date("Y-$initialApprovalMonth-01", time()));
|
||||
@@ -202,6 +206,10 @@
|
||||
}
|
||||
$initialApproval = date("Y-m-d H:i:s", $timerecordingcar->initial_approval);
|
||||
$initialApprovalMonth = date("m", $timerecordingcar->initial_approval);
|
||||
if ($timerecordingcar->override_approval) {
|
||||
$overrideApproval = date("Y-m-d H:i:s", $timerecordingcar->override_approval);
|
||||
$initialApprovalMonth = date("m", $timerecordingcar->override_approval);
|
||||
}
|
||||
$firstApproval = strtotime('+' . $timerecordingcar->first_approval . 'years', strtotime($initialApproval));
|
||||
if ($firstApproval < time()) {
|
||||
$firstApproval = strtotime(date("Y-$initialApprovalMonth-01", time()));
|
||||
|
||||
Reference in New Issue
Block a user