diff --git a/Layout/default/TimerecordingBilling/Detail.php b/Layout/default/TimerecordingBilling/Detail.php
index 75f4c5e8f..53d7b11ef 100644
--- a/Layout/default/TimerecordingBilling/Detail.php
+++ b/Layout/default/TimerecordingBilling/Detail.php
@@ -38,6 +38,9 @@
                     <th class="text-center">Sollabweichung</th>
                     <th class="text-center">Akuelle Gutstunden</th>
                     <th class="text-center">Akuelle Überstunden</th>
+                    <?php if ($me->superexpertEnabled()): ?>
+                        <th class="text-center">Black P. Stunden</th>
+                    <?php endif; ?>
                     <th class="text-center">Nichtleistungszeiten</th>
                     <th class="text-center">Diäten</th>
                     <th class="text-center">Homeoffice Tage</th>
@@ -50,6 +53,9 @@
                     <th></th>
                     <th></th>
                     <th></th>
+                    <?php if ($me->superexpertEnabled()): ?>
+                        <th></th>
+                    <?php endif; ?>
                     <th></th>
                     <th></th>
                     <th></th>
@@ -75,7 +81,7 @@
                         }
                         $offdays .= "</div>";
                     } else {
-                        $offdays = "keine";
+                        $offdays = "-";
                     }
                     ?>
                     <tr>
@@ -91,6 +97,10 @@
                             class="text-center"><?= $timerecording['data']['time']['plushours_now'] ?></td>
                         <td data-order="<?= $timerecording['data']['time']['overtime_noworder'] ?>"
                             class="text-center"><?= $timerecording['data']['time']['overtime_now'] ?></td>
+                        <?php if ($me->superexpertEnabled()): ?>
+                            <td data-order="<?= $timerecording['data']['time']['bpahours'] ?>"
+                                class="text-center"><?= $timerecording['data']['time']['bpahours'] ?></td>
+                        <?php endif; ?>
                         <td class=""><?= $offdays ?></td>
                         <td class="text-center"><?= number_format($timerecording['data']['time']['diet'], 2, ',', '.') . " €" ?></td>
                         <td class="text-center"><?= $timerecording['data']['time']['homeoffice'] ?> Tag(e)</td>
@@ -108,8 +118,11 @@
 
     <script type="text/javascript">
         var hidesearch = [2, 3, 4, 5, 6, 8, 9];
-
+        <?php if ($me->superexpertEnabled()): ?>
+        hidesearch = [2, 3, 4, 5, 6, 7, 9, 10];
+        <?php endif; ?>
         $(document).ready(function () {
+            $('.buttons-excel').closest('div').append('<div ><button id="month-complete" class="btn btn-danger margina">Monats Abschluss</button></div>');
             $('.buttons-excel').closest('div').append('<div ><button id="bmd-export" class="btn btn-info margina">BMD Import</button></div>');
             $('.buttons-excel').closest('div').append('<div ><button id="bmd-export-nlz" class="btn btn-info margina">BMD NLZ Import</button></div>');
 
@@ -118,9 +131,19 @@
                 window.open('<?= self::getUrl("TimerecordingBilling", "api", ['do' => 'generatebmdexport']) ?>&month=' + $('#month').data('month'), '_blank');
             });
             $('body').on('click', '#bmd-export-nlz', function () {
-
                 window.open('<?= self::getUrl("TimerecordingBilling", "api", ['do' => 'generatebmdexportnlz']) ?>&month=' + $('#month').data('month'), '_blank');
             });
+            $('body').on('click', '#month-complete', function () {
+                if (confirm('Buchung wirklich löschen?')) {
+                    $.post("<?= self::getUrl("TimerecordingBilling", "api", ['do' => 'completemonth']) ?>", {
+                        month: $.trim($('#month').data('month')),
+                        ajax: 1
+                    }).done(function (data) {
+                        window.location.href = "<?= self::getUrl("TimerecordingBilling", "detailClosed", ['month' => $month]) ?>";
+                    });
+                }
+
+            });
 
         });
     </script>
diff --git a/Layout/default/TimerecordingBilling/DetailClosed.php b/Layout/default/TimerecordingBilling/DetailClosed.php
new file mode 100644
index 000000000..a0ecc6bf0
--- /dev/null
+++ b/Layout/default/TimerecordingBilling/DetailClosed.php
@@ -0,0 +1,325 @@
+<?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/header.php");
+
+?>
+    <link href="<?= self::getResourcePath() ?>assets/css/datatables-std.css?<?= date('U') ?>" rel="stylesheet"
+          type="text/css"/>
+    <style>
+        .fa-arrow-right-from-bracket {
+            margin-top: 3px;
+            margin-right: 10px;
+            color: #2238d1;
+            cursor: pointer;
+        }
+
+        .filler {
+            width: 30px;
+            height: 1px;
+        }
+
+        .filler-0 {
+            width: 7px;
+            height: 1px;
+        }
+
+        #overtimeModal .table td, #overtimeModal .table th {
+            border: none;
+        }
+
+        @media (min-width: 992px) {
+            .modal-lg, .modal-xl {
+                max-width: 400px !important;
+            }
+        }
+
+    </style>
+    <!-- start page title -->
+    <div class="row">
+        <div class="col-12">
+            <div class="page-title-box">
+                <div class="page-title-right">
+                    <ol class="breadcrumb m-0">
+                        <li class="breadcrumb-item"><a href="<?= self::getUrl("Dashboard") ?>"><?= MFAPPNAME_SLUG ?></a>
+                        </li>
+                        <li class="breadcrumb-item active">Zeiterfassung Verrechnung</li>
+                    </ol>
+                </div>
+                <h4 id="month" data-month="<?= $month ?>" class="page-title">Verrechnung/Abrechnung <?= $month ?></h4>
+            </div>
+        </div>
+    </div>
+    <!-- end page title -->
+
+    <div class="card">
+        <div class="card-body mb-3">
+            <div class="row">
+                <div class="col-12">
+                    <div class="float-left">
+                        <h4 class="header-title">Liste aller Mitarbeiter</h4>
+                    </div>
+                </div>
+            </div>
+            <table id="datatable" class="table table-hover table-sm">
+                <thead>
+                <tr>
+                    <th class="text-center">Mitarbeiter/PersNr.</th>
+                    <th class="text-center">Leistungszeiten</th>
+                    <th class="text-center">Nichtleistungszeiten</th>
+                    <th class="text-center">Iststunden (NLZ+LZ)</th>
+                    <th class="text-center">Sollstunden</th>
+                    <th class="text-center">Sollabweichung</th>
+                    <th class="text-center">Gesamt Überstunden</th>
+                    <?php if ($me->superexpertEnabled()): ?>
+                        <th class="text-center">Black P. Stunden</th>
+                    <?php endif; ?>
+                    <th class="text-center">Ü50</th>
+                    <th class="text-center">Ü100</th>
+                    <th class="text-center">Diäten</th>
+                    <th class="text-center">Homeoffice</th>
+                </tr>
+                <tr id="filterrow">
+                    <th></th>
+                    <th></th>
+                    <th></th>
+                    <th></th>
+                    <th></th>
+                    <th></th>
+                    <?php if ($me->superexpertEnabled()): ?>
+                        <th></th>
+                    <?php endif; ?>
+                    <th></th>
+                    <th></th>
+                    <th></th>
+                    <th></th>
+                    <th></th>
+                </tr>
+                </thead>
+                <tbody>
+                <?php foreach ($timerecordings as $timerecording):
+                    $user = new User($timerecording->timerecordingEmployee->user->id);
+                    $employee_number = (string)$user->getFlag('employee_number');
+                    unset ($nlz);
+                    if ($timerecording->nlz) {
+                        $nlz_details = json_decode($timerecording->nlz, true);
+                        foreach ($nlz_details as $key => $nlz_detail) {
+                            if ($nlz_detail < 100) {
+                                $nlz .= $key . ": " . $nlz_detail . " Tag(e)<br>";
+                            } else {
+                                $nlz .= $key . ": " . round($nlz_detail / 3600, 2) . " Stunden<br>";
+                            }
+                        }
+
+                    } else {
+                        $nlz = "";
+                    }
+                    ?>
+                    <tr>
+                        <td class="text-nowrap">(<?= $employee_number ?>
+                            ) <?= $timerecording->timerecordingEmployee->user->name ?> </td>
+                        <td class="text-center"><?= number_format(round($timerecording->ishours / 3600, 2), "2", ",", ".") ?></td>
+                        <td class="text-center"><?= $nlz ?></td>
+                        <td class="text-center"><?= number_format(round($timerecording->ishourssum / 3600, 2), "2", ",", ".") ?></td>
+                        <td class="text-center"><?= number_format(round($timerecording->musthours / 3600, 2), "2", ",", ".") ?></td>
+                        <td class="text-center"><?= (($timerecording->ishourssum - $timerecording->musthours) == 0) ? '<div class="filler-0 float-left"></div>' : '' ?><?= number_format(round(($timerecording->ishourssum - $timerecording->musthours) / 3600, 2), "2", ",", ".") ?>
+                            <?= (($timerecording->ishourssum - $timerecording->musthours) > 0) ? '<i class="float-right fa-regular fa-arrow-right-from-bracket change-difference"  data-toggle="modal" data-target="#overtimeModal" data-hours="' . number_format(round(($timerecording->ishourssum - $timerecording->musthours) / 3600, 2), "2", ",", ".") . '" data-id="' . $timerecording->id . '"></i>' : '<div class="filler float-right"></div>' ?></td>
+                        <td class="text-center"><?= ($timerecording->timerecordingEmployee->overtime_now == 0) ? '<div class="filler-0 float-left"></div>' : '' ?><?= number_format(round($timerecording->timerecordingEmployee->overtime_now / 3600, 2), "2", ",", ".") ?>
+                            <?= ($timerecording->timerecordingEmployee->overtime_now > 0) ? '<i class="float-right fa-regular fa-arrow-right-from-bracket change-overtime"  data-toggle="modal" data-target="#overtimeModal" data-hours="' . number_format(round($timerecording->timerecordingEmployee->overtime_now / 3600, 2), "2", ",", ".") . '" data-id="' . $timerecording->id . '"></i>' : '<div class="filler float-right"></div>' ?></td>
+                        <?php if ($me->superexpertEnabled()): ?>
+                            <td class="text-center"><?= number_format(round($timerecording->timerecordingEmployee->bpahours / 3600, 2), "2", ",", ".") ?></td>
+                        <?php endif; ?>
+                        <td class="text-center"><?= number_format(round($timerecording->overtime50free / 3600, 2), "2", ",", ".") ?></td>
+                        <td class="text-center"><?= number_format(round($timerecording->overtime100free / 3600, 2), "2", ",", ".") ?></td>
+                        <td class="text-center"><?= number_format($timerecording->diet, 2, ',', '.') . " €" ?></td>
+                        <td class="text-center"><?= $timerecording->homeoffice ?> Tag(e)</td>
+                    </tr>
+                <?php endforeach; ?>
+                </tbody>
+            </table>
+
+        </div>
+    </div>
+
+    </div>
+    </div>
+    <div class="modal fade" id="overtimeModal" tabindex="-1" role="dialog"
+         aria-labelledby="overtimeModalInfoLabel"
+         aria-hidden="true" data-id="">
+        <div class="modal-dialog modal-dialog-centered modal-lg" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title" id="overtimeModal-title"></h5>
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                        <span aria-hidden="true">&times;</span>
+                    </button>
+                </div>
+                <div class="modal-body">
+                    <div class="row">
+                        <div class="col-12">
+                            <table class="table ">
+                                <tr id="overtimes">
+                                </tr>
+                                <tr>
+                                    <th class="align-middle">Überstunden 50</th>
+                                    <td><input type="number" step="any" class="form-control change-overtime-value"
+                                               name="overtime50"
+                                               id="overtime50"></td>
+                                </tr>
+                                <tr>
+                                    <th class="text-nowrap align-middle">Überstunden 100</th>
+                                    <td><input type="number" step="any" class="form-control change-overtime-value"
+                                               name="overtime100"
+                                               id="overtime100"></td>
+                                </tr>
+                                <?php if ($me->superexpertEnabled()): ?>
+                                    <tr>
+                                        <th class="text-nowrap align-middle">Blackpig</th>
+                                        <td><input type="number" step="any" class="form-control change-overtime-value"
+                                                   name="overtimebpa"
+                                                   id="overtimebpa"></td>
+                                    </tr>
+                                <?php endif; ?>
+
+                            </table>
+                        </div>
+
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <button id="submit-button" data-type="" type="button" class="btn btn-primary" data-dismiss="modal">
+                        Speichern
+                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Schließen
+                        </button>
+                </div>
+            </div>
+        </div>
+    </div>
+
+
+    <script type="text/javascript">
+        var hidesearch = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
+        <?php if ($me->superexpertEnabled()): ?>
+        hidesearch = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11];
+        <?php endif; ?>
+        $(document).ready(function () {
+            // $('.buttons-excel').closest('div').append('<div ><button id="month-complete" class="btn btn-danger margina">Monats Abschluss</button></div>');
+            $('.buttons-excel').closest('div').append('<div ><button id="bmd-export" class="btn btn-info margina">BMD Import</button></div>');
+            $('.buttons-excel').closest('div').append('<div ><button id="bmd-export-nlz" class="btn btn-info margina">BMD NLZ Import</button></div>');
+
+            $('body').on('click', '#bmd-export', function () {
+
+                window.open('<?= self::getUrl("TimerecordingBilling", "api", ['do' => 'generatebmdexportclosed']) ?>&month=' + $('#month').data('month'), '_blank');
+            });
+            $('body').on('click', '#bmd-export-nlz', function () {
+                window.open('<?= self::getUrl("TimerecordingBilling", "api", ['do' => 'generatebmdexportnlzclosed']) ?>&month=' + $('#month').data('month'), '_blank');
+            });
+            $('body').on('click', '#month-complete', function () {
+                if (confirm('Buchung wirklich löschen?')) {
+                    $.post("<?= self::getUrl("TimerecordingBilling", "api", ['do' => 'completemonth']) ?>", {
+                        month: $.trim($('#month').data('month')),
+                        ajax: 1
+                    }).done(function (data) {
+                    });
+                }
+
+            });
+            $('#overtimeModal').on('shown.bs.modal', function (event) {
+                var button = $(event.relatedTarget);
+
+                if (button.hasClass('change-difference')) {
+                    $('#overtimeModal-title').text('Mehrstunden Transfer');
+                    $('#overtimeModal').data('id', button.data('id'));
+
+                    $('#overtimes').html('<th>Mehrstunden:</th> <td id="overtime-hours" data-hours="' + button.data('hours') + '">' + button.data('hours') + ' (6,5)</td>');
+                    $('#submit-button').data('type', 'difference');
+                }
+                if (button.hasClass('change-overtime')) {
+                    $('#overtimeModal-title').text('Überstunden Transfer');
+                    $('#overtimes').html('<th>Überstunden:</th> <td id="overtime-hours" data-hours="' + button.data('hours') + '">' + button.data('hours') + '</td>');
+                    $('#submit-button').data('type', 'overtime');
+                    $('#overtimeModal').data('id', button.data('id'));
+                }
+                $('.change-overtime-value').val('');
+            });
+            $('body').on('change', '.change-overtime-value', function () {
+                //$('#overtime-hours').data('hours') to float
+                var difference = 0;
+
+                $(".change-overtime-value").each(function (index) {
+                    //check if float
+                    var value = $(this).val().replace(",", ".");
+                    // console.log(value);
+                    if (isNaN(parseFloat(value))) {
+
+                    } else {
+                        difference += parseFloat(value);
+                    }
+                });
+                var valdiff = difference - parseFloat($(this).val());
+                valdiff = Math.round(valdiff * 100) / 100;
+                console.log("valdif" + valdiff);
+                var hours = $('#overtime-hours').data('hours').replace(",", ".");
+
+                if (parseFloat(hours) < difference) {
+                    difference = difference - parseFloat(hours)
+                    difference = Math.round(difference * 100) / 100;
+                    console.log(difference);
+                    if (valdiff == 0) {
+                        $(this).val(hours);
+                    } else if (valdiff == parseFloat(hours)) {
+                        $(this).val('0');
+                    } else {
+                        var calc = Math.round((hours - valdiff) * 100) / 100
+                        $(this).val(calc);
+                    }
+                } else {
+                    hours = hours.replace(",", ".");
+
+                }
+
+            });
+            $('body').on('click', '#submit-button', function () {
+                var id = $('#overtimeModal').data('id');
+                var overtime50 = $('#overtime50').val();
+                var overtime100 = $('#overtime100').val();
+                var overtimebpa = $('#overtimebpa').val();
+                $.post("<?= self::getUrl("TimerecordingBilling", "api", ['do' => 'saveovertime']) ?>", {
+                    id: id,
+                    type: $(this).data('type'),
+                    overtime50: overtime50,
+                    overtime100: overtime100,
+                    overtimebpa: overtimebpa,
+                    ajax: 1
+                }).done(function (data) {
+                    window.location.reload();
+
+                });
+            });
+            //$.post(insertUrl, {
+            //    id: $.trim($('#id').val()),
+            //    timerecordingCategory_id: $.trim($('#timerecordingCategory_id').val()),
+            //    date: $.trim($('#date').val()),
+            //    enddate: $.trim($('#enddate').val()),
+            //    start: $.trim($('#start').val()),
+            //    end: $.trim($('#end').val()),
+            //    comment: $.trim($('#comment').val()),
+            //    businesstrip: businesstrip,
+            //    businesstrip_info: $.trim($('#businesstrip_info').val()),
+            //    timerecordingCar_id: $.trim($('#timerecordingCar_id').val()),
+            //    mileage_start: $.trim($('#mileage_start').val()),
+            //    mileage_end: $.trim($('#mileage_end').val()),
+            //    homeoffice: homeoffice,
+            //    hourday: $.trim($('#timerecordingCategory_id').find(':selected').data('hourday')),
+            //    ajax: 1
+            //}).done(function (data) {
+            //    if (data.success) {
+            //        window.location.href = '<?php //= self::getUrl("Timerecording") ?>//';
+            //    } else {
+            //        $('#error').html(data.error);
+            //    }
+            //});
+        });
+    </script>
+    <script type="text/javascript"
+            src="<?= self::getResourcePath() ?>assets/js/datatables-std.js?<?= date('U') ?>"></script>
+
+
+<?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/footer.php"); ?>
\ No newline at end of file
diff --git a/Layout/default/TimerecordingBilling/Index.php b/Layout/default/TimerecordingBilling/Index.php
index 81fb23d56..a6e85d515 100644
--- a/Layout/default/TimerecordingBilling/Index.php
+++ b/Layout/default/TimerecordingBilling/Index.php
@@ -1,77 +1,94 @@
 <?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/header.php");
 ?>
