diff --git a/upgrade/data/db_schema.json b/upgrade/data/db_schema.json
index f241296a..7ab66584 100644
--- a/upgrade/data/db_schema.json
+++ b/upgrade/data/db_schema.json
@@ -98705,7 +98705,7 @@
                     "Default": "",
                     "Extra": "auto_increment",
                     "Privileges": "select,insert,update,references",
-                    "Commant": ""
+                    "Comment": ""
                 },
                 {
                     "Field": "address_id",
@@ -98716,7 +98716,7 @@
                     "Default": "",
                     "Extra": "",
                     "Privileges": "select,insert,update,references",
-                    "Commant": ""
+                    "Comment": ""
                 },
                 {
                     "Field": "document_type",
@@ -98727,7 +98727,7 @@
                     "Default": "",
                     "Extra": "",
                     "Privileges": "select,insert,update,references",
-                    "Commant": ""
+                    "Comment": ""
                 },
                 {
                     "Field": "job_type",
@@ -98738,7 +98738,7 @@
                     "Default": "",
                     "Extra": "",
                     "Privileges": "select,insert,update,references",
-                    "Commant": ""
+                    "Comment": ""
                 },
                 {
                     "Field": "printer_id",
@@ -98749,7 +98749,7 @@
                     "Default": "",
                     "Extra": "",
                     "Privileges": "select,insert,update,references",
-                    "Commant": ""
+                    "Comment": ""
                 },
                 {
                     "Field": "created_at",
@@ -98760,7 +98760,7 @@
                     "Default": "current_timestamp()",
                     "Extra": "",
                     "Privileges": "select,insert,update,references",
-                    "Commant": ""
+                    "Comment": ""
                 }
             ],
             "keys": [
diff --git a/www/lib/class.erpapi.php b/www/lib/class.erpapi.php
index 2f793032..aafbfca9 100644
--- a/www/lib/class.erpapi.php
+++ b/www/lib/class.erpapi.php
@@ -7095,7 +7095,7 @@ title: 'Abschicken',
     $navarray['menu']['admin'][$menu]['sec'][]  = array('Arbeitsnachweis','arbeitsnachweis','list');
     $navarray['menu']['admin'][$menu]['sec'][]  = array('Gutschrift / '.$this->Firmendaten("bezeichnungstornorechnung"),'gutschrift','list');
     $navarray['menu']['admin'][$menu]['sec'][]  = array('Proformarechnung','proformarechnung','list');
-    $navarray['menu']['admin'][$menu]['sec'][]  = array('Abolauf','rechnungslauf','rechnungslauf');
+    $navarray['menu']['admin'][$menu]['sec'][]  = array('Abolauf','rechnungslauf','list');
     $navarray['menu']['admin'][$menu]['sec'][]  = array('Mahnwesen','mahnwesen','list');
 
     $navarray['menu']['admin'][$menu]['sec'][]  = array('Dokumenten Scanner','docscan','list');
diff --git a/www/lib/class.image.php b/www/lib/class.image.php
index 71598c45..7d72e7ba 100644
--- a/www/lib/class.image.php
+++ b/www/lib/class.image.php
@@ -49,6 +49,7 @@ class image {
 
             $manipulator = new ImageManipulator($str);
             $type = mime_content_type($path);
+            
             $manipulator->resample($newwidth, $newheight, true, $upscale);
 
             /*
@@ -200,7 +201,7 @@ class ImageManipulator
     public function resample($width, $height, $constrainProportions = true, $upscale = false, $keepformat = false)
     {
       if (!is_resource($this->image)) {
-        throw new RuntimeException('No image set');
+//        throw new RuntimeException('No image set');    
       }
       if($keepformat)
       {
@@ -340,9 +341,9 @@ class ImageManipulator
      */
     protected function _replace($res)
     {
-        if (!is_resource($res)) {
+      /*  if (!is_resource($res)) {
             throw new UnexpectedValueException('Invalid resource');
-        }
+        }*/
         if (is_resource($this->image)) {
             imagedestroy($this->image);
         }
diff --git a/www/lib/dokumente/class.briefpapier.php b/www/lib/dokumente/class.briefpapier.php
index 464fe186..3b10cc26 100644
--- a/www/lib/dokumente/class.briefpapier.php
+++ b/www/lib/dokumente/class.briefpapier.php
@@ -1797,12 +1797,19 @@ class Briefpapier extends SuperFPDF {
 
   public function setStyleData($styleData){
     $this->styleData = $styleData;
-  }
+  }  
 
   private function getStyleElement($key){
-    if(isset($this->styleData[$key]) && !empty($this->styleData[$key])) return $this->styleData[$key];
-
-    return $this->app->erp->Firmendaten($key);
+    $result = null;
+    if(isset($this->styleData[$key]) && !empty($this->styleData[$key])) {
+        $result = $this->styleData[$key];
+    } else {
+        $result = $this->app->erp->Firmendaten($key);
+    }
+    if (empty($result)) {
+        $result = 0;
+    }    
+    return($result);
   }
 
   public function renderDocument() {
diff --git a/www/pages/lager.php b/www/pages/lager.php
index d6c1635d..9a2273f8 100644
--- a/www/pages/lager.php
+++ b/www/pages/lager.php
@@ -451,7 +451,7 @@ class Lager extends GenLager {
                 FROM
                     einkaufspreise minek
                 WHERE
-                    einkaufspreise.artikel = minek.artikel AND DATE(
+                    einkaufspreise.geloescht != 1 AND einkaufspreise.artikel = minek.artikel AND DATE(
                     REPLACE
                         (
                             COALESCE(gueltig_bis, '9999-12-31'),
@@ -482,7 +482,17 @@ class Lager extends GenLager {
                         )
                 ) >= DATE('".$datum."')
             )
-            )
+            ) AND DATE(
+                REPLACE
+                    (
+                        COALESCE(
+                            einkaufspreise.gueltig_bis,
+                            '9999-12-31'
+                        ),
+                        '0000-00-00',
+                        '9999-12-31'
+                    )
+            ) >= DATE('".$datum."')
             GROUP BY
                 artikel,
                 waehrung
diff --git a/www/pages/rechnungslauf.php b/www/pages/rechnungslauf.php
index fa050d00..dcb0313a 100644
--- a/www/pages/rechnungslauf.php
+++ b/www/pages/rechnungslauf.php
@@ -35,8 +35,8 @@ class Rechnungslauf {
                 $width = ['1%', '1%', '10%', '20%', '10%', '10%', '10%', '10%', '10%', '10%', '1%'];
 
                 $findcols = [
-                    '',
-                    '',
+                    'adr.kundennummer',
+                    'adr.kundennummer',
                     'adr.kundennummer',
                     'adr.name',
                     'adr.anschreiben',
@@ -209,7 +209,7 @@ class Rechnungslauf {
         $this->app->ActionHandlerInit($this);
 
         // ab hier alle Action Handler definieren die das Modul hat
-        $this->app->ActionHandler('rechnungslauf', 'ActionList');
+        $this->app->ActionHandler('list', 'ActionList');
         $this->app->ActionHandler('abos', 'ActionAbos');
         $this->app->ActionHandler('minidetail', 'ActionMinidetail');
 
@@ -218,7 +218,7 @@ class Rechnungslauf {
 
     public function MenuList() {
         $this->app->erp->Headlines("Abolauf");
-        $this->app->erp->MenuEintrag("index.php?module=rechnungslauf&action=rechnungslauf", "Übersicht");
+        $this->app->erp->MenuEintrag("index.php?module=rechnungslauf&action=list", "Übersicht");
         $this->app->erp->MenuEintrag("index.php?module=rechnungslauf&action=abos", "gebuchte Abos");
         $this->app->erp->MenuEintrag("index.php?module=rechnungslauf&action=einstellungen", "Einstellungen");
     }