diff --git a/Layout/default/Calendar/View.php b/Layout/default/Calendar/View.php
index 8a5813aec..d590b86b6 100644
--- a/Layout/default/Calendar/View.php
+++ b/Layout/default/Calendar/View.php
@@ -34,6 +34,8 @@ endforeach;
           type="text/css"/>
     <link href="<?= self::getResourcePath() ?>css/pages/Calendar/View.css?<?= $git_merge_ts ?>" rel="stylesheet"
           type="text/css"/>
+    <link href="<?= self::getResourcePath() ?>plugins/summernote/summernote-bs4.min.css" rel="stylesheet">
+
     <script type="text/javascript"
             src="<?= self::getResourcePath() ?>assets/js/calendar/rrule/rrule.min.js?<?= $git_merge_ts ?>"></script>
     <script type="text/javascript"
@@ -645,7 +647,10 @@ endforeach;
     </div>
 
     <div id="output"></div>
-    <script type="text/javascript" src="<?= self::getResourcePath() ?>plugins/select2/js/i18n/de.js"></script>
+    <script type="text/javascript" src="<?= self::getResourcePath() ?>plugins/select2/js/i18n/de.js?<?= $git_merge_ts ?>"></script>
+    <script type="text/javascript" src="<?=self::getResourcePath()?>plugins/summernote/summernote-bs4.min.js?<?= $git_merge_ts ?>"></script>
+    <script type="text/javascript"  src="<?=self::getResourcePath()?>plugins/summernote/lang/summernote-de-DE.min.js?<?= $git_merge_ts ?>"></script>
+
     <script>
         let requestUrl = "<?= self::getUrl("Calendar", "api", ['do' => 'getCalendarEvents']) ?>";
         let requestEventUrl = "<?= self::getUrl("Calendar", "api", ['do' => 'getCalendarEvent']) ?>";
@@ -669,7 +674,7 @@ endforeach;
         var birthdays = [];
         <?php
 
-        $counter = 10000;
+        $counter = 1000000;
         foreach ($timerecordingholidays as $timerecordingholiday) :?>
         holiDays.push({
             id: <?= $counter ?>,
diff --git a/Layout/default/ConstructionConsent/Consentform.pdf.php b/Layout/default/ConstructionConsent/Consentform.pdf.php
index 8bbcd4f1e..3d8b68c47 100644
--- a/Layout/default/ConstructionConsent/Consentform.pdf.php
+++ b/Layout/default/ConstructionConsent/Consentform.pdf.php
@@ -269,6 +269,8 @@
                 <p>Energie Steiermark Breitband GmbH</p>
             </div>
 
+            <div class="page">&nbsp;</div>
+
             <div class="page">
 
                 <p class="text-right">
@@ -410,7 +412,7 @@
             <div class="borderpoint">
                 <h3>Übersichtsplan / Planskizze</h3>
 
-                <?php if($consent->file): ?>
+                <?php if($consent->file && $consent->file->file_id && $consent->file->file->fileExists()): ?>
                     <img src="<?=$consent->file->file->asDataUrl()?>" style="max-width: 640px; max-height: 640px; border: 1px solid #000" />
                 <?php endif; ?>
             </div>
diff --git a/Layout/default/ConstructionConsent/Form.php b/Layout/default/ConstructionConsent/Form.php
index 3f518f870..93c7b43ce 100644
--- a/Layout/default/ConstructionConsent/Form.php
+++ b/Layout/default/ConstructionConsent/Form.php
@@ -55,9 +55,9 @@
                             </div>
 
                             <div class="form-group row">
-                                <label class="col-lg-2 col-form-label" for="name">Name</label>
+                                <label class="col-lg-2 col-form-label" for="name">Name*</label>
                                 <div class="col-lg-10">
-                                    <input type="text" class="form-control" name="name" id="name" value="<?=(isset($item)) ? $item->name : ""?>" placeholder="z.B. Straße oder Adresse" />
+                                    <input type="text" class="form-control" name="name" id="name" value="<?=(isset($item)) ? $item->name : ""?>" placeholder="z.B. Straße oder Adresse" data-toggle="popover" data-trigger="focus" data-placement="left" data-content="Wird in der Zustimmungserklärung in der Objektanschrift verwendet." />
                                 </div>
                             </div>
 
@@ -119,57 +119,61 @@
                             </div>
 
                             <hr />
-                            <h4>Nutzung</h4>
 
-                            <div class="form-group row">
-                                <label class="col-lg-2 col-form-label" for="usage_length">Länge auf Grundstück (in m)</label>
-                                <div class="col-lg-10">
-                                    <input type="text" class="form-control" name="usage_length" id="usage_length" value="<?=(isset($item)) ? $item->usage_length : ""?>" />
-                                </div>
-                            </div>
+                            <div id="usage-container">
+                                <h4>Nutzung</h4>
 
-                            <div class="form-group row mt-3">
-                                <div class="col-lg-2"></div>
-                                <div class="col-lg-10">
-                                    <label>
-                                        <input type="checkbox" name="usage_pipe_on_plot" id="usage_pipe_on_plot" value="1" <?=(isset($item) && $item->usage_pipe_on_plot ? "checked='checked'" : "")?> />
-                                        Verlegung von Rohren und Lichtwellenleitern am Grundstück
-                                    </label>
+                                <div class="form-group row">
+                                    <label class="col-lg-2 col-form-label" for="usage_length">Länge auf Grundstück (in m)</label>
+                                    <div class="col-lg-10">
+                                        <input type="text" class="form-control" name="usage_length" id="usage_length" value="<?=(isset($item)) ? $item->usage_length : ""?>" />
+                                    </div>
                                 </div>
-                            </div>
 
-                            <div class="form-group row">
-                                <div class="col-lg-2"></div>
-                                <div class="col-lg-10">
-                                    <label>
-                                        <input type="checkbox" name="usage_pipe_in_building" id="usage_pipe_in_building" value="1" <?=(isset($item) && $item->usage_pipe_in_building ? "checked='checked'" : "")?> />
-                                        Verlegung von Rohren und Lichtwellenleitern in den darauf befindlichen Gebäuden
-                                    </label>
+                                <div id="usage-checkbox-container" class="<?=(isset($item) && $item->object_type == "building") ? "hidden": ""?>">
+                                <div class="form-group row mt-3">
+                                    <div class="col-lg-2"></div>
+                                    <div class="col-lg-10">
+                                        <label>
+                                            <input type="checkbox" name="usage_pipe_on_plot" id="usage_pipe_on_plot" value="1" <?=(isset($item) && $item->usage_pipe_on_plot ? "checked='checked'" : "")?> />
+                                            Verlegung von Rohren und Lichtwellenleitern am Grundstück
+                                        </label>
+                                    </div>
                                 </div>
-                            </div>
 
-                            <div class="form-group row">
-                                <div class="col-lg-2"></div>
-                                <div class="col-lg-10">
-                                    <label>
-                                        <input type="checkbox" name="usage_manhole" id="usage_manhole" value="1" <?=(isset($item) && $item->usage_manhole ? "checked='checked'" : "")?> />
-                                        Errichtung eines Schachtes/einer Kabelmontagegrube und/oder eines LWL-Verteilschrankes/einer LWL-Abschlussbox
-                                    </label>
+                                <div class="form-group row">
+                                    <div class="col-lg-2"></div>
+                                    <div class="col-lg-10">
+                                        <label>
+                                            <input type="checkbox" name="usage_pipe_in_building" id="usage_pipe_in_building" value="1" <?=(isset($item) && $item->usage_pipe_in_building ? "checked='checked'" : "")?> />
+                                            Verlegung von Rohren und Lichtwellenleitern in den darauf befindlichen Gebäuden
+                                        </label>
+                                    </div>
                                 </div>
-                            </div>
 
-                            <div class="form-group row">
-                                <div class="col-lg-2"></div>
-                                <div class="col-lg-10">
-                                    <label>
-                                        <input type="checkbox" name="usage_owner" id="usage_owner" value="1" <?=(isset($item) && $item->usage_owner ? "checked='checked'" : "")?> />
-                                        Die Nutzung der Liegenschaft seitens BB dient der Eigenversorgung der GE und/oder dessen Nutzer(in) und wird dieser entgeltlos zugestimmt
-                                    </label>
+                                <div class="form-group row">
+                                    <div class="col-lg-2"></div>
+                                    <div class="col-lg-10">
+                                        <label>
+                                            <input type="checkbox" name="usage_manhole" id="usage_manhole" value="1" <?=(isset($item) && $item->usage_manhole ? "checked='checked'" : "")?> />
+                                            Errichtung eines Schachtes/einer Kabelmontagegrube und/oder eines LWL-Verteilschrankes/einer LWL-Abschlussbox
+                                        </label>
+                                    </div>
                                 </div>
+
+                                <div class="form-group row">
+                                    <div class="col-lg-2"></div>
+                                    <div class="col-lg-10">
+                                        <label>
+                                            <input type="checkbox" name="usage_owner" id="usage_owner" value="1" <?=(isset($item) && $item->usage_owner ? "checked='checked'" : "")?> />
+                                            Die Nutzung der Liegenschaft seitens BB dient der Eigenversorgung der GE und/oder dessen Nutzer(in) und wird dieser entgeltlos zugestimmt
+                                        </label>
+                                    </div>
+                                </div>
+
                             </div>
 
                             <hr />
-
                             <h4>Planskizze / Bilddatei</h4>
                             <div class="form-group row">
                                 <label class="col-lg-2 col-form-label"></label>
@@ -197,18 +201,10 @@
 
 
                                     <div class="card">
-                                        <h5 class="card-header">Plan Vorschau</h5>
+                                        <h5 class="card-header">Plan Vorschau <button type='button' id="delete-rimo-plan" class='ml-2 btn btn-sm btn-outline-danger pointer <?=($item->file && $item->file->file && $item->file->file->fileExists()) ? "" : "hidden" ?>' onclick='deletePlan()'><i class='fas fa-fw fa-trash'></i> Plan löschen</button></h5>
                                         <div class="card-body" id="rimo-plan-container">
                                             <input type="hidden" name="submit_plan_file_id" id="submit_plan_file_id" value="" />
-                                            <img id="plan_preview" style="max-width: 1200px;" <?=($item->file) ? "src=".$item->file->file->asDataUrl()."" : "" ?> />
-                                            <div class="row mt-2">
-                                                <div class="col">
-                                                    <button type="button" class="btn btn-outline-danger hidden" id="delete-rimo-plan" onclick="deleteRimoPlan()">
-                                                        <i class="far fa-fw fa-trash-alt"></i> Plan löschen
-                                                    </button>
-                                                </div>
-                                            </div>
-
+                                            <img id="plan_preview" style="max-width: 1200px;" <?=($item->file && $item->file->file && $item->file->file->fileExists()) ? "src=".$item->file->file->asDataUrl()."" : "" ?> />
                                         </div>
                                     </div>
 
@@ -268,11 +264,13 @@
             $("#adb_hausnummer_id").val("").change();
 
             $("#street-search").show();
+            $("#usage-checkbox-container").show();
         } else {
             $("#street-search").hide();
             $("#adb_strasse_id").val("").change();
 
             $("#address-search").show();
+            $("#usage-checkbox-container").hide();
         }
     });
 