-<link href="<?= self::getResourcePath() ?>assets/css/datatables-std.css?<?= date('U') ?>" rel="stylesheet"
-      type="text/css"/>
-<!-- start page title -->
-<div class="row">
-    <div class="col-12">
-        <div class="page-title-box">
-            <div class="page-title-right">
-                <ol class="breadcrumb m-0">
-                    <li class="breadcrumb-item"><a href="<?= self::getUrl("Dashboard") ?>"><?= MFAPPNAME_SLUG ?></a>
-                    </li>
-                    <li class="breadcrumb-item active">Zeiterfassung Verrechnung</li>
-                </ol>
+    <link href="<?= self::getResourcePath() ?>assets/css/datatables-std.css?<?= date('U') ?>" rel="stylesheet"
+          type="text/css"/>
+    <!-- start page title -->
+    <div class="row">
+        <div class="col-12">
+            <div class="page-title-box">
+                <div class="page-title-right">
+                    <ol class="breadcrumb m-0">
+                        <li class="breadcrumb-item"><a href="<?= self::getUrl("Dashboard") ?>"><?= MFAPPNAME_SLUG ?></a>
+                        </li>
+                        <li class="breadcrumb-item active">Zeiterfassung Verrechnung</li>
+                    </ol>
+                </div>
+                <h4 class="page-title">Zeiterfassung Verrechnung/Abrechnung</h4>
             </div>
-            <h4 class="page-title">Zeiterfassung Verrechnung/Abrechnung</h4>
         </div>
     </div>
-</div>
-<!-- end page title -->
+    <!-- end page title -->
 
 
-<div class="card">
-    <div class="card-body mb-3">
-        <div class="row">
-            <div class="col-12">
-                <div class="float-left">
-                    <h4 class="header-title">Liste aller Abrechnungsmonate</h4>
+    <div class="card">
+        <div class="card-body mb-3">
+            <div class="row">
+                <div class="col-12">
+                    <div class="float-left">
+                        <h4 class="header-title">Liste aller Abrechnungsmonate</h4>
+                    </div>
                 </div>
             </div>
-        </div>
-        <table id="datatable" class="table table-hover table-sm">
-            <thead>
-            <tr>
-                <th class="text-center">Monat</th>
-                <th class="text-center">Abgeschlossen</th>
-                <th class="text-center">Abgeschlossen am</th>
-                <th class="text-center">Abgeschlossen von</th>
-            </tr>
-            <tr id="filterrow">
-                <th></th>
-                <th></th>
-                <th></th>
-                <th></th>
-            </tr>
-            </thead>
-            <tbody>
-            <?php foreach ($months as $month): ?>
+            <table id="datatable" class="table table-hover table-sm">
+                <thead>
                 <tr>
-                    <td class="text-center"><a href="<?= self::getUrl("TimerecordingBilling", "detail", ["month" => $month]) ?>"> <?= $month ?></a></td>
-                    <td class="text-center"></td>
-                    <td class="text-center"></td>
-                    <td class="text-center"></td>
+                    <th class="text-center">Monat</th>
+                    <th class="text-center">Abgeschlossen</th>
+                    <th class="text-center">Abgeschlossen am</th>
+                    <th class="text-center">Abgeschlossen von</th>
                 </tr>
-            <?php endforeach; ?>
-            </tbody>
-        </table>
+                <tr id="filterrow">
+                    <th></th>
+                    <th></th>
+                    <th></th>
+                    <th></th>
+                </tr>
+                </thead>
+                <tbody>
+                <?php
+
+                foreach ($months as $month):
+                    if ($timerecordingbillings[ltrim($month, "0")]) {
+
+                        $closetime = $timerecordingbillings[ltrim($month, "0")]->closetime;
+                        $closetime = date("d.m.Y H:i", $closetime);
+                        $closer = $timerecordingbillings[ltrim($month, "0")]->creator->name;
+                        $closed = "Ja";
+
+                    } else {
+                        $closetime = "";
+                        $closer = "";
+                        $closed = "Nein";
+                    }
+                    ?>
+                    <tr>
+                        <td class="text-center"><a
+                                    href="<?= self::getUrl("TimerecordingBilling", "detail", ["month" => $month]) ?>"> <?= $month ?></a>
+                        </td>
+                        <td class="text-center"><?= $closed ?></td>
+                        <td class="text-center"><?= $closetime ?></td>
+                        <td class="text-center"><?= $closer ?></td>
+                    </tr>
+                <?php endforeach; ?>
+                </tbody>
+            </table>
+
+        </div>
+    </div>
 
     </div>
