Merge branch 'master' of git@vc.linet-services.de:public/lx-office-erp

diff --git a/peppershop/Picture.php b/peppershop/Picture.php
index 692a7ea..55184da 100644 (file)
--- a/peppershop/Picture.php
+++ b/peppershop/Picture.php
@@ -37,12 +37,12 @@ class picture {
             $faktor = $d["width"]/$d["height"];
         }
         $smallheight = floor($this->smallwidth*$faktor);
-        $handle->thumbnailImage($this->smallwidth, $smallheight);
+        $handle->thumbnailImage($this->smallwidth, $smallheight, true);
         $rc = $handle->writeImage( "./tmp/tmp.file_small");
         if ( !$this->original ) {
             $handle->readImage("./tmp/tmp.file_org");
             $bigheight = floor($this->bigwidth * $faktor);
-            $handle->thumbnailImage( $this->bigwidth, $bigheight);
+            $handle->thumbnailImage( $this->bigwidth, $bigheight,true);
             return $handle->writeImage( "./tmp/tmp.file_org");
         }
         return $rc;

diff --git a/peppershop/pepper.php b/peppershop/pepper.php
index 25a9d79..094c610 100644 (file)
--- a/peppershop/pepper.php
+++ b/peppershop/pepper.php
@@ -11,7 +11,7 @@ class pepper {
     var $divVerm = false;
     var $minder = false;
     var $paypal = false;
-    var $treuh = false;
+    var $treuhand = false;
     var $nachn = false;
     var $shopcode = 'ISO-8859-1';
     var $erpcode = 'UTF-8';
@@ -85,7 +85,7 @@ class pepper {
     function translateTable($data,$table) {
         $newdata = array();
         foreach ($data as $key=>$val) {
-             if ($this->{$table}[$key]) 
+             if (array_key_exists($key, $this->{$table}))
                  $newdata[$this->{$table}[$key]] = $val;
         }
         return $newdata;
@@ -257,8 +257,8 @@ class pepper {
                  $artikel[]   = array("partnumber"=>$this->paypal['NR'],"description"=>$this->paypal['TXT'],"taxrate"=>$this->paypal['TAX'],
                                       "qty"=>1,"unit"=>$this->paypal['Unit'],"sellprice"=>round($row["paypalkosten"],2));
              if ($row["treuhandkosten"]>0) 
-                 $artikel[] = array("partnumber"=>$this->treuh['NR'],"description"=>$this->treuh['TXT'],"taxrate"=>$this->treuh['TAX'],
-                                      "qty"=>1,"unit"=>$this->treuh['Unit'],"sellprice"=>$row["treuhandkosten"]);
+                 $artikel[] = array("partnumber"=>$this->treuhand['NR'],"description"=>$this->treuhand['TXT'],"taxrate"=>$this->treuhand['TAX'],
+                                      "qty"=>1,"unit"=>$this->treuhand['Unit'],"sellprice"=>$row["treuhandkosten"]);
              if ($row["mindermengenzuschlag"]>0) 
                  $artikel[] = array("partnumber"=>$this->minder['NR'],"description"=>$this->minder['TXT'],"taxrate"=>$this->minder['TAX'],
                                     "qty"=>1,"unit"=>$this->minder['Unit'],"sellprice"=>$row["mindermengenzuschlag"]);