diff --git a/application/WarehouseEShopOrder/WarehouseEShopOrderController.php b/application/WarehouseEShopOrder/WarehouseEShopOrderController.php
index f8c26b18a..cdffa2063 100644
--- a/application/WarehouseEShopOrder/WarehouseEShopOrderController.php
+++ b/application/WarehouseEShopOrder/WarehouseEShopOrderController.php
@@ -4,51 +4,36 @@ class WarehouseEShopOrderController extends TTCrud {
     protected string $headerTitle = 'Energie Steiermark Bestellungen';
     protected bool $createText = false;
 
-    protected array $columns = [['key' => 'id', 'text' => 'ID', 'modal' => false],
-                                ['key' => 'extRef', 'text' => 'Externe Referenz', 'required' => true],
-                                ['key' => 'status',
-                                 'text' => 'Status',
-                                 'required' => true,
-                                 'modal' => ['type' => 'select',
-                                             'items' => [['value' => 'new', 'text' => 'Neu'],
-                                                         ['value' => 'accepted', 'text' => 'An Lieferant übergeben'],
-                                                         ['value' => 'acceptedInternally', 'text' => 'Interne verarbeitung'],
-                                                         ['value' => 'sent', 'text' => 'Gesendet'],
-                                                         ['value' => 'done', 'text' => 'Erledigt'],]],
-                                 'table' => ['filter' => 'select']],
-                                ['key' => 'deliveryMode',
-                                 'text' => 'Liefermodus',
-                                 'required' => true,
-                                 'modal' => ['type' => 'select',
-                                             'items' => [['value' => 'singleAddress', 'text' => 'Einzelne Adresse'],
-                                                         //            ['value' => 'multipleAddresses', 'text' => 'Mehrere Adressen'],
-                                             ]]],
-                                ['key' => 'deliveryAddressName', 'text' => 'Name', 'required' => true],
-                                ['key' => 'deliveryAddressLine', 'text' => 'Adresse', 'required' => true, 'required_length' => 4],
-                                ['key' => 'deliveryAddressPLZ', 'text' => 'PLZ', 'required' => true, 'regex' => '/^\d{4}$/'],
-                                ['key' => 'deliveryAddressCity', 'text' => 'Stadt', 'required' => true, 'required_length' => 3],
-                                ['key' => 'trackingNumber', 'text' => 'Trackingnummer', 'required' => false, 'modal' => false],
-                                ['key' => 'create', 'text' => 'Erstellt', 'required' => true, 'modal' => false, 'filter' => 'datetime'],
-                                ['key' => 'createBy',
-                                 'text' => 'Erstellt von',
-                                 'required' => true,
-                                 'table' => ['filter' => 'select'],
-                                 'modal' => ['type' => 'select', 'items' => []]],
-                                ['key' => 'actions',
-                                 'text' => 'Aktionen',
-                                 'required' => false,
-                                 'modal' => false,
-                                 'table' => ['filter' => false, 'sortable' => false, 'class' => 'text-center']],];
+    //@formatter:off
+    protected array $columns = [
+        ['key' => 'id', 'text' => 'ID', 'modal' => false],
+        ['key' => 'extRef', 'text' => 'Externe Referenz', 'required' => true],
+        ['key' => 'status', 'text' => 'Status', 'required' => true, 'modal' => ['type' => 'select', 'items' => [['value' => 'new', 'text' => 'Neu'], ['value' => 'accepted', 'text' => 'An Lieferant übergeben'], ['value' => 'acceptedInternally', 'text' => 'Interne verarbeitung'], ['value' => 'sent', 'text' => 'Gesendet'], ['value' => 'done', 'text' => 'Erledigt'],]], 'table' => ['filter' => 'select']],
+        ['key' => 'deliveryMode', 'text' => 'Liefermodus', 'required' => true, 'modal' => ['type' => 'select', 'items' => [['value' => 'singleAddress', 'text' => 'Einzelne Adresse']]]],
+        ['key' => 'deliveryAddressName', 'text' => 'Name', 'required' => true],
+        ['key' => 'deliveryAddressLine', 'text' => 'Adresse', 'required' => true, 'required_length' => 4],
+        ['key' => 'deliveryAddressPLZ', 'text' => 'PLZ', 'required' => true, 'regex' => '/^\d{4}$/'],
+        ['key' => 'deliveryAddressCity', 'text' => 'Stadt', 'required' => true, 'required_length' => 3],
+        ['key' => 'trackingNumber', 'text' => 'Trackingnummer', 'required' => false, 'modal' => false],
+        ['key' => 'create', 'text' => 'Erstellt', 'required' => true, 'modal' => false, 'filter' => 'datetime'],
+        ['key' => 'createBy', 'text' => 'Erstellt von', 'required' => true, 'table' => ['filter' => 'select'], 'modal' => ['type' => 'select', 'items' => []]],
+        ['key' => 'actions', 'text' => 'Aktionen', 'required' => false, 'modal' => false, 'table' => ['filter' => false, 'sortable' => false, 'class' => 'text-center']]
+    ];
 
-    protected array $additionalActions = [['key' => 'openHistory', 'title' => 'Historie', 'class' => 'fas fa-history text-primary'],
-                                          ['key' => 'showTrackingHistory', 'title' => 'Tracking Historie', 'class' => 'fas fa-truck text-primary'],
-                                          ['key' => 'createShippingNote', 'title' => 'Lieferschein erstellen', 'class' => 'fas fa-file-invoice text-primary'],
-                                          ['key' => 'openSingleOrderEmail', 'title' => 'Bestellbestätigung', 'class' => 'fas fa-envelope text-primary'],];
+    protected array $additionalActions = [
+        ['key' => 'openHistory', 'title' => 'Historie', 'class' => 'fas fa-history text-primary'],
+        ['key' => 'showTrackingHistory', 'title' => 'Tracking Historie', 'class' => 'fas fa-truck text-primary'],
+        ['key' => 'createShippingNote', 'title' => 'Lieferschein erstellen', 'class' => 'fas fa-file-invoice text-primary'],
+        ['key' => 'openSingleOrderEmail', 'title' => 'Bestellbestätigung', 'class' => 'fas fa-envelope text-primary']#
+    ];
 
-    protected array $infoMessages = ['create' => 'Bestellung wurde erfolgreich erstellt, sie erhalten in Kürze eine Bestätigungsmail',
-                                     'update' => 'Bestellung wurde aktualisiert',
-                                     'delete' => 'Bestellung wurde gelöscht',
-                                     'noChanges' => 'Keine Änderungen',];
+    protected array $infoMessages = [
+        'create' => 'Bestellung wurde erfolgreich erstellt, sie erhalten in Kürze eine Bestätigungsmail',
+        'update' => 'Bestellung wurde aktualisiert',
+        'delete' => 'Bestellung wurde gelöscht',
+        'noChanges' => 'Keine Änderungen'
+    ];
+    //@formatter:on
 
     public function permissionCheck(): bool {
         return $this->user->can(["WarehouseEShop"]);
@@ -120,9 +105,12 @@ class WarehouseEShopOrderController extends TTCrud {
                                                               'deliveryAddressLine' => $order->deliveryAddressLine,
                                                               'deliveryAddressPLZ' => $order->deliveryAddressPLZ,
                                                               'deliveryAddressCity' => $order->deliveryAddressCity,
+                                                              'deliveryAddressEMail' => '',
+                                                              'note' => 'Erstellung aus Energie Steiermark Shop Bestellung #' . $id,
                                                               'status' => 'new',
                                                               'positions' => $positions,
                                                               'textElements' => '[]',
+                                                              'hoursEntries' => '[]',
                                                               'eShopOrderId' => $id,
                                                               'create' => time(),
                                                               'createBy' => $this->user->id]);