@@ -363,6 +361,7 @@
         var [file] = $("#consent_plan_image").prop("files");
         if(file) {
             $("#plan_preview").attr("src", URL.createObjectURL(file));
+            $("#delete-rimo-plan").show();
         }
     });
 
@@ -371,11 +370,19 @@
         $("#adb_strasse_id").val("").change();
     });
 
-    function deleteRimoPlan() {
-        $('#plan_adb_hausnummer_id').val("");
-        $("#submit_plan_file_id").val();
+    function deletePlan() {
+        $('#plan_adb_hausnummer_id').val("").change();
+        $("#submit_plan_file_id").val("");
         $("#plan_preview").attr("src", "");
         $("#delete-rimo-plan").hide();
+        $("#consent_plan_image").val("");
+
+        <?php if(isset($item) && $item->id): ?>
+        $.post("<?=self::getUrl("ConstructionConsent", "api")?>", {
+            do: "deleteRimoPlan",
+            id: <?=$item->id?>
+        });
+        <?php endif; ?>
 
     }
 
@@ -391,6 +398,30 @@
         $("#gstnr").val(kg + gst);
     }
 
+    $(window).bind("paste", (e) => {
+        var files = e.originalEvent.clipboardData.files;
+        if(files.length > 0) {
+            $("#consent_plan_image").prop("files", files);
+            $("#consent_plan_image").change();
+            window.notify("info", "Plan aus Zwischenablage übernommen.");
+        }
+    });
+
+
+    $(document).ready(function(){
+        $('[data-toggle="popover"]').popover();
+    });
+
+
 </script>
+    <style>
+        .popover {
+            background-color: #ffff99;
+        }
+        .popover .arrow::after {
+            border-top-color: #ffff99;
+        }
+    </style>
+
 
 <?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/footer.php"); ?>
\ No newline at end of file
diff --git a/Layout/default/ConstructionConsent/Index.php b/Layout/default/ConstructionConsent/Index.php
index 4e79018ab..82b2ea4c9 100644
--- a/Layout/default/ConstructionConsent/Index.php
+++ b/Layout/default/ConstructionConsent/Index.php
@@ -112,11 +112,7 @@ $pagination_entity_name = "Zustimmungserklärungen";
                         <th>Name</th>
                         <th>Objekttyp</th>
                         <th>Objektadresse</th>
-<!--                        <th title="Grundstücksnummer">GST-Nr.</th>-->
-<!--                        <th title="Grundbuch Einlagezahl">EZ</th>-->
-<!--                        <th>Besitzer</th>-->
-<!--                        <th>Besitzer Adresse</th>-->
-<!--                        <th>Besitzer Kontakt</th>-->
+                        <th>GST-Nr.</th>
                         <th>Anfragestatus</th>
                         <th>Anfrageresultat</th>
                         <th></th>
@@ -137,24 +133,7 @@ $pagination_entity_name = "Zustimmungserklärungen";
                                     <?=$item->adb_hausnummer->strasse->gemeinde->name?>
                                 <?php endif; ?>
                             </td>
-<!--                            <td>--><?php //=$item->gstnr?><!--</td>-->
-<!--                            <td>--><?php //=$item->ez?><!--</td>-->
-<!--                            <td>--><?php //=$item->owner_name?><!--</td>-->
-<!--                            <td>-->
-<!--                                --><?php //=$item->owner_street?><!--<br />-->
-<!--                                --><?php //=$item->owner_zip?><!-- --><?php //=$item->owner_city?><!--<br />-->
-<!--                            </td>-->
-<!--                            <td>-->
-<!--                                --><?php //if($item->phone): ?>
-<!--                                Tel: --><?php //=$item->phone?><!--<br />-->
-<!--                                --><?php //endif; ?>
-<!--                                --><?php //if($item->fax): ?>
-<!--                                    Fax: --><?php //=$item->fax?><!--<br />-->
-<!--                                --><?php //endif; ?>
-<!--                                --><?php //if($item->email): ?>
-<!--                                    Email: --><?php //=$item->email?>
-<!--                                --><?php //endif; ?>
-<!--                            </td>-->
+                            <td><?=$item->gst?></td>
                             <td><?=($item->status) ? __($item->status,"consent") : ""?></td>
                             <td>
                                 <?php
@@ -177,9 +156,8 @@ $pagination_entity_name = "Zustimmungserklärungen";
                                 <?php if(!$item->result): ?>
                                     <a href="<?=self::getUrl("ConstructionConsent", "edit", ["id" => $item->id])?>"><i class="far fa-edit"  title="Bearbeiten"></i></a>
 
-                                    <?php if($item->status == "new"): ?>
-                                        <a href="<?=self::getUrl("ConstructionConsent", "delete", ["id" => $item->id])?>" onclick="if(!confirm('Zustimmungserklärung wirklich löschen?')) return false;" class="text-danger" title="Löschen"><i class="fas fa-trash"></i></a>
-                                    <?php endif; ?>
+                                    <a href="<?=self::getUrl("ConstructionConsent", "delete", ["id" => $item->id])?>" onclick="if(!confirm('Zustimmungserklärung wirklich löschen?')) return false;" class="text-danger" title="Löschen"><i class="fas fa-trash"></i></a>
+
 
                                 <?php endif; ?>
 
diff --git a/Layout/default/Timerecording/Index.php b/Layout/default/Timerecording/Index.php
index d4bbd8b9c..7a96f9097 100644
--- a/Layout/default/Timerecording/Index.php
+++ b/Layout/default/Timerecording/Index.php
@@ -95,6 +95,10 @@ $mindate = date("Y-m-d", strtotime("+ 1 Month", $closedmonth));
         .holiday-text {
             color: #d70000;
         }
+        .height-unset
+        {
+            height: unset;
+        }
 
     </style>
     <!-- start page title -->
@@ -314,16 +318,12 @@ $mindate = date("Y-m-d", strtotime("+ 1 Month", $closedmonth));
                     <div class="form-row">
                         <div class="col text-center">
                             <div class="input-group ">
-                                <label class="col-form-label form-control"><span
-                                            class="text-bold">Sollzeit: </span><span id="must-time"
-                                                                                     class="ml-1 text-normal"></span></label>
+                                <label class="col-form-label form-control height-unset"><span class="text-bold">Sollzeit: </span><span id="must-time" class="ml-1 text-normal"></span></label>
                             </div>
                         </div>
                         <div class="col text-center">
                             <div class="input-group  ">
-                                <label class="col-form-label form-control"><span class="text-bold">Istzeit: </span><span
-                                            id="is-time"
-                                            class="ml-1 text-normal"></span></label>
+                                <label class="col-form-label form-control height-unset"><span class="text-bold">Istzeit: </span><span id="is-time" class="ml-1 text-normal"></span></label>
                             </div>
                         </div>
                     </div>
@@ -332,19 +332,32 @@ $mindate = date("Y-m-d", strtotime("+ 1 Month", $closedmonth));
                     <div class="form-row">
                         <div class="col text-center">
                             <div class="input-group ">
-                                <label class="col-form-label form-control fixed-state"><span
+                                <label class="col-form-label form-control fixed-state height-unset"><span
                                             class="text-bold">Urlaubstage: </span><span id="holidays"
                                                                                         class="ml-1 text-normal"></span></label>
                             </div>
                         </div>
                         <div class="col text-center">
                             <div class="input-group  ">
-                                <label id="plushours-label" class="col-form-label form-control fixed-state"><span
+                                <label id="plushours-label" class="col-form-label form-control fixed-state height-unset"><span
                                             class="text-bold">Gutzeit: </span><span
                                             id="plushours"
                                             class="ml-1 text-normal"></span></label>
                             </div>
                         </div>
+
+                    </div>
+                </div>
+                <div class="col-lg-2" id="AllHours-div" style="display: none">
+                    <div class="form-row">
+                        <div class="col text-center">
+                            <div class="input-group ">
+                                <label class="col-form-label form-control height-unset"><span
+                                            class="text-bold">Gesamtzeit: </span><span id="AllHours"
+                                                                                        class="ml-1 text-normal"></span></label>
+                            </div>
+                        </div>
+
                     </div>
                 </div>
             </div>