-</div>
-
-</div>
-</div>
+    </div>
 
 
-<script type="text/javascript">
-    var hidesearch = [7];
+    <script type="text/javascript">
+        var hidesearch = [7];
 
-    $(document).ready(function () {
+        $(document).ready(function () {
 
-    });
-</script>
-<script type="text/javascript"
-        src="<?= self::getResourcePath() ?>assets/js/datatables-std.js?<?= date('U') ?>"></script>
+        });
+    </script>
+    <script type="text/javascript"
+            src="<?= self::getResourcePath() ?>assets/js/datatables-std.js?<?= date('U') ?>"></script>
 
 
 <?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/footer.php"); ?>
\ No newline at end of file
diff --git a/Layout/default/TimerecordingCar/Detail.php b/Layout/default/TimerecordingCar/Detail.php
index 023e4cf51..1c147c8ee 100644
--- a/Layout/default/TimerecordingCar/Detail.php
+++ b/Layout/default/TimerecordingCar/Detail.php
@@ -67,10 +67,11 @@ $approval = date("m/Y", $firstApproval);
                                 <td><?= ($timerecordingcar->first_approval) ? $timerecordingcar->first_approval . " Jahr(en)" : "-" ?></td>
                             </tr>
                             <tr>
-                                <th>Fahrtenbuch</th>
-                                <td><?= ($timerecordingcar->timerecording) ? "Ja" : "Nein" ?></td>
+                                <th>Fahrzeugverwalter</th>
+                                <td><?= ($timerecordingcar->user_id) ? $timerecordingcar->user->name : "-" ?></td>
                             </tr>
 
+
                             </tbody>
                         </table>
                     </div>
@@ -85,6 +86,10 @@ $approval = date("m/Y", $firstApproval);
                     <div>
                         <table class="table table-sm">
                             <tbody>
+                            <tr>
+                                <th>Fahrtenbuch</th>
+                                <td><?= ($timerecordingcar->timerecording) ? "Ja" : "Nein" ?></td>
+                            </tr>
                             <tr>
                                 <th>Erstzulassung</th>
                                 <td><?= ($timerecordingcar->initial_approval) ? date("m/Y", $timerecordingcar->initial_approval) : "-" ?></td>
diff --git a/Layout/default/TimerecordingCar/Form.php b/Layout/default/TimerecordingCar/Form.php
index 070fdd9b9..bc8f624f6 100644
--- a/Layout/default/TimerecordingCar/Form.php
+++ b/Layout/default/TimerecordingCar/Form.php
@@ -4,6 +4,10 @@ if (isset($_GET['returnto']) && $_GET['returnto'] == "detail") {
 } else {
     $cancelUrl = self::getUrl("TimerecordingCar");
 }
+foreach ($timerecordingusers as $timerecordinguser) {
+    $timerecordingUsers[$timerecordinguser->name] = $timerecordinguser->id;
+}
+ksort($timerecordingUsers);
 ?>
     <link href="<?= self::getResourcePath() ?>assets/css/select2-cstm.css?<?= date('U') ?>" rel="stylesheet"
           type="text/css"/>
@@ -46,6 +50,20 @@ if (isset($_GET['returnto']) && $_GET['returnto'] == "detail") {
                                                value="<?= $timerecordingcars->number_plate ?>"/>
                                     </div>
                                 </div>
+                                <div class="form-group row">
+                                    <label class="col-lg-2 col-form-label" for="brand">Fahrzeugverwalter</label>
+                                    <div class="col-lg-2">
+                                        <select id="user_id_select" name="user_id"
+                                                class="select2 form-control" required="required">
+                                            <option value="-">&nbsp</option>
+                                            <?php foreach ($timerecordingUsers as $key => $timerecordingUser): ?>
+                                                <option <?= ($timerecordingcars->user_id==$timerecordingUser) ? 'selected="selected' : "" ?> value="<?= $timerecordingUser ?>"><?= $key ?></option>
+                                            <?php
+                                            endforeach; ?>
+                                        </select>
+                                    </div>
+
+                                </div>
                                 <div class="form-group row">
                                     <label class="col-lg-2 col-form-label" for="brand">Marke *</label>
                                     <div class="col-lg-3">
diff --git a/Layout/default/TimerecordingCar/Index.php b/Layout/default/TimerecordingCar/Index.php
index 746bf1f7f..31c0e5bbb 100644
--- a/Layout/default/TimerecordingCar/Index.php
+++ b/Layout/default/TimerecordingCar/Index.php
@@ -41,6 +41,7 @@
                 <thead>
                 <tr>
                     <th class="text-center">Kennzeichen</th>
+                    <th class="text-center">Fahrzeugverwalter</th>
                     <th class="text-center">Marke</th>
                     <th class="text-center">Model/Typ</th>
                     <th class="text-center">Erstzulassssung</th>
@@ -58,6 +59,7 @@
                     <th></th>
                     <th></th>
                     <th></th>
+                    <th></th>
                 </tr>
                 </thead>
                 <tbody>
@@ -78,6 +80,7 @@
                         <td>
                             <a href="<?= self::getUrl("TimerecordingCar", "detail", ["id" => $timerecordingcar->id]) ?>"> <?= $timerecordingcar->number_plate ?></a>
                         </td>
+                        <td><?= ($timerecordingcar->user_id) ? $timerecordingcar->user->name : "-" ?></td>
                         <td><?= $timerecordingcar->brand ?></td>
                         <td><?= $timerecordingcar->model ?></td>
                         <td class="text-center"><?= ($timerecordingcar->initial_approval) ? date("m/Y", $timerecordingcar->initial_approval) : "-" ?></td>
@@ -105,9 +108,9 @@
 
 
     <script type="text/javascript">
-        var hidesearch = [7];
+        var hidesearch = [8];
 
-        var columnfilter = [5];
+        var columnfilter = [6];
         var columnoptions = '<option value=""></option><option value="Ja">Ja</option><option value="Nein">Nein</option>';
         $(document).ready(function () {
 
diff --git a/Layout/default/TimerecordingEmployee/Form.php b/Layout/default/TimerecordingEmployee/Form.php
index 7cf2ddf2d..509d4e408 100644
--- a/Layout/default/TimerecordingEmployee/Form.php
+++ b/Layout/default/TimerecordingEmployee/Form.php
@@ -61,6 +61,17 @@ $daysSelect .= "</select>";
                         <div class="card no-shadow">
                             <div class="card-body">
                                 <input type="hidden" name="id" value="<?= $timerecordingemployees->id ?>"/>
+                                <div class="form-group row">
+                                    <label class="col-lg-2 col-form-label"
+                                           for="bmd_active">Aktive Verrechnung</label>
+                                    <div class="col-lg-3">
+                                        <div class="form-check">
+                                            <input id="bmd_active"
+                                                   class="form-check-input" <?php if ($timerecordingemployees->bmd_active) echo 'checked="checked"'; ?>
+                                                   type="checkbox" name="bmd_active" value="1"/>
+                                        </div>
+                                    </div>
+                                </div>
                                 <div class="form-group row">
                                     <label class="col-lg-2 col-form-label" for="user_id">Mitarbeiter *</label>
                                     <div class="col-lg-3">
@@ -89,6 +100,15 @@ $daysSelect .= "</select>";
                                                value="<?= ($timerecordingemployees->startdate) ? date('Y-m-d', $timerecordingemployees->startdate): "" ?>"/>
                                     </div>
                                 </div>
+                                <div class="form-group row">
+                                    <label class="col-lg-2 col-form-label" for="enddate">Enddatum
+                                        Zeiterfassung</label>
+                                    <div class="col-lg-2">
+                                        <input type="date" id="enddate" name="enddate"
+                                               class="form-control"
+                                               value="<?= ($timerecordingemployees->enddate) ? date('Y-m-d', $timerecordingemployees->enddate): "" ?>"/>
+                                    </div>
+                                </div>
                                 <div class="form-group row">
                                     <label class="col-lg-2 col-form-label" for="birthday">Geburtstag</label>
                                     <div class="col-lg-2">
diff --git a/Layout/default/TimerecordingEmployee/Index.php b/Layout/default/TimerecordingEmployee/Index.php
index 6aa293165..618fa546c 100644
--- a/Layout/default/TimerecordingEmployee/Index.php
+++ b/Layout/default/TimerecordingEmployee/Index.php
@@ -9,9 +9,14 @@ $type[3] = "Lehrling";
         .border-dark {
             border-color: #cbcbcb !important;
         }
+
         .border-bottom {
             border-bottom: 1px dotted #adadad !important;
         }
+
+        .inactive_empoyee {
+            background-color: #ff75756e !important;
+        }
     </style>
     <!-- start page title -->
     <div class="row">
@@ -52,6 +57,9 @@ $type[3] = "Lehrling";
                         <th class="text-center">Sollstunden</th>
                         <th class="text-center">Mehrstunden</th>
                         <th class="text-center">Überstunden</th>
+                        <?php if ($me->superexpertEnabled()): ?>
+                            <th class="text-center">Black P. Stunden</th>
+                        <?php endif; ?>
                         <th class="text-center">Offene Urlaube</th>
                         <th class="text-center edit-width">Schnellbuchung</th>
                         <th class="edit-width"></th>
@@ -62,6 +70,9 @@ $type[3] = "Lehrling";
                         <th></th>
                         <th></th>
                         <th></th>
+                        <?php if ($me->superexpertEnabled()): ?>
+                            <th></th>
+                        <?php endif; ?>
                         <th></th>
                         <th></th>
                         <th></th>
@@ -97,7 +108,7 @@ $type[3] = "Lehrling";
                         }
                         ?>
 
-                        <tr>
+                        <tr class="<?= ($timerecordingemployees[$timerecordinguser->id]['bmd_active'] == "0") ? "inactive_empoyee" : "" ?>">
                             <td><?= $timerecordinguser->name ?></td>
                             <td><?= $type[$timerecordingemployees[$timerecordinguser->id]['type']] ?></td>
                             <td class="text-center"><?= ($timerecordingemployees[$timerecordinguser->id]['startdate']) ? date("d.m.Y", $timerecordingemployees[$timerecordinguser->id]['startdate']) : "-" ?></td>
@@ -105,8 +116,14 @@ $type[3] = "Lehrling";
                             <td class="text-center"><?= $sum ?></td>
                             <td class="text-center"
                                 data-order="<?= ($timerecordingemployees[$timerecordinguser->id]['plushours_now']) ? $timerecordingemployees[$timerecordinguser->id]['plushours_now'] : 0 ?>"><?= $plusHours ?></td>
-                            <td class="text-center" data-order="<?= $timerecordingemployees[$timerecordinguser->id]['overtime_now'] ?>"><?= $overTime ?></td>
-                            <td class="text-center" data-order="<?= ($timerecordingemployees[$timerecordinguser->id]['holidays_now']) ? $timerecordingemployees[$timerecordinguser->id]['holidays_now'] : '' ?>"><?= ($timerecordingemployees[$timerecordinguser->id]['holidays_now']) ? $timerecordingemployees[$timerecordinguser->id]['holidays_now'] . ' Tage' : '' ?> </td>
+                            <td class="text-center"
+                                data-order="<?= $timerecordingemployees[$timerecordinguser->id]['overtime_now'] ?>"><?= $overTime ?></td>
+                            <?php if ($me->superexpertEnabled()): ?>
+                                <td class="text-center"
+                                    data-order="<?= $timerecordingemployees[$timerecordinguser->id]['bpa_hours'] ?>"><?= sprintf('%02dh:%02dm', floor($timerecordingemployees[$timerecordinguser->id]['bpa_hours'] / 3600), floor($timerecordingemployees[$timerecordinguser->id]['bpa_hours'] / 60 % 60)) ?></td>
+                            <?php endif; ?>
+                            <td class="text-center"
+                                data-order="<?= ($timerecordingemployees[$timerecordinguser->id]['holidays_now']) ? $timerecordingemployees[$timerecordinguser->id]['holidays_now'] : '' ?>"><?= ($timerecordingemployees[$timerecordinguser->id]['holidays_now']) ? $timerecordingemployees[$timerecordinguser->id]['holidays_now'] . ' Tage' : '' ?> </td>
                             <td class="text-center"><?= ($timerecordingemployees[$timerecordinguser->id]['auto_workinghours'] == '1') ? 'Ja' : 'Nein' ?></td>
                             <td style="text-align: left; letter-spacing: 4px; font-size: 1.1em;">
                                 <a href="<?= self::getUrl("TimerecordingEmployee", "edit", ['id' => $timerecordingemployees[$timerecordinguser->id]['id'], "userid" => $timerecordinguser->id]) ?>"><i
@@ -126,7 +143,9 @@ $type[3] = "Lehrling";
 
     <script type="text/javascript">
         var hidesearch = [3, 4, 5, 6, 7, 9];
-
+        <?php if ($me->superexpertEnabled()): ?>
+        hidesearch = [3, 4, 5, 6, 7,8 ,10];
+        <?php endif; ?>
         $(document).ready(function () {
 
         });
diff --git a/Layout/default/TimerecordingReport/Index.php b/Layout/default/TimerecordingReport/Index.php
index 8d5b70464..195fa48a7 100644
--- a/Layout/default/TimerecordingReport/Index.php
+++ b/Layout/default/TimerecordingReport/Index.php
@@ -251,17 +251,16 @@ $years[time() - 31536000] = date('Y', time() - 31536000);
                         </select>
                     </div>
                     <div class="col-lg-1 car-div " style="display:none">
-                        <input style="" type="text" id="mileage_start" name="mileage_start"
+                        <input style="" type="number" id="mileage_start" name="mileage_start"
                                placeholder="KM Start"
                                class="form-control"/>
                     </div>
                     <div class="col-lg-1 car-div" style="display:none">
-                        <input style="" type="text" id="mileage_end" name="mileage_end"
+                        <input style="" type="number" id="mileage_end" name="mileage_end"
                                placeholder="KM Ende"
                                class="form-control"/>
                     </div>
                 </div>
-
                 <div class=" row  mt-2">
                     <div class="col-lg-2 ">
                         <button id="submit-button" type="submit" class="btn btn-primary">Speichern</button>
@@ -270,16 +269,17 @@ $years[time() - 31536000] = date('Y', time() - 31536000);
                         </button>
                     </div>
                 </div>
-                <div class=" row  mt-2">
-                    <div class="col-lg-4" id="message-box">
+            </div>
+
+            <div class=" row  mt-2">
+                <div class="col-lg-4" id="message-box">
 
-                    </div>
                 </div>
             </div>
 
-        </div>
-    </form>
 
+    </form>
+    </div>
     <div class="card">
         <div class="card-body mb-3">
             <div class="form-group module-row row mb-3">
@@ -317,7 +317,7 @@ $years[time() - 31536000] = date('Y', time() - 31536000);
                             <div class="input-group">
                                 <select id="datayear" class="form-control select2">
                                     <?php foreach ($years as $key => $Year): ?>
-                                        <option <?= (date('Y', time()) == $Year) ? "selected='selsected'" : NULL ?>
+                                        <option <?= (date('Y', time()) == $Year) ? "selected='selected'" : NULL ?>
                                                 value="<?= $key ?>"><?= $Year ?></option>
                                     <?php endforeach; ?>
                                 </select>
diff --git a/application/TimerecordingBilling/TimerecordingBilling.php b/application/TimerecordingBilling/TimerecordingBilling.php
new file mode 100644
index 000000000..16d8aa843
--- /dev/null
+++ b/application/TimerecordingBilling/TimerecordingBilling.php
@@ -0,0 +1,60 @@
+<?php
+
+class TimerecordingBilling extends mfBaseModel
+{
+    private $editor;
+    private $creator;
+
+    private $timerecordingEmployee;
+
+
+    public function getProperty($name)
+{
+    if ($this->$name == null) {
+
+        if (!$this->id) {
+            return null;
+        }
+
+        if ($name == "creator") {
+            $this->creator = mfValuecache::singleton()->get("Worker-id-" . $this->create_by);
+            if ($this->creator === null) {
+                $this->creator = new User($this->create_by);
+                if ($this->creator->id) {
+                    mfValuecache::singleton()->set("Worker-id-" . $this->create_by, $this->creator);
+                }
+            }
+            return $this->creator;
+        }
+
+        if ($name == "editor") {
+            $this->editor = mfValuecache::singleton()->get("Worker-id-" . $this->edit_by);
+            if ($this->editor === null) {
+                $this->editor = new User($this->edit_by);
+                if ($this->editor->id) {
+                    mfValuecache::singleton()->set("Worker-id-" . $this->edit_by, $this->editor);
+                }
+            }
+            return $this->editor;
+        }
+
+        $classname = ucfirst($name);
+        $idfield = $name . "_id";
+        $this->$name = mfValuecache::singleton()->get("mfObjectmodel-$name-" . $this->$idfield);
+        if (!$this->$name) {
+            $this->$name = new $classname($this->$idfield);
+        }
+
+        if ($this->$name->id) {
+            mfValuecache::singleton()->set("mfObjectmodel-$name-" . $this->$name->id, $this->$name);
+            return $this->$name;
+        } else {
+            return null;
+        }
+
+    }
+
+    return $this->$name;
+}
+
+}
\ No newline at end of file
diff --git a/application/TimerecordingBilling/TimerecordingBillingController.php b/application/TimerecordingBilling/TimerecordingBillingController.php
index a3348342a..9ea288a1b 100644
--- a/application/TimerecordingBilling/TimerecordingBillingController.php
+++ b/application/TimerecordingBilling/TimerecordingBillingController.php
@@ -26,10 +26,31 @@ class TimerecordingBillingController extends mfBaseController
             $months[] = date("m.Y", $month);
             $month = strtotime("+1 month", $month);
         }
+        $timerecordingBillings = TimerecordingBillingModel::getAll();
+
+        foreach ($timerecordingBillings as $timerecordingBilling) {
+            $timerecordingbillings[$timerecordingBilling->month] = $timerecordingBilling;
+            echo $timerecordingBilling->month;
+        }
+
         $this->layout()->set("months", $months);
+        $this->layout()->set("timerecordingbillings", $timerecordingbillings);
         $this->layout()->setTemplate("TimerecordingBilling/Index");
     }
 
