Update SERVER_INSTALL.md

test mail utf8_encode

SERVER_INSTALL.md

@@ -54,14 +54,11 @@ memory_limit = 256M
 ## Install additional zip
 `sudo apt-get install zip`
 
-## Install mysql client
-`sudo apt-get install mysql-client`
-
 ## Install database server
 `sudo apt-get install mariadb-server`
 
 ## Configure database server
-`sudo mysql_secure_installation`
+`sudo mariadb-secure-installation`
 ```
 NOTE: RUNNING ALL PARTS OF THIS SCRIPT IS RECOMMENDED FOR ALL MariaDB
       SERVERS IN PRODUCTION USE!  PLEASE READ EACH STEP CAREFULLY!

phpwf/plugins/class.stringcleaner.php

@@ -426,10 +426,12 @@
         }
       }elseif(is_object($xml))
       {
+        $xml = (array) $xml;
         if(count($xml) > 0)
         {
           foreach($xml as $k => $v)
           {
+            $v = (array) $v;
             if(count($v) > 0)
             {
               if($lvl < 10)

phpwf/plugins/class.yui.php

@@ -2578,11 +2578,19 @@ class YUI {
                 if(CHAR_LENGTH(b.bezeichnung)>" . $this->app->erp->MaxArtikelbezeichnung() . ",CONCAT(SUBSTR(b.bezeichnung,1," . $this->app->erp->MaxArtikelbezeichnung() . "),'...'),b.bezeichnung))
             ) $erweiterte_ansicht)
             as Artikel,
+            p.abkuerzung as projekt,
+            b.nummer as nummer,
+            DATE_FORMAT(lieferdatum,'%d.%m.%Y') as lieferdatum,
+            trim(b.menge)+0 as menge,
+            ".$this->FormatPreis($preiscell)." as preis,
+            b.waehrung,
+            ".$this->FormatPreis('b.rabatt')." as rabatt,";
 
-
+            if ($this->app->erp->RechteVorhanden('auftrag','einkaufspreise')) {
-
+                $sql .= $this->FormatPreis('einkaufspreis')." as einkaufspreis,
-               p.abkuerzung as projekt, b.nummer as nummer, DATE_FORMAT(lieferdatum,'%d.%m.%Y') as lieferdatum, trim(b.menge)+0 as menge, ".$this->FormatPreis($preiscell)." as preis,b.waehrung, ".$this->FormatPreis('b.rabatt')." as rabatt, ";
+                        CONCAT(".$this->app->erp->FormatPreis("ROUND(deckungsbeitrag*100,2)",2).",'%') AS DB,
-        
+                        ";
+            }             
                
         $sql .= "b.id as id
                  FROM $table b
@@ -3614,6 +3622,121 @@ class YUI {
             '</td></tr></table>')";
     }
 
+    function IconsSQL_versandpaket() {
+/*
+    status:
+        neu -> 
+   
+    Lagergo
+    lagergo_stop
+    lagerstop
+
+    Schein
+    summe_go
+    summe_stop
+
+    Auto
+    liefersperrego
+    liefersperrestop
+
+    marke
+    portogo
+    portostop
+
+    produktion_usn_gut
+    storno*/
+    
+
+        $lieferschein_kein = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/summe_stop.png\" title=\"Kein Lieferschein\" border=\"0\" style=\"margin-right:1px\">";
+        $lieferschein_ohne_pos = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/summe_go.png\" title=\"Lieferschein ohne Positionen\" border=\"0\" style=\"margin-right:1px\">";
+        $lieferschein_voll = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/lagergo.png\" title=\"Lieferschein vollst&auml;ndig\" border=\"0\" style=\"margin-right:1px\">";
+        $lieferschein_teil = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/lagergo_teil.png\" title=\"Lieferschein teilweise\" border=\"0\" style=\"margin-right:1px\">";
+
+        $versendet = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/liefersperrego.png\" title=\"Versendet\" border=\"0\" style=\"margin-right:1px\">";
+        $versendet_nicht = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/liefersperrestop.png\" title=\"Nicht versendet\" border=\"0\" style=\"margin-right:1px\">";
+
+        $paketmarke = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/portogo.png\" style=\"margin-right:1px\" title=\"Paketmarke\" border=\"0\">";
+        $paketmarke_keine = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/portostop.png\" style=\"margin-right:1px\" title=\"Keine Paketmarke\" border=\"0\">";
+
+        $ausgeliefert = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/delivery_ok.png\" style=\"margin-right:1px\" title=\"Ausgeliefert\" border=\"0\">";
+        $ausgeliefert_nicht = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/delivery.png\" style=\"margin-right:1px\" title=\"Nicht ausgeliefert\" border=\"0\">";
+
+        $storno = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/storno.png\" style=\"margin-right:1px\" title=\"Storniert\" border=\"0\">";
+
+        for ($z = 0;$z < 4;$z++) {
+            $abgeschlossen .= $ausgeliefert; 
+            $storniert .= $storno; 
+        }
+
+        return "CONCAT('<table><tr><td nowrap>',
+            CASE 
+                WHEN status = 'storniert' THEN '$storniert'
+            ELSE CONCAT(                                
+                CASE 
+                    WHEN lieferscheine <> '' AND vmenge = lmenge THEN '$lieferschein_voll'
+                    WHEN lieferschein_ohne_pos <> '' AND vmenge IS NULL THEN '$lieferschein_ohne_pos'
+                    WHEN lieferscheine <> '' THEN '$lieferschein_teil'
+                ELSE 
+                    '$lieferschein_kein'
+                END,
+                CASE 
+                    WHEN tracking <> '' THEN '$paketmarke'
+                ELSE 
+                    '$paketmarke_keine'
+                END,
+                CASE 
+                    WHEN status = 'versendet' THEN '$versendet'
+                    WHEN status = 'abgeschlossen' THEN '$versendet'
+                ELSE 
+                    '$versendet_nicht'
+                END,
+                CASE 
+                    WHEN status = 'abgeschlossen' THEN '$ausgeliefert'
+                ELSE 
+                    '$ausgeliefert_nicht'
+                END
+            )
+            END,
+            '</td></tr></table>')";
+    }
+    function IconsSQL_lieferung() {
+
+        $lieferschein_kein = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/lagerstop.png\" title=\"Keine Artikel in Versandpaketen\" border=\"0\" style=\"margin-right:1px\">";
+        $lieferschein_ohne_pos = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/summe_go.png\" title=\"Lieferschein ohne Positionen\" border=\"0\" style=\"margin-right:1px\">";
+        $lieferschein_voll = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/lagergo.png\" title=\"Artikel vollst&auml;ndig in Versandpaketen\" border=\"0\" style=\"margin-right:1px\">";
+        $lieferschein_teil = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/lagergo_stop.png\" title=\"Artikel teilweise in Versandpaketen\" border=\"0\" style=\"margin-right:1px\">";
+
+        $versendet = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/liefersperrego.png\" title=\"Versendet\" border=\"0\" style=\"margin-right:1px\">";
+        $versendet_nicht = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/liefersperrestop.png\" title=\"Nicht versendet\" border=\"0\" style=\"margin-right:1px\">";
+        $versendet_teil = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/liefersperregostop.png\" title=\"Teilweise versendet\" border=\"0\" style=\"margin-right:1px\">";
+
+        $ausgeliefert = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/delivery_ok.png\" style=\"margin-right:1px\" title=\"Ausgeliefert\" border=\"0\">";
+        $ausgeliefert_nicht = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/delivery.png\" style=\"margin-right:1px\" title=\"Nicht ausgeliefert\" border=\"0\">";
+        $ausgeliefert_teil = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/delivery_pending.png\" style=\"margin-right:1px\" title=\"Teilweise ausgeliefert\" border=\"0\">";
+
+        $storno = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/storno.png\" style=\"margin-right:1px\" title=\"Storniert\" border=\"0\">";
+
+        return "CONCAT(
+                '<table><tr><td nowrap>',
+                CASE 
+                    WHEN vmenge >= lmenge THEN '$lieferschein_voll'
+                    WHEN vmenge < lmenge AND vmenge <> 0 THEN '$lieferschein_teil'
+                    ELSE '$lieferschein_kein'
+                END,
+                CASE 
+                    WHEN alle_abgeschlossen THEN '$versendet'
+                    WHEN alle_versendet THEN '$versendet'
+                    WHEN eins_versendet THEN '$versendet_teil'
+                    ELSE '$versendet_nicht'
+                END,
+                CASE 
+                    WHEN alle_abgeschlossen THEN '$ausgeliefert'
+                    WHEN eins_abgeschlossen THEN '$ausgeliefert_teil'
+                    ELSE '$ausgeliefert_nicht'
+                END,
+                '</td></tr></table>')";
+    }
+
   function TablePositionSearch($parsetarget, $name, $callback = "show", $gener) {
 
     $id = $this->app->Secure->GetGET("id");
@@ -5702,12 +5825,8 @@ url:strUrl, success:function(html){strReturn = html;}, async:false
           }
         }
         // Fester filter
-        $more_data6 = $this->app->Secure->GetGET("more_data6");
-        $more_data7 = $this->app->Secure->GetGET("more_data7");
-        $more_data8 = $this->app->Secure->GetGET("more_data8");
-        
         $more_data4 = $this->app->Secure->GetGET("more_data4");
-
+/*
         $versandjoin = "";
         if(isset($parameter['offenversandzentrum'])  && !empty($parameter['offenversandzentrum']))
         {
@@ -5741,7 +5860,7 @@ url:strUrl, success:function(html){strReturn = html;}, async:false
         }
         
         if($versandjoin)$sql .= $versandjoin;
-        
+        */
        
         if($more_data4 || (isset($parameter['ohnerechnung']) && !empty($parameter['ohnerechnung']))) {
 
@@ -5817,6 +5936,21 @@ url:strUrl, success:function(html){strReturn = html;}, async:false
         if ($more_data3 == 1) $subwhere[] = " l.lieferantenretoure=1 ";
 
         // ENDE EXTRA more
+        $more_data6 = $this->app->Secure->GetGET("more_data6");
+        $more_data7 = $this->app->Secure->GetGET("more_data7"); 
+        $more_data8 = $this->app->Secure->GetGET("more_data8"); 
+        
+        if ($more_data6) {            
+            $subwhere[] = "l.versand_status = 3";
+        }
+        if ($more_data7) {
+            $subwhere[] = "l.versand_status = 1";
+        }
+        if ($more_data8) {
+            $subwhere[] = "l.versand_status IN (2,3)";
+        }
+
+
         for ($j = 0;$j < (empty($subwhere)?0:count($subwhere));$j++) $tmp.= " AND " . $subwhere[$j];
         $where = " l.id!='' AND l.status!='angelegt' $tmp " . $this->app->erp->ProjektRechte('p.id', true, 'l.vertriebid');
 
@@ -14592,7 +14726,7 @@ source: "index.php?module=ajax&action=filter&filtername=' . $filter . $extendurl
       if ($module == "angebot" || $module == "auftrag" || $module == "rechnung" || $module == "gutschrift" || $module == "proformarechnung") {
         
         if ($schreibschutz != 1) {
-          $addrow = array('<form action="" method="post" id="myform">', '[ARTIKELSTART]<input type="text" size="30" name="artikel" id="artikel" onblur="window.setTimeout(\'selectafterblur()\',200);">[ARTIKELENDE]', '<input type="text" name="projekt" id="projekt" size="10" readonly onclick="checkhere()" >', '<input type="text" name="nummer" id="nummer" size="7">', '<input type="text" size="8" name="lieferdatum" id="lieferdatum">', '<input type="text" name="menge" id="menge" size="5" onblur="window.setTimeout(\'selectafterblurmenge()\',200); document.getElementById(\'preis\').style.background =\'none\';">', '<input type="text" name="preis" id="preis" size="10" onclick="checkhere();">', '<input type="text" name="waehrung" id="waehrung" size="10" onclick="checkhere();">' ,'<input type="text" name="rabatt" id="rabatt" size="7">');
+          $addrow = array('<form action="" method="post" id="myform">', '[ARTIKELSTART]<input type="text" size="30" name="artikel" id="artikel" onblur="window.setTimeout(\'selectafterblur()\',200);">[ARTIKELENDE]', '<input type="text" name="projekt" id="projekt" size="10" readonly onclick="checkhere()" >', '<input type="text" name="nummer" id="nummer" size="7">', '<input type="text" size="8" name="lieferdatum" id="lieferdatum">', '<input type="text" name="menge" id="menge" size="5" onblur="window.setTimeout(\'selectafterblurmenge()\',200); document.getElementById(\'preis\').style.background =\'none\';">', '<input type="text" name="preis" id="preis" size="10" onclick="checkhere();">', '<input type="text" name="waehrung" id="waehrung" size="10" onclick="checkhere();">' ,'<input type="text" name="rabatt" id="rabatt" size="7">','','');
           $addrow[] = '<input type="submit" value="einf&uuml;gen" name="ajaxbuchen">
             <script type="text/javascript">
             document.onkeydown = function(evt) {
@@ -14755,9 +14889,11 @@ source: "index.php?module=ajax&action=filter&filtername=' . $filter . $extendurl
         }
         $table->headings[6] = 'Preis';
         $mengencol = 5;
-        if ($module == "angebot" || $module == "auftrag" || $module == "rechnung" || $module == "gutschrift") $table->headings[7] = 'W&auml;hrung';
+        if ($module == "angebot" || $module == "auftrag" || $module == "rechnung" || $module == "gutschrift") {
-        if ($module == "angebot" || $module == "auftrag" || $module == "rechnung" || $module == "gutschrift") $table->headings[8] = 'Rabatt';
+            $table->headings[7] = 'W&auml;hrung';
-        if ($module == "angebot" || $module == "auftrag" || $module == "rechnung" || $module == "gutschrift") $rabattcol = 8;
+            $table->headings[8] = 'Rabatt';
+            $rabattcol = 8; 
+        }       
       }
       $__arr = array($summencol, $mengencol, $rabattcol, $ecol, $dcol,$zwischensumme);
       $this->app->erp->RunHook('yui_sortlistadd_draw', 2,$table,$__arr);

tools/module_creator/module_creator_php_template.txt

@@ -42,7 +42,11 @@ class PLACEHOLDER_MODULECLASSNAME {
                 $defaultorder = 1;
                 $defaultorderdesc = 0;
 
-		$dropnbox = "PLACEHOLDER_DROPNBOX";
+        		$dropnbox = "PLACEHOLDER_DROPNBOX";
+
+//                $moreinfo = true; // Allow drop down details
+//                $moreinfoaction = "lieferschein"; // specify suffix for minidetail-URL to allow different minidetails
+//                $menucol = 11; // Set id col for moredata/menu
 
                 $menu = "<table cellpadding=0 cellspacing=0><tr><td nowrap>" . "<a href=\"index.php?module=PLACEHOLDER_MODULENAME&action=edit&id=%value%\"><img src=\"./themes/{$app->Conf->WFconf['defaulttheme']}/images/edit.svg\" border=\"0\"></a>&nbsp;<a href=\"#\" onclick=DeleteDialog(\"index.php?module=PLACEHOLDER_MODULENAME&action=delete&id=%value%\");>" . "<img src=\"themes/{$app->Conf->WFconf['defaulttheme']}/images/delete.svg\" border=\"0\"></a>" . "</td></tr></table>";
 
@@ -118,6 +122,8 @@ class PLACEHOLDER_MODULECLASSNAME {
             
             // Add checks here
 
+    //        $input['projekt'] = $this->app->erp->ReplaceProjekt(true,$input['projekt'],true); // Parameters: Target db?, value, from form?
+
             $columns = "id, ";
             $values = "$id, ";
             $update = "";
@@ -166,6 +172,9 @@ class PLACEHOLDER_MODULECLASSNAME {
         $this->app->Tpl->Add('KURZUEBERSCHRIFT2', $email);
         $this->app->Tpl->Add('EMAIL', $email);
         $this->app->Tpl->Add('ANGEZEIGTERNAME', $angezeigtername);         
+
+        $this->app->YUI->AutoComplete("artikel", "artikelnummer");
+
          */
 
 //        $this->SetInput($input);              
@@ -183,14 +192,4 @@ class PLACEHOLDER_MODULECLASSNAME {
 
         return $input;
     }
-
+ }
-    /*
-     * Set all fields in the page corresponding to $input
-     */
-    function SetInput($input) {
-        // $this->app->Tpl->Set('EMAIL', $input['email']);        
-        
-        PLACEHOLDER_SET_INPUT
-    }
-
-}

upgrade/data/db_schema.json

@@ -57169,6 +57169,17 @@
                     "Extra": "",
                     "Privileges": "select,insert,update,references",
                     "Comment": ""
+                },
+                {
+                    "Field": "versand_status",
+                    "Type": "int(11)",
+                    "Collation": null,
+                    "Null": "NO",
+                    "Key": "",
+                    "Default": "0",
+                    "Extra": "",
+                    "Privileges": "select,insert,update,references",
+                    "Comment": ""
                 }
             ],
             "keys": [
@@ -112662,6 +112673,76 @@
                 }
             ]
         },
+        {
+            "name": "versandpaket_lieferschein_position",
+            "collation": "utf8mb3_general_ci",
+            "type": "BASE TABLE",
+            "columns": [
+                {
+                    "Field": "id",
+                    "Type": "int(11)",
+                    "Collation": null,
+                    "Null": "NO",
+                    "Key": "PRI",
+                    "Default": null,
+                    "Extra": "auto_increment",
+                    "Privileges": "select,insert,update,references",
+                    "Comment": ""
+                },
+                {
+                    "Field": "versandpaket",
+                    "Type": "int(11)",
+                    "Collation": null,
+                    "Null": "NO",
+                    "Key": "",
+                    "Default": null,
+                    "Extra": "",
+                    "Privileges": "select,insert,update,references",
+                    "Comment": ""
+                },
+                {
+                    "Field": "lieferschein_position",
+                    "Type": "int(11)",
+                    "Collation": null,
+                    "Null": "NO",
+                    "Key": "",
+                    "Default": null,
+                    "Extra": "",
+                    "Privileges": "select,insert,update,references",
+                    "Comment": ""
+                },
+                {
+                    "Field": "menge",
+                    "Type": "decimal(14,4)",
+                    "Collation": null,
+                    "Null": "NO",
+                    "Key": "",
+                    "Default": null,
+                    "Extra": "",
+                    "Privileges": "select,insert,update,references",
+                    "Comment": ""
+                }
+            ],
+            "keys": [
+                {
+                    "Key_name": "PRIMARY",
+                    "Index_type": "BTREE",
+                    "columns": [
+                        "id"
+                    ],
+                    "Non_unique": ""
+                },
+                {
+                    "Key_name": "versandpaket_lieferschein_position",
+                    "Index_type": "BTREE",
+                    "columns": [
+                        "versandpaket",
+                        "lieferschein_position"
+                    ],
+                    "Non_unique": "UNIQUE"
+                } 
+            ]
+        },
         {
             "name": "versandarten",
             "collation": "utf8mb3_general_ci",
@@ -112849,6 +112930,17 @@
                     "Privileges": "select,insert,update,references",
                     "Comment": ""
                 },
+                {
+                    "Field": "datum",
+                    "Type": "datetime",
+                    "Collation": null,
+                    "Null": "NO",
+                    "Key": "",
+                    "Default": "current_timestamp()",
+                    "Extra": "",
+                    "Privileges": "select,insert,update,references",
+                    "Comment": ""
+                },
                 {
                     "Field": "versand",
                     "Type": "int(11)",
@@ -112871,6 +112963,28 @@
                     "Privileges": "select,insert,update,references",
                     "Comment": ""
                 },
+                {
+                    "Field": "versandart",
+                    "Type": "varchar(64)",
+                    "Collation": "utf8mb3_general_ci",
+                    "Null": "NO",
+                    "Key": "",
+                    "Default": "",
+                    "Extra": "",
+                    "Privileges": "select,insert,update,references",
+                    "Comment": ""
+                },
+                {
+                    "Field": "lieferschein_ohne_pos",
+                    "Type": "int(11)",
+                    "Collation": null,
+                    "Null": "YES",
+                    "Key": "",
+                    "Default": null,
+                    "Extra": "",
+                    "Privileges": "select,insert,update,references",
+                    "Comment": ""
+                },
                 {
                     "Field": "tracking",
                     "Type": "varchar(255)",
@@ -112882,6 +112996,17 @@
                     "Privileges": "select,insert,update,references",
                     "Comment": ""
                 },
+                {
+                    "Field": "tracking_link",
+                    "Type": "text",
+                    "Collation": "utf8mb3_general_ci",
+                    "Null": "NO",
+                    "Key": "",
+                    "Default": "",
+                    "Extra": "",
+                    "Privileges": "select,insert,update,references",
+                    "Comment": ""
+                },
                 {
                     "Field": "versender",
                     "Type": "varchar(255)",
@@ -112914,6 +113039,28 @@
                     "Extra": "",
                     "Privileges": "select,insert,update,references",
                     "Comment": ""
+                },
+                {
+                    "Field": "status",
+                    "Type": "varchar(64)",
+                    "Collation": "utf8mb3_general_ci",
+                    "Null": "NO",
+                    "Key": "",
+                    "Default": null,
+                    "Extra": "",
+                    "Privileges": "select,insert,update,references",
+                    "Comment": ""
+                },
+                {
+                    "Field": "usereditid",
+                    "Type": "int(11)",
+                    "Collation": null,
+                    "Null": "YES",
+                    "Key": "MUL",
+                    "Default": null,
+                    "Extra": "",
+                    "Privileges": "select,insert,update,references",
+                    "Comment": ""
                 }
             ],
             "keys": [

www/lib/class.versanddienstleister.php

@@ -76,6 +76,7 @@ abstract class Versanddienstleister
 
       $addressfields = ['name', 'adresszusatz', 'abteilung', 'ansprechpartner', 'unterabteilung', 'ort', 'plz',
           'strasse', 'land'];       
+
       $ret['original'] = array_filter($docArr, fn($key) => in_array($key, $addressfields), ARRAY_FILTER_USE_KEY);
 
       $ret['name'] = empty(trim($docArr['ansprechpartner'])) ? trim($docArr['name']) : trim($docArr['ansprechpartner']);
@@ -127,7 +128,7 @@ abstract class Versanddienstleister
       if (!empty($docArr['ihrebestellnummer'])) {
         $orderNumberParts[] = $docArr['ihrebestellnummer'];
       }
-      $orderNumberParts[] = $docArr['belegnr'];
+      $orderNumberParts[] = ucfirst($sid)." ".$docArr['belegnr'];
       $ret['order_number'] = implode(' / ', $orderNumberParts);
     }
 
@@ -369,7 +370,7 @@ abstract class Versanddienstleister
     return true;
   }
 
-  public function Paketmarke(string $target, string $docType, int $docId): void
+  public function Paketmarke(string $target, string $docType, int $docId, $versandpaket = null): void
   {
     $address = $this->GetAdressdaten($docId, $docType);
     if (isset($_SERVER['CONTENT_TYPE']) && ($_SERVER['CONTENT_TYPE'] === 'application/json')) {
@@ -378,25 +379,65 @@ abstract class Versanddienstleister
       if ($json->submit == 'print') {
         $result = $this->CreateShipment($json, $address);
         if ($result->Success) {
-          $sql = "INSERT INTO versand 
+            if (empty($versandpaket)) {
-          (adresse, lieferschein, versandunternehmen, gewicht, tracking, tracking_link, anzahlpakete) 
+                $sql = "INSERT INTO versandpakete 
-          VALUES 
+                      (
-          ({$address['addressId']}, {$address['lieferscheinId']}, '$this->type',
+                        lieferschein_ohne_pos,
-           '$json->weight', '$result->TrackingNumber', '$result->TrackingUrl', 1)";
+                        gewicht,
-          $this->app->DB->Insert($sql);
+                        tracking,
+                        tracking_link,
+                        status,
+                        versandart,
+                        versender
+                      ) 
+                      VALUES 
+                      (
+                        {$address['lieferscheinId']},
+                        '$json->weight',
+                        '$result->TrackingNumber',
+                        '$result->TrackingUrl',
+                        'neu',
+                        '$this->type',
+                        '".$this->app->User->GetName()."'
+                    )";
+                $this->app->DB->Insert($sql);
+                $versandpaket = $this->app->DB->GetInsertID();
+            }
+            else {
+                $sql = "UPDATE versandpakete SET 
+                            gewicht = '".$json->weight."',
+                            tracking = '".$result->TrackingNumber."',
+                            tracking_link = '".$result->TrackingUrl."'
+                        WHERE id = '".$versandpaket."'
+                        ";             
+                $this->app->DB->Update($sql);      
+            }       
 
-          $filename = $this->app->erp->GetTMP() . join('_', [$this->type, 'Label', $result->TrackingNumber]) . '.pdf';
+            $filename = join('_', [$this->type, 'Label', $result->TrackingNumber]) . '.pdf';
-          file_put_contents($filename, $result->Label);
+            $filefullpath = $this->app->erp->GetTMP() . $filename;
-          $this->app->printer->Drucken($this->labelPrinterId, $filename);
+            file_put_contents($filefullpath, $result->Label);
+            $this->app->erp->CreateDateiWithStichwort(
+                $filename,
+                'Paketmarke '.$this->type.' '.$result->TrackingNumber,
+                'Paketmarke Versandpaket Nr. '.$versandpaket,
+                '',
+                $filefullpath,
+                $this->app->User->GetName(),
+                'paketmarke',
+                'versandpaket',
+                $versandpaket
+            );
 
-          if (isset($result->ExportDocuments)) {
+            $this->app->printer->Drucken($this->labelPrinterId, $filefullpath);
-            $filename = $this->app->erp->GetTMP() . join('_', [$this->type, 'ExportDoc', $result->TrackingNumber]) . '.pdf';
+
-            file_put_contents($filename, $result->ExportDocuments);
+            if (isset($result->ExportDocuments)) {
-            $this->app->printer->Drucken($this->documentPrinterId, $filename);
+                $filefullpath = $this->app->erp->GetTMP() . join('_', [$this->type, 'ExportDoc', $result->TrackingNumber]) . '.pdf';
-          }
+                file_put_contents($filefullpath, $result->ExportDocuments);
-          $ret['messages'][] = ['class' => 'info', 'text' => "Paketmarke wurde erfolgreich erstellt: $result->TrackingNumber"];
+                $this->app->printer->Drucken($this->documentPrinterId, $filefullpath);
+            }
+            $ret['messages'][] = ['class' => 'info', 'text' => "Paketmarke wurde erfolgreich erstellt: $result->TrackingNumber"];
         } else {
-          $ret['messages'] = array_map(fn(string $item) => ['class' => 'error', 'text' => $item], array_unique($result->Errors));
+            $ret['messages'] = array_map(fn(string $item) => ['class' => 'error', 'text' => $item], array_unique($result->Errors));
         }
       }
       header('Content-Type: application/json');
@@ -410,7 +451,12 @@ abstract class Versanddienstleister
     $address['product'] = $products[0]->Id ?? '';
 
     $countries = $this->app->DB->SelectArr("SELECT iso, bezeichnung_de name, eu FROM laender ORDER BY bezeichnung_de");
-    $countries = array_combine(array_column($countries, 'iso'), $countries);
+    if(!empty($countries)) {
+        $countries = array_combine(array_column($countries, 'iso'), $countries);    
+    } else {
+        $countries = Array();        
+        $this->app->Tpl->addMessage('error', 'Länderliste ist leer. Siehe Einstellungen -> Länderliste.', false, 'PAGE');
+    }  
 
     $json['form'] = $address;
     $json['countries'] = $countries;

www/lib/versandarten/content/createshipment.tpl

@@ -137,7 +137,7 @@ SPDX-License-Identifier: LicenseRef-EGPL-3.1
                 <h2>{|Paket|}</h2>
                 <table>
                     <tr>
-                        <td>{|Gewicht (in kg)|}:</td>
+                        <td>{|Gewicht (in kg)</b>|}:</td>
                         <td><input type="text" v-model.number="form.weight"></td>
                     </tr>
                     <tr>
@@ -157,7 +157,7 @@ SPDX-License-Identifier: LicenseRef-EGPL-3.1
                         <td>
                             <select v-model="form.product" required>
                                 <option v-for="prod in products" :value="prod.Id" v-if="productAvailable(prod)">{{prod.Name}}</option>
-                            </select>
+                            </select><i>F&uuml;r Produktwahl Gewicht eingeben!</i>
                         </td>
                     </tr>
                     <tr v-if="serviceAvailable('premium')">
@@ -168,11 +168,11 @@ SPDX-License-Identifier: LicenseRef-EGPL-3.1
             </div>
             <div class="clearfix"></div>
             <div class="col-md-12">
-                <h2>{|Bestellung|}</h2>
+                <h2>{|Sonstiges|}</h2>
                 <table>
                     <tbody>
                         <tr>
-                            <td>{|Bestellnummer|}:</td>
+                            <td>{|Referenzen|}:</td>
                             <td><input type="text" size="36" v-model="form.order_number"></td>
                         </tr>
                         <tr>

www/pages/ajax.php

@@ -1597,11 +1597,17 @@ select a.kundennummer, (SELECT name FROM adresse a2 WHERE a2.kundennummer = a.ku
         if($artikel_freitext1_suche)
         {
           $felder[] = 'art.freifeld1';
+        } else {
+            $artikel_freitext1_suche = 'true';
         }
         $subwhere = $this->AjaxFilterWhere($termorig,$felder);       
-        $arr = $this->app->DB->SelectArr("SELECT CONCAT(art.nummer,' ',art.name_de) as name FROM artikel art
+        $sql = "SELECT CONCAT(art.nummer,' ',art.name_de) as name FROM artikel art
         INNER JOIN $doctype"."_position ap ON ap.artikel = art.id AND $doctype = '$doctypeid'
-        WHERE art.geloescht=0 AND  ($artikel_freitext1_suche) AND art.geloescht=0 AND art.intern_gesperrt!=1 LIMIT 20");
+        WHERE 
+            art.geloescht=0 AND ($artikel_freitext1_suche) AND art.geloescht=0 AND art.intern_gesperrt!=1 AND 
+            (name_de LIKE '%$term%' OR art.nummer LIKE '%$term%') 
+        LIMIT 20";
+        $arr = $this->app->DB->SelectArr($sql);
         $carr = !empty($arr)?count($arr):0;
         for($i = 0; $i < $carr; $i++) {
           $newarr[] = $arr[$i]['name'];
@@ -2479,7 +2485,7 @@ select a.kundennummer, (SELECT name FROM adresse a2 WHERE a2.kundennummer = a.ku
           $adresse = $this->app->DB->Select("SELECT id FROM adresse WHERE kundennummer = '".$kunde[0]."' AND kundennummer <> '' LIMIT 1");
         }
         $beleg = str_replace('kunden','',$filtername);
-        $arr = $this->app->DB->SelectArr("SELECT CONCAT(id,' ',if(belegnr <> '',belegnr,'ENTWURF'),' ',kundennummer,' ',name) as name FROM $beleg WHERE (belegnr LIKE '%$term%' OR name LIKE '%$term%' OR kundennummer LIKE '$%term%') AND (status = 'angelegt' OR status = 'freigegeben') 
+        $arr = $this->app->DB->SelectArr("SELECT CONCAT(belegnr,' ',kundennummer,' ',name) as name FROM $beleg WHERE (belegnr <> '') AND (belegnr LIKE '%$term%' OR name LIKE '%$term%' OR kundennummer LIKE '$%term%') AND (status IN ('angelegt','freigegeben','versendet')) 
         ".($adresse?" AND adresse = '$adresse' ":'')."   ".$this->app->erp->ProjektRechte('projekt')."
         ORDER by belegnr LIMIT 20");
         $carr = !empty($arr)?count($arr):0;

www/pages/auftrag.php

@@ -1990,8 +1990,52 @@ class Auftrag extends GenAuftrag
       $gebuchtezeit = str_replace(".", ",", round($gebuchtezeit,2));
     }
     $summebrutto = $this->app->DB->Select("SELECT gesamtsumme FROM auftrag WHERE id='$id' LIMIT 1");
-    $this->app->Tpl->Set('DECKUNGSBEITRAG',0);
+
-    $this->app->Tpl->Set('DBPROZENT',0);
+    // Deckungsbeitrag
+    if (!$this->app->erp->RechteVorhanden('auftrag','einkaufspreise')) {
+        $this->app->Tpl->Set('DBHIDDEN','hidden');
+    } else {
+        $sql = "
+                SELECT
+                    umsatz_netto_gesamt,
+                    artikel,
+                    menge,
+                    einkaufspreis
+                FROM
+                    `auftrag_position`
+                WHERE
+                    `auftrag` = ".$id."
+            ";
+
+        $positionen = $this->app->DB->SelectArr($sql);
+
+        $umsatz_gesamt = 0;
+        $kosten_gesamt = 0;
+        $db_gesamt = 0;    
+        foreach ($positionen as $position) {
+            if (empty($position['einkaufspreis'])) {
+                $position['einkaufspreis'] = $this->app->erp->GetEinkaufspreis($position['artikel'],$position['menge']);            
+            }
+            $kosten = ($position['einkaufspreis']*$position['menge']);
+            $db_gesamt += $position['umsatz_netto_gesamt']-$kosten;
+            $kosten_gesamt += $kosten;
+            $umsatz_gesamt += $position['umsatz_netto_gesamt'];
+        }
+
+        $this->app->Tpl->Set('NETTOGESAMT',$this->app->erp->number_format_variable($umsatz_gesamt,2));
+        $this->app->Tpl->Set('KOSTEN',$this->app->erp->number_format_variable($kosten_gesamt,2));
+        $this->app->Tpl->Set('DECKUNGSBEITRAG',$this->app->erp->number_format_variable($db_gesamt,2));
+        $this->app->Tpl->Set(   'DBPROZENT',
+                                $umsatz_gesamt==0?
+                                "-":
+                                $this->app->erp->number_format_variable(
+                                    round(
+                                        $db_gesamt/$umsatz_gesamt*100,2
+                                    )                                
+                                )."%"
+                            );
+    }
+   
     $this->app->Tpl->Set('GEBUCHTEZEIT',0);
 
     if($auftragArr[0]['ust_befreit']==0){
@@ -2270,7 +2314,7 @@ class Auftrag extends GenAuftrag
       }
       $this->app->Tpl->Set('PREISANFRAGE', implode('<br />', $priceRequestsHtml));
     }
-
+/*
     $tmpVersand = !$hasDeliveryNotes?[]: $this->app->DB->SelectFirstCols(
       "SELECT if(v.versendet_am!='0000-00-00', 
         CONCAT(DATE_FORMAT( v.versendet_am,'%d.%m.%Y'),' ',v.versandunternehmen),
@@ -2353,6 +2397,39 @@ class Auftrag extends GenAuftrag
     else {
       $this->app->Tpl->Set('TRACKING',$tmpVersand);
     }
+*/
+
+
+      $sql = "SELECT SQL_CALC_FOUND_ROWS
+                v.id,                   
+                v.tracking as tracking,
+                v.tracking_link
+            FROM 
+                versandpakete v
+            LEFT JOIN
+                versandpaket_lieferschein_position vlp ON v.id = vlp.versandpaket
+            LEFT JOIN
+                lieferschein_position lp ON lp.id = vlp.lieferschein_position
+            LEFT JOIN
+                lieferschein l ON lp.lieferschein = l.id
+            LEFT JOIN
+                lieferschein lop ON lop.id = v.lieferschein_ohne_pos 
+            WHERE 
+                l.auftragid = ".$id." OR lop.auftragid = ".$id."
+            GROUP BY 
+               v.id
+            ";
+    $tracking = $this->app->DB->SelectArr($sql);
+
+    $tracking_list = array();
+    foreach ($tracking as $single_tracking) {
+        $tracking_list[] =  '<a href="index.php?module=versandpakete&action=edit&id='.$single_tracking['id'].'">Paket Nr.'.$single_tracking['id'].'</a>'.
+                            ' ('.'<a href="'.$single_tracking['tracking_link'].'">'.$single_tracking['tracking'].'</a>'.')';
+    }
+
+    $this->app->Tpl->Set('TRACKING',implode('<br>',$tracking_list));
+
+
 
 
     $icons = $this->app->YUI->IconsSQL();
@@ -4916,6 +4993,10 @@ class Auftrag extends GenAuftrag
       $this->app->erp->AdresseAlsLieferadresseButton($adresse);
     }
 
+    if ($schreibschutz != 1 AND $status != 'abgeschlossen') {
+        $this->app->erp->BerechneDeckungsbeitrag($id,'auftrag');
+    }
+
     if($nummer!='') {
       $this->app->Tpl->Set('NUMMER',$nummer);
       if($this->app->erp->RechteVorhanden('adresse','edit')){
@@ -5694,8 +5775,13 @@ Die Gesamtsumme stimmt nicht mehr mit urspr&uuml;nglich festgelegten Betrag '.
         }
 
         $this->app->DB->Update("UPDATE lieferschein SET 
-            belegnr='$ls_belegnr', status='freigegeben', versand='".$this->app->User->GetDescription()."' 
+                                    belegnr='$ls_belegnr',  
-            WHERE id='$lieferschein' LIMIT 1");
+                                    status='freigegeben',
+                                    versand='".$this->app->User->GetDescription()."',
+                                    versand_status = 1
+                                WHERE id='$lieferschein' LIMIT 1");
+
+        // Versand_status: 1 = process in versandpakete, 2 = finished, 3 = finished manually
 
         $this->app->erp->LieferscheinProtokoll($lieferschein, 'Lieferschein freigegeben');
 
@@ -6342,7 +6428,7 @@ Die Gesamtsumme stimmt nicht mehr mit urspr&uuml;nglich festgelegten Betrag '.
     $this->app->erp->MenuEintrag('index.php?module=auftrag&action=list','&Uuml;bersicht');
     $this->app->erp->MenuEintrag('index.php?module=auftrag&action=create','Neuen Auftrag anlegen');
     $this->app->erp->MenuEintrag('index.php?module=auftrag&action=offene','Offene Positionen');
-    $this->app->erp->MenuEintrag('index.php?module=auftrag&action=versandzentrum','Versandzentrum');
+    $this->app->erp->MenuEintrag('index.php?module=auftrag&action=versandzentrum','Versand&uuml;bergabe');
 
     if(strlen($backurl)>5){
       $this->app->erp->MenuEintrag("$backurl", 'Zur&uuml;ck zur &Uuml;bersicht');
@@ -6387,7 +6473,7 @@ Die Gesamtsumme stimmt nicht mehr mit urspr&uuml;nglich festgelegten Betrag '.
     $this->AuftraguebersichtMenu();
     $targetMessage = 'AUTOVERSANDBERECHNEN';
 
-    $this->app->Tpl->Add('MESSAGE','<div class="info">Auftr&auml;ge an Versand übergeben mit automatischem Druck und Mailversand.</div>');
+    $this->app->Tpl->Add('MESSAGE','<div class="info">Auftr&auml;ge an Versand übergeben mit automatischem Druck und Mailversand. <a class="button" href="index.php?module=versandpakete&action=lieferungen">Zum Versand</a></div>');
 
     $autoshipmentEnabled = true;
     $this->app->erp->RunHook('OrderAutoShipment', 2, $targetMessage, $autoshipmentEnabled);

www/pages/content/auftrag_minidetail.tpl

@@ -37,7 +37,7 @@
 <tr><td class="auftraginfo_cell">{|Bestellung|}:</td><td class="auftraginfo_cell" >[BESTELLUNG]</td><td class="auftraginfo_cell">{|Eigene Umsatzsteuer ID|}:</td><td class="auftraginfo_cell">[DELIVERYTHRESHOLDVATID]</td></tr>
 <tr><td class="auftraginfo_cell">{|Retoure|}:</td><td class="auftraginfo_cell" >[RETOURE]</td><td class="auftraginfo_cell"></td><td class="auftraginfo_cell"></td></tr>
 <tr><td class="auftraginfo_cell">{|Preisanfrage|}:</td><td class="auftraginfo_cell" >[PREISANFRAGE]</td><td class="auftraginfo_cell"></td><td class="auftraginfo_cell"></td></tr>
-<tr><td class="auftraginfo_cell">{|Tracking|}:</td><td class="auftraginfo_cell" >[TRACKING]</td><td class="auftraginfo_cell"></td><td class="auftraginfo_cell"></td></tr>
+<tr><td class="auftraginfo_cell">{|Pakete|}:</td><td class="auftraginfo_cell" >[TRACKING]</td><td class="auftraginfo_cell"></td><td class="auftraginfo_cell"></td></tr>
 </table>
 
 <table width="100%">
@@ -48,19 +48,14 @@
   <td style="" width="50%">[VERSANDTEXT]</td>
 [RMAENDIF]
 </tr>
-
 </table>
-
 <div style="background-color:white">
 <div style="padding:10px">
   [RECHNUNGLIEFERADRESSE]
 </div>
 </div>
-
-
 </div>
 <div style="float:left; width:50%">
-
 <div style="overflow:auto;max-height:550px;">
 <div style="background-color:white;">
 <h2 class="greyh2">Artikel</h2>
@@ -69,63 +64,55 @@
 <i style="color:#999">* Die linke Zahl zeigt die für den Kunden reservierten Einheiten und die rechte Zahl die global reservierte Anzahl.</i>
 </div>
 </div>
-
 [MINIDETAILNACHARTIKEL]
-<!--    
+<div style="background-color:white" [DBHIDDEN]>
-<div style="background-color:white;">
+    <h2 class="greyh2">{|Deckungsbeitrag (netto)|}</h2>
-<h2 class="greyh2">Lieferkette</h2>
+    <table width="100%">
-<div style="padding:10px">
+        <tbody>
-<table class="mkTable">
+            <tr>
-<tr><th>Art</th><th>Beleg</th><th>Datum</th><th>Lieferant</th><th>Status</th></tr>
+                <td>Umsatz EUR</td>
-<tr><td>Bestellung</td><td>ENTWURF</td><td></td><td>In-Circuit<br>200 x 777777 SMT USBprog 1)</td><td>-</td></tr>
+                <td>Kosten EUR</td>
-<tr><td>Anlieferung</td><td>200000</td><td></td><td>In-Circuit<br>200 x 777777 ATMEGA32</td><td>offen</td></tr>
+                <td>Deckungsbeitrag EUR</td>
-<tr><td>Bestellung</td><td>100023</td><td></td><td>Instanet<br>200 x USBprog 5.0 Spezial Elektor<br>200 x 777777 Flashen + Montieren</td><td>offen</td></tr>
+                <td>DB %</td>
-<tr><td>Anlieferung</td><td>200002</td><td></td><td>Instanet<br>200 x 777777 SMT USBprog 1)<br>200 x 122222 Gehäuse</td><td>offen</td></tr>
+            </tr>
-</table>
+            <tr>
+              <td class="greybox" width="25%">[NETTOGESAMT]</td>
+              <td class="greybox" width="25%">[KOSTEN]</td>
+              <td class="greybox" width="25%">[DECKUNGSBEITRAG]</td>
+              <td class="greybox" width="25%">[DBPROZENT]</td>
+            </tr>
+        </tbody>
+    </table>
 </div>
-</div>
--->
-
 <div style="background-color:white">
 <h2 class="greyh2">{|Zahlungen|}</h2>
 <div style="padding:10px">
   [ZAHLUNGEN]
 </div>
 </div>
-
 <div style="background-color:white">
 <h2 class="greyh2">{|Protokoll|}</h2>
 <div style="padding:10px;">
   [PROTOKOLL]
 </div>
 </div>
-
 [VORPRODUKTIONPROTOKOLL]
 [PRODUKTIONPROTOKOLL]
 [NACHPRODUKTIONPROTOKOLL]
-
+<!--
 <div style="background-color:white">
-<h2 class="greyh2">{|RMA Prozess|}</h2>
+    <h2 class="greyh2">{|RMA Prozess|}</h2>
-<div style="padding:10px">
+    <div style="padding:10px">
-  [RMA]
+      [RMA]
-</div>
+    </div>
 </div>
+-->
 <div style="background-color:white">
 <h2 class="greyh2">{|PDF-Archiv|}</h2>
 <div style="padding:10px;overflow:auto;">
   [PDFARCHIV]
-</div>
-</div>
-<div style="background-color:white">
-<h2 class="greyh2">{|Deckungsbeitrag|}</h2>
-<div style="padding:10px">
-
-<div class="info">{|Dieses Modul ist erst ab Version Professional verfügbar|}</div>
-
-
 </div>
 </div>
 [INTERNEBEMERKUNGEDIT]
-
 </div>
 </div>

www/pages/content/geschaeftsbrief_vorlagen_list.tpl

@@ -122,7 +122,7 @@
                 <li>{|Stornierung|} <i>{|Variablen|}: {AUFTRAG}, {DATUM}, {INTERNET}</i></li>
                 <li>{|ZahlungMiss|} <i>{|Variablen|}: {AUFTRAG}, {DATUM}, {GESAMT}, {REST}, {ANSCHREIBEN}, {INTERNET}</i></li>
                 <li>Mahnung <i>Variablen: {BELEGNR}, {DATUM}, {OFFEN}, {MAHNGEBUEHR}, {HEUTE}</i></li>
-                <li>{|Versand|} <i>{|Variablen|}: {VERSAND}, {VERSANDTYPE}, {VERSANDBEZEICHNUNG}, {TRACKINGNUMMER}, {NAME}, {ANSCHREIBEN}, {BELEGNR}, {IHREBESTELLNUMMER}, {INTERNET}, {AUFTRAGDATUM}, {LIEFERADRESSE}, {LIEFERADRESSELANG}</i></li>
+                <li>{|Versand|} <i>{|Variablen|}: {VERSAND}, {VERSANDTYPE}, {VERSANDBEZEICHNUNG}, {TRACKINGNUMMER}, {TRACKINGLINK}, {NAME}, {ANSCHREIBEN}, {BELEGNR}, {IHREBESTELLNUMMER}, {INTERNET}, {AUFTRAGDATUM}, {LIEFERADRESSE}, {LIEFERADRESSELANG}</i></li>
                 <li>{|VersandMailDokumente|} <i>{|Variablen|}: {NAME}, {ANSCHREIBEN}, {BELEGNR}, {IHREBESTELLNUMMER}, {INTERNET}, {AUFTRAGDATUM}</i></li>
                 <li>{|Erweiterte Freigabe|} <i>{|Variablen|}: {REQUESTER}, {LINK}, {LINKFREIGABEUEBERSICHT}, {DOCTYPE}, {DOCTYPE_ID}</i></li>
                 <li>{|Selbstabholer|}</li>

www/pages/content/lieferschein_minidetail.tpl

@@ -22,7 +22,7 @@
 <tr><td class="auftraginfo_cell">Projekt:</td><td class="auftraginfo_cell">[PROJEKT]</td><td class="auftraginfo_cell">Angebotssumme:</td><td class="auftraginfo_cell">[GESAMTSUMME]</td></tr>
 <tr><td class="auftraginfo_cell">Auftrag:</td><td class="auftraginfo_cell">[AUFTRAG]</td><td class="auftraginfo_cell">Versteuerung:</td><td class="auftraginfo_cell">[STEUER]</td></tr>
 <tr><td class="auftraginfo_cell">Rechnung:</td><td class="auftraginfo_cell">[RECHNUNG]</td><td class="auftraginfo_cell">Gewicht (netto):</td><td class="auftraginfo_cell">[GEWICHT]</td></tr>
-<tr><td class="auftraginfo_cell">Tracking:</td><td class="auftraginfo_cell">[TRACKING]</td><td class="auftraginfo_cell">Versandart:</td><td class="auftraginfo_cell">[VERSANDART]</td></tr>
+<tr><td class="auftraginfo_cell">Pakete:</td><td class="auftraginfo_cell">[TRACKING]</td><td class="auftraginfo_cell">Versandart:</td><td class="auftraginfo_cell">[VERSANDART]</td></tr>
 <tr><td class="auftraginfo_cell">Retoure:</td><td class="auftraginfo_cell">[RETOURE]</td><td class="auftraginfo_cell"></td><td class="auftraginfo_cell"></td></tr>
 </table>
 

www/pages/content/lieferscheinuebersicht.tpl

@@ -17,33 +17,6 @@
 				<li class="filter-item"><input type="checkbox" id="anlieferanten"><label for="anlieferanten">{|an Lieferanten|}</label></li>
 			</ul>
 		</div>
-
-		<div class="filter-block filter-inline">
-			<div class="filter-title">{|Filter Versandzentrum|}</div>
-			<ul class="filter-list">
-				<li class="filter-item">
-					<label for="abgeschlossenlogistik" class="switch">
-						<input type="checkbox" id="abgeschlossenlogistik">
-						<span class="slider round"></span>
-					</label>
-					<label for="abgeschlossenlogistik">{|abgeschlossen &uuml;ber Logistik|}</label>
-				</li>
-				<li class="filter-item">
-					<label for="nochinlogistik" class="switch">
-						<input type="checkbox" id="nochinlogistik">
-						<span class="slider round"></span>
-					</label>
-					<label for="nochinlogistik">{|noch in Logistik|}</label>
-				</li>
-				<li class="filter-item">
-					<label for="manuellabgeschlossen" class="switch">
-						<input type="checkbox" id="manuellabgeschlossen">
-						<span class="slider round"></span>
-					</label>
-					<label for="manuellabgeschlossen">{|manuell abgeschlossen|}</label>
-				</li>
-			</ul>
-		</div>
 	</div>
 
 [MESSAGE]
@@ -56,6 +29,7 @@
 <option value="offen">{|als offen markieren|}</option>
 <option value="versendet">{|als versendet markieren|}</option>
 <option value="storniert">{|als storniert markieren|}</option>
+<option value="versanduebergabe">{|in Versand geben|}</option>
 <option value="pdf">{|Sammel-PDF|}</option>
 <option value="drucken">{|drucken|}</option>
 </select>&nbsp;{|Drucker|}: <select name="seldrucker">[SELDRUCKER]</select>&nbsp;<input type="submit" class="btnBlue" name="ausfuehren" value="{|ausf&uuml;hren|}" />

www/pages/content/ticket_edit.tpl

@@ -19,7 +19,7 @@
 	        				<fieldset>
                                 <table width="100%" border="0" class="mkTableFormular">
                                     <legend>{|[STATUSICON]<b>Ticket <font color="blue">#[SCHLUESSEL]</font></b>|}</legend>
-                                    <tr><td>{|Betreff|}:</td><td><input type="text" name="betreff" id="betreff" value="[BETREFF]" size="100%"></td></tr>
+                                    <tr><td>{|Betreff|}:</td><td><input type="text" name="betreff" id="betreff" value="[BETREFF]" style="width: 100%;"></td></tr>
                                     <tr><td>{|Von|}:</td><td>[KUNDE]&nbsp;[MAILADRESSE]</td></tr>
                                     <tr><td>{|Projekt|}:</td><td><input type="text" name="projekt" id="projekt" value="[PROJEKT]" size="20"></td></tr>
                                     <tr><td>{|Adresse|}:</td><td><input type="text" name="adresse" id="adresse" value="[ADRESSE]" size="20"><a href="index.php?module=adresse&action=edit&id=[ADRESSE_ID]"><img src="./themes/new/images/forward.svg" border="0" style="top:6px; position:relative"></a></td></tr>

www/pages/content/versandarten_neu.tpl

@@ -23,6 +23,9 @@ SPDX-License-Identifier: LicenseRef-EGPL-3.1
             [MODULEINSTALLIERT]
         </fieldset>
         [TAB1NEXT]
+        <form id="neu" action="index.php?module=versandarten&action=neusonstige" method="post">
+            <button name="submit" value="neusonstige" class="ui-button-icon">Versandart ohne Modul anlegen</button>
+        </form>
     </div>
 
 <!-- tab view schließen -->

www/pages/content/versandpakete_add.tpl

@@ -0,0 +1,80 @@
+<div id="tabs">
+    <ul>
+        <li><a href="#tabs-1"></a></li>
+    </ul>
+    <div id="tabs-1">
+        [MESSAGE]
+        <form action="index.php?module=versandpakete&action=add&id=[ID]&lieferschein=[LIEFERSCHEIN_ID]" method="post">   
+            [FORMHANDLEREVENT]
+            <div class="row">
+	        	<div class="row-height">
+	        		<div class="col-xs-14 col-md-10 col-md-height">
+	        			<div class="inside inside-full-height">
+	        				<fieldset>
+                                <legend>{|Hinzuf&uuml;gen von Artikeln aus <a href="index.php?module=lieferschein&action=edit&id=[LIEFERSCHEIN_ID]"><b>Lieferschein [LIEFERSCHEIN]</b></a> zu Versandpaket <b>Nr. [ID]</b>|}</legend>
+                                <table width="100%" border="0" class="mkTableFormular">                                
+                                    <tr>
+                                        <td>
+                                            {|Artikel|}:
+                                        </td>
+                                        <td>
+                                            <input type="text" name="artikel" id="artikel" value="" size="40" autofocus>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            {|Menge|}:
+                                        </td>
+                                        <td>
+                                            <input type="number" name="menge" id="menge" value="" min="1" size="40">
+                                        </td>
+                                    </tr>          
+                                </table>                               
+                            </fieldset>            
+                        </div>
+               		</div>
+                    <div class="col-xs-14 col-md-2 col-md-height">
+	        			<div class="inside inside-full-height">
+	        				<fieldset>
+                                <legend>{|Aktionen|}</legend>
+                                <table width="100%" border="0" class="mkTableFormular">
+                                    <tr><td><button name="submit" value="hinzufuegen" class="ui-button-icon" style="width:100%;">Hinzuf&uuml;gen</button></td></tr>
+                                    <tr><td><button name="submit" value="lieferschein_komplett_hinzufuegen" class="ui-button-icon" style="width:100%;">Alle hinzuf&uuml;gen</button></td></tr>
+                                    <tr><td><button form="back" name="submit" value="fertig" class="ui-button-icon" style="width:100%;">Fertig</button></td></tr>
+                                </table>
+                            </fieldset>            
+                        </div>
+               		</div>
+               	</div>	
+            </div>        
+            <div class="row">
+	        	<div class="row-height">
+	        		<div class="col-xs-12 col-md-12 col-md-height">
+	        			<div class="inside inside-full-height">
+	        				<fieldset>
+                                <legend>{|Lieferscheininhalt|}</legend>
+                                [LIEFERSCHEININHALT]
+                            </fieldset>            
+                        </div>
+               		</div>
+               	</div>	
+            </div>     
+            <div class="row">
+	        	<div class="row-height">
+	        		<div class="col-xs-12 col-md-12 col-md-height">
+	        			<div class="inside inside-full-height">
+	        				<fieldset>
+                                <legend>{|Paketinhalt|}</legend>
+                                [PAKETINHALT]
+                            </fieldset>            
+                        </div>
+               		</div>
+               	</div>	
+            </div> 
+            <input type="text" name="lieferschein" id="lieferschein" value="[LIEFERSCHEIN]" size="40" hidden>
+        </form>
+        <form action="index.php?module=versandpakete&action=edit&id=[VERSANDPAKET_ID]" id="back" method="post">
+        </form>                                    
+    </div>      
+</div>
+

www/pages/content/versandpakete_edit.tpl

@@ -0,0 +1,147 @@
+<div id="tabs">
+    <ul>
+        <li><a href="#tabs-1"></a></li>
+    </ul>
+    <div id="tabs-1">
+        [MESSAGE]        
+        [FORMHANDLEREVENT]
+        <form id="save" action="" method="post">   
+            <div class="row">
+            	<div class="row-height">
+            		<div class="col-xs-14 col-md-6 col-md-height">
+            			<div class="inside inside-full-height">
+            				<fieldset>
+                                <legend>
+                                    {|<b>Versandpaket Nr. [ID]</b> vom [DATUM]<span [NO_ADDRESS_HIDDEN]> f&uuml;r Adresse '[ADRESSE]'|}</span>
+                                </legend>
+                                [ICONS]
+                                <table width="100%" border="0" class="mkTableFormular">                                   
+                                    <tr>
+                                        <td>
+                                            {|Status|}:
+                                        </td>
+                                        <td>
+                                            <input type="text" name="" id="" value="[STATUS]" size="40" disabled>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            {|Versender|}:
+                                        </td>
+                                        <td>
+                                            <input type="text" name="" id="" value="[VERSENDER]" size="40" disabled>
+                                        </td>
+                                    </tr>    
+                                    <tr>
+                                        <td>
+                                            {|Versandart|}:
+                                        </td>
+                                        <td>
+                                            <input type="text" name="" id="" value="[VERSANDART]" size="40" disabled>
+                                        </td>
+                                    </tr>    
+                                    <tr>
+                                        <td>
+                                            {|Tracking|}:
+                                        </td>
+                                        <td>
+                                            <input type="text" name="tracking" id="tracking" value="[TRACKING]" size="40" [TRACKING_DISABLED]>
+                                            <a href="[PAKETMARKE_LINK]" [PAKETMARKE_HIDDEN]>
+                                                <img src="themes/new/images/portogo.png" border="0" title="Zur Paketmarke" style="top:6px; position:relative">
+                                            </a>
+                                            <a href="[TRACKING_LINK]" [TRACKING_LINK_HIDDEN]>
+                                                <img src="themes/new/images/forward.svg" border="0" title="Zum Tracking" style="top:6px; position:relative">
+                                            </a>
+                                        </td>
+                                    </tr>
+                                    <tr [TRACKING_LINK_EDIT_HIDDEN]>
+                                        <td>
+                                            {|Tracking link|}:
+                                        </td>
+                                        <td>
+                                            <input type="text" name="tracking_link" id="tracking_link" value="[TRACKING_LINK]" size="40" [TRACKING_DISABLED]>                                           
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            {|Gewicht Kg|}:
+                                        </td>
+                                        <td>
+                                            <input type="number" name="" id="" value="[GEWICHT]" size="40" disabled>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            {|Bemerkung|}:
+                                        </td>
+                                        <td>
+                                            <textarea name="bemerkung" id="bemerkung" rows="3" style="width:100%;">[BEMERKUNG]</textarea>
+                                        </td>
+                                    </tr>                                
+                                </table>
+                            </fieldset>            
+                        </div>
+               		</div>
+                    <div class="col-xs-14 col-md-6 col-md-height">
+            			<div class="inside inside-full-height">
+                            <fieldset >
+                                <legend>{|Lieferschein|}</legend>
+                                <table width="100%" border="0" class="mkTableFormular"> 
+                                    <tr [LIEFERSCHEIN_OHNE_POS_HIDDEN]>
+                                        <td>
+                                            {|Zugeordnet|}:
+                                        </td>
+                                        <td>
+                                            <input form="add" type="text" name="" id="" value="[LIEFERSCHEIN_OHNE_POS]" size="40" disabled>
+                                            <a href="index.php?module=lieferschein&action=edit&id=[LIEFERSCHEIN_OHNE_POS_ID]"><img src="themes/new/images/forward.svg" title="Zum Lieferschein" border="0" style="top:6px; position:relative"></a>
+                                        </td>
+                                    </tr>      
+                                    <tr [LIEFERSCHEIN_ADD_POS_HIDDEN]>
+                                        <td>
+                                            {|Lieferschein für Artikel hinzuf&uuml;gen|}:
+                                        </td>
+                                        <td>
+                                            <input form="add" type="text" name="lieferschein" id="lieferschein" value="[LIEFERSCHEIN]" autofocus size="40">
+                                        </td>
+                                    </tr>      
+                                </table>
+                            </fieldset>                                             
+                        </div>
+               		</div>
+                    <div class="col-xs-14 col-md-2 col-md-height">
+            			<div class="inside inside-full-height">
+            				<fieldset>
+                                <legend>{|Aktionen|}</legend>
+                                <table width="100%" border="0" class="mkTableFormular">
+                                    <tr><td><button form="save" name="submit" value="speichern" class="ui-button-icon" style="width:100%;">Speichern</button></td></tr>
+                                    <tr [LIEFERSCHEIN_ADD_POS_HIDDEN]><td><button form="add" name="submit" value="lieferschein_hinzufuegen" class="ui-button-icon" style="width:100%;">Artikel hinzuf&uuml;gen</button></td></tr>
+                                    <tr [LIEFERSCHEIN_ADD_POS_HIDDEN]><td><button form="add" name="submit" value="lieferschein_komplett_hinzufuegen" class="ui-button-icon" style="width:100%;">Alle Artikel hinzuf&uuml;gen</button></td></tr>
+                                    <tr [PAKETMARKE_ADD_HIDDEN]><td><button form="paketmarke" name="submit" value="paketmarke" class="ui-button-icon" style="width:100%;">Paketmarke drucken</button></td></tr>
+                                    <tr [ABSENDEN_HIDDEN]><td><button name="submit" value="absenden" class="ui-button-icon" style="width:100%;">Absenden</button></td></tr>
+                                    <tr [ABSCHLIESSEN_HIDDEN]><td><button name="submit" value="abschliessen" class="ui-button-icon" style="width:100%;">Abschlie&szlig;en</button></td></tr>
+                                </table>
+                            </fieldset>            
+                        </div>
+               		</div>
+               	</div>	
+            </div>          
+        </form>
+        <form id="add" action="index.php?module=versandpakete&action=add&id=[ID]" method="post">
+        </form>
+        <form id="paketmarke" action="index.php?module=versandpakete&action=paketmarke&id=[ID]" method="post">
+        </form>
+        <div class="row" [LIEFERSCHEIN_POS_HIDDEN]>
+        	<div class="row-height">
+        		<div class="col-xs-12 col-md-12 col-md-height">
+        			<div class="inside inside-full-height">
+        				<fieldset>
+                            <legend>{|Paketinhalt|}</legend>
+                            [PAKETINHALT]
+                        </fieldset>            
+                    </div>
+           		</div>
+           	</div>	
+        </div> 
+    </div>      
+</div>
+

www/pages/content/versandpakete_lieferung.tpl

@@ -0,0 +1,50 @@
+<div id="tabs">
+    <ul>
+            <li><a href="#tabs-1">[TABTEXT1]</a></li>
+    </ul>
+    <div id="tabs-1">
+       <div class="row">
+        	<div class="row-height">
+        		<div class="col-xs-12 col-md-12 col-md-height">
+        			<div class="inside inside-full-height">
+        				<fieldset>
+                            <legend>{|<b>Lieferung zu <font color="blue"><a href="index.php?module=lieferschein&action=edit&id=[BELEGID]">Lieferschein [BELEGNR]</a></font></b>|}</legend>                              
+                        </fieldset>            
+                    </div>
+           		</div>
+           	</div>	
+        </div>
+        [MESSAGE]        
+        <div class="row">
+        	<div class="row-height">
+        		<div class="col-xs-12 col-md-12 col-md-height">
+        			<div class="inside inside-full-height">
+                        <form action="index.php?module=versandpakete&action=stapelverarbeitung&from=lieferung&id=[FROMID]" id="frmauto" name="frmauto" method="post">
+                            [TAB1]
+                            <fieldset>
+                                <table>
+                                    <legend>Stapelverarbeitung</legend>
+                                    <tr>
+                                       <tr><td>{|Status|}:</td><td><select name="status">[STATUS_OPTIONS]</select></td></tr>
+                                       <td><input type="checkbox" value="1" id="autoalle" />&nbsp;alle markieren&nbsp;</td><td><input type="submit" class="btnBlue" name="status_setzen" value="{|Status setzen|}" /></td>
+                                    </tr>
+                                </table>
+                            </fieldset>
+                        </form>
+                    </div>
+           		</div>
+           	</div>	
+        </div>
+        [TAB1NEXT]
+    </div>
+</div>
+
+<script>
+
+    $('#autoalle').on('change',function(){
+      var wert = $(this).prop('checked');
+      $('#versandpakete_list').find('input[type="checkbox"]').prop('checked',wert);
+      $('#versandpakete_list').find('input[type="checkbox"]').first().trigger('change');
+    });
+  
+</script>

www/pages/content/versandpakete_lieferungen.tpl

@@ -0,0 +1,32 @@
+<div id="tabs">
+    <ul>
+            <li><a href="#tabs-1">[TABTEXT1]</a></li>
+    </ul>
+    <div id="tabs-1">
+        [MESSAGE]
+        <div class="filter-box filter-usersave">
+            <div class="filter-block filter-inline">
+                <div class="filter-title">{|Filter|}</div>
+                <ul class="filter-list">
+                    [STATUSFILTER]   
+                    <li class="filter-item">
+                        <label for="unterwegs" class="switch">
+                            <input type="checkbox" id="unterwegs">
+                            <span class="slider round"></span>
+                        </label>
+                        <label for="unterwegs">{|Unterwegs|}</label>
+                    </li>                 
+                    <li class="filter-item">
+                        <label for="geschlossene" class="switch">
+                            <input type="checkbox" id="geschlossene">
+                            <span class="slider round"></span>
+                        </label>
+                        <label for="geschlossene">{|Zzgl. abgeschlossen|}</label>
+                    </li>
+                </ul>
+            </div>
+        </div>
+        [TAB1]
+        [TAB1NEXT]
+    </div>
+</div>

www/pages/content/versandpakete_list.tpl

@@ -0,0 +1,53 @@
+<div id="tabs">
+    <ul>
+            <li><a href="#tabs-1">[TABTEXT1]</a></li>
+    </ul>
+    <div id="tabs-1">
+        [MESSAGE]
+        <div class="filter-box filter-usersave">
+            <div class="filter-block filter-inline">
+                <div class="filter-title">{|Filter|}</div>
+                <ul class="filter-list">
+                    [STATUSFILTER]                    
+                    <li class="filter-item">
+                        <label for="geschlossene" class="switch">
+                            <input type="checkbox" id="geschlossene">
+                            <span class="slider round"></span>
+                        </label>
+                        <label for="geschlossene">{|Zzgl. abgeschlossen|}</label>
+                    </li>
+                    <li class="filter-item">
+                        <label for="stornierte" class="switch">
+                            <input type="checkbox" id="stornierte">
+                            <span class="slider round"></span>
+                        </label>
+                        <label for="stornierte">{|Zzgl. Papierkorb|}</label>
+                    </li>
+                </ul>
+            </div>
+        </div>
+        <form action="index.php?module=versandpakete&action=stapelverarbeitung" id="frmauto" name="frmauto" method="post">
+            [TAB1]
+            <fieldset>
+                <table>
+                    <legend>Stapelverarbeitung</legend>
+                    <tr>
+                       <tr><td>{|Status|}:</td><td><select name="status">[STATUS_OPTIONS]</select></td></tr>
+                       <td><input type="checkbox" value="1" id="autoalle" />&nbsp;alle markieren&nbsp;</td><td><input type="submit" class="btnBlue" name="status_setzen" value="{|Status setzen|}" /></td>
+                    </tr>
+                </table>
+            </fieldset>
+        </form>
+        [TAB1NEXT]
+    </div>
+</div>
+
+<script>
+
+    $('#autoalle').on('change',function(){
+      var wert = $(this).prop('checked');
+      $('#versandpakete_list').find('input[type="checkbox"]').prop('checked',wert);
+      $('#versandpakete_list').find('input[type="checkbox"]').first().trigger('change');
+    });
+  
+</script>

www/pages/content/wareneingang_paketannahme.tpl

@@ -12,10 +12,10 @@
         <div class="row-height">
           <div class="col-xs-12 col-md-8 col-md-height">
             <div class="inside inside-full-height">
-
               <div class="filter-box filter-usersave">
-                <div class="filter-block filter-inline">
+                 <div class="filter-block filter-inline">
                   <fieldset>
+                     <legend>{|Neuen Wareneingang erzeugen|}</legend>
                     <div class="filter-title">{|Filter|}</div>
                     <ul class="filter-list">
                       <li class="filter-item">

www/pages/content/wareneingang_paketinhalt.tpl

@@ -25,7 +25,7 @@
                   <tr><td>{|Rechnung-Nr.|}:</td><td><input type=text size="40" name="renr" value=[RENR]></td></tr>
                   <tr><td>{|Bemerkung|}:</td><td><textarea rows="5" cols="40" name="bemerkung">[BEMERKUNG]</textarea></td></tr>
                   [ISLIEFERANTSTART]
-                  <tr><td>{|Ziellager|}:</td><td><input type=text size="40" name="ziellager" id="ziellager" value=[LAGER]></td></tr>
+                  <tr><td>{|Ziellager|}:</td><td><input type=text size="40" name="ziellager" id="ziellager" value=[LAGER]><br><i>Wenn nicht angegeben, wird das Standardlager des Artikels bebucht.</i></td></tr>
                   [ISLIEFERANTENDE]                
                 </table>
               </fieldset>
@@ -40,6 +40,7 @@
                     [DISTRIINHALTBUTTONS]
                     [BEFOREFRM]
                     [AFTERFRM]         
+                    <button name="submit" class="ui-button-icon" style="width:100%;" value="speichern" hidden="true"></button>
                     <table width="100%" border="0" class="mkTableFormular">
                         <legend>{|Aktionen|}</legend>                        
                         [BEFOREMANUELLERFASSEN]            
@@ -48,14 +49,12 @@
                         </td></tr>
                         [AFTERMANUELLERFASSEN]
                         [ISLIEFERANTSTART]
-<!--
                         <tr><td>               
                             <button name="submit" class="ui-button-icon" style="width:100%;" value="fuellen">{|Aus Bestellungen f&uuml;llen|}</button>
                         </td></tr>
                         <tr><td>               
                             <button name="submit" class="ui-button-icon" style="width:100%;" value="leeren">{|Leeren|}</button>
                         </td></tr>
--->
                         [ISLIEFERANTENDE]                
                         <tr><td>               
                             <button name="submit" class="ui-button-icon" style="width:100%;" value="speichern">{|Speichern|}</button>

www/pages/emailbackup.php

@@ -300,7 +300,7 @@ $width = array('10%'); // Fill out manually later
         $result[0]['email'],
         $result[0]['angezeigtername'],
         'OpenXE ERP: Testmail',
-        'Dies ist eine Testmail für Account "'.$result[0]['email'].'".',
+        utf8_encode('Dies ist eine Testmail für Account "'.$result[0]['email'].'".'),
         '',0,false,'','',
         true
       )

www/pages/exportbuchhaltung.php

@@ -609,7 +609,7 @@ class Exportbuchhaltung
                     $data['Soll-/Haben-Kennzeichen'] = $typ['kennzeichen_negativ']; // obligatory        
                 }
 
-                $data['EU-Steuersatz (Bestimmung)'] = number_format($$tmpsteuersatz, 2, ',', '');
+                $data['EU-Steuersatz (Bestimmung)'] = number_format($tmpsteuersatz, 2, ',', '');
                 $data['WKZ Umsatz'] = $row['pos_waehrung'];
                 $data['Belegfeld 1'] = mb_strimwidth($row['belegnr'],0,12);
                 $data['Konto'] = $row['kundennummer']; // obligatory

www/pages/lieferschein.php

@@ -468,7 +468,8 @@ class Lieferschein extends GenLieferschein
         AND v.aktiv = 1 AND v.ausprojekt = 0 AND v.modul != ''
         ORDER BY v.projekt DESC LIMIT 1");
     if (empty($result['modul']) || empty($result['id'])) {
-      $this->app->Tpl->addMessage('error', 'Bitte zuerst eine gültige Versandart auswählen', false, 'PAGE');
+//      $this->app->Tpl->addMessage('error', 'Bitte zuerst eine gültige Versandart auswählen', false, 'PAGE');
+        $this->app->Location->execute("index.php?module=versandpakete&action=add&lieferschein=".$id);
       return;
     }
     $versandmodul = $this->app->erp->LoadVersandModul($result['modul'], $result['id']);
@@ -960,6 +961,7 @@ class Lieferschein extends GenLieferschein
 
     $this->app->Tpl->Set('VERSANDART',$auftragArr[0]['versandart']);
 
+/*
     $tracking = $this->app->DB->SelectArr("SELECT
        if(v.tracking_link IS NOT NULL AND v.tracking_link != '', CONCAT(UPPER(versandunternehmen), ':<a href=\"', v.tracking_link, '\">', v.tracking, '</a>'),
          if(versandunternehmen = 'dhlexpress' AND l.land = 'DE' AND v.tracking != '', CONCAT(UPPER(versandunternehmen), ':<a href=\"https://www.dhl.de/de/privatkunden/pakete-empfangen/verfolgen.html?piececode=', v.tracking, '\" target=\"_blank\">', v.tracking, '</a>'),
@@ -1018,7 +1020,32 @@ class Lieferschein extends GenLieferschein
 	if (!is_null($tmp)) {
 	    $this->app->Tpl->Set('TRACKING',implode(', ',$tmp));
 	}
+*/
 
+    $sql = "SELECT SQL_CALC_FOUND_ROWS
+                v.id,                   
+                v.tracking as tracking,
+                v.tracking_link
+            FROM 
+                versandpakete v
+            LEFT JOIN
+                versandpaket_lieferschein_position vlp ON v.id = vlp.versandpaket
+            LEFT JOIN
+                lieferschein_position lp ON lp.id = vlp.lieferschein_position
+            LEFT JOIN
+                lieferschein l ON lp.lieferschein = l.id
+            WHERE l.id = ".$id." OR v.lieferschein_ohne_pos = ".$id."
+            GROUP BY 
+               v.id
+            ";
+    $tracking = $this->app->DB->SelectArr($sql);
+    $tracking_list = array();
+    foreach ($tracking as $single_tracking) {
+        $tracking_list[] =  '<a href="index.php?module=versandpakete&action=edit&id='.$single_tracking['id'].'">Paket Nr.'.$single_tracking['id'].'</a>'.
+                            ' ('.'<a href="'.$single_tracking['tracking_link'].'">'.$single_tracking['tracking'].'</a>'.')';
+    }
+
+    $this->app->Tpl->Set('TRACKING',implode('<br>',$tracking_list));
 
     $returnOrders = (array)$this->app->DB->SelectArr(
       sprintf(
@@ -2259,6 +2286,18 @@ class Lieferschein extends GenLieferschein
               }
             }
           break;
+          case 'versanduebergabe':
+            if(!empty($selectedIds)) {
+              $this->app->DB->Update(
+                sprintf(
+                  "UPDATE `lieferschein` 
+                  SET `versand_status` = 1
+                  WHERE `id` IN (%s) AND `versand_status` = 0",
+                  implode(',' , $selectedIds)
+                )
+              );
+            }
+          break;
         }
       }      
     }

www/pages/paketmarke.php

@@ -1,56 +0,0 @@
-<?php
-/*
-**** COPYRIGHT & LICENSE NOTICE *** DO NOT REMOVE ****
-* 
-* Xentral (c) Xentral ERP Sorftware GmbH, Fuggerstrasse 11, D-86150 Augsburg, * Germany 2019
-*
-* This file is licensed under the Embedded Projects General Public License *Version 3.1. 
-*
-* You should have received a copy of this license from your vendor and/or *along with this file; If not, please visit www.wawision.de/Lizenzhinweis 
-* to obtain the text of the corresponding license version.  
-*
-**** END OF COPYRIGHT & LICENSE NOTICE *** DO NOT REMOVE ****
-*/
-?>
-<?php
-class Paketmarke {
-  /** @var Application $app */
-  var $app;
-
-  /**
-   * Paketmarke constructor.
-   *
-   * @param Application $app
-   * @param bool        $intern
-   */
-  public function __construct($app, $intern = false) {
-    //parent::GenPaketmarke($app);
-    $this->app=$app;
-    if($intern) {
-      return;
-    }
-
-    $this->app->ActionHandlerInit($this);
-
-    $this->app->ActionHandler("create","PaketmarkeCreatePopup");
-    $this->app->ActionHandler("tracking","PaketmarkeTracking");
-
-    $this->app->ActionHandlerListen($app);
-
-  }
-
-  function PaketmarkeTracking()
-  {
-    $this->app->erp->Headlines('Paketmarken Drucker');
-
-    $this->app->Tpl->Set('PAGE',"Tracking-Nummer: <input type=\"text\" id=\"tracking\"><script type=\"text/javascript\">document.getElementById(\"tracking\").focus(); </script>");
-    //$this->app->BuildNavigation=false;
-  }
-
-  function PaketmarkeCreatePopup()
-  {
-    $this->app->erp->Headlines('Paketmarken Drucker');
-      $this->app->erp->PaketmarkeDHLEmbedded('PAGE','lieferschein');
-  }
-}
-

www/pages/projekt.php

@@ -2727,6 +2727,8 @@ class Projekt extends GenProjekt {
 
           if($oldProjectId > 0){
             $this->createAdditionalInputForCopyProjects($oldProjectId,$check);
+            $msg = $this->app->erp->base64_url_encode("<div class=\"info\">Das Projekt wurde erfolgreich kopiert.</div>");
+            $this->app->Location->execute("index.php?module=projekt&action=uebersicht&id=$check&msg=$msg");
             return;
           }
           $msg = $this->app->erp->base64_url_encode("<div class=\"info\">Das Projekt wurde erfolgreich angelegt.</div>");
@@ -2848,7 +2850,7 @@ class Projekt extends GenProjekt {
    * @param int $copyProjectId
    * @return bool
    */
-  public function createAdditionalInputForCopyProjects(int $oldProjectId, int $copyProjectId): bool
+  public function createAdditionalInputForCopyProjects(int $oldProjectId, int $copyProjectId) 
   {
     $hasAdditionalInput = false;
     $this->app->Tpl->Set('TOID',$copyProjectId);

www/pages/versandarten.php

@@ -56,6 +56,7 @@ class Versandarten {
 
     // ab hier alle Action Handler definieren die das Modul hat
     $this->app->ActionHandler("create", "VersandartenCreate");
+    $this->app->ActionHandler("neusonstige", "VersandartenNeuSonstige");
     $this->app->ActionHandler("edit", "VersandartenEdit");
     $this->app->ActionHandler("list", "VersandartenList");
     $this->app->ActionHandler("delete", "VersandartenDelete");
@@ -153,6 +154,13 @@ class Versandarten {
     return $erg;
   }
 
+    public function VersandartenNeuSonstige() {
+        $sql = "INSERT INTO versandarten (aktiv) VALUES (1)";
+        $this->app->DB->Insert($sql);
+        $id = $this->app->DB->GetInsertID();
+        $this->app->Location->execute('index.php?module=versandarten&action=edit&id='.$id);
+    }
+
   /** @noinspection PhpUnused */
   public function VersandartenEdit(): void
   {
@@ -169,8 +177,8 @@ class Versandarten {
     if($submit != '') { // handle form submit
       $form = $this->GetInput();
       $obj = $this->loadModule($form['modul'], $id);
-      if ($obj === null)
+/*      if ($obj === null)
-        $error[] = sprintf('Versandart "%s" existiert nicht.', $form['selmodul']);
+        $error[] = sprintf('Versandart "%s" existiert nicht.', $form['selmodul']); */
 
       if(trim($form['bezeichnung']) == '')
         $error[] = 'Bitte eine Bezeichnung angeben!';

www/pages/wareneingang.php

@@ -205,7 +205,7 @@ class Wareneingang {
                                    )";
                 }
                 // SQL statement
-                $sql = "SELECT SQL_CALC_FOUND_ROWS bp.id, bp.bestellnummer, CONCAT('<a href=\"index.php?module=artikel&action=edit&id=',art.id,'\">',art.nummer,'</a>'), b.belegnr as `Bestellung`, 
+                $sql = "SELECT SQL_CALC_FOUND_ROWS bp.id, bp.bestellnummer, CONCAT('<a href=\"index.php?module=artikel&action=edit&id=',art.id,'\" tabindex=\"-1\">',art.nummer,'</a>'), b.belegnr as `Bestellung`, 
                 $colBeschreibung as beschreibung,
                 if(bp.lieferdatum,DATE_FORMAT(bp.lieferdatum,'%d.%m.%Y'),'sofort') as lieferdatum, p.abkuerzung as projekt, 
                 " . $this->app->erp->FormatMenge('bp.menge') . ", " . $this->app->erp->FormatMenge('bp.geliefert') . ", 
@@ -232,8 +232,12 @@ class Wareneingang {
                   LEFT JOIN projekt p ON b.projekt=p.id ";
                 }
 
-                $where = " b.adresse='$adresse' AND b.belegnr != '' 
+                $where = " 
-              AND bp.geliefert < bp.menge AND (bp.abgeschlossen IS NULL OR bp.abgeschlossen=0)  AND (b.status='versendet' OR b.status='freigegeben') " . $this->app->erp->ProjektRechte();
+                    b.adresse='$adresse' AND
+                    b.belegnr != '' AND bp.geliefert < bp.menge AND 
+                    (bp.abgeschlossen IS NULL OR bp.abgeschlossen=0) AND 
+                    (b.status='versendet' OR b.status='freigegeben')
+                    " . $this->app->erp->ProjektRechte();
 
                 // gesamt anzahl
                 $count = "
@@ -1691,8 +1695,56 @@ class Wareneingang {
 
         switch ($submit) {
             case 'fuellen':
+                // Get bestellung_position from form
+                $form_input = $this->app->Secure->GetPOSTArray();
+                foreach ($form_input as $key => $menge) {
+                    if ((strpos($key,'menge_') === 0)) {
+                        $bestellposition = substr($key,'6');
+                        // Remove existing preliminary value
+                        $sql = "DELETE FROM paketdistribution WHERE paketannahme = ".$id." AND bestellung_position = ".$bestellposition." AND vorlaeufig = 1";
+                        $this->app->DB->Delete($sql);
+
+                        // Write paketdistribution                            
+                        $sql = "INSERT INTO paketdistribution(
+                                            id,
+                                            bearbeiter,
+                                            zeit,
+                                            paketannahme,
+                                            adresse,
+                                            artikel,
+                                            menge,
+                                            vpe,
+                                            etiketten,
+                                            bemerkung,
+                                            bestellung_position,
+                                            vorlaeufig
+                                        )
+                                        VALUES(
+                                            '',
+                                            '" . $this->app->User->GetName() . "',
+                                            NOW(), 
+                                            '$id', 
+                                            '', 
+                                            '$artikel', 
+                                            (SELECT menge-geliefert FROM bestellung_position WHERE id = ".$bestellposition."), 
+                                            '$vpe', 
+                                            '', 
+                                            '$bemerkung', 
+                                            '$bestellposition',
+                                            1
+                                        )";
+
+                            $this->app->DB->Insert($sql);      
+
+                    }
+                }
+                
+
                 break;
             case 'leeren':
+                // Remove existing preliminary value
+                $sql = "DELETE FROM paketdistribution WHERE paketannahme = ".$id." AND vorlaeufig = 1";
+                $this->app->DB->Delete($sql);
                 break;
             case 'manuellerfassen':
                 $this->app->Location->execute('index.php?module=wareneingang&action=manuellerfassen&id=' . $id);
@@ -1707,6 +1759,9 @@ class Wareneingang {
                 $msg = "";
 
                 foreach ($menge_input as $key => $menge) {
+
+                    $bemerkung = "";
+
                     if ((strpos($key,'menge_') === 0) && ($menge !== '')) {
                         $bestellposition = substr($key,'6');
                         if ($menge > 0) {
@@ -1720,22 +1775,24 @@ class Wareneingang {
                             $vpe = $bparr['vpe'];
                             $menge_bestellung = $bparr['menge'];
 
-                            // Get Lager_platz
+                            if ($bparr['lagerartikel']) {
-                            if (empty($ziellager_from_form)) {
+                                // Get Lager_platz
-                                $lager = $this->app->DB->Select("SELECT lager_platz FROM artikel WHERE id='" . $artikel . "' LIMIT 1");
+                                if (empty($ziellager_from_form)) {
-                                if (empty($lager)) {
+                                    $lager = $this->app->DB->Select("SELECT lager_platz FROM artikel WHERE id='" . $artikel . "' LIMIT 1");
-                                    $msg .= '<div class="error">Kein Ziellagerplatz gefunden für Artikel: '.$artikel_nr.'</div>';   
+                                    if (empty($lager)) {
-                                    continue;
+                                        $msg .= '<div class="error">Kein Ziellagerplatz gefunden für Artikel: '.$artikel_nr.'</div>';   
+                                        continue;
+                                    }
+                                }
+                                else {
+                                    $lager = $ziellager_from_form;
                                 }
-                            }
-                            else {
-                                $lager = $ziellager_from_form;
-                            }
 
-                            // Put stock
+                                // Put stock
-                            $this->app->erp->LagerEinlagern($artikel, $menge, $lager, '', "Wareneingang Paket $id, Bestellung $bestellung_belegnr", '', $id);
+                                $this->app->erp->LagerEinlagern($artikel, $menge, $lager, '', "Wareneingang Paket $id, Bestellung $bestellung_belegnr", '', $id);
-                            $lagerplatz_name = $this->app->DB->Select("SELECT kurzbezeichnung FROM lager_platz WHERE lager_platz.id = $lager LIMIT 1");
+                                $lagerplatz_name = $this->app->DB->Select("SELECT kurzbezeichnung FROM lager_platz WHERE lager_platz.id = $lager LIMIT 1");
-                            $bemerkung = $lagerplatz_name;
+                                $bemerkung = $lagerplatz_name;
+                            } 
 
                             // Increase bestellung_position geliefert_menge
                             $geliefert = $this->app->DB->Select("SELECT ifnull(geliefert,0) FROM bestellung_position WHERE id='$bestellposition' LIMIT 1");                    
@@ -1789,8 +1846,8 @@ class Wareneingang {
                 foreach ($menge_input as $key => $menge) {
                     if ((strpos($key,'menge_') === 0) && ($menge !== '')) {
                         $bestellposition = substr($key,'6');                            
-                        if ($menge > 0) {
 
+                        if ($menge >= 0) { // Allow 0 for reset of saved value
                             // Gather info bestellung
                             $bparr = $this->app->DB->SelectRow("SELECT * FROM bestellung INNER JOIN bestellung_position ON bestellung_position.bestellung = bestellung.id INNER JOIN artikel ON bestellung_position.artikel = artikel.id WHERE bestellung_position.id='$bestellposition' LIMIT 1");
                             $artikel = $bparr['artikel'];                            

www/themes/new/css/color3.css

@@ -64,5 +64,6 @@
     --error: #F05A5C;
     --error-color: #fff;
     --important: #68D4D0;
-    --success: #92EFB4;
+/*    --success: #92EFB4;*/
+    --success: #2DCA73;
 }

www/themes/new/css/styles.css

@@ -2961,7 +2961,6 @@ div.error > input[type=submit] {
 }
 
 .info,
-.success,
 .error2 {
     background-color: var(--info);
     color: var(--info-color);
@@ -2976,6 +2975,14 @@ div.error > input[type=submit] {
     background-size: 30px 30px;
 }
 
+.success {
+    background-color: var(--success);
+    color: var(--info-color);
+    background-image: url('../images/info.png');
+    background-size: 30px 30px;
+}
+
+
 .pull-right {
   float: right !important;
 }
@@ -3040,7 +3047,7 @@ div.error > input[type=submit] {
 #header div.headererror > input {
     padding: 5px;
     margin: 3px;
-    background-color: var(--info);
+    background-color: var(--success);
     color: var(--info-color);
 }
 
@@ -3656,9 +3663,8 @@ a.ui-tabs-anchor:hover {
 
 .greybox {
     background-color: lightgrey;
-    color: white;
     padding: 10px;
-    font-size: 1.8em;
+    font-size: 1.2em;
     text-align: right;
 }
 

www/themes/new/images/sidebar/logistik.svg

@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.06267 11.2331H4.76674C4.5067 11.2331 4.2959 11.4439 4.2959 11.7039V14.529C4.2959 14.7891 4.5067 14.9999 4.76674 14.9999H7.59182C7.85186 14.9999 8.06267 14.7891 8.06267 14.529V11.2331Z" stroke="white" stroke-linecap="round" stroke-linejoin="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.3584 11.2331H8.0625V14.529C8.0625 14.7891 8.27331 14.9999 8.53335 14.9999H11.3584C11.6185 14.9999 11.8293 14.7891 11.8293 14.529V11.7039C11.8293 11.4439 11.6185 11.2331 11.3584 11.2331Z" stroke="white" stroke-linecap="round" stroke-linejoin="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.47512 7.46631H6.65005C6.39 7.46631 6.1792 7.67711 6.1792 7.93716V11.2331H9.94597V7.93716C9.94597 7.67711 9.73517 7.46631 9.47512 7.46631Z" stroke="white" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M15.1254 15V5.2064C15.1255 4.85853 14.9339 4.53892 14.6269 4.37519L8.50592 1.11066C8.22908 0.963114 7.89694 0.963114 7.6201 1.11066L1.4991 4.37519C1.19193 4.53876 1 4.85839 1 5.2064V15" stroke="white" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

www/widgets/_gen/widget.gen.auftrag_position.php

@@ -288,7 +288,6 @@ class WidgetGenauftrag_position
     $field = new HTMLInput("mlmdirektpraemie","text","","50","","","","","","","","0","","");
     $this->form->NewField($field);
 
-
     $field = new HTMLInput("kostenstelle","text","","15","","","","","","","","0","","");
     $this->form->NewField($field);
 
@@ -298,6 +297,11 @@ class WidgetGenauftrag_position
     $field = new HTMLCheckbox("erloesefestschreiben","","","1","0","0");
     $this->form->NewField($field);
 
+    if ($this->app->erp->RechteVorhanden('auftrag','einkaufspreise')) {
+        $field = new HTMLInput("einkaufspreis","text","","50","","","","","","","","0","","");
+        $this->form->NewField($field);
+    }
+
     $field = new HTMLTextarea("bemerkung",3,40,"","","","","0");   
     $this->form->NewField($field);
 

www/widgets/templates/_gen/auftrag_position.tpl

@@ -222,34 +222,47 @@ $( document ).ready(function() {
 				</table>
         </td>
         <td width="30%" [STYLERECHTS]>
-          <table width="100%"><tr><td align="right"><input type="submit" value="Speichern" ></td></tr></table>
+            <table width="100%"><tr><td align="right"><input type="submit" value="Speichern" ></td></tr></table>
-          <div id="positionaccordion">
+            <div id="positionaccordion"> [ANZEIGEEINKAUFLAGER]
-            [ANZEIGEEINKAUFLAGER]
+                <h3>{|Steuer|}</h3>
-
+                <div class="table-responsive">
-            <h3>{|Steuer|}</h3>
+                    <table>
-            <div class="table-responsive">
+	                    <tbody> [VORSTEUER]
-            <table>
+		                    <tr>
-            <tbody>
+			                    <td>{|Kostenstelle|}:</td>
-            [VORSTEUER]
+			                    <td>[KOSTENSTELLE][MSGKOSTENSTELLE]</td>
-            <tr><td>{|Kostenstelle|}:</td><td>[KOSTENSTELLE][MSGKOSTENSTELLE]</td></tr>
+		                    </tr>
-            <tr><td>{|Erl&ouml;se|}:</td><td>[ERLOESE][MSGERLOESE]</td></tr>
+		                    <tr>
-            <tr><td>{|festschreiben|}:</td><td>[ERLOESEFESTSCHREIBEN][MSGERLOESEFESTSCHREIBEN]</td></tr>
+			                    <td>{|Erl&ouml;se|}:</td>
-            [NACHSTEUER]
+			                    <td>[ERLOESE][MSGERLOESE]</td>
-            </tbody>
+		                    </tr>
-            </table>
+		                    <tr>
+			                    <td>{|festschreiben|}:</td>
+			                    <td>[ERLOESEFESTSCHREIBEN][MSGERLOESEFESTSCHREIBEN]</td>
+		                    </tr> [NACHSTEUER] </tbody>
+                    </table>
+                </div>
+                <h3>{|Einkaufspreis f&uuml;r Deckungsbeitrag|}</h3>
+                <div class="table-responsive">
+                    <table>
+	                    <tbody>
+		                    <tr>
+			                    <td>[EINKAUFSPREIS][MSGEINKAUFSPREIS]</td>
+		                    </tr>
+	                    </tbody>
+                    </table>
+                </div>
+                <h3>{|Bemerkung|}</h3>
+                <div class="table-responsive">
+                    <table>
+	                    <tbody>
+		                    <tr>
+			                    <td> [BEMERKUNG][MSGBEMERKUNG] </td>
+		                    </tr>
+	                    </tbody>
+                    </table>
+                </div>
             </div>
-
-            <h3>{|Bemerkung|}</h3>
-            <div class="table-responsive">
-            <table>
-            <tbody>
-            <tr><td>
-            [BEMERKUNG][MSGBEMERKUNG]
-            </td></tr>
-            </tbody>
-            </table>
-            </div>
-          </div>
         </td>
       </tr>
     </tbody>

www/widgets/widget.auftrag_position.php

@@ -43,6 +43,7 @@ class WidgetAuftrag_position extends WidgetGenAuftrag_position
     $this->app->YUI->DatePicker("lieferdatum");
     $this->form->ReplaceFunction("lieferdatum",$this,"ReplaceDatum");
     $this->form->ReplaceFunction("preis",$this,"ReplaceMengeBetrag");
+    $this->form->ReplaceFunction("einkaufspreis",$this,"ReplaceMengeBetrag");
     $this->form->ReplaceFunction("steuersatz",$this,"ReplaceSteuersatz");
     $this->form->ReplaceFunction("menge",$this,"ReplaceMenge");
     $this->form->ReplaceFunction("grundrabatt",$this,"ReplaceDecimal");