diff --git a/Layout/default/WarehouseOrder/PDF_HEADER.html b/Layout/default/WarehouseOrder/PDF_HEADER.html
index 21802f9d5..2f38d21f9 100644
--- a/Layout/default/WarehouseOrder/PDF_HEADER.html
+++ b/Layout/default/WarehouseOrder/PDF_HEADER.html
@@ -17,10 +17,8 @@
         }
 
         .customer-details {
-            vertical-align: bottom;
+            vertical-align: top;
             font-size: 14px;
-            padding-left: 30pt;
-            width: 35%;
         }
 
         .invoice-details {
@@ -58,8 +56,8 @@
 
 <table style="width: 100%; border-collapse: collapse;">
     <tr>
-        <td class="customer-details" style="float: left">
-            <h3>Lieferant</h3>
+        <td class="customer-details">
+            <h3>{{ addressLine_header }}</h3>
             <div>{{ addressLine_1 }}</div>
             <div>{{ addressLine_2 }}</div>
             <div>{{ addressLine_3 }}</div>
@@ -67,8 +65,15 @@
             <div style="margin-bottom: 12pt"></div>
             <div>{{ externalReference }}</div>
         </td>
-        <td class="customer-details" align="top">
-            <h3>Rechnungsadresse</h3>
+        <td class="customer-details">
+            <h3>{{ shippingAddressLine_header }}</h3>
+            <div>{{ shippingAddressLine_1 }}</div>
+            <div>{{ shippingAddressLine_2 }}</div>
+            <div>{{ shippingAddressLine_3 }}</div>
+            <div>{{ shippingAddressLine_4 }}</div>
+        </td>
+        <td class="customer-details">
+            <h3>{{ billingAddressLine_header }}</h3>
             <div>{{ billingAddressLine_1 }}</div>
             <div>{{ billingAddressLine_2 }}</div>
             <div>{{ billingAddressLine_3 }}</div>
@@ -76,12 +81,6 @@
             <div>{{ billingAddressLine_5 }}</div>
             <div>{{ billingAddressLine_6 }}</div>
         </td>
-        <td class="customer-details" style="float: right">
-            <div>{{ shippingAddressLine_1 }}</div>
-            <div>{{ shippingAddressLine_2 }}</div>
-            <div>{{ shippingAddressLine_3 }}</div>
-            <div>{{ shippingAddressLine_4 }}</div>
-        </td>
     </tr>
 </table>
 
diff --git a/Layout/default/WarehouseOrder/PDF_MAIN.php b/Layout/default/WarehouseOrder/PDF_MAIN.php
index 144555322..4ad27fda0 100644
--- a/Layout/default/WarehouseOrder/PDF_MAIN.php
+++ b/Layout/default/WarehouseOrder/PDF_MAIN.php
@@ -6,13 +6,51 @@
  * @var Array $textElements
  */
 $this->setReturnValue(['filename' => $order["id"] . ".pdf"]);
+
+
+$texts = [
+    'EN' => [
+        'header' => 'XINON Supplier Order from ' . date("d.m.Y", $order["create"]),
+        'sum' => 'Sum',
+        'vat' => '20% VAT',
+        'total' => 'Total',
+        'taxFree' => 'Please provide tax-free delivery according to § 6a UStG (Austrian Sales tax law).<br>Our VAT ID number: ATU68711968. Delivery to Austria.',
+        'orderConfirmation' => 'Please send the order confirmation to office@xinon.at',
+        'table' => [
+            'pos' => 'POS',
+            'article' => 'Article',
+            'articleNumber' => 'Dist. art. nr.',
+            'amount' => 'Amount',
+            'unitPrice' => 'Unit price',
+            'totalPrice' => 'Total price'
+        ]
+    ],
+    'DE' => [
+        'header' => 'XINON Lieferantenbestellung vom ' . date("d.m.Y", $order["create"]),
+        'sum' => 'Summe',
+        'vat' => '20% MwSt',
+        'total' => 'Gesamt',
+        'taxFree' => 'Bitte um steuerfreie Lieferung gemäß § 6a UStG.<br> Unsere UID-Nr.: ATU68711968. Lieferung nach Österreich.',
+        'orderConfirmation' => 'Wir bitten um Zusendung der Auftragsbestätigung für die Bestellung an office@xinon.at.',
+        'table' => [
+                'pos' => 'POS',
+                'article' => 'Artikel',
+                'articleNumber' => 'Art.-Nr. Lieferant',
+                'amount' => 'Menge',
+                'unitPrice' => 'Einzelpreis',
+                'totalPrice' => 'Gesamtpreis'
+        ]
+]];
+
+$text = $texts[in_array($distributorCountryText, ["Österreich", "Deutschland", "Schweiz"]) ? "DE" : "EN"];
+
 ?>
 
 <!DOCTYPE html>
 <html>
 <head>
-    <title>Bestellung</title>
-    <meta charset="utf-8" />
+    <title><?= $text['header'] ?></title>
+    <meta charset="utf-8"/>
     <style>
         body {
             margin-top: 0;
@@ -76,58 +114,78 @@ $this->setReturnValue(['filename' => $order["id"] . ".pdf"]);
 </head>
 <body>
 <div>
-<!--
-TODO: enable option for showing prices
- vertauschen
- Die gelieferte Ware bleibt bis zur vollständigen Bezahlung in unserem Eigentum.
--->
-    <h2 style="text-align: center;color: #005384">XINON Lieferantenbestellung vom <?=date("d.m.Y", $order["create"])?></h2>
+    <h2 style="text-align: center;color: #005384"><?= $text['header'] ?></h2>
 
     <table style="border-collapse: collapse; width: 100%;" id="invoiceTable">
         <tr style="font-weight: bold; border-bottom: 1px solid black;" class="uneven">
-            <th style="text-align: center;padding-right: 6pt">Position</th>
-            <th style="text-align: center;padding-right: 6pt">Artikel</th>
-            <th style="text-align: center;padding-right: 6pt">Art.-Nr. Lieferant</th>
-            <th style="text-align: right">Menge</th>
-            <th style="text-align: right">Einzelpreis</th>
-            <th style="text-align: right;padding-right: 8pt">Gesamtpreis</th>
+            <th style="text-align: center;padding-right: 6pt"><?= $text['table']['pos'] ?></th>
+            <th style="text-align: center;padding-right: 6pt"><?= $text['table']['article'] ?></th>
+            <th style="text-align: center;padding-right: 6pt"><?= $text['table']['articleNumber'] ?></th>
+            <th style="text-align: right"><?= $text['table']['amount'] ?></th>
+            <th style="text-align: right"><?= $text['table']['unitPrice'] ?></th>
+            <th style="text-align: right;padding-right: 8pt"><?= $text['table']['totalPrice'] ?></th>
         </tr>
-        <?php $i = 0; foreach($order['positions'] as $p):?>
+        <?php $i = 0;
+        foreach ($order['positions'] as $p): ?>
 
-        <tr class="position <?=($i%2 == 0) ? "even" : "uneven" ?>">
-            <td style="text-align: center;"><?= $i + 1 ?></td>
-            <td style="text-align: left;padding-right: 8pt"><?=$p["articleName"]?></td>
-            <td style="text-align: center;padding-right: 8pt"><?=$p["distributorArticleNumber"]?></td>
-            <td style="text-align: right"><?=$p["amount"]?></td>
-            <td style="text-align: right"><?=number_format($p["buyPrice"], 2, ",", ".")?> €</td>
-            <td style="text-align: right;padding-right: 8pt"><?=number_format($p["amount"] * $p["buyPrice"], 2, ",", ".")?> €</td>
-        </tr>
-        <?php $i++; endforeach;?>
-<!--        display a grey like header sum with top border to differentiate 2nd last td = Summe , last td is the calculated value both bold-->
+            <tr class="position <?= ($i % 2 == 0) ? "even" : "uneven" ?>">
+                <td style="text-align: center;"><?= $i + 1 ?></td>
+                <td style="text-align: left;padding-right: 8pt"><?= $p["articleName"] ?></td>
+                <td style="text-align: center;padding-right: 8pt"><?= $p["distributorArticleNumber"] ?></td>
+                <td style="text-align: right"><?= $p["amount"] ?></td>
+                <td style="text-align: right"><?= number_format($p["buyPrice"], 2, ",", ".") ?> €</td>
+                <td style="text-align: right;padding-right: 8pt"><?= number_format($p["amount"] * $p["buyPrice"], 2, ",", ".") ?> €</td>
+            </tr>
+
+            <tr class="<?= ($i % 2 == 0) ? "even" : "uneven" ?>">
+                <td></td>
+                <td style="text-align: left;max-width: 200px"><?= $p["articleDescription"] ?></td>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td></td>
+            </tr>
+
+
+            <?php $i++; endforeach; ?>
 
         <tr class="uneven">
             <?php
             $sum = 0;
-            foreach($order['positions'] as $p){
+            foreach ($order['positions'] as $p) {
                 $sum += $p["amount"] * $p["buyPrice"];
             }
             ?>
             <td colspan="5" style="text-align: right;border-top: 1px solid black;font-weight: bold
 ;border-bottom: 1px solid black;
-">Summe</td>
+"><?= $text['sum'] ?>
+            </td>
             <td style="text-align: right;border-top: 1px solid black;font-weight: bold
 ;border-bottom: 1px solid black;
-"><?=number_format($sum, 2, ",", ".")?> €</td>
+"><?= number_format($sum, 2, ",", ".") ?> €
+            </td>
         </tr>
 
+        <?php if ($distributorCountryText === "Österreich"): ?>
+            <tr style="font-weight: bold; border-bottom: 1px solid black; background-color: #ebebeb;">
+                <td colspan="5" style="text-align: right;font-weight: bold;">20% MwSt</td>
+                <td style="text-align: right;font-weight: bold;"><?= number_format($sum * 0.2, 2, ",", ".") ?> €</td>
+            </tr>
+            <tr class="uneven" style="font-weight: bold; border-bottom: 3px double black; background-color: #ebebeb;">
+                <td colspan="5" style="text-align: right;font-weight: bold;"><?= $text['total'] ?></td>
+                <td style="text-align: right;font-weight: bold;"><?= number_format($sum * 1.2, 2, ",", ".") ?> €</td>
+            </tr>
+        <?php endif; ?>
+
 
     </table>
 
     <div>
-        <h3>Anmerkungen</h3>
-        <p>
-            <?=$order["note"]?>
-        </p>
+        <?php if ($distributorCountryText !== "Österreich"): ?>
+        <?= $text['taxFree'] ?>
+        <?php endif; ?>
+
+        <?= $text['orderConfirmation'] ?>
     </div>
 </body>
 </html>
\ No newline at end of file
diff --git a/Layout/default/menu.php b/Layout/default/menu.php
index 0acf0392f..4ac0041c7 100644
--- a/Layout/default/menu.php
+++ b/Layout/default/menu.php
@@ -11,6 +11,9 @@
             </a>
             <ul class="submenu">
               <li><a href="<?=self::getUrl("Preorder")?>"><i class="far fa-fw fa-calendar-lines text-info"></i> Vorbestellung</a></li>
+                              <?php if($me->is(["Admin","netowner","salespartner"]) && in_array($me->address_id, [1,209,5908,2187])): ?>
+                    <li><a href="<?=self::getUrl("ConstructionConsentProject")?>"><i class="far fa-fw fa-clipboard-question text-info"></i> Zustimmungserklärungen</a></li>
+                <?php endif; ?>
             </ul>
           </li>
         <?php else: ?>
@@ -198,7 +201,7 @@
               <?php if($me->is(["Admin","salespartner"]) && $me->can("Order")): ?>
                 <li><a href="<?=self::getUrl("Order")?>"><i class="far fa-fw fa-file-signature text-info"></i> Bestellungen</a></li>
               <?php endif; ?>
-              <?php if($me->is(["Admin","netowner","salespartner"]) && in_array($me->address_id, [1,209,5908])): ?>
+              <?php if($me->is(["Admin","netowner","salespartner"]) && in_array($me->address_id, [1,209,5908,2187])): ?>
                 <li><a href="<?=self::getUrl("ConstructionConsentProject")?>"><i class="far fa-fw fa-clipboard-question text-info"></i> Zustimmungserklärungen</a></li>
               <?php endif; ?>
             </ul>
diff --git a/Layout/default/vueHeader.php b/Layout/default/vueHeader.php
index e6a0b46e7..fd9146223 100644
--- a/Layout/default/vueHeader.php
+++ b/Layout/default/vueHeader.php
@@ -61,6 +61,8 @@
 </head>
 
 <body>
+<script src="https://cdn.jsdelivr.net/npm/sortablejs@1.14.0/Sortable.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/vue-draggable-next@2.1.0"></script>
 <script type="text/javascript">
     baseurl = '<?=self::getResourcePath()?>';
 </script>
diff --git a/application/ConstructionConsent/ConstructionConsent.php b/application/ConstructionConsent/ConstructionConsent.php
index 51d997be9..37243778f 100644
--- a/application/ConstructionConsent/ConstructionConsent.php
+++ b/application/ConstructionConsent/ConstructionConsent.php
@@ -34,6 +34,33 @@ class ConstructionConsent extends mfBaseModel {
         return $data;
     }
 
+    protected function beforeDelete() {
+        if(!$this->id) return true;
+        // delete owners
+        foreach($this->getProperty("owners") as $owner) {
+            $owner->delete();
+        }
+        // delete contacts
+        foreach($this->getProperty("contacts") as $contact) {
+            $contact->delete();
+        }
+        // delete journals
+        foreach($this->getProperty("journal") as $journal) {
+            $journal->delete();
+        }
+        // delete history
+        foreach($this->getProperty("history") as $history) {
+            $history->delete();
+        }
+        // delete files
+        if($this->getProperty("file")) {
+            $this->getProperty("file")->delete();
+        }
+
+        return true;
+
+    }
+
     protected function afterSave() {
         $this->createHistory();
     }
@@ -181,7 +208,7 @@ class ConstructionConsent extends mfBaseModel {
             }
 
             if($name == "file") {
-                if(!$this->id) return [];
+                if(!$this->id) return null;
                 $file = ConstructionConsentFile::getFirst(["constructionconsent_id" => $this->id]);
                 if($file) {
                     $this->file = $file;
diff --git a/application/ConstructionConsent/ConstructionConsentController.php b/application/ConstructionConsent/ConstructionConsentController.php
index c50faa654..c07fb68ab 100644
--- a/application/ConstructionConsent/ConstructionConsentController.php
+++ b/application/ConstructionConsent/ConstructionConsentController.php
@@ -10,7 +10,7 @@ class ConstructionConsentController extends mfBaseController {
         $this->me = $me;
         $this->layout()->set("me", $me);
 
-        if (!($me->is(["Admin","netowner","salespartner"]) && in_array($me->address_id, [1,209,5908]))) $this->redirect("Dashboard");
+        if (!($me->is(["Admin","netowner","salespartner"]) && in_array($me->address_id, [1,209,5908,2187]))) $this->redirect("Dashboard");
     }
 
     protected function indexAction() : void {
@@ -70,7 +70,7 @@ class ConstructionConsentController extends mfBaseController {
         $pagination['maxItems'] = ConstructionConsent::count($filter);
         $this->layout()->set("pagination", $pagination);
 
-        $items = ConstructionConsent::search($filter);
+        $items = ConstructionConsent::search($filter, $pagination);
         $this->layout->set("items", $items);
 
         if(array_key_exists("project_id", $filter) && $filter["project_id"]) {
@@ -217,7 +217,7 @@ class ConstructionConsentController extends mfBaseController {
         $data["usage_manhole"] = $r->usage_manhole ? 1 : 0;
         $data["usage_owner"] = $r->usage_owner ? 1 : 0;
 
-        if($r->object_type == "street") {
+        if($r->object_type == "building") {
             $data["usage_length"] = 1;
             $data["usage_pipe_on_plot"] = 1;
             $data["usage_pipe_in_building"] = 1;
@@ -320,6 +320,25 @@ class ConstructionConsentController extends mfBaseController {
 
     }
 
+    protected function deleteAction() {
+        $id = $this->request->id;
+        if(!is_numeric($id) || $id < 1) {
+            $this->layout()->setFlash("Zustimmungserklärung nicht gefunden", "error");
+            $this->redirect("ConstructionConsent");
+        }
+
+        $item = new ConstructionConsent($id);
+        if(!$item->id) {
+            $this->layout()->setFlash("Zustimmungserklärung nicht gefunden", "error");
+            $this->redirect("ConstructionConsent");
+        }
+
+        $item->delete();
+
+        $this->layout()->setFlash("Zustimmungserklärung erfolgreich gelöscht", "success");
+        $this->redirect("ConstructionConsent");
+    }
+
     protected function saveDate() {
         $r = $this->request;
 
@@ -470,6 +489,9 @@ class ConstructionConsentController extends mfBaseController {
             case "saveCheckbox":
                 $return = $this->saveCheckboxApi();
                 break;
+            case "deleteRimoPlan":
+                $return = $this->deleteRimoPlanApi();
+                break;
             default:
                 $this->log->warn(__METHOD__ . ": Called API function '$do' does not exist");
                 $return = false;
@@ -870,9 +892,17 @@ class ConstructionConsentController extends mfBaseController {
 
     }
 
-    private function saveRimoPlanPreviewApi() {
-        $adb_hausnummer_id = $this->request->building_id;
-        $consent_id = $this->request->constructionconsent_id;
+    private function deleteRimoPlanApi() {
+        $consent_id = $this->request->id;
+
+        $consent = new ConstructionConsent($consent_id);
+        if(!$consent->id) return false;
+
+        if($consent->file && $consent->file->file_id) {
+            $consent->file->delete();
+        }
+
+        return ["message" => "Plan deleted successfully"];
     }
 
     private function saveCheckboxApi() {
diff --git a/application/ConstructionConsentFile/ConstructionConsentFile.php b/application/ConstructionConsentFile/ConstructionConsentFile.php
index 8f0628888..359116205 100644
--- a/application/ConstructionConsentFile/ConstructionConsentFile.php
+++ b/application/ConstructionConsentFile/ConstructionConsentFile.php
@@ -5,6 +5,12 @@ class ConstructionConsentFile extends mfBaseModel {
     private $creator;
     private $editor;
 
+    protected function beforeDelete() {
+        if(!$this->id) return true;
+        $this->getProperty("file")->delete();
+        return true;
+
+    }
 
     public function getProperty($name) {
         if($this->$name == null) {
diff --git a/application/ConstructionConsentOwner/ConstructionConsentOwner.php b/application/ConstructionConsentOwner/ConstructionConsentOwner.php
index 852705610..d5294779c 100644
--- a/application/ConstructionConsentOwner/ConstructionConsentOwner.php
+++ b/application/ConstructionConsentOwner/ConstructionConsentOwner.php
@@ -10,6 +10,15 @@ class ConstructionConsentOwner extends mfBaseModel {
         $this->createHistory();
     }
 
+    protected function beforeDelete() {
+        if(!$this->id) return true;
+        foreach($this->getProperty("files") as $file) {
+            $file->delete();
+        }
+
+        return true;
+    }
+
     protected function beforeUpdate($data) {
         if(!array_key_exists("edit_by", $data)) {
             $me = new User();
@@ -45,13 +54,16 @@ class ConstructionConsentOwner extends mfBaseModel {
         if($this->$name == null) {
 
             if($name == "files") {
-                if(!$this->id) return null;
+                if(!$this->id) return [];
                 $files = ConstructionConsentOwnerFile::search(["constructionconsentowner_id" => $this->id]);
-                if(count($files)) {
-                    foreach($files as $file) {
-                        $this->files[$file->filename] = $file;
-                    }
+
+                if(!count($files)) {
+                    return [];
                 }
+                foreach($files as $file) {
+                    $this->files[$file->filename] = $file;
+                }
+
                 return $this->files;
             }
 
diff --git a/application/ConstructionConsentProject/ConstructionConsentProjectController.php b/application/ConstructionConsentProject/ConstructionConsentProjectController.php
index fa6b13769..0086383c2 100644
--- a/application/ConstructionConsentProject/ConstructionConsentProjectController.php
+++ b/application/ConstructionConsentProject/ConstructionConsentProjectController.php
@@ -10,7 +10,7 @@ class ConstructionConsentProjectController extends mfBaseController {
         $this->me = $me;
         $this->layout()->set("me", $me);
 
-        if (!($me->is(["Admin","netowner","salespartner"]) && in_array($me->address_id, [1,209,5908]))) $this->redirect("Dashboard");
+        if (!($me->is(["Admin","netowner","salespartner"]) && in_array($me->address_id, [1,209,5908,2187]))) $this->redirect("Dashboard");
     }
 
     protected function indexAction() : void {
diff --git a/application/Device/DeviceController.php b/application/Device/DeviceController.php
index 6cd20e58a..b55d259a0 100644
--- a/application/Device/DeviceController.php
+++ b/application/Device/DeviceController.php
@@ -18,7 +18,7 @@ class DeviceController extends mfBaseController
             $this->allowedPops = null;
         } else {
             $networkIds = array_column($this->me->getProperty('my_networks'), 'id');
-            $pops=PopNetworkModel::search(['Networks' => $networkIds]);
+            $pops = PopNetworkModel::search(['Networks' => $networkIds]);
             foreach ($pops as $pop) {
                 $popIds[] = $pop->pop_id;
             }
@@ -28,7 +28,7 @@ class DeviceController extends mfBaseController
 
     protected function indexAction()
     {
-        $deviceManufacturers = array_map(function($deviceManufacturer) {
+        $deviceManufacturers = array_map(function ($deviceManufacturer) {
             return [
                 "id" => $deviceManufacturer->id,
                 "name" => $deviceManufacturer->name,
@@ -37,7 +37,7 @@ class DeviceController extends mfBaseController
             ];
         }, DevicemanufactorModel::getAll());
 
-        $deviceTypes = array_map(function($deviceType) {
+        $deviceTypes = array_map(function ($deviceType) {
             return [
                 "id" => $deviceType->id,
                 "name" => $deviceType->name,
@@ -96,7 +96,7 @@ class DeviceController extends mfBaseController
         $this->layout()->setTemplate("Device/Detail");
         $devicesconfig = DeviceModel::getconifg($id);
         $devices = DeviceModel::getOne($id);
-        $devicesall= DeviceModel::getAll();
+        $devicesall = DeviceModel::getAll();
 
         if ($devices->devicetype->olt == "1") {
             $customer = DeviceModel::getOltCustomer($device->ip);
@@ -417,7 +417,9 @@ class DeviceController extends mfBaseController
 
     private function getDevices()
     {
-        if ($this->allowedPops === null) return [];
+        if (!$this->me->is(["Admin"])) {
+            if ($this->allowedPops === null) return [];
+        }
         $devices = DeviceModel::search(['popIds' => $this->allowedPops]);
 
         foreach ($devices as $device) {
diff --git a/application/Timerecording/TimerecordingController.php b/application/Timerecording/TimerecordingController.php
index db4bcde7e..e1446ab49 100644
--- a/application/Timerecording/TimerecordingController.php
+++ b/application/Timerecording/TimerecordingController.php
@@ -680,6 +680,7 @@ class TimerecordingController extends mfBaseController
         $holiDays = 0;
         $plusHours = 0;
         $startdate = time();
+        $allhours=0;
         if (!$userid) {
             $userid = $this->me->id;
         }
@@ -697,6 +698,10 @@ class TimerecordingController extends mfBaseController
             }
 
             $overtime = $employee[0]->overtime_now;
+            if ($employee[0]->only_admin) {
+                $getAllHours=TimerecordingModel::getAllHours($userid);
+                $getAllHours=$getAllHours[0]->gesamt_summe;
+            }
         }
         $workinghours = TimerecordingEmployeeWorkingHourModel::search(['user_id' => $userid]);
         $holidays = TimerecordingHolidayModel::getAll();
@@ -1155,6 +1160,7 @@ class TimerecordingController extends mfBaseController
             $json['time']['must'] = sprintf('%02dh:%02dm', floor($mustSeconds / 3600), floor($mustSeconds / 60 % 60));
             $json['time']['holidays'] = $holiDays;
             $json['time']['plushours'] = $plusHours;
+            $json['time']['AllHours'] = sprintf('%02dh:%02dm', floor($getAllHours / 3600), floor($getAllHours / 60 % 60));;
             $json['data'] = $rows;
             $json['recordsFiltered'] = $responsecount;
             $json['recordsTotal'] = $responsecount;
diff --git a/application/Timerecording/TimerecordingModel.php b/application/Timerecording/TimerecordingModel.php
index 1d7b16a17..b942f640e 100644
--- a/application/Timerecording/TimerecordingModel.php
+++ b/application/Timerecording/TimerecordingModel.php
@@ -73,6 +73,21 @@ class TimerecordingModel
         }
         return $item;
     }
+    public static function getAllHours($user_id)
+    {
+        $items = [];
+
+        $db = FronkDB::singleton();
+        $sql="SELECT SUM(`end` - `start`) AS gesamt_summe FROM Timerecording where user_id=$user_id AND `timerecordingCategory_id` =1";
+        $res = $db->query($sql);
+        if ($db->num_rows($res)) {
+            while ($data = $db->fetch_object($res)) {
+                $items[] = new Timerecording($data);
+            }
+        }
+        return $items;
+
+    }
 
     public static function getAll()
     {
diff --git a/application/WarehouseOffer/WarehouseOfferController.php b/application/WarehouseOffer/WarehouseOfferController.php
index e9a80096b..66fa5008f 100644
--- a/application/WarehouseOffer/WarehouseOfferController.php
+++ b/application/WarehouseOffer/WarehouseOfferController.php
@@ -30,6 +30,10 @@ class WarehouseOfferController extends TTCrud {
         ['key' => 'sendOffer', 'title' => 'Angebot senden', 'class' => 'fas fa-paper-plane text-success']
     ];
 
+    protected array $additionalJS = ['
+    https://cdn.jsdelivr.net/npm/sortablejs@1.14.0/Sortable.min.js
+    https://cdn.jsdelivr.net/npm/vue-draggable-next@2.1.0'];
+
     protected array $infoMessages = [
         'create' => 'Angebot wurde erfolgreich erstellt.',
         'update' => 'Angebot wurde aktualisiert.',
diff --git a/application/WarehouseOrder/WarehouseOrderController.php b/application/WarehouseOrder/WarehouseOrderController.php
index 19548172d..e45cebabc 100644
--- a/application/WarehouseOrder/WarehouseOrderController.php
+++ b/application/WarehouseOrder/WarehouseOrderController.php
@@ -9,18 +9,18 @@ class WarehouseOrderController extends TTCrud {
     protected array $columns = [
         ['key' => 'id', 'text' => 'ID', 'modal' => false, 'table' => false],
         ['key' => 'orderNumber', 'text' => 'Bestellnummer', 'required' => true, 'modal' => false],
-        ['key' => 'distributor', 'text' => 'Lieferant', 'required' => false, 'modal' => false, 'table' => ['filter' => false]],
+        ['key' => 'distributorId', 'text' => 'Lieferant', 'required' => false, 'modal' => ['type' => 'select', 'items' => []], 'table' => ['filter' => 'select']],
         ['key' => 'delAddrCity', 'text' => 'Stadt', 'required' => true, 'modal' => false, 'table' => false],
         ['key' => 'delAddrEMail', 'text' => 'E-Mail', 'required' => true, 'modal' => false, 'table' => false],
         ['key' => 'delAddrLine', 'text' => 'Adresse', 'required' => true, 'modal' => false, 'table' => false],
         ['key' => 'delAddrName', 'text' => 'Name', 'required' => true, 'modal' => false, 'table' => false],
         ['key' => 'delAddrPLZ', 'text' => 'PLZ', 'required' => true, 'modal' => false, 'table' => false],
         ['key' => 'editor', 'text' => 'Bearbeiter', 'required' => true, 'modal' => ['type' => 'select'], 'table' => ['filter' => 'select']],
-        ['key' => 'note', 'text' => 'Notiz', 'required' => true, 'modal' => false, 'table' => false],
+        ['key' => 'note', 'text' => 'Notiz', 'required' => false, 'modal' => false, 'table' => false],
         ['key' => 'sum', 'text' => 'Summe', 'required' => false, 'modal' => false, 'table' => ['class' => 'text-right']],
         ['key' => 'status', 'text' => 'Status', 'required' => false, 'modal' => ['type' => 'select', 'items' => []], 'table' => ['filter' => 'select']],
         ['key' => 'positions', 'text' => 'Positionen', 'required' => true, 'modal' => false, 'table' => false],
-        ['key' => 'extReference', 'text' => 'Externe Referenz', 'required' => true, 'modal' => false],
+        ['key' => 'extReference', 'text' => 'Externe Referenz', 'required' => false, 'modal' => false],
         ['key' => 'createBy', 'text' => 'Erstellt von', 'required' => true, 'modal' => ['type' => 'select'], 'table' => ['filter' => 'select']],
         ['key' => 'create', 'text' => 'Erstellt', 'required' => true, 'modal' => false],
         ['key' => 'actions', 'text' => 'Aktionen', 'required' => false, 'modal' => false, 'table' => ['filter' => false, 'sortable' => false, 'class' => 'text-center']],
@@ -32,6 +32,8 @@ class WarehouseOrderController extends TTCrud {
                                      'delete' => 'Bestellung wurde gelöscht',
                                      'noChanges' => 'Keine Änderungen',];
 
+    protected array $additionalActions = [['key' => 'openpdf', 'title' => 'PDF öffnen', 'class' => 'fas fa-file-pdf', 'color' => 'primary']];
+
     protected function prepareCrudConfig(): void {
         $editorColumnIndex = array_search('editor', array_column($this->columns, 'key'));
         $this->columns[$editorColumnIndex]['modal']['items'] = array_map(function ($user) {
@@ -48,6 +50,11 @@ class WarehouseOrderController extends TTCrud {
             ['value' => 'fullyDelivered', 'text' => 'Geliefert'],
             ['value' => 'cancelled', 'text' => 'Storniert'],
         ];
+
+        $distributorIndex = array_search('distributorId', array_column($this->columns, 'key'));
+        $this->columns[$distributorIndex]['modal']['items'] = array_map(function ($distributor) {
+            return ['value' => intval($distributor->id), 'text' => $distributor->name];
+        }, WarehouseDistributorModel::getAll());
     }
 
     protected function beforeCreate(): bool {
@@ -91,40 +98,43 @@ class WarehouseOrderController extends TTCrud {
             // we need to get the article name and distributor name for the pdf
             $position['distributorName'] = WarehouseDistributorModel::get($position['distributorId'])->name;
             $position['articleName'] = WarehouseArticleModel::get($position['article'])->title;
+            $position['articleDescription'] = WarehouseArticleModel::get($position['article'])->description;
 
             $order['positions'][$key] = $position;
         }
 
         $pdf_vars = ['order' => $order,
                      'distributor' => WarehouseDistributorModel::get($distributorId),
+                     'distributorCountryText' => (new Country(WarehouseDistributorModel::get($distributorId)->countryId))->name,
                      "bank_iban" => TT_INVOICE_BANK_IBAN,
                      "bank_bic" => TT_INVOICE_BANK_BIC,
                      "bank_bank" => TT_INVOICE_BANK_BANK,
                      "bank_owner" => TT_INVOICE_BANK_OWNER];
 
-
-        $countryText = CountryModel::search(['id' => WarehouseDistributorModel::get($distributorId)->countryId])[0]->name;
+        $countryText = (new Country(WarehouseDistributorModel::get($distributorId)->countryId))->name;
+        $shouldGenerateEnglisch = !in_array($countryText, ['Österreich', 'Deutschland', 'Schweiz']);
 
         $headerHtml = file_get_contents(BASEDIR . "/Layout/default/WarehouseOrder/PDF_HEADER.html");
         $headerHtml = str_replace("{{ basedir }}", BASEDIR, $headerHtml);
-        $headerHtml = str_replace("{{ externalReference }}","<strong>Ihre Referenz:</strong> ". $order['extReference'], $headerHtml);
+        $headerHtml = str_replace("{{ externalReference }}", count($order['extReference']) > 0 ? "<strong>Ext. Ref.:</strong> ". $order['extReference'] : "", $headerHtml);
 
+        $headerHtml = str_replace("{{ addressLine_header }}", $shouldGenerateEnglisch ? "Supplier" : "Lieferant", $headerHtml);
         $headerHtml = str_replace("{{ addressLine_1 }}", WarehouseDistributorModel::get($distributorId)->name, $headerHtml);
         $headerHtml = str_replace("{{ addressLine_2 }}", WarehouseDistributorModel::get($distributorId)->address, $headerHtml);
         $headerHtml = str_replace("{{ addressLine_3 }}", WarehouseDistributorModel::get($distributorId)->plz . " " . WarehouseDistributorModel::get($distributorId)->city, $headerHtml);
         $headerHtml = str_replace("{{ addressLine_4 }}", $countryText, $headerHtml);
 
+        $headerHtml = str_replace("{{ billingAddressLine_header }}", $shouldGenerateEnglisch ? "Billing Address" : "Rechnungsadresse", $headerHtml);
         $headerHtml = str_replace("{{ billingAddressLine_1 }}", "Xinon GmbH", $headerHtml);
         $headerHtml = str_replace("{{ billingAddressLine_2 }}", "Fladnitz im Raabtal 150", $headerHtml);
-        $headerHtml = str_replace("{{ billingAddressLine_3 }}", "8322 Studenzen", $headerHtml);
-        $headerHtml = str_replace("{{ billingAddressLine_4 }}", "Österreich", $headerHtml);
-        $headerHtml = str_replace("{{ billingAddressLine_5 }}", "einkauf@xinon.at", $headerHtml);
+        $headerHtml = str_replace("{{ billingAddressLine_3 }}", "A-8322 Studenzen", $headerHtml);
+        $headerHtml = str_replace("{{ billingAddressLine_4 }}", "UID: ATU68711968", $headerHtml);
+        $headerHtml = str_replace("{{ billingAddressLine_5 }}", "EORI-Nr.: ATEOS1000085074", $headerHtml);
         $headerHtml = str_replace("{{ billingAddressLine_6 }}", "<strong>Referenz: ". $order["orderNumber"] . "</strong>", $headerHtml);
 
-        // if order dellAddrLine is Fladnitz im Raabtal 150 we need to set all template strings to empty
-
         $chk = $order['delAddrLine'] == "Fladnitz im Raabtal 150";
 
+        $headerHtml = str_replace("{{ shippingAddressLine_header }}", $chk ? "" : ($shouldGenerateEnglisch ? "Shipping Address" : "Lieferadresse"), $headerHtml);
         $headerHtml = str_replace("{{ shippingAddressLine_1 }}", $chk ? "" : $order['delAddrName'], $headerHtml);
         $headerHtml = str_replace("{{ shippingAddressLine_2 }}", $chk ? "" : $order['delAddrLine'], $headerHtml);
         $headerHtml = str_replace("{{ shippingAddressLine_3 }}", $chk ? "" : $order['delAddrPLZ'] . " " . $order['delAddrCity'], $headerHtml);
diff --git a/application/WarehouseOrder/WarehouseOrderModel.php b/application/WarehouseOrder/WarehouseOrderModel.php
index ac4677800..3d7cbf339 100644
--- a/application/WarehouseOrder/WarehouseOrderModel.php
+++ b/application/WarehouseOrder/WarehouseOrderModel.php
@@ -23,7 +23,7 @@
 class WarehouseOrderModel extends TTCrudBaseModel {
     public int $id;
     public string $orderNumber;
-    public string $extReference;
+    public ?string $extReference;
     public int $distributorId;
     public string $delAddrCity;
     public string $delAddrEMail;
@@ -31,7 +31,7 @@ class WarehouseOrderModel extends TTCrudBaseModel {
     public string $delAddrName;
     public string $delAddrPLZ;
     public int $editor;
-    public string $note;
+    public ?string $note;
     public string $positions;
     public int $create;
     public int $createBy;
diff --git a/application/WarehouseShippingNote/WarehouseShippingNoteController.php b/application/WarehouseShippingNote/WarehouseShippingNoteController.php
index fa683a50e..2861ac418 100644
--- a/application/WarehouseShippingNote/WarehouseShippingNoteController.php
+++ b/application/WarehouseShippingNote/WarehouseShippingNoteController.php
@@ -8,12 +8,17 @@ class WarehouseShippingNoteController extends TTCrud {
     protected array $columns = [
         ['key' => 'id', 'text' => 'LS-Nr.', 'required' => false, 'modal' => false, 'table' => ['class' => 'text-nowrap']],
         ['key' => 'billingAddressId', 'text' => 'Rechnungsadresse', 'required' => true, 'type' => 'autocomplete', 'table' => ['class' => 'text-nowrap', 'filter' => 'autocomplete'], 'modal' => ['apiUrl' => 'Address/api?do=findAddress', 'items' => '/Address/Api?do=findAddress', 'type' => 'autocomplete']],
+        ['key' => 'status', 'text' => 'Status', 'required' => true, 'table' => ['filter' => 'iconSelect'], 'modal' => ['type' => 'iconSelect', 'items' => [
+            ['value' => 'new', 'text' => 'Neu', 'icon' => 'fas fa-star text-primary'],
+            ['value' => 'in_progress', 'text' => 'In Bearbeitung', 'icon' => 'fas fa-cog text-warning'],
+            ['value' => 'accepted', 'text' => 'Akzeptiert', 'icon' => 'fas fa-check text-success'],
+            ['value' => 'invoiced', 'text' => 'In Rechnung gestellt', 'icon' => 'fas fa-file-invoice-dollar text-info'],
+        ]]],
         ['key' => 'deliveryAddressName', 'text' => 'L.-Adr. Name', 'required' => true],
         ['key' => 'deliveryAddressLine', 'text' => 'L.-Adr.', 'required' => true],
         ['key' => 'deliveryAddressPLZ', 'text' => 'L.-Adr. PLZ', 'required' => true],
         ['key' => 'deliveryAddressEMail', 'text' => 'L.-Adr. EMail', 'required' => false, 'table' => false],
         ['key' => 'note', 'text' => 'Art der Arbeit', 'required' => true, 'table' => false],
-        ['key' => 'status', 'text' => 'Status', 'required' => true, 'table' => ['filter' => 'select'], 'modal' => ['type' => 'select', 'items' => [['value' => 'new', 'text' => 'Neu'], ['value' => 'in_progress', 'text' => 'In Bearbeitung'], ['value' => 'accepted', 'text' => 'Akzeptiert'], ['value' => 'invoiced', 'text' => 'In Rechnung gestellt'],]]],
         ['key' => 'positions', 'text' => 'Positionen', 'required' => true, 'table' => false, 'modal' => false],
         ['key' => 'create', 'text' => 'Erstellt', 'required' => false, 'modal' => ['visible' => false], 'table' => ['filter' => 'date']],
         ['key' => 'createBy', 'text' => 'Erstellt von', 'required' => false, 'type' => 'autocomplete', 'table' => ['class' => 'text-nowrap', 'filter' => 'select'], 'modal' => ['items' => [], 'type' => 'select',]],
diff --git a/lib/Mapbox/StaticImageApi.php b/lib/Mapbox/StaticImageApi.php
index 45fafe998..3cfd28261 100644
--- a/lib/Mapbox/StaticImageApi.php
+++ b/lib/Mapbox/StaticImageApi.php
@@ -29,6 +29,8 @@ class Mapbox_StaticImageApi {
             $pin_part .= "+$pin_color($pin_gps_long,$pin_gps_lat)";
         }
 
+        $initial_path_count = 0;
+        $path_count = 0;
         $path_parts = [];
         if(is_array($paths) && count($paths)) {
             $path_stroke_width = $paths["line_width"];
@@ -37,8 +39,8 @@ class Mapbox_StaticImageApi {
             $path_fill_color = $paths["line_fill_color"];
             $path_fill_opacity = $paths["line_fill_opacity"];
 
-            $path_count = 0;
-            $initial_path_count = 0;
+
+
             foreach($paths["coords"] as $path) {
                 $initial_path_count++;
                 //mfLoghandler::singleton()->debug(print_r($paths, true));
@@ -101,7 +103,7 @@ class Mapbox_StaticImageApi {
             }
         }
 
-        if(is_array($url_opt_parts)) {
+        if(is_array($url_opt_parts) && count($url_opt_parts)) {
             $url .= "/".implode(",", $url_opt_parts);
         }
 
diff --git a/public/js/pages/DashboardNew/DashboardNew.css b/public/js/pages/DashboardNew/DashboardNew.css
index 756e7268f..9f6a4480a 100644
--- a/public/js/pages/DashboardNew/DashboardNew.css
+++ b/public/js/pages/DashboardNew/DashboardNew.css
@@ -38,6 +38,12 @@
     margin-top: 20px;
 }
 
+.dashboard-buttons {
+    display: flex;
+    gap: 1rem;
+    margin-top: 20px;
+}
+
 
 @media (min-width: 768px) {
     .dashboard-cards {
diff --git a/public/js/pages/DashboardNew/DashboardNew.js b/public/js/pages/DashboardNew/DashboardNew.js
index 201f0f166..e7ebf9043 100644
--- a/public/js/pages/DashboardNew/DashboardNew.js
+++ b/public/js/pages/DashboardNew/DashboardNew.js
@@ -190,6 +190,39 @@ Vue.component('tt-timeline-chart', {
 
 Vue.component('dashboard-default', {
     props: ['dashboardData'],
+    data() {
+        return {
+            selectedTimeframe: 'all',
+            window: window,
+            moment: moment
+        }
+    },
+    methods: {
+        exportTimeline() {
+        //     we need all timelines with "ONT installiert", "Leerrohr", "Bestellungen"
+            const data = this.dashboardData.timeline[0].map((item, index) => ({
+                date: item.date,
+                bestellungen: item.value,
+                leerrohr: this.dashboardData.timeline_leerrohr[0][index].value,
+                ont_installiert: this.dashboardData.timeline_ont_installed[0][index].value
+            }));
+
+            // dont use any library for the csv
+            const csv = [
+                ['Datum', 'Bestellungen', 'Leerrohr', 'ONT installiert'],
+                ...data.map(item => [item.date, item.bestellungen, item.leerrohr, item.ont_installiert])
+            ].map(row => row.join(';')).join('\n');
+
+            const blob = new Blob([csv], {type: 'text/csv'});
+            const url = URL.createObjectURL(blob);
+            const a = document.createElement('a');
+
+            a.href = url;
+            a.download = 'timeline.csv';
+            a.click();
+            URL.revokeObjectURL(url);
+        }
+    },
     template: `
     <div>
                     <h4 class="mt-4">Bestellungen</h4>
@@ -307,13 +340,25 @@ Vue.component('dashboard-default', {
 
                     <hr>
                     <h4 class="mt-4">Bestellverlauf</h4>
+      
+<!--      add 4 new buttons here tt-button "Letzten 4 Wochen, Letzte 3 Monate, Letzten 6 Monate-->
+                    <div class="dashboard-buttons">
+                      <tt-button text="CSV Download" additional-class="btn-success" @click="exportTimeline" icon="fas fa-download"/>
+                      <tt-button text="Letzten 4 Wochen" additional-class="btn-primary" @click="selectedTimeframe = '4 weeks'" v-if="selectedTimeframe !== '4 weeks'"/>
+                      <tt-button text="Letzte 3 Monate" additional-class="btn-primary" @click="selectedTimeframe = '3 months'" v-if="selectedTimeframe !== '3 months'"/>
+                      <tt-button text="Letzte 6 Monate" additional-class="btn-primary" @click="selectedTimeframe = '6 months'" v-if="selectedTimeframe !== '6 months'"/>
+                      <tt-button text="Alle" additional-class="btn-primary" @click="selectedTimeframe = 'all'" v-if="selectedTimeframe !== 'all'"/>
+                    </div>
+      
                     <div class="dashboard-chart">
                       <tt-timeline-chart
                           v-if="dashboardData.timeline.length > 0"
                           :datasets="[
         {
             label: 'Bestellungen',
-            data: dashboardData.timeline[0],
+            data: dashboardData.timeline[0].filter(item => {
+                return selectedTimeframe === 'all' || moment(item.date).isAfter(moment().subtract(selectedTimeframe.split(' ')[0], selectedTimeframe.split(' ')[1]))
+            }),
             color: 'rgb(75, 192, 192)',
             fill: true,
             yAxisID: 'y',
@@ -321,7 +366,7 @@ Vue.component('dashboard-default', {
         },
         {
             label: 'Leerrohr',
-            data: dashboardData.timeline_leerrohr[0],
+            data: dashboardData.timeline_leerrohr[0].filter(item => selectedTimeframe === 'all' || moment(item.date).isAfter(moment().subtract(selectedTimeframe.split(' ')[0], selectedTimeframe.split(' ')[1]))),
             color: 'rgb(255, 99, 132)',
             fill: false,
             yAxisID: 'y',
@@ -329,7 +374,7 @@ Vue.component('dashboard-default', {
         },
         {
             label: 'ONT installiert',
-            data: dashboardData.timeline_ont_installed[0],
+            data: dashboardData.timeline_ont_installed[0].filter(item => selectedTimeframe === 'all' || moment(item.date).isAfter(moment().subtract(selectedTimeframe.split(' ')[0], selectedTimeframe.split(' ')[1]))),
             color: 'rgb(54, 162, 235)',
             fill: false,
             yAxisID: 'y',
@@ -347,6 +392,39 @@ Vue.component('dashboard-default', {
 
 Vue.component('dashboard-rml', {
     props: ['dashboardData'],
+    data() {
+        return {
+            selectedTimeframe: 'all',
+            window: window,
+            moment: moment
+        }
+    },
+    methods: {
+        exportTimeline() {
+            //     we need all timelines with "ONT installiert", "Leerrohr", "Bestellungen"
+            const data = this.dashboardData.timeline[0].map((item, index) => ({
+                date: item.date,
+                bestellungen: item.value,
+                leerrohr: this.dashboardData.timeline_leerrohr[0][index].value,
+                ont_installiert: this.dashboardData.timeline_ont_installed[0][index].value
+            }));
+
+            // dont use any library for the csv
+            const csv = [
+                ['Datum', 'Bestellungen', 'Leerrohr', 'ONT installiert'],
+                ...data.map(item => [item.date, item.bestellungen, item.leerrohr, item.ont_installiert])
+            ].map(row => row.join(';')).join('\n');
+
+            const blob = new Blob([csv], {type: 'text/csv'});
+            const url = URL.createObjectURL(blob);
+            const a = document.createElement('a');
+
+            a.href = url;
+            a.download = 'timeline.csv';
+            a.click();
+            URL.revokeObjectURL(url);
+        }
+    },
     template: `
              <div>
                <h4 class="mt-4">Bestellungen</h4>
@@ -439,57 +517,67 @@ Vue.component('dashboard-rml', {
 
                <hr>
                <h4 class="mt-4">Bestellverlauf</h4>
+               <div class="dashboard-buttons">
+                 <tt-button text="CSV Download" additional-class="btn-success" @click="exportTimeline" icon="fas fa-download"/>
+                 <tt-button text="Letzten 4 Wochen" additional-class="btn-primary" @click="selectedTimeframe = '4 weeks'" v-if="selectedTimeframe !== '4 weeks'"/>
+                 <tt-button text="Letzte 3 Monate" additional-class="btn-primary" @click="selectedTimeframe = '3 months'" v-if="selectedTimeframe !== '3 months'"/>
+                 <tt-button text="Letzte 6 Monate" additional-class="btn-primary" @click="selectedTimeframe = '6 months'" v-if="selectedTimeframe !== '6 months'"/>
+                 <tt-button text="Alle" additional-class="btn-primary" @click="selectedTimeframe = 'all'" v-if="selectedTimeframe !== 'all'"/>
+               </div>
+
                <div class="dashboard-chart">
                  <tt-timeline-chart
                      v-if="dashboardData.timeline.length > 0"
                      :datasets="[
-                    {
-                        label: 'Bestellungen',
-                        data: dashboardData.timeline[0],
-                        color: 'rgb(23, 162, 184)',
-                        fill: true,
-                        yAxisID: 'y',
-                        order: 5
-                    },
-                    {
-                        label: 'Summe von 244+245',
-                        data: dashboardData.timeline_inhouse_kabel_verlegt_efh[0],
-                        color: 'rgb(0, 123, 255)',
-                        fill: false,
-                        yAxisID: 'y',
-                        order: 4
-                    },
-                    {
-                        label: 'Status 500 Energie Steiermark',
-                        data: dashboardData.timeline_status_500_energie_steiermark[0],
-                        color: 'rgb(40, 167, 69)',
-                        fill: false,
-                        yAxisID: 'y',
-                        order: 3
-                    },
-                    {
-                        label: 'Status 500 Magenta',
-                        data: dashboardData.timeline_status_500_magenta[0],
-                        color: 'rgb(226, 0, 116)',
-                        fill: false,
-                        yAxisID: 'y',
-                        order: 2
-                    },
-                    {
-                        label: 'Status 500 Salzburg AG',
-                        data: dashboardData.timeline_status_500_salzburg_ag[0],
-                        color: 'rgb(0, 102, 179)',
-                        fill: false,
-                        yAxisID: 'y',
-                        order: 1
-                    }
-                ]"
+        {
+            label: 'Bestellungen',
+            data: dashboardData.timeline[0].filter(item => {
+                return selectedTimeframe === 'all' || moment(item.date).isAfter(moment().subtract(selectedTimeframe.split(' ')[0], selectedTimeframe.split(' ')[1]))
+            }),
+            color: 'rgb(75, 192, 192)',
+            fill: true,
+            yAxisID: 'y',
+            order: 3
+        },
+        {
+            label: 'Summe von 244+245',
+            data: dashboardData.timeline_inhouse_kabel_verlegt_efh[0].filter(item => selectedTimeframe === 'all' || moment(item.date).isAfter(moment().subtract(selectedTimeframe.split(' ')[0], selectedTimeframe.split(' ')[1]))),
+            color: 'rgb(0, 123, 255)',
+            fill: false,
+            yAxisID: 'y',
+            order: 2
+        },
+        {
+            label: 'Status 500 Energie Steiermark',
+            data: dashboardData.timeline_status_500_energie_steiermark[0].filter(item => selectedTimeframe === 'all' || moment(item.date).isAfter(moment().subtract(selectedTimeframe.split(' ')[0], selectedTimeframe.split(' ')[1]))),
+            color: 'rgb(40, 167, 69)',
+            fill: false,
+            yAxisID: 'y',
+            order: 1
+        },
+        {
+            label: 'Status 500 Magenta',
+            data: dashboardData.timeline_status_500_magenta[0].filter(item => selectedTimeframe === 'all' || moment(item.date).isAfter(moment().subtract(selectedTimeframe.split(' ')[0], selectedTimeframe.split(' ')[1]))),
+            color: 'rgb(226, 0, 116)',
+            fill: false,
+            yAxisID: 'y',
+            order: 1
+        },
+        {
+            label: 'Status 500 Salzburg AG',
+            data: dashboardData.timeline_status_500_salzburg_ag[0].filter(item => selectedTimeframe === 'all' || moment(item.date).isAfter(moment().subtract(selectedTimeframe.split(' ')[0], selectedTimeframe.split(' ')[1]))),
+            color: 'rgb(0, 102, 179)',
+            fill: false,
+            yAxisID: 'y',
+            order: 1
+        }
+    ]"
                      label="KW"
                      :showGrid="false"
                  />
+
                </div>
-             </div>
-    `
+             </div>    `
 })
 
 
diff --git a/public/js/pages/WarehouseOffer/WarehouseOffer.js b/public/js/pages/WarehouseOffer/WarehouseOffer.js
index fe1365051..38b0b53c9 100644
--- a/public/js/pages/WarehouseOffer/WarehouseOffer.js
+++ b/public/js/pages/WarehouseOffer/WarehouseOffer.js
@@ -15,29 +15,27 @@ Vue.component('warehouse-offer-modal', {
                                sm
                                row
                                v-model="offer.editor"/>
-                    <tt-input label="Kundennummer" v-model="offer.customerNumber" sm row/>
+                    
+                    <tt-autocomplete label="Kunde" v-model="offer.customerNumber" sm row :api-url="billAddrAutoCompleteUrl"/>
                     <tt-input label="Kundenreferenz" v-model="offer.reference" sm row/>
                     <tt-textarea label="Angebotszweck" v-model="offer.purpose" sm row/>
                     <hr>
                     <h4 class="text-center">Kundenadresse</h4>
-                    <div style="display: grid; grid-gap: 10px; grid-template-columns: 2fr 2fr 1fr 1fr 2fr;">
+                    <div style="display: grid; grid-gap: 10px; grid-template-columns: 2fr 1fr 2fr 1fr 1fr;">
                       <tt-input label="Name" v-model="offer.customerName" sm/>
+                      <tt-input label="Kontakt" v-model="offer.contactPerson" sm/>
                       <tt-input label="Straße" v-model="offer.customerStreet" sm/>
                       <tt-input label="PLZ" v-model="offer.customerZip" sm/>
                       <tt-input label="Ort" v-model="offer.customerCity" sm/>
-                      <tt-input label="UID" v-model="offer.customerVAT" sm/>
                     </div>
                     <hr>
                     <h4 class="text-center">Positionen</h4>
-                    <tt-positions-manager ref="positionsManager" v-model="offer.positions" :config="positionsConfig" @updateField-article="fetchArticleData"/>
-                    <hr>
-                    <h4 class="text-center">Alternative Artikel</h4>
-                    <tt-positions-manager ref="alternativePositionsManager" v-model="offer.alternativePositions" :config="alternativePositionsConfig"/>
+                    <tt-positions-manager group-mode ref="positionsManager" v-model="offer.positions" :config="positionsConfig" @updateField-article="fetchArticleData"/>
                     <hr>
                     <tt-input label="Gesamtrabatt (%)" v-model="offer.totalDiscount" sm row type="number"/>
                     <tt-select label="Zahlungskonditionen" :options="paymentTerms" sm row v-model="offer.paymentTerms"/>
                     <tt-select label="Lieferkonditionen" :options="deliveryTerms" sm row v-model="offer.deliveryTerms"/>
-                    <tt-select label="Schlusstext" :options="closingTexts" sm row v-model="offer.closingText"/>
+                    <tt-textarea label="Schlusstext" sm rows="11" row v-model="offer.closingText"/>
                     <hr>
                     <tt-textarea label="Notizen" v-model="offer.notes" sm row/>
                   </div>
@@ -45,6 +43,7 @@ Vue.component('warehouse-offer-modal', {
               `,
     data() {
         return {
+            billAddrAutoCompleteUrl: window.TT_CONFIG['BASE_PATH'] + '/Address/Api?do=findAddress&fibu_primary_account=1',
             window:                     window,
             positionsConfig:            {
                 fields:       {
@@ -57,6 +56,7 @@ Vue.component('warehouse-offer-modal', {
                     amount:        {type: 'input', label: 'Menge', inputType: 'number'},
                     unit:          {type: 'input', label: 'Einheit'},
                     articleNumber: {type: 'input', label: 'Artikelnummer'},
+                    isAlternative: {type: 'checkbox', label: 'Alternativposition'},
                     unitPrice:     {type: 'input', label: 'Einzelpreis', inputType: 'number'},
                     discount:      {type: 'input', label: 'Rabatt (%)', inputType: 'number'},
                 },
@@ -71,12 +71,6 @@ Vue.component('warehouse-offer-modal', {
                     return true;
                 },
             },
-            alternativePositionsConfig: {
-                fields: {
-                    article:     {type: 'input', label: 'Artikel'},
-                    description: {type: 'textarea', label: 'Beschreibung'},
-                },
-            },
             paymentTerms:               [
                 {value: 'net30', text: '30 Tage netto'},
                 {value: 'net60', text: '60 Tage netto'},
@@ -87,11 +81,6 @@ Vue.component('warehouse-offer-modal', {
                 {value: 'free_delivery', text: 'Frei Haus'},
                 {value: 'fob', text: 'FOB'},
             ],
-            closingTexts:               [
-                {value: 'standard', text: 'Standardtext'},
-                {value: 'custom1', text: 'Angepasster Text 1'},
-                {value: 'custom2', text: 'Angepasster Text 2'},
-            ],
             offer:                    {
                 editor:               window.TT_CONFIG['USER_ID'],
                 customerNumber:       '',
@@ -107,7 +96,18 @@ Vue.component('warehouse-offer-modal', {
                 totalDiscount:        0,
                 paymentTerms:         'net30',
                 deliveryTerms:        'ex_works',
-                closingText:          'standard',
+                closingText:          'Sollten sich die Rohstoffpreise bzw. die Preise unserer Zulieferer um mehr als 10% innerhalb der Angebots bzw.\n' +
+                                          '\n' +
+                                          'Auftragsgültigkeit erhöhen (Stichtag Datum), sind wir gezwungen die Preise anzupassen.\n' +
+                                          '\n' +
+                                          'Diese Angebot hat eine Gültigkeit von 4 Wochen.\n' +
+                                          '\n' +
+                                          'Verrechnung erfolgt nach tatsächlichem Aufwand.\n' +
+                                          '\n' +
+                                          'Wir sind sicher, Ihnen ein konkurenzfähiges Angebot unterbreitet zu haben und sehen gern Ihrer Bestellung entgegen.\n' +
+                                          '\n' +
+                                          'Sollten Sie noch Fragen oder weitere Informationen benötigen stehen wir Ihnen jederzeit gern zu Verfügung.\n' +
+                                          ' ',
                 notes:                '',
             }
         }
diff --git a/public/js/pages/WarehouseOrder/WarehouseOrder.js b/public/js/pages/WarehouseOrder/WarehouseOrder.js
index c9b937d86..c274ae0ca 100644
--- a/public/js/pages/WarehouseOrder/WarehouseOrder.js
+++ b/public/js/pages/WarehouseOrder/WarehouseOrder.js
@@ -218,19 +218,20 @@ Vue.component('warehouse-order', {
                 <tt-card>
                   <warehouse-order-modal v-if="orderModalId" :id="orderModalId" @close="closeOrderModal"/>
                   <button @click="orderModalId = 'create'" class="btn btn-primary">Bestellung erstellen</button>
-                  <tt-table-crud emit-edit @edit="orderModalId = $event.id" ref="table">
+                  <tt-table-crud emit-edit
+                                 @openpdf="window.open(window.TT_CONFIG['BASE_PATH'] + '/WarehouseOrder/createPDF?id=' + $event.id)"
+                                 @edit="orderModalId = $event.id" ref="table">
                     <template v-slot:expandedRow="{ row }">
                       <warehouse-order-detail :id="row['id']"/>
                     </template>
 
                     <template v-slot:sum="{ row }">{{ calculateSum(JSON.parse(row["positions"])).toFixed(2)}} €</template>
-<!--                    TODO: think of a way here prob we add it to the database as field-->
-                    <template v-slot:distributor="{ row }">{{ row.id % 2 == 0 ? 'Triotronik' : 'Discomp' }}</template>
                   </tt-table-crud>
                 </tt-card>
               `,
     data() {
         return {
+            window:       window,
             orderModalId: null,
         }
     },
diff --git a/public/js/pages/timerecording/index.js b/public/js/pages/timerecording/index.js
index 8bebe8264..0e20748d9 100644
--- a/public/js/pages/timerecording/index.js
+++ b/public/js/pages/timerecording/index.js
@@ -87,6 +87,10 @@ table = $('#datatable').DataTable({
             $('#must-time').text(json.time.must);
             $('#holidays').text(json.time.holidays);
             $('#plushours').text(json.time.plushours);
+            if (json.time.AllHours!="00h:00m") {
+                $('#AllHours-div').show();
+                $('#AllHours').text(json.time.AllHours);
+            }
             if ($("#plushours").text().includes("-")) {
                 $('#plushours-label').css('background-color', '#fda7a7');
             } else {
diff --git a/public/plugins/vue/tt-components/tt-modal.js b/public/plugins/vue/tt-components/tt-modal.js
index 1b64e2814..72ab3af7f 100644
--- a/public/plugins/vue/tt-components/tt-modal.js
+++ b/public/plugins/vue/tt-components/tt-modal.js
@@ -55,7 +55,6 @@ Vue.component('tt-modal', {
                        tabindex="-1"
                        style="background: rgba(0, 0, 0, 0.5);"
                        ref="modal"
-                       @mousedown="!isMobile ? $emit('update:show', false) : null"
                        @keydown.esc="$emit('update:show', false)"
                        v-if="show">
                     <div class="modal-dialog modal-lg modal-dialog-scrollable" role="document" @mousedown.stop>
@@ -81,4 +80,4 @@ Vue.component('tt-modal', {
                     </div>
                   </div>
                 `
-})
\ No newline at end of file
+})
diff --git a/public/plugins/vue/tt-components/tt-position-manager.js b/public/plugins/vue/tt-components/tt-position-manager.js
index 7d8996bbd..26aaee48a 100644
--- a/public/plugins/vue/tt-components/tt-position-manager.js
+++ b/public/plugins/vue/tt-components/tt-position-manager.js
@@ -1,13 +1,42 @@
+Vue.component('tt-resolver', {
+    props: {
+        value:     {type: Number, required: true},
+        reference: {type: String, required: true},
+    },
+    data() {
+        return {
+            window:  window,
+            loading: true,
+            text:    '',
+        }
+    },
+    template: `
+                <div v-if="loading" class="d-flex justify-content-center align-items-center">
+                  <div class="spinner-border spinner-border-sm text-primary" role="status">
+                    <span class="sr-only">Loading...</span>
+                  </div>
+                </div>
+                <span v-else>{{ text }}</span>
+              `,
+    async created() {
+        const entry = await axios.get(window.TT_CONFIG['BASE_PATH'] + '/' + this.reference + '/getById?id=' + this.value);
+        this.text = entry.data.name ?? entry.data.title ?? entry.data.text ?? '[E] Key not found';
+        this.loading = false;
+    }
+})
+
 Vue.component('tt-positions-manager', {
     props: {
-        value:  {type: Array, required: false},
-        config: {type: Object, required: true},
+        value:     {type: Array, required: false},
+        config:    {type: Object, required: true},
+        groupMode: {type: Boolean, default: false},
     },
     data() {
         return {
             window:          window,
             positions:       this.value,
             formData:        {},
+            groupName:       '',
             selectedIndex:   null,
             resolvingFields: {},
         }
@@ -63,6 +92,12 @@ Vue.component('tt-positions-manager', {
                     </div>
                   </div>
 
+
+                  <div class="form-container" v-if="groupMode">
+                    <tt-input label="Gruppenname" v-model="groupName" sm/>
+                    <tt-button @click="addGroup" sm text="Gruppe hinzufügen" additional-class="btn-primary"/>
+                  </div>
+
                   <table class="table table-striped table-sm">
                     <thead>
                     <tr>
@@ -71,24 +106,50 @@ Vue.component('tt-positions-manager', {
                     </tr>
                     </thead>
                     <tbody>
-                    <tr v-for="(position, index) in positions" :key="index">
-                      <td v-for="(field, key) in config.fields">
-                        <template v-if="resolvingFields[index + key] === true">
-                          <div class="d-flex justify-content-center align-items-center">
-                            <div class="spinner-border spinner-border-sm text-primary" role="status">
-                              <span class="sr-only">Loading...</span>
+                    <template v-if="groupMode">
+                      <template v-for="(groupPositions, groupName) in groupedPositions">
+                        <tr>
+                          <td colspan="100%">
+                            <h4 style="text-align: center;">{{ groupName }}</h4>
+                          </td>
+                        <tr v-for="(position, index) in groupPositions" :key="groupName + index">
+                          <td v-for="(field, key) in config.fields">
+                            <tt-resolver v-if="field.customFieldReference" :reference="field.customFieldReference" :value="position[key]"/>
+                            <span v-else>{{ formatFieldValue(position[key], field) }}</span>
+                          </td>
+                          <td>
+                            <select v-model="position._group" @change="$set(position, '_group', $event.target.value)">
+                              <option v-for="group in allGroups" :value="group">{{ group }}</option>
+                            </select>
+                            <button @click="editEntry(index)" class="btn btn-sm btn-primary">Editieren</button>
+                            <button @click="deleteEntry(index)" class="btn btn-sm btn-danger">Löschen</button>
+                          </td>
+                        </tr>
+                      </template>
+                    </template>
+                    <template v-else>
+                      <tr v-for="(position, index) in positions" :key="index">
+                        <td v-for="(field, key) in config.fields">
+                          <template v-if="resolvingFields[index + key] === true">
+                            <div class="d-flex justify-content-center align-items-center">
+                              <div class="spinner-border spinner-border-sm text-primary" role="status">
+                                <span class="sr-only">Loading...</span>
+                              </div>
                             </div>
-                          </div>
-                        </template>
+                          </template>
 
-                        <span v-else-if="resolvingFields[index + key]">{{ resolvingFields[index + key] }}</span>
-                        <span v-else>{{ formatFieldValue(position[key], field) }}</span>
-                      </td>
-                      <td>
-                        <button @click="editEntry(index)" class="btn btn-sm btn-primary">Editieren</button>
-                        <button @click="deleteEntry(index)" class="btn btn-sm btn-danger">Löschen</button>
-                      </td>
-                    </tr>
+                          <span v-else-if="resolvingFields[index + key]">{{ resolvingFields[index + key] }}</span>
+                          <span v-else>{{ formatFieldValue(position[key], field) }}</span>
+                        </td>
+                        <td>
+                          <select v-model="position._group" @change="position._group = $event">
+                            <option v-for="group in allGroups" :value="group">{{ group }}</option>
+                          </select>
+                          <button @click="editEntry(index)" class="btn btn-sm btn-primary">Editieren</button>
+                          <button @click="deleteEntry(index)" class="btn btn-sm btn-danger">Löschen</button>
+                        </td>
+                      </tr>
+                    </template>
                     </tbody>
                   </table>
                 </div>
@@ -110,6 +171,10 @@ Vue.component('tt-positions-manager', {
             this.$emit('input', this.positions);
             this.resetForm();
         },
+        addGroup() {
+            this.positions.push({_group: this.groupName});
+            this.groupName = '';
+        },
         editEntry(index) {
             this.selectedIndex = index;
             this.formData = {...this.positions[index]};
@@ -133,7 +198,7 @@ Vue.component('tt-positions-manager', {
                         this.$set(this.resolvingFields, i + key, true);
                         const textValue = await this.config.fields[key].customFieldResolver(this.positions[i][key]);
                         this.$set(this.resolvingFields, i + key, textValue);
-                    } else if (this.config.fields[key].customFieldReference) {
+                    } else if (this.config.fields[key].customFieldReference && this.positions[i][key]) {
                         this.$set(this.resolvingFields, i + key, true);
                         if (this.config.fields[key].customFieldReference) {
                             const entry = await axios.get(window.TT_CONFIG['BASE_PATH'] +
@@ -153,7 +218,21 @@ Vue.component('tt-positions-manager', {
     created() {
         if (this.config.customMethods) Object.assign(this, this.config.customMethods);
     },
-    watch: {
+    computed: {
+        groupedPositions() {
+            const groups = {};
+            for (const position of this.positions) {
+                const group = position._group ?? 'Keine Gruppe';
+                if (!groups[group]) groups[group] = [];
+                if (Object.keys(position).length !== 1) groups[group].push(position);
+            }
+            return groups;
+        },
+        allGroups() {
+            return Object.keys(this.groupedPositions);
+        }
+    },
+    watch:    {
         positions: {
             handler() {
                 this.resolveFields().then();