+    protected function detailClosedAction($timerecordingBilling)
+    {
+        $r = $this->request;
+        $month = $r->get("month");
+        $month = strtotime("01." . $month);
+
+        $timerecordings = TimerecordingBillingEmployeeModel::search(["timerecordingBilling_id" => $timerecordingBilling[0]->id]);
+        $this->layout()->setTemplate("TimerecordingBilling/DetailClosed");
+        $this->layout()->set("month", date("m.Y", $month));
+        $this->layout()->set("timerecordings", $timerecordings);
+
+    }
+
     protected function detailAction()
     {
         $r = $this->request;
@@ -37,20 +58,26 @@ class TimerecordingBillingController extends mfBaseController
         if (!$month) {
             $this->redirect("TimerecordingBilling");
         }
-        $month = strtotime("01." . $month);
-        $timerecordingsEmolyees = TimerecordingEmployeeModel::getAll();
-        foreach ($timerecordingsEmolyees as $timerecordingsEmolyee) {
-            $user = new User($timerecordingsEmolyee->user_id);
-            $employee_number = (string)$user->getFlag('employee_number');
-            $timerecordingReport = new TimerecordingReportController();
-            $timerecordings[$timerecordingsEmolyee->user_id]['user_id'] = $timerecordingsEmolyee->user_id;
-            $timerecordings[$timerecordingsEmolyee->user_id]['user_name'] = $timerecordingsEmolyee->user->name;
-            $timerecordings[$timerecordingsEmolyee->user_id]['employee_number'] = $employee_number;
-            $timerecordings[$timerecordingsEmolyee->user_id]['data'] = $timerecordingReport->getTimerecordingsTimes('2', $month, $month, $month, $timerecordingsEmolyee->user_id, 0);
+        $timerecordingBilling = TimerecordingBillingModel::search(["month" => $month]);
+        if ($timerecordingBilling) {
+            $this->detailclosedAction($timerecordingBilling);
+        } else {
+            $month = strtotime("01." . $month);
+            $timerecordingsEmolyees = TimerecordingEmployeeModel::getAll();
+            foreach ($timerecordingsEmolyees as $timerecordingsEmolyee) {
+                if ($timerecordingsEmolyee->bmd_active == 0) continue;
+                $user = new User($timerecordingsEmolyee->user_id);
+                $employee_number = (string)$user->getFlag('employee_number');
+                $timerecordingReport = new TimerecordingReportController();
+                $timerecordings[$timerecordingsEmolyee->user_id]['user_id'] = $timerecordingsEmolyee->user_id;
+                $timerecordings[$timerecordingsEmolyee->user_id]['user_name'] = $timerecordingsEmolyee->user->name;
+                $timerecordings[$timerecordingsEmolyee->user_id]['employee_number'] = $employee_number;
+                $timerecordings[$timerecordingsEmolyee->user_id]['data'] = $timerecordingReport->getTimerecordingsTimes('2', $month, $month, $month, $timerecordingsEmolyee->user_id, 0);
+            }
+            $this->layout()->set("timerecordings", $timerecordings);
+            $this->layout()->setTemplate("TimerecordingBilling/Detail");
+            $this->layout()->set("month", date("m.Y", $month));
         }
-        $this->layout()->set("timerecordings", $timerecordings);
-        $this->layout()->setTemplate("TimerecordingBilling/Detail");
-        $this->layout()->set("month", date("m.Y", $month));
     }
 
     protected function apiAction()
@@ -67,6 +94,18 @@ class TimerecordingBillingController extends mfBaseController
             case "generatebmdexportnlz":
                 $return = $this->generateBmdExport($month, 1);
                 break;
+            case "generatebmdexportclosed":
+                $return = $this->generateBmdExportClosed($month);
+                break;
+            case "generatebmdexportnlzclosed":
+                $return = $this->generateBmdExportClosed($month, 1);
+                break;
+            case "completemonth":
+                $return = $this->completemonth($month);
+                break;
+            case "saveovertime":
+                $return = $this->saveovertime();
+                break;
             default:
                 $return = false;
         }
