From c42b4099728b3496c8ba5205380caa7cf86b9e7c Mon Sep 17 00:00:00 2001
From: Daniel Spitzer <daniel.spitzer@inode.at>
Date: Mon, 10 Mar 2025 08:36:12 +0100
Subject: [PATCH] =?UTF-8?q?Zeiterfassung=20neues=20Feature:=20Features=20f?=
 =?UTF-8?q?=C3=BCr=20Project=207832:=20*=20Das=20Pickerldatum=20Zusatzfeld?=
 =?UTF-8?q?=20*=20Auftrennen=20PKW=20und=20Anh=C3=A4nger=20*=20Dokumente?=
 =?UTF-8?q?=20Upload=20*=20Standardsortierung=20*=20Ausgeschieden=20Flag?=
 =?UTF-8?q?=20mit=20Datum=20*=20zus=C3=A4tzliche=20migration?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Layout/default/TimerecordingCar/Detail.php | 4 ++--
 Layout/default/TimerecordingCar/Index.php  | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Layout/default/TimerecordingCar/Detail.php b/Layout/default/TimerecordingCar/Detail.php
index 8e8a5bba6..15bd2861d 100644
--- a/Layout/default/TimerecordingCar/Detail.php
+++ b/Layout/default/TimerecordingCar/Detail.php
@@ -16,7 +16,7 @@ $approval = date("m/Y", $firstApproval);
 $cartypes = TimerecordingCarModel::$carTypes;
 
 ?>
-    <link href="<?= self::getResourcePath() ?>assets/css/datatables-std.css?<?= date('U') ?>" rel="stylesheet"
+    <link href="<?= self::getResourcePath() ?>assets/css/datatables-std.css?<?= $git_merge_ts ?>" rel="stylesheet"
           type="text/css"/>
     <link href="<?= self::getResourcePath() ?>css/pages/TimerecordingCar/Form.css?<?= $git_merge_ts ?>" rel="stylesheet"
           type="text/css"/>
@@ -266,7 +266,7 @@ $cartypes = TimerecordingCarModel::$carTypes;
         });
     </script>
     <script type="text/javascript"
-            src="<?= self::getResourcePath() ?>assets/js/datatables-std.js?<?= date('U') ?>"></script>
+            src="<?= self::getResourcePath() ?>assets/js/datatables-std.js?<?= $git_merge_ts ?>"></script>
 
 
 <?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/footer.php"); ?>
\ No newline at end of file
diff --git a/Layout/default/TimerecordingCar/Index.php b/Layout/default/TimerecordingCar/Index.php
index 3511303fe..50830625e 100644
--- a/Layout/default/TimerecordingCar/Index.php
+++ b/Layout/default/TimerecordingCar/Index.php
@@ -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()));