Merge remote-tracking branch 'upstream/master' into sendcloud

# Conflicts:
#	www/pages/versandarten.php

Author: Andreas Palm

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": [

www/lib/class.erpapi.php

@@ -7095,7 +7095,7 @@ function Navigation()
     $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');

www/lib/class.image.php

@@ -49,6 +49,7 @@ public function scaledPicByFileId($id, $newwidth, $newheight, $upscale = false,
 
             $manipulator = new ImageManipulator($str);
             $type = mime_content_type($path);
+            
             $manipulator->resample($newwidth, $newheight, true, $upscale);
 
             /*
@@ -200,7 +201,7 @@ public function setImageString($data)
     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 @@ public function crop($x1, $y1 = 0, $x2 = 0, $y2 = 0)
      */
     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);
         }

www/lib/dokumente/class.briefpapier.php

@@ -1797,12 +1797,19 @@ function GetFont()
 
   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() {

www/pages/lager.php

@@ -451,7 +451,7 @@ public static function TableSearch($app, $name, $erlaubtevars)
                 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 @@ public static function TableSearch($app, $name, $erlaubtevars)
                         )
                 ) >= DATE('".$datum."')
             )
-            )
+            ) AND DATE(
+                REPLACE
+                    (
+                        COALESCE(
+                            einkaufspreise.gueltig_bis,
+                            '9999-12-31'
+                        ),
+                        '0000-00-00',
+                        '9999-12-31'
+                    )
+            ) >= DATE('".$datum."')
             GROUP BY
                 artikel,
                 waehrung

www/pages/rechnungslauf.php

@@ -35,8 +35,8 @@ public static function TableSearch($app, $name, $erlaubtevars)
                 $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 @@ public function __construct($app, $intern = false) {
         $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 @@ public function __construct($app, $intern = false) {
 
     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");
     }