@@ -92,13 +131,73 @@ class TimerecordingBillingController extends mfBaseController
 
     protected function saveAction()
     {
+        $r = $this->request;
+        $id = $r->id;
+        //var_dump($r->get());exit;
+        if (is_numeric($id) && $id > 0) {
+            $mode = "edit";
+            $timerecordingbillings = new TimerecordingBilling($id);
+            if (!$timerecordingbillings->id) {
+                $this->layout()->setFlash("Timerecording nicht gefunden", "error");
+                $this->redirect("TimerecordingBilling");
+            }
+        } else {
+            $mode = "add";
+        }
 
+        $data = [];
+        $data['month'] = trim($r->month);
+        $data['closetime'] = time();
+
+
+        if (!$data['month']) {
+            $data['month'] = NULL;
+        }
+        if (!$data['closetime']) {
+            $data['closetime'] = NULL;
+        }
+
+
+//        var_dump($_FILES);
+//        var_dump($upload);
+//        exit;
+
+
+        if ($mode == "edit") {
+            $timerecordingbillings->update($data);
+
+        } else {
+            $timerecordingbillings = TimerecordingBillingModel::create($data);
+        }
+//        var_dump($filestore);
+//        exit;
+        $id = $timerecordingbillings->save();
+
+        if (!$id) {
+            $this->layout()->setFlash("Timerecording konnte nicht angelegt werden", "error");
+            $this->redirect("TimerecordingBilling");
+        }
+
+        if ($mode == "edit") {
+//            $this->layout()->setFlash("Timerecording erfolgreich geändert", "success");
+        } else if ($mode = "add") {
+//            $this->layout()->setFlash("Timerecording erfolgreich angelegt", "success");
+        }
+        return $id;
     }
 
 
     protected function deleteAction()
     {
+        $id = $this->request->id;
+        $timerecordingbillings = new TimerecordingBilling($id);
+        if (!$timerecordingbillings->id || $timerecordingbillings->id != $id) {
+            $this->layout()->setFlash("Timerecording nicht gefunden.", "error");
+            $this->redirect("TimerecordingBilling");
+        }
 
+        $timerecordingbillings->delete();
+        $this->redirect("TimerecordingBilling");
     }
 
     protected function generateBmdLine()
@@ -106,13 +205,14 @@ class TimerecordingBillingController extends mfBaseController
 
     }
 
-    protected function generateBmdExport($month, $nlz = 0)
+    protected function generateBmdExportClosed($month, $nlz = 0)
     {
-        //create and download csv file
-        $filename = "BMDExport_" . $month . ".csv";
+        $filename = "import_bmd_" . $month . ".csv";
         $file = fopen("php://output", 'w');
         header('Content-Type: text/csv; charset=utf-8');
         header('Content-Disposition: attachment; filename=' . $filename);
+        $monthbmd = date("n", strtotime("01." . $month));
+        $companybmd = "1";
         if ($nlz == 0) {
             $headerarray = ["Monat", "Firma", "Mitarbeiter", "Lohnart", "Menge", "Satz", "Betrag", "Kostenstelle", "NLZ-Kennzeichen", "NLZ Von-Datum", "NLZ Bis-Datum"];
             fputcsv($file, $headerarray, ";");
@@ -120,17 +220,113 @@ class TimerecordingBillingController extends mfBaseController
             $headerarray = ["Firma", "Mitarbeiter", "DV-Nr", "Art", "Sonderzeit", "Verarbeitungs-KZ", "Von", "Bis", "Verwaltung", "Bezahlt"];
             fputcsv($file, $headerarray, ";");
         }
+        $billing = TimerecordingBillingModel::search(["month" => $month]);
+        $timerecordingBillingEmployees = TimerecordingBillingEmployeeModel::search(["timerecordingBilling_id" => $billing[0]->id]);
+        foreach ($timerecordingBillingEmployees as $timerecordingBillingEmployee) {
+            if ($timerecordingBillingEmployee->timerecordingEmployee->bmd_active == 0) continue;
+            $user = new User($timerecordingBillingEmployee->timerecordingEmployee->user_id);
+            $employee_number = (string)$user->getFlag('employee_number');
+            $employeetypesbmd = TimerecordingEmployeeModel::$employeetypesbmd;
+            $employee_type = $employeetypesbmd[$timerecordingBillingEmployee->timerecordingEmployee->type];
+            if ($nlz == 0) {
+                $hours = $timerecordingBillingEmployee->ishours / 3600;
+                $hours = round($hours, 2);
+                $hours = str_replace(".", ",", $hours);
+                if ($hours > 0) {
+                    $bodyarray = [$monthbmd, "1", $employee_number, $employee_type, $hours, "", "", "", "", "", ""];
+                    fputcsv($file, $bodyarray, ";");
+                }
+                if ($timerecordingBillingEmployee->overtime50free > 0) {
+                    $overtime50free = $timerecordingBillingEmployee->overtime50free / 3600;
+                    $overtime50free = round($overtime50free, 2);
+                    $overtime50free = str_replace(".", ",", $overtime50free);
+                    $bodyarray = [$monthbmd, "1", $employee_number, "3110", $overtime50free, "", "", "", "", "", ""];
+                    fputcsv($file, $bodyarray, ";");
+                }
+                if ($timerecordingBillingEmployee->overtime100free > 0) {
+                    $overtime100free = $timerecordingBillingEmployee->overtime100free / 3600;
+                    $overtime100free = round($overtime100free, 2);
+                    $overtime100free = str_replace(".", ",", $overtime100free);
+                    $bodyarray = [$monthbmd, "1", $employee_number, "3150", $overtime100free, "", "", "", "", "", ""];
+                    fputcsv($file, $bodyarray, ";");
+                }
+                if ($timerecordingBillingEmployee->homeoffice > 0) {
+                    $homeoffice = $timerecordingBillingEmployee->homeoffice;
+                    $homeoffice = round($homeoffice, 2);
+                    $homeoffice = str_replace(".", ",", $homeoffice);
+                    $bodyarray = [$monthbmd, "1", $employee_number, "7590", $homeoffice, "", "", "", "", "", ""];
+                    fputcsv($file, $bodyarray, ";");
+                }
+
+            } else {
+                if ($timerecordingBillingEmployee->nlz_detail) {
+                    foreach (json_decode($timerecordingBillingEmployee->nlz_detail, true) as $nlztime) {
+
+                        $bodyarray = [$companybmd, $employee_number, 1, $nlztime['categoryshort'], $nlztime['catExtended'], "3", $nlztime['start'], $nlztime['end'], $nlztime['time'], $nlztime['pay']];
+                        fputcsv($file, $bodyarray, ";");
+
+
+                    }
+                }
+            }
+            if ($timerecordingBillingEmployee->diet > 0 && $nlz == 0) {
+                $dietsum = round($timerecordingBillingEmployee->diet, 2);
+                $dietsum = str_replace(".", ",", $dietsum);
+                $bodyarray = [$monthbmd, $companybmd, $employee_number, "2500", "", "", $dietsum, "", "", "", ""];
+                fputcsv($file, $bodyarray, ";");
+
+            }
+
+        }
+
+
+        fclose($file);
+        exit;
+    }
+
+    protected function generateBmdExport($month, $nlz = 0, $export = 1)
+    {
+        //create and download csv file
+        if ($export == 1) {
+            $filename = "import_bmd_" . $month . ".csv";
+            $file = fopen("php://output", 'w');
+            header('Content-Type: text/csv; charset=utf-8');
+            header('Content-Disposition: attachment; filename=' . $filename);
+        }
+        if ($export == 1) {
+            if ($nlz == 0) {
+                $headerarray = ["Monat", "Firma", "Mitarbeiter", "Lohnart", "Menge", "Satz", "Betrag", "Kostenstelle", "NLZ-Kennzeichen", "NLZ Von-Datum", "NLZ Bis-Datum"];
+                fputcsv($file, $headerarray, ";");
+            } else {
+                $headerarray = ["Firma", "Mitarbeiter", "DV-Nr", "Art", "Sonderzeit", "Verarbeitungs-KZ", "Von", "Bis", "Verwaltung", "Bezahlt"];
+                fputcsv($file, $headerarray, ";");
+            }
+        }
+
+
         $month = strtotime("01." . $month);
+        //last of month
+        $monthend = date("Y-m-d", strtotime("last day of this month", $month));
+        $monthend = strtotime($monthend . " 23:59:59");
+
+
         $monthbmd = date("n", $month);
         $companybmd = "1";
         $timerecordingsEmolyees = TimerecordingEmployeeModel::getAll();
         foreach ($timerecordingsEmolyees as $timerecordingsEmolyee) {
+            if ($timerecordingsEmolyee->bmd_active == 0) continue;
             $user = new User($timerecordingsEmolyee->user_id);
             $employee_number = (string)$user->getFlag('employee_number');
             $employeetypesbmd = TimerecordingEmployeeModel::$employeetypesbmd;
             $employee_type = $employeetypesbmd[$timerecordingsEmolyee->type];
             $timerecordingReport = new TimerecordingReportController();
             $timerecording = $timerecordingReport->getTimerecordingsTimes('2', $month, $month, $month, $timerecordingsEmolyee->user_id, 0);
+            if ($export == 0) {
+                $reponse[$employee_number]['employee_id'] = $timerecordingsEmolyee->id;
+                $reponse[$employee_number]['homeoffice'] = $timerecording['time']['homeoffice'];
+                $reponse[$employee_number]['istimeall'] = $timerecording['time']['isorder'];
+                $reponse[$employee_number]['musttime'] = $timerecording['time']['mustorder'];
+            }
 
             foreach ($timerecording['time']['isclean'] as $key => $value) {
                 $hours = $value;
@@ -139,8 +335,12 @@ class TimerecordingBillingController extends mfBaseController
                 $hours = round($hours, 2);
                 $hours = str_replace(".", ",", $hours);
                 if (strpos($key, ',') !== false && $nlz == 0) {
-                    $bodyarray = [$monthbmd, $companybmd, $employee_number, $employee_type, $hours, "", "", "", "", "", ""];
-                    fputcsv($file, $bodyarray, ";");
+                    if ($export == 1) {
+                        $bodyarray = [$monthbmd, $companybmd, $employee_number, $employee_type, $hours, "", "", "", "", "", ""];
+                        fputcsv($file, $bodyarray, ";");
+                    } else {
+                        $reponse[$employee_number]['istime'] = $value;
+                    }
                 } else if (strpos($key, ',') === false && $nlz == 1) {
 
                 }
@@ -149,13 +349,34 @@ class TimerecordingBillingController extends mfBaseController
 
             if ($timerecording['time']['diet'] > 0 && $nlz == 0) {
                 $dietsum = round($timerecording['time']['diet'], 2);
-                $dietsum = str_replace(".", ",", $dietsum);
-                $bodyarray = [$monthbmd, $companybmd, $employee_number, "2500", "", "", $dietsum, "", "", "", ""];
-                fputcsv($file, $bodyarray, ";");
+                if ($export == 1) {
+                    $dietsum = str_replace(".", ",", $dietsum);
+                    $bodyarray = [$monthbmd, $companybmd, $employee_number, "2500", "", "", $dietsum, "", "", "", ""];
+                    fputcsv($file, $bodyarray, ";");
+                } else {
+                    $reponse[$employee_number]['diet'] = $dietsum;
+                }
             }
-            if (!empty($timerecording['time']['nlztimes']) && $nlz == 1) {
+            if (!empty($timerecording['time']['nlztimes']) && ($nlz == 1 || $export == 0)) {
                 foreach ($timerecording['time']['nlztimes'] as $nlztime) {
+                    if (strtotime($nlztime['start']) < $month) {
+                        $nlztime['start'] = date("d.m.Y", $month);
+                    }
+                    if ((strtotime($nlztime['end']) + 84599) > $monthend) {
+                        $nlztime['end'] = date("d.m.Y", $monthend);
+                    }
+
+
+                    if (strpos($nlztime['categoryshort'], '6-') !== false) {
+                        $catExtended = explode("-", $nlztime['categoryshort']);
+                        $catExtended = $catExtended[1];
+                        $nlztime['categoryshort'] = "6";
+                    } else {
+                        $catExtended = "";
+                    }
+
                     if ($nlztime['minutes']) {
+                        $timesecounds = $nlztime['minutes'];
                         $time = $nlztime['minutes'] / 60;
                         $time = round($time, 2);
                         $time = str_replace(".", ",", $time);
@@ -166,19 +387,162 @@ class TimerecordingBillingController extends mfBaseController
                         }
 
                     } else {
-                        $time = "";
-                        $pay = "";
+                        if (empty($catExtended)) {
+                            $time = "";
+                            $timesecounds = "";
+                            $pay = "";
+                        } else {
+                            //calc days from $nlztime['start'] to $nlztime['end']
+                            $start = strtotime($nlztime['start']);
+                            $end = strtotime($nlztime['end']);
+                            $time = ($end - $start);
+                            $timesecounds = $time;
+                            $time = $time / 86400 + 1;
+                            $time = round($time, 0);
+
+
+                            if ($nlztime['unpaid'] == "0") {
+                                $pay = $time;
+                            } else {
+                                $pay = 0;
+                            }
+                        }
+
+                    }
+                    if ($export == 1) {
+                        $bodyarray = [$companybmd, $employee_number, 1, $nlztime['categoryshort'], $catExtended, "3", $nlztime['start'], $nlztime['end'], $time, $pay];
+                        fputcsv($file, $bodyarray, ";");
+                    } else {
+                        $reponse[$employee_number]['nlz'][] = array("categoryshort" => $nlztime['categoryshort'], "catExtended" => $catExtended, "start" => $nlztime['start'], "end" => $nlztime['end'], "time" => $time, "pay" => $pay);
                     }
 
-                    $bodyarray = [$companybmd, $employee_number, 1, $nlztime['categoryshort'], "", "3", $nlztime['start'], $nlztime['end'], $time, $pay];
-                    fputcsv($file, $bodyarray, ";");
+
+                }
+                if ($export == 0) {
+                    $reponse[$employee_number]['daysum'] = json_encode($timerecording['time']['daysum']);
                 }
             }
 
         }
+        if ($export == 1) {
+            fclose($file);
+            exit;
+        } else {
+            return $reponse;
+        }
 
 
-        die();
-
+    }
+
+    protected function completemonth($month)
+    {
+        $id = $this->saveAction();
+        $user = new User($timerecordingsEmolyee->user_id);
+        $employee_number = (string)$user->getFlag('employee_number');
+
+        $timerecordings = $this->generateBmdExport($month, 0, 0);
+        foreach ($timerecordings as $employeenumber => $timerecording) {
+            $data = [];
+            $data['timerecordingBilling_id'] = $id;
+            $data['timerecordingEmployee_id'] = $timerecording['employee_id'];
+            $data['musthours'] = $timerecording['musttime'];
+            if ($timerecording['istime']) {
+                $data['ishours'] = $timerecording['istime'];
+            } else {
+                $data['ishours'] = 0;
+            }
+            $data['ishourssum'] = $timerecording['istimeall'];
+            $data['diet'] = $timerecording['diet'];
+            if ($timerecording['nlz']) {
+                $data['nlz_detail'] = json_encode($timerecording['nlz']);
+            }
+            if ($timerecording['daysum']) {
+                $data['nlz'] = $timerecording['daysum'];
+            }
+            if ($timerecording['homeoffice']) {
+                $data['homeoffice'] = $timerecording['homeoffice'];
+            }
+
+
+            if (!$data['diet']) {
+                $data['diet'] = 0;
+
+            }
+
+            $timerecordingbillingemployee = TimerecordingBillingEmployeeModel::create($data);
+            $timerecordingbillingemployee->save();
+        }
+        $result['state'] = "success";
+        echo json_encode($result);
+        die();
+    }
+
+    protected function saveovertime()
+    {
+        $id = $this->request->id;
+        $type = $this->request->type;
+        $timerecordingbillingsemployee = new TimerecordingBillingEmployee($id);
+        if ($type == "overtime") {
+            $sum = 0;
+            $data = [];
+            if ($this->request->overtime50) {
+                $data['overtime50free'] = $timerecordingbillingsemployee->overtime50free + $this->request->overtime50 * 3600;
+                $sum += $this->request->overtime50 * 3600;
+            }
+            if ($this->request->overtime100) {
+                $data['overtime100free'] = $timerecordingbillingsemployee->overtime100free + $this->request->overtime100 * 3600;
+                $sum += $this->request->overtime100 * 3600;
+            }
+            if ($this->request->overtimebpa) {
+                $timerecordingbillingsemployee->timerecordingEmployee->id;
+                $timerecordingEmployee = new TimerecordingEmployee($timerecordingbillingsemployee->timerecordingEmployee->id);
+                $dataemployee = [];
+                $dataemployee['bpahours'] = $timerecordingEmployee->bpahours + $this->request->overtimebpa * 3600;
+                $sum += $this->request->overtimebpa * 3600;
+                $timerecordingEmployee->update($dataemployee);
+                $timerecordingEmployee->save();
+
+            }
+            if ($data) {
+                $timerecordingbillingsemployee->update($data);
+                $timerecordingbillingsemployee->save();
+                $timerecordingbillingsemployee->timerecordingEmployee->id;
+                $timerecordingEmployee = new TimerecordingEmployee($timerecordingbillingsemployee->timerecordingEmployee->id);
+                $dataemployee = [];
+                $dataemployee['overtime_now'] = $timerecordingEmployee->overtime_now - $sum;
+                $dataemployee['overtime'] = $timerecordingEmployee->overtime - $sum;
+                $timerecordingEmployee->update($dataemployee);
+                $timerecordingEmployee->save();
+            }
+        } else if ($type == "difference") {
+            $sum = 0;
+            $data = [];
+            if ($this->request->overtime50) {
+                $data['overtime50free'] = $timerecordingbillingsemployee->overtime50free + $this->request->overtime50 * 3600;
+                $sum += $this->request->overtime50 * 3600;
+            }
+            if ($this->request->overtime100) {
+                $data['overtime100free'] = $timerecordingbillingsemployee->overtime100free + $this->request->overtime100 * 3600;
+                $sum += $this->request->overtime100 * 3600;
+            }
+            if ($this->request->overtimebpa) {
+                $timerecordingbillingsemployee->timerecordingEmployee->id;
+                $timerecordingEmployee = new TimerecordingEmployee($timerecordingbillingsemployee->timerecordingEmployee->id);
+                $dataemployee = [];
+                $dataemployee['bpahours'] = $timerecordingEmployee->bpahours + $this->request->overtimebpa * 3600;
+                $sum += $this->request->overtimebpa * 3600;
+                $timerecordingEmployee->update($dataemployee);
+                $timerecordingEmployee->save();
+
+            }
+            if ($sum > 0) {
+                $data['ishourssum'] = $timerecordingbillingsemployee->ishourssum - $sum;
+                $timerecordingbillingsemployee->update($data);
+                $timerecordingbillingsemployee->save();
+            }
+        }
+        $response['state'] = "success";
+        echo json_encode($response);
+        die();
     }
 }
diff --git a/application/TimerecordingBilling/TimerecordingBillingModel.php b/application/TimerecordingBilling/TimerecordingBillingModel.php
index 75e6eec9f..b6751ed67 100644
--- a/application/TimerecordingBilling/TimerecordingBillingModel.php
+++ b/application/TimerecordingBilling/TimerecordingBillingModel.php
@@ -4,5 +4,125 @@ class TimerecordingBillingModel
 {
     public static $dieatBase = 26.4;
     public static $excludeEmployees = [1000, 1001, 9999, 4, 5, 6, 7, 8, 9, 10];
+    private $month;
+    private $closetime;
+
+
+    public static function find($data)
+    {
+
+    }
+
+    public static function create(array $data)
+    {
+        $model = new TimerecordingBilling();
+
+        foreach ($data as $field => $value) {
+            if (property_exists(get_called_class(), $field)) {
+                if (substr($field, 0, 5) == "vlan_" && !$value) {
+                    $model->$field = null;
+                    continue;
+                }
+                $model->$field = $value;
+            }
+        }
+
+        $me = mfValuecache::singleton()->get("me");
+        if (!$me) {
+            $me = new User();
+            $me->loadMe();
+            mfValuecache::singleton()->set("me", $me);
+        }
+
+        if ($model->create_by === null) {
+            $model->create_by = $me->id;
+        }
+        if ($model->edit_by === null) {
+            $model->edit_by = $me->id;
+        }
+
+        return $model;
+    }
+
+    public static function getOne($id)
+    {
+        if (!is_numeric($id) || !$id) {
+            throw new Exception("Invalid number", 400);
+        }
+        $item = [];
+        $db = FronkDB::singleton();
+
+        $res = $db->select("TimerecordingBilling", "*", "id=$id LIMIT 1");
+        if ($db->num_rows($res)) {
+            $data = $db->fetch_object($res);
+            $item = new TimerecordingBilling($data);
+        }
+        return $item;
+    }
+
+    public static function getAll()
+    {
+        $items = [];
+
+        $db = FronkDB::singleton();
+
+        $res = $db->select("TimerecordingBilling", "*", "1=1");
+        if ($db->num_rows($res)) {
+            while ($data = $db->fetch_object($res)) {
+                $items[] = new TimerecordingBilling($data);
+            }
+        }
+        return $items;
+
+    }
+
+    public static function getFirst()
+    {
+        $db = FronkDB::singleton();
+
+        $where = self::getSqlFilter($filter);
+        $res = $db->select("TimerecordingBilling", "*", "$where ");
+        if ($db->num_rows($res)) {
+            $data = $db->fetch_object($res);
+            $item = new TimerecordingBilling($data);
+            if ($item->id) {
+                return $item;
+            } else {
+                return null;
+            }
+        }
+        return null;
+    }
+
+    public static function search($filter)
+    {
+        $items = [];
+        $db = FronkDB::singleton();
+
+        $where = self::getSqlFilter($filter);
+        $res = $db->select("TimerecordingBilling", "*", "$where");
+        if ($db->num_rows($res)) {
+            while ($data = $db->fetch_object($res)) {
+                $items[] = new TimerecordingBilling($data);
+            }
+        }
+        return $items;
+    }
+
+    private static function getSqlFilter($filter)
+    {
+        $where = "1=1 ";
+
+        //var_dump($filter);exit;
+        if (array_key_exists("month", $filter)) {
+            $month = $filter['month'];
+            if ($month) {
+                $where .= " AND month=$month";
+            }
+        }
+
+        //var_dump($filter, $where);exit;
+        return $where;
+    }
 
 }
diff --git a/application/TimerecordingBillingEmployee/TimerecordingBillingEmployee.php b/application/TimerecordingBillingEmployee/TimerecordingBillingEmployee.php
new file mode 100644
index 000000000..b8d95f194
--- /dev/null
+++ b/application/TimerecordingBillingEmployee/TimerecordingBillingEmployee.php
@@ -0,0 +1,61 @@
+<?php
+
+class TimerecordingBillingEmployee extends mfBaseModel
+{
+    private $editor;
+    private $creator;
+    private $timerecordingBilling;
+    private $timerecordingEmployee;
+    
+
+
+    public function getProperty($name)
+{
+    if ($this->$name == null) {
+
+        if (!$this->id) {
+            return null;
+        }
+
+        if ($name == "creator") {
+            $this->creator = mfValuecache::singleton()->get("Worker-id-" . $this->create_by);
+            if ($this->creator === null) {
+                $this->creator = new User($this->create_by);
+                if ($this->creator->id) {
+                    mfValuecache::singleton()->set("Worker-id-" . $this->create_by, $this->creator);
+                }
+            }
+            return $this->creator;
+        }
+
+        if ($name == "editor") {
+            $this->editor = mfValuecache::singleton()->get("Worker-id-" . $this->edit_by);
+            if ($this->editor === null) {
+                $this->editor = new User($this->edit_by);
+                if ($this->editor->id) {
+                    mfValuecache::singleton()->set("Worker-id-" . $this->edit_by, $this->editor);
+                }
+            }
+            return $this->editor;
+        }
+
+        $classname = ucfirst($name);
+        $idfield = $name . "_id";
+        $this->$name = mfValuecache::singleton()->get("mfObjectmodel-$name-" . $this->$idfield);
+        if (!$this->$name) {
+            $this->$name = new $classname($this->$idfield);
+        }
+
+        if ($this->$name->id) {
+            mfValuecache::singleton()->set("mfObjectmodel-$name-" . $this->$name->id, $this->$name);
+            return $this->$name;
+        } else {
+            return null;
+        }
+
+    }
+
+    return $this->$name;
+}
+
+}
\ No newline at end of file
diff --git a/application/TimerecordingBillingEmployee/TimerecordingBillingEmployeeController.php b/application/TimerecordingBillingEmployee/TimerecordingBillingEmployeeController.php
new file mode 100644
index 000000000..c75745430
--- /dev/null
+++ b/application/TimerecordingBillingEmployee/TimerecordingBillingEmployeeController.php
@@ -0,0 +1,172 @@
+<?php
+
+class TimerecordingBillingEmployeeController extends mfBaseController
+{
+
+    protected function init()
+    {
+        $this->needlogin = true;
+        $me = new User();
+        $me->loadMe();
+        $this->me = $me;
+        $this->layout()->set("me", $me);
+
+        if (!$me->is(["Admin"])) {
+            $this->redirect("Dashboard");
+        }
+    }
+
+    protected function indexAction()
+    {
+
+        $this->layout()->setTemplate("TimerecordingBillingEmployee/Index");
+        $timerecordingbillingemployees = TimerecordingBillingEmployeeModel::getAll();
+        $this->layout()->set("timerecordingbillingemployees", $timerecordingbillingemployees);
+
+    }
+
+    protected function addAction()
+    {
+        $timerecordingBillingEmployees = TimerecordingBillingEmployeeModel::getAll();
+        $this->layout()->set("timerecordingBillingEmployees", $timerecordingBillingEmployees);
+        $timerecordingEmployees = TimerecordingEmployeeModel::getAll();
+        $this->layout()->set("timerecordingEmployees", $timerecordingEmployees);
+
+        $this->layout()->setTemplate("TimerecordingBillingEmployee/Form");
+
+    }
+
+    protected function editAction()
+    {
+        $id = $this->request->id;
+
+        if (!is_numeric($id) || !$id) {
+            $this->layout()->setFlash("fdfsdf nicht gefunden", "error");
+            $this->redirect("TimerecordingBillingEmployee");
+        }
+
+        $timerecordingbillingemployees = new TimerecordingBillingEmployee($id);
+        if ($timerecordingbillingemployees->id != $id) {
+            $this->layout()->setFlash("fdfsdf nicht gefunden", "error");
+            $this->redirect("TimerecordingBillingEmployee");
+        }
+
+        $this->layout()->set("timerecordingbillingemployees", $timerecordingbillingemployees);
+        return $this->addAction();
+    }
+
+    protected function saveAction()
+    {
+        $r = $this->request;
+        $id = $r->id;
+        //var_dump($r->get());exit;
+        if (is_numeric($id) && $id > 0) {
+            $mode = "edit";
+            $timerecordingbillingemployees = new TimerecordingBillingEmployee($id);
+            if (!$timerecordingbillingemployees->id) {
+                $this->layout()->setFlash("dfsdfsdfds nicht gefunden", "error");
+                $this->redirect("TimerecordingBillingEmployee");
+            }
+        } else {
+            $mode = "add";
+        }
+
+        $data = [];
+        $data['timerecordingBillingEmployee_id'] = trim($r->timerecordingBillingEmployee_id);
+        $data['timerecordingEmployee_id'] = trim($r->timerecordingEmployee_id);
+        $data['type'] = trim($r->type);
+        $data['ishours'] = trim($r->ishours);
+        $data['overtime25'] = trim($r->overtime25);
+        $data['plushours50'] = trim($r->plushours50);
+        $data['plushours50free'] = trim($r->plushours50free);
+        $data['plushours100'] = trim($r->plushours100);
+        $data['plushours100free'] = trim($r->plushours100free);
+        $data['homeoffice'] = trim($r->homeoffice);
+        $data['diet'] = trim($r->diet);
+        $data['nlz'] = trim($r->nlz);
+        $data['nlz_detail'] = trim($r->nlz_detail);
+
+
+        if (!$data['timerecordingBillingEmployee_id']) {
+            $data['timerecordingBillingEmployee_id'] = NULL;
+        }
+        if (!$data['timerecordingEmployee_id']) {
+            $data['timerecordingEmployee_id'] = NULL;
+        }
+        if (!$data['type']) {
+            $data['type'] = NULL;
+        }
+        if (!$data['ishours']) {
+            $data['ishours'] = NULL;
+        }
+        if (!$data['overtime25']) {
+            $data['overtime25'] = NULL;
+        }
+        if (!$data['plushours50']) {
+            $data['plushours50'] = NULL;
+        }
+        if (!$data['plushours50free']) {
+            $data['plushours50free'] = NULL;
+        }
+        if (!$data['plushours100']) {
+            $data['plushours100'] = NULL;
+        }
+        if (!$data['plushours100free']) {
+            $data['plushours100free'] = NULL;
+        }
+        if (!$data['homeoffice']) {
+            $data['homeoffice'] = NULL;
+        }
+        if ($data['diet'] == NULL) {
+            $data['diet'] = 0;
+        }
+        if (!$data['nlz']) {
+            $data['nlz'] = NULL;
+        }
+        if (!$data['nlz_detail']) {
+            $data['nlz_detail'] = NULL;
+        }
+
+//        var_dump($_FILES);
+//        var_dump($upload);
+//        exit;
+
+
+        if ($mode == "edit") {
+            $timerecordingbillingemployees->update($data);
+
+        } else {
+            $timerecordingbillingemployees = TimerecordingBillingEmployeeModel::create($data);
+        }
+//        var_dump($filestore);
+//        exit;
+        $id = $timerecordingbillingemployees->save();
+
+        if (!$id) {
+            $this->layout()->setFlash("fdfsdf konnte nicht angelegt werden", "error");
+            $this->redirect("TimerecordingBillingEmployee");
+        }
+
+        if ($mode == "edit") {
+            $this->layout()->setFlash("fdfsdf erfolgreich geändert", "success");
+        } else if ($mode = "add") {
+            $this->layout()->setFlash("fdfsdf erfolgreich angelegt", "success");
+        }
+        $this->redirect("TimerecordingBillingEmployee");
+    }
+
+
+    protected function deleteAction()
+    {
+        $id = $this->request->id;
+        $timerecordingbillingemployees = new TimerecordingBillingEmployee($id);
+        if (!$timerecordingbillingemployees->id || $timerecordingbillingemployees->id != $id) {
+            $this->layout()->setFlash("fdfsdf nicht gefunden.", "error");
+            $this->redirect("TimerecordingBillingEmployee");
+        }
+
+        $timerecordingbillingemployees->delete();
+        $this->redirect("TimerecordingBillingEmployee");
+    }
+
+}
diff --git a/application/TimerecordingBillingEmployee/TimerecordingBillingEmployeeModel.php b/application/TimerecordingBillingEmployee/TimerecordingBillingEmployeeModel.php
new file mode 100644
index 000000000..c7f69fd18
--- /dev/null
+++ b/application/TimerecordingBillingEmployee/TimerecordingBillingEmployeeModel.php
@@ -0,0 +1,139 @@
+<?php
+
+class TimerecordingBillingEmployeeModel
+{
+    private $timerecordingBilling_id;
+    private $timerecordingEmployee_id;
+    private $musthours;
+    private $type;
+    private $ishours;
+    private $ishourssum;
+    private $overtime25;
+    private $plushours50;
+    private $plushours50free;
+    private $plushours100;
+    private $plushours100free;
+    private $homeoffice;
+    private $diet;
+    private $nlz;
+    private $nlz_detail;
+
+
+    public static function find($data)
+    {
+
+    }
+
+    public static function create(array $data)
+    {
+        $model = new TimerecordingBillingEmployee();
+
+        foreach ($data as $field => $value) {
+            if (property_exists(get_called_class(), $field)) {
+                if (substr($field, 0, 5) == "vlan_" && !$value) {
+                    $model->$field = null;
+                    continue;
+                }
+                $model->$field = $value;
+            }
+        }
+
+        $me = mfValuecache::singleton()->get("me");
+        if (!$me) {
+            $me = new User();
+            $me->loadMe();
+            mfValuecache::singleton()->set("me", $me);
+        }
+
+        if ($model->create_by === null) {
+            $model->create_by = $me->id;
+        }
+        if ($model->edit_by === null) {
+            $model->edit_by = $me->id;
+        }
+
+        return $model;
+    }
+
+    public static function getOne($id)
+    {
+        if (!is_numeric($id) || !$id) {
+            throw new Exception("Invalid number", 400);
+        }
+        $item = [];
+        $db = FronkDB::singleton();
+
+        $res = $db->select("TimerecordingBillingEmployee", "*", "id=$id LIMIT 1");
+        if ($db->num_rows($res)) {
+            $data = $db->fetch_object($res);
+            $item = new TimerecordingBillingEmployee($data);
+        }
+        return $item;
+    }
+
+    public static function getAll()
+    {
+        $items = [];
+
+        $db = FronkDB::singleton();
+
+        $res = $db->select("TimerecordingBillingEmployee", "*", "1=1");
+        if ($db->num_rows($res)) {
+            while ($data = $db->fetch_object($res)) {
+                $items[] = new TimerecordingBillingEmployee($data);
+            }
+        }
+        return $items;
+
+    }
+
+    public static function getFirst()
+    {
+        $db = FronkDB::singleton();
+
+        $where = self::getSqlFilter($filter);
+        $res = $db->select("TimerecordingBillingEmployee", "*", "$where ");
+        if ($db->num_rows($res)) {
+            $data = $db->fetch_object($res);
+            $item = new TimerecordingBillingEmployee($data);
+            if ($item->id) {
+                return $item;
+            } else {
+                return null;
+            }
+        }
+        return null;
+    }
+
+    public static function search($filter)
+    {
+        $items = [];
+        $db = FronkDB::singleton();
+
+        $where = self::getSqlFilter($filter);
+        $res = $db->select("TimerecordingBillingEmployee", "*", "$where");
+        if ($db->num_rows($res)) {
+            while ($data = $db->fetch_object($res)) {
+                $items[] = new TimerecordingBillingEmployee($data);
+            }
+        }
+        return $items;
+    }
+
+    private static function getSqlFilter($filter)
+    {
+        $where = "1=1 ";
+
+        //var_dump($filter);exit;
+        if (array_key_exists("timerecordingBilling_id", $filter)) {
+            $timerecordingBilling_id = $filter['timerecordingBilling_id'];
+            if (is_numeric($timerecordingBilling_id)) {
+                $where .= " AND timerecordingBilling_id='$timerecordingBilling_id'";
+            }
+        }
+
+        //var_dump($filter, $where);exit;
+        return $where;
+    }
+
+}
diff --git a/application/TimerecordingCar/TimerecordingCar.php b/application/TimerecordingCar/TimerecordingCar.php
index be5ba62f2..01f300927 100644
--- a/application/TimerecordingCar/TimerecordingCar.php
+++ b/application/TimerecordingCar/TimerecordingCar.php
@@ -2,6 +2,7 @@
 
 class TimerecordingCar extends mfBaseModel
 {
+    private $user;
     private $editor;
     private $creator;
     
diff --git a/application/TimerecordingCar/TimerecordingCarController.php b/application/TimerecordingCar/TimerecordingCarController.php
index 548f92b2a..f718bac62 100644
--- a/application/TimerecordingCar/TimerecordingCarController.php
+++ b/application/TimerecordingCar/TimerecordingCarController.php
@@ -38,7 +38,8 @@ class TimerecordingCarController extends mfBaseController
 
     protected function addAction()
     {
-
+        $timerecordingusers = UserModel::search(['employee' => 'true']);
+        $this->layout()->set("timerecordingusers", $timerecordingusers);
         $this->layout()->setTemplate("TimerecordingCar/Form");
 
     }
@@ -58,6 +59,7 @@ class TimerecordingCarController extends mfBaseController
             $this->redirect("TimerecordingCar");
         }
 
+
         $this->layout()->set("timerecordingcars", $timerecordingcars);
         return $this->addAction();
     }
@@ -80,6 +82,7 @@ class TimerecordingCarController extends mfBaseController
 
         $data = [];
         $data['number_plate'] = trim($r->number_plate);
+        $data['user_id'] = trim($r->user_id);
         $data['brand'] = trim($r->brand);
         $data['model'] = trim($r->model);
         $data['mileage'] = trim($r->mileage);
@@ -88,6 +91,9 @@ class TimerecordingCarController extends mfBaseController
         $data['first_approval'] = trim($r->first_approval);
 
 
+        if (!$data['user_id']) {
+            $data['user_id'] = null;
+        }
         if (!$data['initial_approval']) {
             $data['initial_approval'] = null;
         }
diff --git a/application/TimerecordingCar/TimerecordingCarModel.php b/application/TimerecordingCar/TimerecordingCarModel.php
index ad78e52d8..d77f3fef6 100644
--- a/application/TimerecordingCar/TimerecordingCarModel.php
+++ b/application/TimerecordingCar/TimerecordingCarModel.php
@@ -2,6 +2,7 @@
 
 class TimerecordingCarModel
 {
+    private $user_id;
     private $number_plate;
     private $brand;
     private $model;
diff --git a/application/TimerecordingEmployee/TimerecordingEmployeeController.php b/application/TimerecordingEmployee/TimerecordingEmployeeController.php
index 9d1110968..52493034d 100644
--- a/application/TimerecordingEmployee/TimerecordingEmployeeController.php
+++ b/application/TimerecordingEmployee/TimerecordingEmployeeController.php
@@ -114,13 +114,21 @@ class TimerecordingEmployeeController extends mfBaseController
         $data['holidays'] = trim($r->holidays);
         $data['plushours'] = $plushours;
         $data['startdate'] = strtotime($r->startdate);
+        $data['enddate'] = strtotime($r->enddate);
         $data['type'] = trim($r->type);
+        $data['bmd_active'] = trim($r->bmd_active);
         $data['overtime'] = $overtime;
 #
 
         if (!$data['overtime']) {
             $data['overtime'] = 0;
         }
+        if (!$data['bmd_active']) {
+            $data['bmd_active'] = 0;
+        }
+        if (!$data['enddate']) {
+            $data['enddate'] = null;
+        }
 
         if ($r->birthday) {
             $data['birthday'] = strtotime($r->birthday);
diff --git a/application/TimerecordingEmployee/TimerecordingEmployeeModel.php b/application/TimerecordingEmployee/TimerecordingEmployeeModel.php
index 089e76cfb..b42acc1ce 100644
--- a/application/TimerecordingEmployee/TimerecordingEmployeeModel.php
+++ b/application/TimerecordingEmployee/TimerecordingEmployeeModel.php
@@ -16,6 +16,8 @@ class TimerecordingEmployeeModel
     private $overtime_timestamp;
     private $bpahours;
     private $startdate;
+    private $enddate;
+    private $bmd_active;
     private $birthday;
     public static $employeetypesbmd = array('1' => '1000', '2' => '1200', '3' => '1400');
 
diff --git a/application/TimerecordingReport/TimerecordingReportController.php b/application/TimerecordingReport/TimerecordingReportController.php
index 6fe936c3b..7e4b18f54 100644
--- a/application/TimerecordingReport/TimerecordingReportController.php
+++ b/application/TimerecordingReport/TimerecordingReportController.php
@@ -411,6 +411,7 @@ class TimerecordingReportController extends mfBaseController
             $overtime_now = $employee[0]->overtime_now;
             $auto_workinghours = $employee[0]->auto_workinghours;
             $startdate = $employee[0]->startdate;
+            $bpahours = $employee[0]->bpahours;
         }
         $workinghours = TimerecordingEmployeeWorkingHourModel::search(['user_id' => $user_id]);
         $holidays = TimerecordingHolidayModel::getAll();
@@ -775,6 +776,8 @@ class TimerecordingReportController extends mfBaseController
         $json['time']['plushours'] = sprintf('%02dh:%02dm', floor($plusHours / 3600), floor($plusHours / 60 % 60));
         $json['time']['plushours_now'] = $plusHours_now;
         $json['time']['plushours_noworder'] = $plusHours_noworder;
+        $json['time']['bpahours'] = sprintf('%02dh:%02dm', floor($bpahours / 3600), floor($bpahours / 60 % 60));
+
         $json['time']['overtime_now'] = sprintf('%02dh:%02dm', floor($overtime_now / 3600), floor($overtime_now / 60 % 60));
         $json['time']['overtime_noworder'] = $overtime_now;
         $json['time']['homeoffice'] = $homeofficesum;
diff --git a/db/migrations/20240401144219_timerecording_employee_add_field_bmd.php b/db/migrations/20240401144219_timerecording_employee_add_field_bmd.php
new file mode 100644
index 000000000..e0190d657
--- /dev/null
+++ b/db/migrations/20240401144219_timerecording_employee_add_field_bmd.php
@@ -0,0 +1,31 @@
+<?php
+declare(strict_types=1);
+
+use Phinx\Migration\AbstractMigration;
+
+final class TimerecordingEmployeeAddFieldBmd extends AbstractMigration
+{
+    public function up(): void
+    {
+        if($this->getEnvironment() == "thetool") {
+            $table = $this->table("TimerecordingEmployee", ["signed" => true]);
+            $table->addColumn("bmd_active", "integer", ["null" => false, "default" => 1, "after" => "bpahours"]);
+            $table->update();
+        }
+        
+        if($this->getEnvironment() == "addressdb") {
+          
+        }
+    }
+
+    public function down(): void
+    {
+        if($this->getEnvironment() == "thetool") {
+            $this->table("TimerecordingEmployee")->removeColumn("bmd_active")->save();
+        }
+        
+        if($this->getEnvironment() == "addressdb") {
+          
+        }
+    }
+}
diff --git a/db/migrations/20240402075053_timerecording_billing.php b/db/migrations/20240402075053_timerecording_billing.php
new file mode 100644
index 000000000..39d5116a7
--- /dev/null
+++ b/db/migrations/20240402075053_timerecording_billing.php
@@ -0,0 +1,35 @@
+<?php
+
+use Phinx\Migration\AbstractMigration;
+
+final class TimerecordingBilling extends AbstractMigration
+{
+    public function up(): void
+    {
+        if ($this->getEnvironment() == "thetool") {
+            $table = $this->table("TimerecordingBilling", ["signed" => true]);
+
+            $table->addColumn("month", "string", ["null" => false]);
+            $table->addColumn("closetime", "integer", ["null" => false]);
+            $table->addColumn("create_by", "integer", ["null" => false]);
+            $table->addColumn("edit_by", "integer", ["null" => false]);
+            $table->addColumn("create", "integer", ["null" => false]);
+            $table->addColumn("edit", "integer", ["null" => false]);
+            $table->save();
+        }
+
+        if ($this->getEnvironment() == "addressdb") {
+
+        }
+    }
+
+    public function down(): void
+    {
+        if ($this->getEnvironment() == "thetool") {
+            $this->table("TimerecordingBilling")->drop()->save();
+        }
+        if ($this->getEnvironment() == "addressdb") {
+        }
+    }
+}
+?>
\ No newline at end of file
diff --git a/db/migrations/20240402075109_timerecording_billing_employee.php b/db/migrations/20240402075109_timerecording_billing_employee.php
new file mode 100644
index 000000000..ef8ef3407
--- /dev/null
+++ b/db/migrations/20240402075109_timerecording_billing_employee.php
@@ -0,0 +1,48 @@
+<?php
+
+use Phinx\Migration\AbstractMigration;
+
+final class TimerecordingBillingEmployee extends AbstractMigration
+{
+    public function up(): void
+    {
+        if ($this->getEnvironment() == "thetool") {
+            $table = $this->table("TimerecordingBillingEmployee", ["signed" => true]);
+
+            $table->addColumn("timerecordingBilling_id", "integer", ["null" => false]);
+            $table->addColumn("timerecordingEmployee_id", "integer", ["null" => false]);
+            $table->addColumn("musthours", "integer", ["null" => false]);
+            $table->addColumn("ishours", "integer", ["null" => false]);
+            $table->addColumn("ishourssum", "integer", ["null" => false]);
+            $table->addColumn("plushours25", "integer", ["null" => false, "default" => "0"]);
+            $table->addColumn("overtime50", "integer", ["null" => false, "default" => "0"]);
+            $table->addColumn("overtime50free", "integer", ["null" => false, "default" => "0"]);
+            $table->addColumn("overtime100", "integer", ["null" => false, "default" => "0"]);
+            $table->addColumn("overtime100free", "integer", ["null" => false, "default" => "0"]);
+            $table->addColumn("homeoffice", "integer", ["null" => false, "default" => "0"]);
+            $table->addColumn("diet", "decimal", ["null" => false, "default" => "0", "precision" => 10, "scale" => 2]);
+            $table->addColumn("nlz", "text", ["null" => true]);
+            $table->addColumn("nlz_detail", "text", ["null" => true]);
+            $table->addColumn("create_by", "integer", ["null" => false]);
+            $table->addColumn("edit_by", "integer", ["null" => false]);
+            $table->addColumn("create", "integer", ["null" => false]);
+            $table->addColumn("edit", "integer", ["null" => false]);
+            $table->save();
+        }
+
+        if ($this->getEnvironment() == "addressdb") {
+
+        }
+    }
+
+    public function down(): void
+    {
+        if ($this->getEnvironment() == "thetool") {
+            $this->table("TimerecordingBillingEmployee")->drop()->save();
+        }
+        if ($this->getEnvironment() == "addressdb") {
+        }
+    }
+}
+
+?>
\ No newline at end of file
diff --git a/db/migrations/20240403064256_timerecording_car_add_field_user.php b/db/migrations/20240403064256_timerecording_car_add_field_user.php
new file mode 100644
index 000000000..61f180de2
--- /dev/null
+++ b/db/migrations/20240403064256_timerecording_car_add_field_user.php
@@ -0,0 +1,31 @@
+<?php
+declare(strict_types=1);
+
+use Phinx\Migration\AbstractMigration;
+
+final class TimerecordingCarAddFieldUser extends AbstractMigration
+{
+    public function up(): void
+    {
+        if($this->getEnvironment() == "thetool") {
+            $table = $this->table("TimerecordingCar", ["signed" => true]);
+            $table->addColumn("user_id", "integer", ["null" => true, "after" => "id"]);
+            $table->update();
+        }
+        
+        if($this->getEnvironment() == "addressdb") {
+          
+        }
+    }
+
+    public function down(): void
+    {
+        if($this->getEnvironment() == "thetool") {
+            $this->table("TimerecordingCar")->removeColumn("user_id")->save();
+        }
+        
+        if($this->getEnvironment() == "addressdb") {
+          
+        }
+    }
+}