export buchhaltung added internet from auftrag, zahlweise

Fehler bei Änderung des Rabatts in der ersten Zeile von Angeboten, Rechnungen, etc.

.gitignore

@@ -2,3 +2,4 @@ conf/user.inc.php
 conf/user_defined.php
 userdata
 www/cache/
+www/themes/new/css/custom.css

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!

classes/Components/MailClient/Data/MailMessageData.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace Xentral\Components\MailClient\Data;
 
 use DateTime;
+use DateTimeImmutable;
 use DateTimeInterface;
 use JsonSerializable;
 use Throwable;
@@ -307,11 +308,13 @@ final class MailMessageData implements MailMessageInterface, JsonSerializable
         if ($date === null) {
             return null;
         }
-        $dateTime = date_create($date->getValue());
+/*        $dateTime = date_create($date->getValue());
         if ($dateTime === false) {
             throw new InvalidArgumentException('Invalid date: '.$date->getValue());
             return null;
-        }
+        }*/
+
+        $dateTime = new DateTimeImmutable($date->getValue());
 
         return $dateTime;
     }

classes/Core/Installer/Psr4ClassNameResolver.php

@@ -35,7 +35,7 @@ final class Psr4ClassNameResolver
     {
         // Normalize inputs
         $prefix = trim($prefix, '\\') . '\\';
-        $baseDir = rtrim($baseDir, '/') . '/';
+        $baseDir = rtrim($baseDir, '/\\') . DIRECTORY_SEPARATOR;
 
         $this->prefixes[$prefix] = $baseDir;
     }

classes/Modules/Shopware6/Client/Shopware6Client.php

@@ -73,7 +73,7 @@ final class Shopware6Client
 
         $request = new ClientRequest(
             $method,
-            $this->url . 'v2/' . $endpoint,
+            $this->url . $endpoint,
             $headerInformation,
             empty($body) ? null : json_encode($body)
         );

classes/Modules/SubscriptionCycle/SubscriptionModule.php

@@ -31,14 +31,14 @@ class SubscriptionModule implements SubscriptionModuleInterface
         aa.id, 
         @start := GREATEST(aa.startdatum, aa.abgerechnetbis) as start,
         @end := IF(aa.enddatum = '0000-00-00' OR aa.enddatum > :calcdate, :calcdate, aa.enddatum) as end,
-        @cycles := CASE
+        @cycles := GREATEST(aa.zahlzyklus, CASE
             WHEN aa.preisart = 'monat' THEN
                 TIMESTAMPDIFF(MONTH, @start, @end)
             WHEN aa.preisart = 'jahr' THEN
                 TIMESTAMPDIFF(YEAR,  @start, @end)
             WHEN aa.preisart = '30tage' THEN
                 FLOOR(TIMESTAMPDIFF(DAY, @start, @end) / 30)
-        END+1 as cycles,
+        END+1) as cycles,
         CASE
             WHEN aa.preisart = 'monat' THEN
                 DATE_ADD(@start, INTERVAL @cycles MONTH)

classes/Modules/Ticket/Task/TicketImportHelper.php

@@ -285,6 +285,7 @@ class TicketImportHelper
             tr.dsgvo AS `is_gdpr_relevant`,
             tr.prio AS `priority`,
             tr.persoenlich AS `is_private`,
+            tr.adresse,
             tr.warteschlange AS `queue_id`
         FROM `ticket_regeln` AS `tr`
         WHERE
@@ -408,9 +409,6 @@ class TicketImportHelper
             $this->logger->error('Failed to insert ticket message into db', ['exception' => $e]);
         }
 
-
-        $this->applyTicketRules($messageId);
-
         return($result);
     }
 
@@ -440,7 +438,7 @@ class TicketImportHelper
 
         foreach ($ruleArray as $rule) {
 
-            $this->logger->debug('ticket rule applies',['rule_id' => $rule['id']]);
+            $this->logger->debug('ticket rule applies',['rule_id' => $rule['id'],'rule' => print_r($rule,true)]);
 
 /*
             $update = $this->db->update();
@@ -461,12 +459,16 @@ class TicketImportHelper
             $this->db->perform($sql, ['ticket_id' => $ticketId]);
 */
 
-            if ($rule['is_spam'] === 1) {
+            if ($rule['is_spam'] == 1) {
-              $sql = "UPDATE `ticket_nachricht` SET `status` = \'spam\' WHERE `id` = '".$ticketMessageId."'";
+                $status = 'spam';
-              $this->db->Update($sql);
+            } else {
+                $status = 'neu';
             }
 
-            $sql = "UPDATE `ticket` SET `dsgvo` = '".$rule['is_gdpr_relevant']."', `privat` = '".$rule['is_private']."', `prio` = '".$rule['priority']."', `warteschlange` = '".$rule['queue_id']."' WHERE `id` = '".$ticketId."'";
+            $sql = "UPDATE `ticket` SET `dsgvo` = '".$rule['is_gdpr_relevant']."', `privat` = '".$rule['is_private']."', `prio` = '".$rule['priority']."',`adresse` = '".$rule['adresse']."', `warteschlange` = '".$rule['queue_id']."', `status` = '".$status."' WHERE `id` = '".$ticketId."'";
+
+            $this->logger->debug('ticket rule sql',['sql' => $sql]);
+
             $this->db->Update($sql);
         }
     }
@@ -699,6 +701,12 @@ class TicketImportHelper
             $from
         );
 
+        // Only for new tickets: apply filter rules        
+        if (!$ticketexists) {        
+            $this->applyTicketRules($ticketnachricht);
+        }
+
+
         if ($ticketnachricht > 0 && $emailbackup_mails_id > 0) {
             $this->db->Update(
                 "UPDATE `emailbackup_mails`

classes/bootstrap.php

@@ -30,10 +30,10 @@ $factoryServiceMap = @include $serviceCacheFile;
 
 if (!is_file($serviceCacheFile)) {
 
-    // Installer ausführen wenn ServiceMap nicht vorhanden ist
+    // Installer ausführen, wenn ServiceMap nicht vorhanden ist
     $resolver = new Psr4ClassNameResolver();
     $resolver->addNamespace('Xentral\\', __DIR__);
-    $resolver->excludeFile(__DIR__ . '/bootstrap.php');
+    $resolver->excludeFile(__DIR__ . DIRECTORY_SEPARATOR . 'bootstrap.php');
 
     $generator = new ClassMapGenerator($resolver, __DIR__);
     $installer = new Installer($generator, $resolver);

cronjobs/command.php

@@ -223,7 +223,7 @@ if ($task) {
       } catch (Exception $e) {
         $app->erp->LogFile(
           $app->DB->real_escape_string(
-            'Prozessstarter Fehler bei Aufruf des Moduls ' . $task[$task_index]['parameter'] . ': ' . $e->getMessage()
+            'Prozessstarter Fehler bei Aufruf des Moduls ' . $task[$task_index]['parameter'] . ': ' . $e->getMessage()." Trace: ".$e->GetTraceAsString()
           )
         );
       }

database/struktur.sql

@@ -16729,7 +16729,9 @@ INSERT INTO `firmendaten_werte` (`id`, `name`, `typ`, `typ1`, `typ2`, `wert`, `d
 (386, 'cleaner_shopimport_tage', 'int', '11', '', '90', '90', 0, 0),
 (387, 'cleaner_adapterbox', 'tinyint', '1', '', '1', '1', 0, 0),
 (388, 'cleaner_adapterbox_tage', 'int', '11', '', '90', '90', 0, 0),
-(389, 'bcc3', 'varchar', '128', '', '', '', 0, 0)
+(389, 'bcc3', 'varchar', '128', '', '', '', 0, 0),
+(390, 'rechnungersatz_standard', 'int', '1', '', '0', '0', 0, 0)
+
 ;
 
 INSERT INTO `geschaeftsbrief_vorlagen` (`id`, `sprache`, `betreff`, `text`, `subjekt`, `projekt`, `firma`) VALUES
@@ -16749,6 +16751,24 @@ INSERT INTO `geschaeftsbrief_vorlagen` (`id`, `sprache`, `betreff`, `text`, `sub
 (16, 'deutsch', 'Zusammenstellung Ihrer Bestellung', '{ANSCHREIBEN},<br><br>soeben wurde Ihr Bestellung zusammengestellt. Sie können Ihre Ware jetzt abholen. Sind Sie bereits bei uns gewesen, so sehen Sie diese E-Mail bitte als gegenstandslos an.<br><br>{VERSAND}<br><br>Ihr {FIRMA} Team<br>', 'Selbstabholer', 0, 1),
 (17, 'deutsch', 'Ihre Gutschrift {BELEGNR} von {FIRMA}', '{ANSCHREIBEN},<br><br>anbei finden Sie Ihre Gutschrift. Gerne stehen wir Ihnen weiterhin zur Verfügung.<br><br>Ihre Gutschrift ist im PDF-Format erstellt worden. Um sich die Gutschrift ansehen zu können, klicken Sie auf den Anhang und es öffnet sich automatisch der Acrobat Reader. Sollten Sie keinen Acrobat Reader besitzen, haben wir für Sie den Link zum kostenlosen Download von Adobe Acrobat Reader mit angegeben. Er führt Sie automatisch auf die Downloadseite von Adobe. So können Sie sich Ihre Gutschrift auch für Ihre Unterlagen ausdrucken.<br><br>http://www.adobe.com/products/acrobat/readstep2.html<br><br>{IF}{INTERNET}{THEN}Internet-Bestellnr.: {INTERNET}{ELSE}{ENDIF}', 'Gutschrift', 1, 1);
 
+
+/* OpenXE 2024-01-24 für datatablelabel */
+INSERT INTO `hook` (`name`, `aktiv`, `parametercount`, `alias`, `description`) VALUES
+('eproosystem_ende', 1, 0, '', ''),
+('parseuservars', 1, 0, '', ''),
+('dokumentsend_ende', 1, 0, '', ''),
+('auftrag_versand_ende', 1, 0, '', ''),
+('transfer_document_incoming', 1, 0, '', '')
+;
+
+INSERT INTO `hook_register` (`hook_action`, `function`, `aktiv`, `position`, `hook`, `module`, `module_parameter`) VALUES
+(0, 'DataTableLabelsInclude', 1, 3, (SELECT id FROM hook WHERE name = 'eproosystem_ende'), 'Datatablelabels', 0),
+(0, 'DatatablelabelsParseUserVars', 1, 2, (SELECT id FROM hook WHERE name = 'parseuservars'), 'Datatablelabels', 0),
+(0, 'DataTableLabelsDokumentSendHook', 1, 1, (SELECT id FROM hook WHERE name = 'dokumentsend_ende'), 'Datatablelabels', 0),
+(0, 'DatatablelabelsOrderSent', 1, 1, (SELECT id FROM hook WHERE name = 'auftrag_versand_ende'), 'Datatablelabels', 0),
+(0, 'DatatablelabelsTransferDocumentIncomming', 1, 1, (SELECT id FROM hook WHERE name = 'transfer_document_incoming'), 'Datatablelabels', 0);
+/* OpenXE 2024-01-24 für datatablelabel */
+
 INSERT INTO `hook_menu` (`id`, `module`, `aktiv`) VALUES
 (1, 'artikel', 1),
 (2, 'provisionenartikel', 1),

languages/german/tooltip.php

@@ -765,6 +765,7 @@ $tooltip['firmendaten']['edit']['bezeichnungangebotersatz']="Im Angebot gibt es
 $tooltip['firmendaten']['edit']['angebotersatz_standard']="Mit dieser Option setzen Sie die alternative Bezeichnung im Angebot (Option drüber) als Standard. Dadurch ist der Haken beim Erstellen eines neuen Angebots immer gesetzt.";
 $tooltip['firmendaten']['edit']['bezeichnungauftragersatz']="Im Auftrag gibt es einen Haken um den Betreff des Augtrag-Belegs umzubenennen.<br>Mit der Option hier legen Sie den Namen des alternativen Betreffs fest.";
 $tooltip['firmendaten']['edit']['bezeichnungrechnungersatz']="In der Rechnung gibt es einen Haken um den Betreff des Rechnung-Belegs umzubenennen.<br>Mit der Option hier legen Sie den Namen des alternativen Betreffs fest.";
+$tooltip['firmendaten']['edit']['rechnungersatz_standard']="Mit dieser Option setzen Sie die alternative Bezeichnung in der Rechnung (Option drüber) als Standard. Dadurch ist der Haken beim Erstellen einer neuen Rechnung immer gesetzt.";
 $tooltip['firmendaten']['edit']['bezeichnunglieferscheinersatz']="Im Lieferschein gibt es einen Haken um den Betreff des Lieferschein-Belegs umzubenennen.<br>Mit der Option hier legen Sie den Namen des alternativen Betreffs fest.";
 $tooltip['firmendaten']['edit']['bezeichnungbestellungersatz']="In der Bestellung gibt es einen Haken um den Betreff des Bestell-Belegs umzubenennen.<br>Mit der Option hier legen Sie den Namen des alternativen Betreffs fest.";
 $tooltip['firmendaten']['edit']['bezeichnungproformarechnungersatz']="In der Proformarechnung gibt es einen Haken um den Betreff der Proformarechnung-Belegs umzubenennen.<br>Mit der Option hier legen Sie den Namen des alternativen Betreffs fest.";

phpwf/plugins/class.acl.php

@@ -1252,7 +1252,7 @@ Options -Indexes
 # Deny access to all *.php
 Order deny,allow
 Allow from all
-<FilesMatch "\.(css|jpg|jpeg|gif|png|svg|js|ico|css.map)$">
+<FilesMatch "\.(css|jpg|jpeg|gif|png|svg|js|ico|css.map|js.map)$">
     Order Allow,Deny
     Allow from all
 </FilesMatch>

phpwf/plugins/class.mysql.php

@@ -1230,7 +1230,7 @@ class DB{
     $sql = "UPDATE `$tablename` SET ";
     foreach($ArrCols as $key=>$value) {
       if($key!=$pkname && (isset($ziel[$key]) || !$zielspalten)) {
-        $sqla[] = $key." = '".($escape?$this->real_escape_string($value):$value)."' ";
+        $sqla[] = "`".$key."` = '".($escape?$this->real_escape_string($value):$value)."' ";
       }
     }
     if(!empty($sqla)) {
@@ -1424,7 +1424,7 @@ class DB{
     if(empty($TableName) || empty($IDFieldName) || empty($IDToDuplicate)) {
       return null;
     }
-
+/*
     $sql = "SELECT * FROM $TableName WHERE $IDFieldName = $IDToDuplicate";
     $result = @mysqli_query($this->connection,$sql);
     if(empty($result)) {
@@ -1442,6 +1442,23 @@ class DB{
       }
       $sql .= $RowKeys[$i] . " = '" . $this->real_escape_string($RowValues[$i]) . "'";
     }
+
+    @mysqli_query($this->connection,$sql);
+*/
+
+    $sql = "INSERT INTO ".$TableName." SELECT ";
+    $fields = $this->GetColAssocArray($TableName);
+    $comma = "";
+    foreach ($fields as $field => $value) {
+        if ($field != $IDFieldName) {
+            $sql .= $comma."`".$field."`";
+        } else {
+            $sql .= "NULL";
+        }            
+        $comma = ", ";
+    }
+    $sql .= " FROM ".$TableName." WHERE id = ".$IDToDuplicate;
+
     @mysqli_query($this->connection,$sql);
 
     $id = $this->GetInsertID();

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

@@ -28,6 +28,15 @@ class YUI {
     $this->app = $app;
   }
 
+  function dateien_module_objekt_map($module) : string {
+    $dateien_module_objekt_map_array = array(
+        'adresse' => 'adressen',
+        'ticket'  => 'ticket_header' 
+    );
+
+    return (isset($dateien_module_objekt_map_array[$module]) ? $dateien_module_objekt_map_array[$module] : $module);
+  }
+
   function PasswordCheck($passwordFieldID, $repassFieldID, $accountNameFieldID, $submitButtonID, $extra = ''){
         $this->app->Tpl->Add('JQUERYREADY', "
                 function checkPassword(){
@@ -727,9 +736,10 @@ class YUI {
             if($value == '')$value = '0';
             $this->app->DB->Update("UPDATE $table SET rabatt='$value',keinrabatterlaubt=1 WHERE id='$id' LIMIT 1");
             $result = $this->app->DB->Select("SELECT ".$this->FormatPreis('rabatt')." FROM $table WHERE id='$id' LIMIT 1");
-            $sort = $this->app->DB->Select("SELECT sort FROM $table WHERE id='$id' LIMIT 1");
+
-            $parent = $this->app->DB->Select("SELECT $module FROM $table WHERE id='$id' LIMIT 1");
+            //$sort = $this->app->DB->Select("SELECT sort FROM $table WHERE id='$id' LIMIT 1");
-            if($parent && $sort == 1)$this->app->DB->Update("UPDATE $module SET rabatt = '$value',keinrabatterlaubt=1 WHERE id = '$parent' LIMIT 1");
+            //$parent = $this->app->DB->Select("SELECT $module FROM $table WHERE id='$id' LIMIT 1");
+            //if($parent && $sort == 1)$this->app->DB->Update("UPDATE $module SET rabatt = '$value',keinrabatterlaubt=1 WHERE id = '$parent' LIMIT 1");
             if(in_array($module, array('auftrag','rechnung','gutschrift')))
             {
               $tmptable_value = $this->app->DB->Select("SELECT $module FROM $table WHERE id = '$id' LIMIT 1");
@@ -1542,7 +1552,7 @@ class YUI {
       if(!empty($positionsIds)) {
         $positions = $this->app->DB->SelectArr(
           sprintf(
-            "SELECT b.id, %s AS `preis`, round(b.menge) as menge  
+            "SELECT b.id, %s AS `preis`, trim(b.menge)+0 as menge
             FROM `%s` AS `b` 
             %s 
             WHERE b.`%s` = %d AND b.id IN (%s)",
@@ -2578,11 +2588,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, round(b.menge) 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
@@ -2601,7 +2619,7 @@ class YUI {
             as Artikel,
 
 
-               p.abkuerzung as projekt, b.nummer as nummer, DATE_FORMAT(lieferdatum,'%d.%m.%Y') as lieferdatum, round(b.menge) as menge, if(b.geliefert, ".$this->app->erp->FormatMenge('b.geliefert')." ,'-') as geliefert, b.id as id
+               p.abkuerzung as projekt, b.nummer as nummer, DATE_FORMAT(lieferdatum,'%d.%m.%Y') as lieferdatum, trim(b.menge)+0 as menge, if(b.geliefert, ".$this->app->erp->FormatMenge('b.geliefert')." ,'-') as geliefert, b.id as id
                  FROM $table b
                  LEFT JOIN artikel a ON a.id=b.artikel LEFT JOIN projekt p ON b.projekt=p.id
                  WHERE b.$module='$id'";
@@ -2656,7 +2674,7 @@ class YUI {
 
 
                p.abkuerzung as projekt, b.nummer as nummer, DATE_FORMAT(lieferdatum,'%d.%m.%Y') as lieferdatum, 
-               round(b.menge) as menge, 
+               trim(b.menge)+0 as menge,
                if(b.geliefert, ".$this->app->erp->FormatMenge('b.geliefert')." ,'-') as geliefert,
                if(b.menge_eingang, ".$this->app->erp->FormatMenge('b.menge_eingang')." ,'-') as `Eingang`,
                if(b.menge_gutschrift, ".$this->app->erp->FormatMenge('b.menge_gutschrift')." ,'-') as `Menge Gutschrift`,
@@ -2678,7 +2696,7 @@ class YUI {
             as Artikel,
 
 
-               p.abkuerzung as projekt, b.nummer as nummer, round(b.menge) as menge, 
+               p.abkuerzung as projekt, b.nummer as nummer, trim(b.menge)+0 as menge,
                ".$this->FormatPreis(' b.preis')." as preis,
 
                b.id as id
@@ -2695,7 +2713,7 @@ class YUI {
             as Artikel,
 
 
-               p.abkuerzung as projekt, b.nummer as nummer, DATE_FORMAT(b.lieferdatum,'%d.%m.%Y') as lieferdatum, round(b.menge) as menge,
+               p.abkuerzung as projekt, b.nummer as nummer, DATE_FORMAT(b.lieferdatum,'%d.%m.%Y') as lieferdatum, trim(b.menge)+0 as menge,
 
                b.id as id
                  FROM $table b
@@ -2717,7 +2735,7 @@ class YUI {
           if(CHAR_LENGTH(b.bezeichnunglieferant)>" . $this->app->erp->MaxArtikelbezeichnung() . ",CONCAT(SUBSTR(CONCAT(b.bezeichnunglieferant,' *'),1," . $this->app->erp->MaxArtikelbezeichnung() . "),'...'),CONCAT(b.bezeichnunglieferant,' *')),
             if(CHAR_LENGTH(b.bezeichnunglieferant)>" . $this->app->erp->MaxArtikelbezeichnung() . ",CONCAT(SUBSTR(b.bezeichnunglieferant,1," . $this->app->erp->MaxArtikelbezeichnung() . "),'...'),b.bezeichnunglieferant)))
               as Artikel,
-                 p.abkuerzung as projekt,  a.nummer as nummer, DATE_FORMAT(lieferdatum,'%d.%m.%Y') as lieferdatum, round(b.menge) as menge, ".$this->FormatPreis(' b.preis')."  as preis, b.waehrung, b.id as id
+                 p.abkuerzung as projekt,  a.nummer as nummer, DATE_FORMAT(lieferdatum,'%d.%m.%Y') as lieferdatum, trim(b.menge)+0 as menge, ".$this->FormatPreis(' b.preis')."  as preis, b.waehrung, b.id as id
                    FROM $table b
                    LEFT JOIN artikel a ON a.id=b.artikel LEFT JOIN projekt p ON b.projekt=p.id
                    WHERE b.$module='$id'";
@@ -2821,6 +2839,14 @@ class YUI {
                               
                               
                               ,b.waehrung, b.rabatt as rabatt,";          
+                              
+                              
+            if ($this->app->erp->RechteVorhanden('angebot','einkaufspreise')) {
+                $sql .= $this->FormatPreis('einkaufspreis')." as einkaufspreis,
+                        CONCAT(".$this->app->erp->FormatPreis("ROUND(deckungsbeitrag*100,2)",2).",'%') AS DB,
+                        ";
+            }          
+                              
         }else{
         $sql = "SELECT $sortcol, CONCAT($hersteller_ansicht if(b.beschreibung!='',
                        if(CHAR_LENGTH(b.bezeichnung)>" . $this->app->erp->MaxArtikelbezeichnung() . ",CONCAT(SUBSTR(CONCAT(b.bezeichnung,' *'),1," . $this->app->erp->MaxArtikelbezeichnung() . "),'...'),CONCAT(b.bezeichnung,' *')),
@@ -2836,7 +2862,64 @@ class YUI {
                                 LEFT JOIN artikel a ON a.id=b.artikel LEFT JOIN projekt p ON b.projekt=p.id
                                 WHERE b.$module='$id'";
 
-      } else {
+      } 
+        else if ($module == "verbindlichkeit") // OpenXE
+        {     
+            $sql = "
+                SELECT
+                    $sortcol,
+                    IF(
+                        b.beschreibung != '',
+                        IF(
+                            CHAR_LENGTH(b.bezeichnung) > " . $this->app->erp->MaxArtikelbezeichnung() . ",
+                            CONCAT(
+                                SUBSTR(
+                                    CONCAT(b.bezeichnung, ' *'),
+                                    1,
+                                    " . $this->app->erp->MaxArtikelbezeichnung() . "
+                                ),
+                                '...'
+                            ),
+                            CONCAT(b.bezeichnung, ' *')
+                        ),
+                        IF(
+                            CHAR_LENGTH(b.bezeichnung) > " . $this->app->erp->MaxArtikelbezeichnung() . ",
+                            CONCAT(
+                                SUBSTR(
+                                    b.bezeichnung,
+                                    1,
+                                    " . $this->app->erp->MaxArtikelbezeichnung() . "
+                                ),
+                                '...'
+                            ),
+                            b.bezeichnung
+                        )
+                    ) AS Artikel,
+                    p.abkuerzung AS projekt,
+                    a.nummer,
+                    ".$this->app->erp->FormatDate('lieferdatum')." AS lieferdatum,
+                    TRIM(b.menge) +0 AS menge,
+                    " . $this->FormatPreis($preiscell) . " AS preis,
+                    " . $this->FormatPreis($preiscell."*menge") . " AS Betrag,
+                    CONCAT(
+                        k.sachkonto,
+                        ' - ',
+                        k.beschriftung
+                    ) AS sachkonto,
+                    b.id AS id
+                FROM
+                    $table b
+                LEFT JOIN artikel a ON
+                    a.id = b.artikel
+                LEFT JOIN projekt p ON
+                    b.projekt = p.id
+                LEFT JOIN kontorahmen k ON
+                    k.id = b.sachkonto
+                WHERE
+                    b.$module = '$id'
+            ";
+        }
+        else {
         $sql = null;
         $this->app->erp->RunHook('yui_position_sql', 3, $table, $id, $sql);
         if($sql === null){
@@ -3522,34 +3605,26 @@ class YUI {
   
   function IconsSQLVerbindlichkeit() {
 
-    $go_ware = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/ware_go.png\" style=\"margin-right:1px\" title=\"Wareneingangspr&uuml;fung OK\" border=\"0\">";
+    $go_ware = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/lagergo.png\" style=\"margin-right:1px\" title=\"Wareneingangspr&uuml;fung OK\" border=\"0\">";
-    $stop_ware = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/ware_stop.png\" style=\"margin-right:1px\" title=\"Wareneingangspr&uuml;fung fehlt\" border=\"0\">";
+    $stop_ware = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/lagerstop.png\" style=\"margin-right:1px\" title=\"Wareneingangspr&uuml;fung fehlt\" border=\"0\">";
-    $go_summe = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/summe_go.png\" style=\"margin-right:1px\" title=\"Rechnungseingangspr&uuml;fung OK\" border=\"0\">";
+    
-    $stop_summe = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/summe_stop.png\" style=\"margin-right:1px\" title=\"Rechnungseingangspr&uuml;fung fehlt\" border=\"0\">";
+    $go_pdf = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/summe_go.png\" style=\"margin-right:1px\" title=\"Anhang OK\" border=\"0\">";
+    $stop_pdf = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/summe_stop.png\" style=\"margin-right:1px\" title=\"Anhang fehlt\" border=\"0\">";
+        
+    $go_summe = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/check_go.png\" style=\"margin-right:1px\" title=\"Rechnungseingangspr&uuml;fung OK\" border=\"0\">";
+    $stop_summe = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/check_stop.png\" style=\"margin-right:1px\" title=\"Rechnungseingangspr&uuml;fung fehlt\" border=\"0\">";
 
     $go_zahlung = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/bank_go.svg\" style=\"margin-right:1px\" title=\"Kontoverkn&uuml;pfung OK\" border=\"0\">";
     $stop_zahlung = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/bank_stop.svg\" style=\"margin-right:1px\" title=\"Kontoverkn&uuml;pfung fehlt\" border=\"0\">";
 
     $stop_betragbezahlt = "<img alt=\"Zahlung fehlt\" src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/vorkassestop.png\" style=\"margin-right:1px\" title=\"Zahlung fehlt\" border=\"0\">";
     $gostop_betragbezahlt = "<img alt=\"teilweise bezahlt\" src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/vorkassegostop.png\" style=\"margin-right:1px\" title=\"teilweise bezahlt\" border=\"0\">";
-    $go_betragbezahlt = "<img alt=\"nicht bezahlt\"  src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/vorkassego.png\" style=\"margin-right:1px\" title=\"komplett bezahlt\" border=\"0\">";
+    $go_betragbezahlt = "<img alt=\"nicht bezahlt\"  src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/vorkassego.png\" style=\"margin-right:1px\" title=\"bezahlt\" border=\"0\">";
     return "CONCAT('<table><tr><td nowrap>',
+    if(datei_anzahl > 0,'$go_pdf','$stop_pdf'),
     if(v.freigabe,'$go_ware','$stop_ware'),
     if(v.rechnungsfreigabe,'$go_summe','$stop_summe'),
-    IF( v.betragbezahlt = 0 OR (v.betrag > 0 AND v.betragbezahlt < 0),'$stop_betragbezahlt',
+    if(v.bezahlt,'$go_betragbezahlt','$stop_betragbezahlt'),
-      IF(v.betrag > 0 AND (v.betragbezahlt + v.skonto_erhalten) >= v.betrag, '$go_betragbezahlt',
-        IF(v.betrag - v.betragbezahlt <= v.betrag-((v.betrag/100.0)*v.skonto),
-          '$gostop_betragbezahlt',
-          '$go_betragbezahlt'
-        )
-      )
-    ),     
-    if((
-    (SELECT COUNT(ka.id) 
-    FROM kontoauszuege_zahlungsausgang ka WHERE ka.parameter=v.id AND ka.objekt='verbindlichkeit') + 
-    (SELECT COUNT(ke.id) FROM kontoauszuege_zahlungseingang ke WHERE ke.parameter=v.id AND ke.objekt='verbindlichkeit')) > 0,
-    '$go_zahlung','$stop_zahlung'
-    ),
     '</td></tr></table>')";
   }
   
@@ -3614,6 +3689,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");
@@ -3951,6 +4141,7 @@ url:strUrl, success:function(html){strReturn = html;}, async:false
         $allowed['wiki'] = array('dateien');
         $allowed['geschaeftsbrief_vorlagen'] = array('dateien');
         $allowed['kasse'] = array('dateien');
+        $allowed['ticket'] = array('dateien');
 
         $id = $this->app->Secure->GetGET("id");
         $sid = $this->app->Secure->GetGET("sid");
@@ -3959,13 +4150,8 @@ url:strUrl, success:function(html){strReturn = html;}, async:false
         }
 
         parse_str(parse_url($_SERVER['HTTP_REFERER'], PHP_URL_QUERY), $queries);
-        switch($queries['module'])
-        {
-          case "adresse": $objekt="adressen"; break;
-          default: $objekt=$queries['module'];
-        }
 
-        //if(!ctype_alpha($objekt))$objekt="";
+        $objekt = $this->dateien_module_objekt_map($queries['module']);
 
         if(!preg_match('/[A-Za-z_]/', $objekt)) {
           $objekt='';
@@ -5702,12 +5888,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 +5923,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 +5999,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');
 
@@ -12108,9 +12305,6 @@ url:strUrl, success:function(html){strReturn = html;}, async:false
     </tr>
     </tfoot>
     </table></div>
-    <br>
-    <br>
-    <br>
     ');
     
         if((empty($disableautosavefilter)) && $this->anzusersaves < 2) {
@@ -13936,11 +14130,7 @@ source: "index.php?module=ajax&action=filter&filtername=' . $filter . $extendurl
         $sid = (int)$this->app->Secure->GetPOST("sid");
         $sort = $this->app->DB->Select("SELECT sort FROM datei_stichwoerter WHERE id = '$sid' LIMIT 1");
         $id = (int)$this->app->Secure->GetGET("id");
-        switch($module)
+        $objekt = $this->dateien_module_objekt_map($module);
-        {
-          case "adresse": $objekt="adressen"; break;
-          default: $objekt=$module;
-        }
 
         if(!preg_match('/[A-Za-z_]/', $objekt))$objekt="";
         $parameter=$id;
@@ -13969,11 +14159,7 @@ source: "index.php?module=ajax&action=filter&filtername=' . $filter . $extendurl
         $sid = (int)$this->app->Secure->GetPOST("sid");
         $sort = $this->app->DB->Select("SELECT sort FROM datei_stichwoerter WHERE id = '$sid' LIMIT 1");
         $id = (int)$this->app->Secure->GetGET("id");
-        switch($module)
+        $objekt = $this->dateien_module_objekt_map($module);
-        {
-          case "adresse": $objekt="adressen"; break;
-          default: $objekt=$module;
-        }
 
         if(!preg_match('/[A-Za-z_]/', $objekt))$objekt="";
         $parameter=$id;
@@ -14072,7 +14258,7 @@ source: "index.php?module=ajax&action=filter&filtername=' . $filter . $extendurl
           $this->app->Tpl->Add('MESSAGE','<div class="error">Keine Dateien ausgew&auml;hlt!</div>');
         }else{
           $objekt = $this->app->Secure->GetGET('module');
-          if($objekt == 'adresse')$objekt = 'adressen';          
+          $objekt = $this->dateien_module_objekt_map($objekt);
           $parameter = (int)$this->app->Secure->GetGET('id');
           $alledateien = $this->app->DB->SelectArr("SELECT  v.datei, v.id FROM 
               datei d INNER JOIN datei_stichwoerter s ON d.id=s.datei INNER JOIN datei_version v ON v.datei=d.id WHERE s.objekt LIKE '$objekt' AND s.parameter='$parameter' AND d.geloescht=0 ");         
@@ -14139,7 +14325,7 @@ source: "index.php?module=ajax&action=filter&filtername=' . $filter . $extendurl
           $this->app->Tpl->Add('MESSAGE','<div class="error">Keine Dateien ausgew&auml;hlt!</div>');
         }else{
           $objekt = $this->app->Secure->GetGET('module');
-          if($objekt == 'adresse')$objekt = 'adressen';
+          $objekt = $this->dateien_module_objekt_map($objekt);
           $typmodul = $this->app->Secure->GetPOST('typ');
           if($objekt == 'dateien' && $typmodul == 'geschaeftsbrief_vorlagen'){
             $objekt = $typmodul;
@@ -14595,7 +14781,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) {
@@ -14734,8 +14920,6 @@ source: "index.php?module=ajax&action=filter&filtername=' . $filter . $extendurl
         $table->headings[4] = 'Abr. bei Kd';
         $table->headings[5] = 'sonst. MwSt'; // kann man auch umbenennen in Keine
 
-
-
         $table->headings[6] = 'MwSt';
         $table->headings[7] = 'Kommentar';
         $table->headings[8] = 'Bezahlt';
@@ -14758,9 +14942,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);

phpwf/widgets/easytable.php

@@ -388,7 +388,7 @@ class EasyTable {
             {
               $editcols = array(4,5,6,7);
             }else{
-              $einkaufspreiseerlaubt = false;
+              $einkaufspreiseerlaubt = true;
               if($einkaufspreiseerlaubt)
               {
                 $editcols =array(4,5,6,7,8,9);

tools/module_creator/module_creator_php_template.txt

@@ -41,8 +41,16 @@ class PLACEHOLDER_MODULECLASSNAME {
 
                 $defaultorder = 1;
                 $defaultorderdesc = 0;
+                $aligncenter = array();
+                $alignright = array();
+                $numbercols = array();
+                $sumcol = array();
 
-		$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>";
 
@@ -93,7 +101,7 @@ class PLACEHOLDER_MODULECLASSNAME {
         $id = $this->app->Secure->GetGET('id');
         
         // Check if other users are editing this id
-        if($this->app->erp->DisableModul('artikel',$id))
+        if($this->app->erp->DisableModul('PLACEHOLDER_MODULENAME',$id))
         {
           return;
         }   
@@ -118,6 +126,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 = "";
@@ -159,6 +169,12 @@ class PLACEHOLDER_MODULECLASSNAME {
             $this->app->Tpl->Set(strtoupper($key), $value);   
         }
 
+        if (!empty($result)) {
+            $PLACEHOLDER_MODULENAME_from_db = $result[0];
+        } else {
+            return;
+        }
+             
         /*
          * Add displayed items later
          * 
@@ -166,9 +182,11 @@ 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);              
         $this->app->Tpl->Parse('PAGE', "PLACEHOLDER_MODULENAME_edit.tpl");
     }
 
@@ -183,14 +201,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

@@ -3649,6 +3649,17 @@
                     "Extra": "",
                     "Privileges": "select,insert,update,references",
                     "Comment": ""
+                },
+                {
+                    "Field": "kontorahmen",
+                    "Type": "int(11)",
+                    "Collation": null,
+                    "Null": "NO",
+                    "Key": "",
+                    "Default": "0",
+                    "Extra": "",
+                    "Privileges": "select,insert,update,references",
+                    "Comment": ""
                 }
             ],
             "keys": [
@@ -10924,6 +10935,17 @@
                     "Extra": "",
                     "Privileges": "select,insert,update,references",
                     "Comment": ""
+                },
+                {
+                    "Field": "rabatteportofestschreiben",
+                    "Type": "int(1)",
+                    "Collation": null,
+                    "Null": "NO",
+                    "Key": "",
+                    "Default": "0",
+                    "Extra": "",
+                    "Privileges": "select,insert,update,references",
+                    "Comment": ""
                 }
             ],
             "keys": [
@@ -16965,6 +16987,17 @@
                     "Extra": "",
                     "Privileges": "select,insert,update,references",
                     "Comment": ""
+                },
+                {
+                    "Field": "kontorahmen",
+                    "Type": "int(11)",
+                    "Collation": null,
+                    "Null": "YES",
+                    "Key": "",
+                    "Default": "0",
+                    "Extra": "",
+                    "Privileges": "select,insert,update,references",
+                    "Comment": ""
                 }
             ],
             "keys": [
@@ -30900,6 +30933,122 @@
                 }
             ]
         },
+        {
+            "name": "crossselling_artikel",
+            "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": "aktiv",
+                    "Type": "int(1)",
+                    "Collation": null,
+                    "Null": "NO",
+                    "Key": "",
+                    "Default": null,
+                    "Extra": "",
+                    "Privileges": "select,insert,update,references",
+                    "Comment": ""
+                },
+                {
+                    "Field": "art",
+                    "Type": "int(11)",
+                    "Collation": null,
+                    "Null": "NO",
+                    "Key": "",
+                    "Default": null,
+                    "Extra": "",
+                    "Privileges": "select,insert,update,references",
+                    "Comment": ""
+                },
+                {
+                    "Field": "artikel",
+                    "Type": "int(11)",
+                    "Collation": null,
+                    "Null": "NO",
+                    "Key": "",
+                    "Default": null,
+                    "Extra": "",
+                    "Privileges": "select,insert,update,references",
+                    "Comment": ""
+                },
+                {
+                    "Field": "crosssellingartikel",
+                    "Type": "int(11)",
+                    "Collation": null,
+                    "Null": "NO",
+                    "Key": "",
+                    "Default": null,
+                    "Extra": "",
+                    "Privileges": "select,insert,update,references",
+                    "Comment": ""
+                },
+                {
+                    "Field": "shop",
+                    "Type": "int(11)",
+                    "Collation": null,
+                    "Null": "NO",
+                    "Key": "",
+                    "Default": null,
+                    "Extra": "",
+                    "Privileges": "select,insert,update,references",
+                    "Comment": ""
+                },
+                {
+                    "Field": "sort",
+                    "Type": "int(11)",
+                    "Collation": null,
+                    "Null": "NO",
+                    "Key": "",
+                    "Default": null,
+                    "Extra": "",
+                    "Privileges": "select,insert,update,references",
+                    "Comment": ""
+                },
+                {
+                    "Field": "bemerkung",
+                    "Type": "varchar(255)",
+                    "Collation": "utf8mb3_general_ci",
+                    "Null": "NO",
+                    "Key": "",
+                    "Default": null,
+                    "Extra": "",
+                    "Privileges": "select,insert,update,references",
+                    "Comment": ""
+                },
+                {
+                    "Field": "gegenseitigzuweisen",
+                    "Type": "int(1)",
+                    "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": ""
+                }
+            ]
+        },
         {
             "name": "datei",
             "collation": "utf8mb3_general_ci",
@@ -52371,6 +52520,17 @@
                     "Privileges": "select,insert,update,references",
                     "Comment": ""
                 },
+                {
+                    "Field": "nummer",
+                    "Type": "int(11)",
+                    "Collation": null,
+                    "Null": "NO",
+                    "Key": "PRI",
+                    "Default": null,
+                    "Extra": "",
+                    "Privileges": "select,insert,update,references",
+                    "Comment": ""
+                },
                 {
                     "Field": "bezeichnung",
                     "Type": "varchar(255)",
@@ -52382,6 +52542,17 @@
                     "Privileges": "select,insert,update,references",
                     "Comment": ""
                 },
+                {
+                    "Field": "beschreibung",
+                    "Type": "varchar(255)",
+                    "Collation": "utf8mb3_general_ci",
+                    "Null": "NO",
+                    "Key": "",
+                    "Default": null,
+                    "Extra": "",
+                    "Privileges": "select,insert,update,references",
+                    "Comment": ""
+                },
                 {
                     "Field": "projekt",
                     "Type": "varchar(255)",
@@ -57169,6 +57340,28 @@
                     "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": ""
+                },
+                {
+                    "Field": "umgelagert",
+                    "Type": "int(1)",
+                    "Collation": null,
+                    "Null": "NO",
+                    "Key": "",
+                    "Default": "0",
+                    "Extra": "",
+                    "Privileges": "select,insert,update,references",
+                    "Comment": ""
                 }
             ],
             "keys": [
@@ -64406,6 +64599,17 @@
                     "Privileges": "select,insert,update,references",
                     "Comment": ""
                 },
+                {
+                    "Field": "datum_abgeschlossen",
+                    "Type": "datetime",
+                    "Collation": null,
+                    "Null": "NO",
+                    "Key": "",
+                    "Default": null,
+                    "Extra": "",
+                    "Privileges": "select,insert,update,references",
+                    "Comment": ""
+                },
                 {
                     "Field": "verpackungszustand",
                     "Type": "int(11)",
@@ -64461,6 +64665,17 @@
                     "Privileges": "select,insert,update,references",
                     "Comment": ""
                 },
+                {
+                    "Field": "bearbeiter_abgeschlossen",
+                    "Type": "varchar(255)",
+                    "Collation": "utf8mb3_general_ci",
+                    "Null": "NO",
+                    "Key": "",
+                    "Default": null,
+                    "Extra": "",
+                    "Privileges": "select,insert,update,references",
+                    "Comment": ""
+                },
                 {
                     "Field": "projekt",
                     "Type": "int(11)",
@@ -64785,6 +65000,17 @@
                     "Extra": "",
                     "Privileges": "select,insert,update,references",
                     "Comment": ""
+                },
+                {
+                    "Field": "vorlaeufig",
+                    "Type": "int(1)",
+                    "Collation": null,
+                    "Null": "YES",
+                    "Key": "",
+                    "Default": "",
+                    "Extra": "",
+                    "Privileges": "select,insert,update,references",
+                    "Comment": ""
                 }
             ],
             "keys": [
@@ -94793,6 +95019,17 @@
                     "Extra": "",
                     "Privileges": "select,insert,update,references",
                     "Comment": ""
+                },
+                {
+                    "Field": "produkt_ausgehend",
+                    "Type": "int(11)",
+                    "Collation": null,
+                    "Null": "NO",
+                    "Key": "",
+                    "Default": null,
+                    "Extra": "",
+                    "Privileges": "select,insert,update,references",
+                    "Comment": ""
                 }
             ],
             "keys": [
@@ -99553,6 +99790,17 @@
                     "Privileges": "select,insert,update,references",
                     "Comment": ""
                 },
+                {
+                    "Field": "getestet",
+                    "Type": "int(11)",
+                    "Collation": null,
+                    "Null": "NO",
+                    "Key": "",
+                    "Default": "0",
+                    "Extra": "",
+                    "Privileges": "select,insert,update,references",
+                    "Comment": ""
+                },
                 {
                     "Field": "bearbeiter",
                     "Type": "varchar(32)",
@@ -104738,6 +104986,17 @@
                     "Privileges": "select,insert,update,references",
                     "Comment": ""
                 },
+                {
+                    "Field": "adresse",
+                    "Type": "int(11)",
+                    "Collation": null,
+                    "Null": "NO",
+                    "Key": "",
+                    "Default": "0",
+                    "Extra": "",
+                    "Privileges": "select,insert,update,references",
+                    "Comment": ""
+                },
                 {
                     "Field": "warteschlange",
                     "Type": "text",
@@ -108904,6 +109163,17 @@
                     "Privileges": "select,insert,update,references",
                     "Comment": ""
                 },
+                {
+                    "Field": "usereditid",
+                    "Type": "int(11)",
+                    "Collation": null,
+                    "Null": "NO",
+                    "Key": "PRI",
+                    "Default": null,
+                    "Extra": "",
+                    "Privileges": "select,insert,update,references",
+                    "Comment": ""
+                },
                 {
                     "Field": "belegnr",
                     "Type": "varchar(255)",
@@ -108915,6 +109185,17 @@
                     "Privileges": "select,insert,update,references",
                     "Comment": ""
                 },
+                {
+                    "Field": "datum",
+                    "Type": "date",
+                    "Collation": null,
+                    "Null": "YES",
+                    "Key": "",
+                    "Default": null,
+                    "Extra": "",
+                    "Privileges": "select,insert,update,references",
+                    "Comment": ""
+                },
                 {
                     "Field": "status_beleg",
                     "Type": "varchar(64)",
@@ -110641,6 +110922,39 @@
                     "Extra": "",
                     "Privileges": "select,insert,update,references",
                     "Comment": ""
+                },
+                {
+                    "Field": "steuersatz_normal",
+                    "Type": "decimal(5,2)",
+                    "Collation": null,
+                    "Null": "NO",
+                    "Key": "",
+                    "Default": "0",
+                    "Extra": "",
+                    "Privileges": "select,insert,update,references",
+                    "Comment": ""
+                },
+                {
+                    "Field": "steuersatz_ermaessigt",
+                    "Type": "decimal(5,2)",
+                    "Collation": null,
+                    "Null": "NO",
+                    "Key": "",
+                    "Default": "0",
+                    "Extra": "",
+                    "Privileges": "select,insert,update,references",
+                    "Comment": ""
+                },
+                {
+                    "Field": "ust_befreit",
+                    "Type": "int(1)",
+                    "Collation": null,
+                    "Null": "NO",
+                    "Key": "",
+                    "Default": "0",
+                    "Extra": "",
+                    "Privileges": "select,insert,update,references",
+                    "Comment": ""
                 }
             ],
             "keys": [
@@ -111094,6 +111408,17 @@
                     "Privileges": "select,insert,update,references",
                     "Comment": ""
                 },
+                {
+                    "Field": "paketdistribution",
+                    "Type": "int(11)",
+                    "Collation": null,
+                    "Null": "NO",
+                    "Key": "MUL",
+                    "Default": "0",
+                    "Extra": "",
+                    "Privileges": "select,insert,update,references",
+                    "Comment": ""
+                },
                 {
                     "Field": "waehrung",
                     "Type": "varchar(255)",
@@ -111236,6 +111561,17 @@
                     "Extra": "",
                     "Privileges": "select,insert,update,references",
                     "Comment": ""
+                },
+                {
+                    "Field": "kontorahmen",
+                    "Type": "int(11)",
+                    "Collation": null,
+                    "Null": "NO",
+                    "Key": "",
+                    "Default": "0",
+                    "Extra": "",
+                    "Privileges": "select,insert,update,references",
+                    "Comment": ""
                 }
             ],
             "keys": [
@@ -112640,6 +112976,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",
@@ -112827,6 +113233,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)",
@@ -112849,6 +113266,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)",
@@ -112860,6 +113299,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)",
@@ -112892,6 +113342,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": [
@@ -117723,7 +118195,7 @@
         {
             "name": "fibu_buchungen_alle_view",
             "type": "VIEW",
-            "Create": "CREATE VIEW `fibu_buchungen_alle_view` AS select `fb`.`buchungsart` AS `buchungsart`,`fb`.`typ` AS `typ`,`fb`.`id` AS `id`,if(`fibu_objekte_view`.`datum` <> '',`fibu_objekte_view`.`datum`,`fb`.`datum`) AS `datum`,`fb`.`gegen_typ` AS `doc_typ`,`fb`.`gegen_id` AS `doc_id`,`fibu_objekte_view`.`info` AS `doc_info`,`fb`.`soll` AS `betrag`,`fb`.`waehrung` AS `waehrung`,`fb`.`edit_module` AS `edit_module`,`fb`.`edit_id` AS `edit_id` from ((select 'umsatz' AS `buchungsart`,'rechnung' AS `typ`,`rechnung`.`id` AS `id`,-`rechnung`.`soll` AS `soll`,`rechnung`.`waehrung` AS `waehrung`,'rechnung' AS `gegen_typ`,`rechnung`.`id` AS `gegen_id`,`rechnung`.`datum` AS `datum`,'rechnung' AS `edit_module`,`rechnung`.`id` AS `edit_id` from `rechnung` where `rechnung`.`belegnr` <> '' union select 'umsatz' AS `umsatz`,'gutschrift' AS `gutschrift`,`gutschrift`.`id` AS `id`,`gutschrift`.`soll` AS `soll`,`gutschrift`.`waehrung` AS `waehrung`,'gutschrift' AS `gutschrift`,`gutschrift`.`id` AS `id`,`gutschrift`.`datum` AS `datum`,'gutschrift' AS `edit_module`,`gutschrift`.`id` AS `id` from `gutschrift` where `gutschrift`.`belegnr` <> '' union select 'aufwand' AS `aufwand`,'verbindlichkeit' AS `verbindlichkeit`,`verbindlichkeit`.`id` AS `id`,`verbindlichkeit`.`betrag` AS `betrag`,`verbindlichkeit`.`waehrung` AS `waehrung`,'verbindlichkeit' AS `verbindlichkeit`,`verbindlichkeit`.`id` AS `id`,`verbindlichkeit`.`rechnungsdatum` AS `rechnungsdatum`,'verbindlichkeit' AS `verbindlichkeit`,`verbindlichkeit`.`id` AS `id` from `verbindlichkeit` where `verbindlichkeit`.`belegnr` <> '' union select 'zahlung' AS `zahlung`,'kontoauszuege' AS `kontoauszuege`,`kontoauszuege`.`id` AS `id`,`kontoauszuege`.`soll` AS `soll`,`kontoauszuege`.`waehrung` AS `waehrung`,'kontoauszuege' AS `kontoauszuege`,`kontoauszuege`.`id` AS `id`,`kontoauszuege`.`buchung` AS `buchung`,'kontoauszuege' AS `kontoauszuege`,`kontoauszuege`.`id` AS `id` from `kontoauszuege` where `kontoauszuege`.`importfehler` is null union select 'abbuchung' AS `abbuchung`,`fibu_buchungen`.`von_typ` AS `von_typ`,`fibu_buchungen`.`von_id` AS `von_id`,`fibu_buchungen`.`betrag` AS `betrag`,`fibu_buchungen`.`waehrung` AS `waehrung`,`fibu_buchungen`.`nach_typ` AS `nach_typ`,`fibu_buchungen`.`nach_id` AS `nach_id`,`fibu_buchungen`.`datum` AS `datum`,'fibu_buchungen' AS `fibu_buchungen`,`fibu_buchungen`.`id` AS `id` from `fibu_buchungen` union select 'zubuchung' AS `zubuchung`,`fibu_buchungen`.`nach_typ` AS `nach_typ`,`fibu_buchungen`.`nach_id` AS `nach_id`,-`fibu_buchungen`.`betrag` AS `-``openxe``.``fibu_buchungen``.``betrag```,`fibu_buchungen`.`waehrung` AS `waehrung`,`fibu_buchungen`.`von_typ` AS `von_typ`,`fibu_buchungen`.`von_id` AS `von_id`,`fibu_buchungen`.`datum` AS `datum`,'fibu_buchungen' AS `fibu_buchungen`,`fibu_buchungen`.`id` AS `id` from `fibu_buchungen`) `fb` left join `fibu_objekte_view` on(`fb`.`gegen_typ` = `fibu_objekte_view`.`typ` and `fb`.`gegen_id` = `fibu_objekte_view`.`id`)) where `fb`.`datum` >= (select `firmendaten_werte`.`wert` from `firmendaten_werte` where `firmendaten_werte`.`name` = 'fibu_buchungen_startdatum') and `fibu_objekte_view`.`datum` >= (select `firmendaten_werte`.`wert` from `firmendaten_werte` where `firmendaten_werte`.`name` = 'fibu_buchungen_startdatum') or `fibu_objekte_view`.`datum` = ''"
+            "Create": "CREATE VIEW `fibu_buchungen_alle_view` AS select `fb`.`buchungsart` AS `buchungsart`,`fb`.`typ` AS `typ`,`fb`.`id` AS `id`,if(`fibu_objekte_view`.`datum` <> '',`fibu_objekte_view`.`datum`,`fb`.`datum`) AS `datum`,`fb`.`gegen_typ` AS `doc_typ`,`fb`.`gegen_id` AS `doc_id`,`fibu_objekte_view`.`info` AS `doc_info`,cast(`fb`.`soll` as decimal(10,2)) AS `betrag`,`fb`.`waehrung` AS `waehrung`,`fb`.`edit_module` AS `edit_module`,`fb`.`edit_id` AS `edit_id` from ((select 'umsatz' AS `buchungsart`,'rechnung' AS `typ`,`rechnung`.`id` AS `id`,-`rechnung`.`soll` AS `soll`,`rechnung`.`waehrung` AS `waehrung`,'rechnung' AS `gegen_typ`,`rechnung`.`id` AS `gegen_id`,`rechnung`.`datum` AS `datum`,'rechnung' AS `edit_module`,`rechnung`.`id` AS `edit_id` from `rechnung` where `rechnung`.`belegnr` <> '' union select 'umsatz' AS `umsatz`,'gutschrift' AS `gutschrift`,`gutschrift`.`id` AS `id`,`gutschrift`.`soll` AS `soll`,`gutschrift`.`waehrung` AS `waehrung`,'gutschrift' AS `gutschrift`,`gutschrift`.`id` AS `id`,`gutschrift`.`datum` AS `datum`,'gutschrift' AS `edit_module`,`gutschrift`.`id` AS `id` from `gutschrift` where `gutschrift`.`belegnr` <> '' union select 'aufwand' AS `aufwand`,'verbindlichkeit' AS `verbindlichkeit`,`verbindlichkeit`.`id` AS `id`,`verbindlichkeit`.`betrag` AS `betrag`,`verbindlichkeit`.`waehrung` AS `waehrung`,'verbindlichkeit' AS `verbindlichkeit`,`verbindlichkeit`.`id` AS `id`,`verbindlichkeit`.`rechnungsdatum` AS `rechnungsdatum`,'verbindlichkeit' AS `verbindlichkeit`,`verbindlichkeit`.`id` AS `id` from `verbindlichkeit` where `verbindlichkeit`.`belegnr` <> '' union select 'zahlung' AS `zahlung`,'kontoauszuege' AS `kontoauszuege`,`kontoauszuege`.`id` AS `id`,`kontoauszuege`.`soll` AS `soll`,`kontoauszuege`.`waehrung` AS `waehrung`,'kontoauszuege' AS `kontoauszuege`,`kontoauszuege`.`id` AS `id`,`kontoauszuege`.`buchung` AS `buchung`,'kontoauszuege' AS `kontoauszuege`,`kontoauszuege`.`id` AS `id` from `kontoauszuege` where `kontoauszuege`.`importfehler` is null union select 'abbuchung' AS `abbuchung`,`fibu_buchungen`.`von_typ` AS `von_typ`,`fibu_buchungen`.`von_id` AS `von_id`,`fibu_buchungen`.`betrag` AS `betrag`,`fibu_buchungen`.`waehrung` AS `waehrung`,`fibu_buchungen`.`nach_typ` AS `nach_typ`,`fibu_buchungen`.`nach_id` AS `nach_id`,`fibu_buchungen`.`datum` AS `datum`,'fibu_buchungen' AS `fibu_buchungen`,`fibu_buchungen`.`id` AS `id` from `fibu_buchungen` union select 'zubuchung' AS `zubuchung`,`fibu_buchungen`.`nach_typ` AS `nach_typ`,`fibu_buchungen`.`nach_id` AS `nach_id`,-`fibu_buchungen`.`betrag` AS `-``openxe``.``fibu_buchungen``.``betrag```,`fibu_buchungen`.`waehrung` AS `waehrung`,`fibu_buchungen`.`von_typ` AS `von_typ`,`fibu_buchungen`.`von_id` AS `von_id`,`fibu_buchungen`.`datum` AS `datum`,'fibu_buchungen' AS `fibu_buchungen`,`fibu_buchungen`.`id` AS `id` from `fibu_buchungen`) `fb` left join `fibu_objekte_view` on(`fb`.`gegen_typ` = `fibu_objekte_view`.`typ` and `fb`.`gegen_id` = `fibu_objekte_view`.`id`)) where `fb`.`datum` >= (select `firmendaten_werte`.`wert` from `firmendaten_werte` where `firmendaten_werte`.`name` = 'fibu_buchungen_startdatum') and `fibu_objekte_view`.`datum` >= (select `firmendaten_werte`.`wert` from `firmendaten_werte` where `firmendaten_werte`.`name` = 'fibu_buchungen_startdatum') or `fibu_objekte_view`.`datum` = ''"
         }
     ]
 }

upgrade/data/upgrade.php

@@ -113,6 +113,12 @@ if (php_sapi_name() == "cli") {
         } else {
         } 
 
+        if (in_array('-strict', $argv)) {
+          $strict_db = true;
+        } else {
+          $strict_db = false;
+        } 
+        
         if (in_array('-do', $argv)) {
             if (!$check_git && !$check_db) {
                 $do_git = true;
@@ -127,7 +133,17 @@ if (php_sapi_name() == "cli") {
         }
 
         if ($check_git || $check_db || $do_git || $do_db) {
-            upgrade_main($directory,$verbose,$check_git,$do_git,$export_db,$check_db,$do_db,$force,$connection,$origin);
+            upgrade_main(   directory: $directory,
+                            verbose: $verbose,
+                            check_git: $check_git,
+                            do_git: $do_git,
+                            export_db: $export_db,
+                            check_db: $check_db,
+                            strict_db: $strict_db,
+                            do_db: $do_db,
+                            force: $force,
+                            connection: $connection,
+                            origin: $origin);
         } else {
             info();
         }
@@ -139,7 +155,7 @@ if (php_sapi_name() == "cli") {
 } 
 // -------------------------------- END
 
-function upgrade_main(string $directory,bool $verbose, bool $check_git, bool $do_git, bool $export_db, bool $check_db, bool $do_db, bool $force, bool $connection, bool $origin) {  
+function upgrade_main(string $directory,bool $verbose, bool $check_git, bool $do_git, bool $export_db, bool $check_db, bool $strict_db, bool $do_db, bool $force, bool $connection, bool $origin) {  
   
     $mainfolder = dirname($directory);
     $datafolder = $directory."/data";
@@ -365,6 +381,9 @@ function upgrade_main(string $directory,bool $verbose, bool $check_git, bool $do
             foreach ($compare_differences as $compare_difference) {
                 $comma = "";
                 foreach ($compare_difference as $key => $value) {
+                    if (is_array($value)) {
+                        $value = implode(',',$value);
+                    }
                     echo_out($comma."$key => [$value]");
                     $comma = ", ";
                 }
@@ -376,7 +395,7 @@ function upgrade_main(string $directory,bool $verbose, bool $check_git, bool $do
         echo_out("--------------- Calculating database upgrade for '$schema@$host'... ---------------\n");
 
         $upgrade_sql = array();
-        $result =  mustal_calculate_db_upgrade($compare_def, $db_def, $upgrade_sql, $mustal_replacers);
+        $result =  mustal_calculate_db_upgrade($compare_def, $db_def, $upgrade_sql, $mustal_replacers, $strict_db);
 
         if (!empty($result)) {
             abort(count($result)." errors.\n");
@@ -479,6 +498,7 @@ function info() {
     echo_out("\t-f: force override of existing files\n");
     echo_out("\t-o: update from origin instead of remote.json\n");
     echo_out("\t-connection use connection.json in data folder instead of user.inc.php\n");
+    echo_out("\t-strict: innodb_strict_mode=ON\n");
     echo_out("\t-clean: (not yet implemented) create the needed SQL to remove items from the database not in the JSON\n");
     echo_out("\n");
 }

vendor/mustal/mustal_mysql_upgrade_tool.php

@@ -21,7 +21,7 @@ function mustal_compare_table_array(array $nominal, string $nominal_name, array
 Compare two database structures
 Returns a structured array containing information on all the differences.
 
-function mustal_calculate_db_upgrade(array $compare_def, array $db_def, array &$upgrade_sql) : int
+function mustal_calculate_db_upgrade(array $compare_def, array $db_def, array &$upgrade_sql, bool $strict) : int
 Generate the SQL needed to upgrade the database to match the definition, based on a comparison.
 
 Data structure in Array and JSON
@@ -67,6 +67,7 @@ $mustal_replacers = [
     ['on update current_timestamp','on update current_timestamp()']
 ];
 
+
 // Load all db_def from a DB connection into a db_def array
 function mustal_load_tables_from_db(string $host, string $schema, string $user, string $passwd, array $replacers) : array {
 
@@ -358,8 +359,6 @@ function mustal_compare_table_array(array $nominal, string $nominal_name, array
                                 $compare_difference['table'] = $database_table['name'];
                                 $compare_difference['key'] = $sql_index['Key_name'];
                                 $compare_difference['property'] = $key;
-/*                                    $compare_difference[$nominal_name] = implode(',',$value);
-                                $compare_difference[$actual_name] = implode(',',$found_sql_index[$key]);*/
                                 $compare_difference[$nominal_name] = $value;
                                 $compare_difference[$actual_name] = $found_sql_index[$key];
                                 $compare_differences[] = $compare_difference;
@@ -543,7 +542,7 @@ function mustal_implode_with_quote(string $quote, string $delimiter, array $arra
 // 11 Table type upgrade not supported
 // 12 Upgrade type not supported
 
-function mustal_calculate_db_upgrade(array $compare_def, array $db_def, array &$upgrade_sql, array $replacers) : array {
+function mustal_calculate_db_upgrade(array $compare_def, array $db_def, array &$upgrade_sql, array $replacers, bool $strict) : array {
 
     $result = array();
     $upgrade_sql = array();    
@@ -585,14 +584,7 @@ function mustal_calculate_db_upgrade(array $compare_def, array $db_def, array &$
                                 if ($key['Key_name'] == 'PRIMARY') {
                                     $keystring = "PRIMARY KEY ";
                                 } else {
-
+                                    $keystring = mustal_key_type(" ".$key['Non_unique']." KEY `".$key['Key_name']."` ",$key['Index_type']);
-                               //     if(array_key_exists('Index_type', $key)) {
-                               //         $index_type = $key['Index_type'];
-                               //     } else {
-                                        $index_type = "";
-                               //     }
-
-                                    $keystring = $index_type." ".$key['Non_unique']." KEY `".$key['Key_name']."` ";
                                 }
                                 $sql .= $comma.$keystring."(`".implode("`,`",$key['columns'])."`) ";
                             }
@@ -675,10 +667,7 @@ function mustal_calculate_db_upgrade(array $compare_def, array $db_def, array &$
 
                     if ($key_key !== false) {
                         $key = $table['keys'][$key_key];
-
+                        $sql = "ALTER TABLE `$table_name` ADD ".mustal_key_type(" ".$key['Non_unique']." KEY `".$key['Key_name']."` "."(`".implode("`,`",$key['columns'])."`)",$key['Index_type']).";";
-                        $sql = "ALTER TABLE `$table_name` ADD ".$key['Non_unique']." KEY `".$key_name."` "; 
-                        $sql .= "(`".implode("`,`",$key['columns'])."`)";
-                        $sql .= ";";
                         $upgrade_sql[] = $sql;
                     }
                     else {
@@ -706,7 +695,7 @@ function mustal_calculate_db_upgrade(array $compare_def, array $db_def, array &$
                         $sql = "ALTER TABLE `$table_name` DROP KEY `".$key_name."`;"; 
                         $upgrade_sql[] = $sql;
 
-                        $sql = "ALTER TABLE `$table_name` ADD ".$key['Non_unique']." KEY `".$key_name."` "; 
+                        $sql = "ALTER TABLE `$table_name` ADD ".mustal_key_type(" ".$key['Non_unique']." KEY `".$key['Key_name']."` ",$key['Index_type']);
                         $sql .= "(`".implode("`,`",$key['columns'])."`)";
                         $sql .= ";";
                         $upgrade_sql[] = $sql;
@@ -763,8 +752,10 @@ function mustal_calculate_db_upgrade(array $compare_def, array $db_def, array &$
     $upgrade_sql = array_unique($upgrade_sql);
 
     if (count($upgrade_sql) > 0) {
-
+        array_unshift($upgrade_sql,"SET SQL_MODE='ALLOW_INVALID_DATES';");
-        array_unshift($upgrade_sql,"SET SQL_MODE='ALLOW_INVALID_DATES';","SET SESSION innodb_strict_mode=OFF;");
+        if (!$strict) {
+            array_unshift($upgrade_sql,"SET SESSION innodb_strict_mode=OFF;");
+        }
     }
 
     return($result);
@@ -781,3 +772,20 @@ function mustal_is_string_type(string $type) {
     return(false);
 }
 
+// create correct index type syntax
+function mustal_key_type(string $key_definition_string, string $key_type) {
+
+    // Key types with using syntax
+    $mustal_key_types_using_mapping = [
+        'BTREE', 
+        'HASH'
+    ];
+
+    if (in_array($key_type,$mustal_key_types_using_mapping)) {
+        return ($key_definition_string." USING ".$key_type);
+    } else {
+        return ($key_type." ".$key_definition_string);
+    }
+
+}
+

version.php

@@ -1,7 +1,7 @@
 <?php 
 
 $version="OSS"; 
-$version_revision="1.10";
+$version_revision="1.11";
 $githash = file_get_contents("../githash.txt");
 if (!empty($githash)) {
   $version_revision .= " (".substr($githash,0,8).")";

www/.htaccess

@@ -4,7 +4,7 @@ Options -Indexes
 # Deny access to all *.php
 Order deny,allow
 Allow from all
-<FilesMatch "\.(css|jpg|jpeg|gif|png|svg|js|ico|css.map)$">
+<FilesMatch "\.(css|jpg|jpeg|gif|png|svg|js|ico|css.map|js.map)$">
     Order Allow,Deny
     Allow from all
 </FilesMatch>

www/eproosystem.php

@@ -1699,7 +1699,6 @@ if (typeof document.hidden !== \"undefined\") { // Opera 12.10 and Firefox 18 an
               FROM `beleg_chargesnmhd` s 
               INNER JOIN lieferschein_position lp ON s.doctype = 'lieferschein' AND s.pos = lp.id AND s.type = 'sn' AND s.wert <> ''
               INNER JOIN lieferschein l ON lp.lieferschein = l.id AND l.status <> 'storniert'
-              WHERE l.id NOT IN (SELECT lieferscheinid FROM retoure LIMIT 1)
               GROUP BY s.wert, lp.artikel 
               )
               UNION ALL (
@@ -1708,7 +1707,7 @@ if (typeof document.hidden !== \"undefined\") { // Opera 12.10 and Firefox 18 an
               SELECT lp.artikel, s.seriennummer as wert , count(s.id) as anzahl, max(l.id) as lieferschein, max(l.belegnr) as belegnr
               FROM `seriennummern` s 
               INNER JOIN lieferschein_position lp ON s.lieferscheinpos = lp.id 
-              INNER JOIN lieferschein l ON lp.lieferschein = l.id WHERE s.seriennummer <> '' AND l.id NOT IN (SELECT lieferscheinid FROM retoure LIMIT 1)
+              INNER JOIN lieferschein l ON lp.lieferschein = l.id WHERE s.seriennummer <> ''
               GROUP BY s.seriennummer, lp.artikel 
 
 

www/lib/class.remote.php

@@ -631,8 +631,17 @@ class Remote
         }
         $arr['projekt'] = $shopexportArr['projekt'];
         $arr['name_de'] = $ret['name'];
-        $arr['uebersicht_de'] = isset($ret['uebersicht_de'])?$ret['uebersicht_de']:'';
+        $arr['uebersicht_de'] = $ret['uebersicht_de'] ?? '';
-        $arr['kurztext_de'] = isset($ret['kurztext_de'])?$ret['kurztext_de']:'';
+        $arr['kurztext_de'] = $ret['kurztext_de'] ?? '';
+        $arr['name_en'] = $ret['name_en'];
+        $arr['uebersicht_en'] = $ret['uebersicht_en'] ?? '';
+        $arr['kurztext_en'] = $ret['kurztext_en'] ?? '';
+        $arr['metakeywords_de'] = $ret['metakeywords_de'] ?? '';
+        $arr['metakeywords_en'] = $ret['metakeywords_en'] ?? '';
+        $arr['metatitle_de'] = $ret['metatitle_de'] ?? '';
+        $arr['metatitle_en'] = $ret['metatitle_en'] ?? '';
+        $arr['metadescription_de'] = $ret['metadescription_de'] ?? '';
+        $arr['metadescription_en'] = $ret['metadescription_en'] ?? '';
         //$arr['anabregs_text'] = isset($ret['uebersicht_de'])?$ret['uebersicht_de']:'';
         if(isset($ret['ean']) && $ret['ean'] != '')
         {
@@ -1577,14 +1586,20 @@ class Remote
           $data[$i]['crosssellingartikel'] = [];
         }
 
-        $gegenseitigzugewiesen = $this->app->DB->SelectArr("SELECT a.id, a.nummer, ak.bezeichnung as kategorie, a.name_de, a.name_en, ca.art, ca.gegenseitigzuweisen, af.nummer AS fremdnummer
+       
+        $sql = 
+        
+        "SELECT a.id, a.nummer, ak.bezeichnung as kategorie, a.name_de, a.name_en, ca.art, ca.gegenseitigzuweisen, af.nummer AS fremdnummer
             FROM crossselling_artikel ca 
             JOIN artikel a ON ca.artikel = a.id 
             LEFT JOIN artikelkategorien ak ON CONCAT(ak.id,'_kat') = a.typ 
             LEFT JOIN (SELECT af.id,af.nummer,af.artikel,af.shopid FROM artikelnummer_fremdnummern af JOIN (SELECT artikel, MAX(shopid) AS maxid FROM artikelnummer_fremdnummern WHERE aktiv=1 AND (shopid=0 OR shopid=2) GROUP BY artikel) x ON x.artikel = af.artikel AND af.shopid=x.maxid WHERE af.aktiv = 1) af ON af.artikel = a.id            
+            LEFT JOIN (SELECT nummer,artikel FROM artikelnummer_fremdnummern WHERE shopid=0 OR shopid='$id' ORDER BY shopid DESC LIMIT 1 ) af2 ON af2.artikel = a.id
             WHERE ca.crosssellingartikel='" . $tmp->GetId() . "' AND ca.gegenseitigzuweisen=1 AND (ca.shop='$id' OR ca.shop='0') 
-            LEFT JOIN (SELECT nummer,artikel FROM artikelnummer_fremdnummern WHERE shopid=0 OR shopid='$id' ORDER BY shopid DESC LIMIT 1 ) af ON af.artikel = a.id
+            GROUP BY ca.artikel, ca.art";
-            GROUP BY ca.artikel, ca.art");
+
+        $gegenseitigzugewiesen = $this->app->DB->SelectArr($sql);
+
         if (!empty($gegenseitigzugewiesen)) {
           foreach ($gegenseitigzugewiesen as $gegenseitigzugewiesenercrosssellingartikel) {
             $data[$i]['crosssellingartikel'][] = $gegenseitigzugewiesenercrosssellingartikel;

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/dokumente/class.bestellung.php

@@ -302,7 +302,7 @@ class BestellungPDF extends BriefpapierCustom {
       }
 
       if($this->bestellungohnepreis) {
-        $value['preis'] = '-';
+        $value['preis'] = null;
       }
   
       if($value['waehrung']!='' && $value['waehrung']!=$this->waehrung){

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/objectapi/mysql/_gen/object.gen.verbindlichkeit_position.php

@@ -38,6 +38,7 @@ class ObjGenVerbindlichkeit_Position
   private  $preis;
   private  $menge;
   private  $kostenstelle;
+  private  $sachkonto;
 
   public $app;            //application object 
 
@@ -76,12 +77,13 @@ $result = $result[0];
     $this->preis=$result['preis'];
     $this->menge=$result['menge'];
     $this->kostenstelle=$result['kostenstelle'];
+    $this->sachkonto=$result['sachkonto'];
   }
 
   public function Create()
   {
     $sql = "INSERT INTO `verbindlichkeit_position` (`id`,`verbindlichkeit`,`sort`,`artikel`,`projekt`,`bestellung`,`nummer`,`bestellnummer`,`waehrung`,`einheit`,`vpe`,`bezeichnung`,`umsatzsteuer`,`status`,`beschreibung`,`lieferdatum`,`steuersatz`,`steuertext`,`preis`,`menge`,`kostenstelle`)
-      VALUES(NULL,'{$this->verbindlichkeit}','{$this->sort}','{$this->artikel}','{$this->projekt}','{$this->bestellung}','{$this->nummer}','{$this->bestellnummer}','{$this->waehrung}','{$this->einheit}','{$this->vpe}','{$this->bezeichnung}','{$this->umsatzsteuer}','{$this->status}','{$this->beschreibung}','{$this->lieferdatum}','{$this->steuersatz}','{$this->steuertext}','{$this->preis}','{$this->menge}','{$this->kostenstelle}')"; 
+      VALUES(NULL,'{$this->verbindlichkeit}','{$this->sort}','{$this->artikel}','{$this->projekt}','{$this->bestellung}','{$this->nummer}','{$this->bestellnummer}','{$this->waehrung}','{$this->einheit}','{$this->vpe}','{$this->bezeichnung}','{$this->umsatzsteuer}','{$this->status}','{$this->beschreibung}','{$this->lieferdatum}','{$this->steuersatz}','{$this->steuertext}','{$this->preis}','{$this->menge}','{$this->kostenstelle}','{$this->sachkonto}')"; 
 
     $this->app->DB->Insert($sql);
     $this->id = $this->app->DB->GetInsertID();
@@ -113,7 +115,8 @@ $result = $result[0];
       `steuertext`='{$this->steuertext}',
       `preis`='{$this->preis}',
       `menge`='{$this->menge}',
-      `kostenstelle`='{$this->kostenstelle}'
+      `kostenstelle`='{$this->kostenstelle}',
+      `sachkonto`='{$this->sachkonto}'
       WHERE (`id`='{$this->id}')";
 
     $this->app->DB->Update($sql);
@@ -152,6 +155,7 @@ $result = $result[0];
     $this->preis='';
     $this->menge='';
     $this->kostenstelle='';
+    $this->sachkonto='';
   }
 
   public function Copy()
@@ -234,5 +238,7 @@ $result = $result[0];
   public function GetMenge() { return $this->menge; }
   public function SetKostenstelle($value) { $this->kostenstelle=$value; }
   public function GetKostenstelle() { return $this->kostenstelle; }
+  public function SetSachkonto($value) { $this->sachkonto=$value; }
+  public function GetSachkonto() { return $this->sachkonto; }
 
 }

www/pages/adresse.php

@@ -2054,7 +2054,7 @@ $table_kontakte = '';
 $ckontakte = !empty($kontakte)?count($kontakte):0;
 for($i=0;$i<$ckontakte;$i++)
 {
-  $tabindex = $tabindex+i;
+  $tabindex = $tabindex+$i;
   $table_kontakte .= "<tr><td>".$kontakte[$i]['bezeichnung'].":&nbsp;
     </td><td><input type=text name=\"adresse_kontakte[".$kontakte[$i]['id']."]\" value=\"".$kontakte[$i]['kontakt']."\" size=\"30\" tabindex=\"$tabindex\">&nbsp;<a href=\"#\" onclick=\"if(!confirm('".$kontakte[$i]['bezeichnung']." wirklich entfernen?'))    return false; else window.location.href='index.php?module=adresse&action=delkontakt&id=".$id."&lid=".$kontakte[$i]['id']."';\">x</a></td></tr>";
 }

www/pages/ajax.php

@@ -350,9 +350,9 @@ class Ajax {
       $id = $this->app->Secure->GetPOST('id');
       $objekt = $this->app->Secure->GetPOST('typ');
       $parameter = $this->app->Secure->GetPOST('parameter');
-      if($objekt === 'adresse'){
+
-        $objekt = 'Adressen';
+      $module = strtolower($objekt);
-      }
+      $objekt = $this->app->YUI->dateien_module_objekt_map($objekt);   
 
       $data = $this->app->DB->SelectRow(
         "SELECT d.*, s.subjekt 
@@ -363,12 +363,6 @@ class Ajax {
         LIMIT 1"
       );
 
-
-      $module = strtolower($objekt);
-      if($module === 'adressen'){
-        $module = 'adresse';
-      }
-
       $typen = $this->app->erp->getDateiTypen($module);
       $found = false;
       foreach($typen as $typ) {
@@ -431,10 +425,10 @@ class Ajax {
       $titel = $this->app->Secure->GetPOST('titel');
       $beschreibung = $this->app->Secure->GetPOST('beschreibung');
       $subjekt = $this->app->Secure->GetPOST('subjekt');
-      if($objekt == 'adresse')
+
-      {
+      $module = strtolower($objekt);
-        $objekt = 'Adressen';
+      $objekt = $this->app->YUI->dateien_module_objekt_map($module);      
-      }
+
       $ersteller = $this->app->DB->real_escape_string($this->app->User->GetName());
       $datei = $this->app->DB->SelectArr("SELECT d.id, s.id as sid FROM datei d LEFT JOIN datei_stichwoerter s ON d.id=s.datei LEFT JOIN datei_version v ON v.datei=d.id WHERE s.objekt LIKE '$objekt' AND s.parameter='$parameter' AND d.geloescht=0 AND d.id = '$id' LIMIT 1");
       if($datei)
@@ -654,6 +648,9 @@ class Ajax {
     $cmd = trim($this->app->Secure->GetGET('cmd'));
     $id = (int)$this->app->Secure->GetGET('id');
 
+    $module = strtolower($cmd);
+    $cmd = $this->app->YUI->dateien_module_objekt_map($cmd);
+
     if(!empty($cmd) && $id
       && (!in_array($cmd, $cmds) || (in_array($cmd, $cmds) && $this->app->erp->RechteVorhanden($cmd,'dateien')))) {
       $datei = $this->app->DB->SelectRow(
@@ -661,7 +658,7 @@ class Ajax {
           "SELECT dv.id, ds.parameter, dv.dateiname 
           FROM datei_version AS dv 
           INNER JOIN datei_stichwoerter ds ON ds.datei = dv.datei 
-          WHERE dv.datei = %d AND (ds.objekt like '%s'".($cmd === 'adresse'?" OR ds.objekt like 'Adressen' ":'').") 
+          WHERE dv.datei = %d AND (ds.objekt like '%s') 
           ORDER BY  dv.datei DESC, dv.version DESC 
           LIMIT 1",
           $id, $cmd
@@ -677,6 +674,7 @@ class Ajax {
         echo $str;
         exit;
       }
+
       if(!empty($datei['parameter'])) {
         if($cmd === 'projekt') {
           if(!$this->app->erp->UserProjektRecht($datei['parameter'])) {
@@ -694,7 +692,7 @@ class Ajax {
           $projekt = $this->app->DB->Select(
             sprintf(
               'SELECT `projekt` FROM `%s` WHERE `id` = %d LIMIT 1',
-              $cmd, $datei[0]['parameter']
+              $module, $datei[0]['parameter']
             )
           );
           if(!$this->app->erp->UserProjektRecht($projekt)) {
@@ -711,7 +709,6 @@ class Ajax {
         }
       }
       //Rechte prüfen     
-      
       $userdata = isset($this->app->Conf->WFuserdata)
         ?$this->app->Conf->WFuserdata
         :(str_replace('index.php', '', $_SERVER['SCRIPT_FILENAME']).'../userdata');
@@ -749,29 +746,12 @@ class Ajax {
               exit;
             break;
             case 'application/pdf':
-              $str = file_get_contents(dirname(__DIR__) . '/themes/new/images/pdf.svg');
+              $str = file_get_contents(dirname(__DIR__) . '/themes/new/images/pdf.png');
               header('Content-type: image/png');
               echo $str;
               exit;
             break;
             default:             
-              $str = file_get_contents(dirname(__DIR__) . '/themes/new/images/pdf.svg');
-              if(substr(strtolower($datei['dateiname']),-4) === '.gif'){
-                header('Content-type: image/gif');
-                echo $str;
-                exit; 
-              }
-              if(substr(strtolower($datei['dateiname']),-4) === '.png'){
-                header('Content-type: image/png');
-                echo $str;
-                exit; 
-              }
-              if(substr(strtolower($datei['dateiname']),-4) === '.jpg'
-                || substr(strtolower($datei['dateiname']),-4) === 'jpeg'){
-                header('Content-type: image/jpg');
-                echo $str;
-                exit;                 
-              }
             break;
           }
         }
@@ -1597,11 +1577,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'];
@@ -2376,7 +2362,14 @@ select a.kundennummer, (SELECT name FROM adresse a2 WHERE a2.kundennummer = a.ku
         for($i = 0; $i < $carr; $i++)
           $newarr[] = $arr[$i]['name'];
         break;
+      case "sachkonto_aufwendungen":
+         $arr = $this->app->DB->SelectArr("SELECT CONCAT(sachkonto,' ',beschriftung) as name FROM kontorahmen 
+            WHERE art = 1 AND (beschriftung LIKE '%$term%' OR sachkonto LIKE '%$term%' OR sachkonto LIKE '%$term2%' OR sachkonto LIKE '%$term3%' OR beschriftung LIKE '%$term2%' OR beschriftung LIKE '%$term3%') AND ausblenden!=1 $andprojekt ORDER by sachkonto");
 
+        $carr = !empty($arr)?count($arr):0;
+        for($i = 0; $i < $carr; $i++)
+          $newarr[] = $arr[$i]['name'];
+        break;
       case "lieferbedingungen":
         $arr = $this->app->DB->SelectArr("SELECT CONCAT(lieferbedingungen) as name FROM lieferbedingungen
             WHERE (lieferbedingungen LIKE '%$term%' OR lieferbedingungen LIKE '%$term2%' OR lieferbedingungen LIKE '%$term3%') ORDER by lieferbedingungen");
@@ -2455,6 +2448,7 @@ select a.kundennummer, (SELECT name FROM adresse a2 WHERE a2.kundennummer = a.ku
         $subwhere = $this->AjaxFilterWhere($termorig,$felder);
 
         $arr = $this->app->DB->SelectArr("SELECT CONCAT(nummer,' ',beschreibung) as name FROM kostenstellen WHERE $subwhere ORDER by nummer");
+
         $carr = !empty($arr)?count($arr):0;
         for($i = 0; $i < $carr; $i++)
           $newarr[] = $arr[$i]['name'];
@@ -2479,7 +2473,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;
@@ -2495,7 +2489,7 @@ select a.kundennummer, (SELECT name FROM adresse a2 WHERE a2.kundennummer = a.ku
           $adresse = $this->app->DB->Select("SELECT id FROM adresse WHERE lieferantennummer = '".$lieferant[0]."' AND lieferantennummer <> '' LIMIT 1");
         }
         $beleg = str_replace('lieferanten','',$filtername);
-        $arr = $this->app->DB->SelectArr("SELECT CONCAT(id,' ',if(belegnr <> '',belegnr,'ENTWURF'),' ',lieferantennummer,' ',name) as name FROM $beleg WHERE (belegnr LIKE '%$term%' OR name LIKE '%$term%' OR lieferantennummer LIKE '$%term%') AND (status = 'angelegt' OR status = 'freigegeben') 
+        $arr = $this->app->DB->SelectArr("SELECT CONCAT(belegnr,' ',lieferantennummer,' ',name) as name FROM $beleg WHERE (belegnr <> '') AND (belegnr LIKE '%$term%' OR name LIKE '%$term%' OR lieferantennummer LIKE '$%term%') AND (status = 'versendet' OR status = 'freigegeben') 
         ".($adresse?" AND adresse = '$adresse' ":'')."  ".$this->app->erp->ProjektRechte('projekt')."
         ORDER by belegnr LIMIT 20" );
         $carr = !empty($arr)?count($arr):0;

www/pages/angebot.php

@@ -307,20 +307,51 @@ class Angebot extends GenAngebot
   {
     $id = $this->app->Secure->GetGET('id');
     
-    if(!$this->app->DB->Select("SELECT deckungsbeitragcalc FROM angebot WHERE  id='$id' LIMIT 1")) {
+    // Deckungsbeitrag
-      $this->app->erp->BerechneDeckungsbeitrag($id,'angebot');
+    if (!$this->app->erp->RechteVorhanden('angebot','einkaufspreise')) {
+        $this->app->Tpl->Set('DBHIDDEN','hidden');
+    } else {
+        $sql = "
+                SELECT
+                    umsatz_netto_gesamt,
+                    artikel,
+                    menge,
+                    einkaufspreis
+                FROM
+                    `angebot_position`
+                WHERE
+                    `angebot` = ".$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
+                                    )                                
+                                )."%"
+                            );
     }
 
-    $auftragArr = $this->app->DB->SelectArr("SELECT * FROM angebot WHERE id='$id' LIMIT 1");
-    $kundennummer = $this->app->DB->Select("SELECT kundennummer FROM adresse WHERE id='{$auftragArr[0]['adresse']}' LIMIT 1");
-    $projekt = $this->app->DB->Select("SELECT abkuerzung FROM projekt WHERE id='{$auftragArr[0]['projekt']}' LIMIT 1");
-    $kundenname = $this->app->DB->Select("SELECT name FROM adresse WHERE id='{$auftragArr[0]['adresse']}' LIMIT 1");
-
-
-    $this->app->Tpl->Set('KUNDE',"<a href=\"index.php?module=adresse&action=edit&id=".$auftragArr[0]['adresse']."\" target=\"_blank\">".$kundennummer."</a> ".$kundenname);
-    //$this->app->Tpl->Set('KUNDE',$kundennummer." ".$kundenname);
-    $this->app->Tpl->Set('DECKUNGSBEITRAG',0);
-    $this->app->Tpl->Set('DBPROZENT',0);    
 
     if($this->app->erp->RechteVorhanden('projekt','dashboard')){
       $this->app->Tpl->Set('PROJEKT', "<a href=\"index.php?module=projekt&action=dashboard&id=" . $auftragArr[0]['projekt'] . "\" target=\"_blank\">$projekt</a>");
@@ -1695,6 +1726,11 @@ class Angebot extends GenAngebot
       $this->app->erp->AdresseAlsLieferadresseButton($adresse);
     }
     
+    
+    if ($schreibschutz != 1 AND $status != 'abgeschlossen') {
+        $this->app->erp->BerechneDeckungsbeitrag($id,'angebot');
+    }
+
     if($nummer!="")
     {
       $this->app->Tpl->Set('NUMMER',$nummer);

www/pages/api.php

@@ -802,7 +802,7 @@ if (!function_exists('getallheaders')) {
       return $permissions;
     }
 
-    private function fillApiPermissions()
+    function fillApiPermissions()
     {
       foreach ($this->getGroupedPermissions() as $group => $permissions){
         foreach ($permissions as $permission){

www/pages/api_account.php

@@ -267,6 +267,12 @@ class Api_account
 
     $apiPermissions = $this->app->DB->SelectArr("SELECT * FROM `api_permission`");
 
+    if (empty($apiPermissions)) {
+        $api = $this->app->loadModule('api');
+        $api->fillApiPermissions();
+        $apiPermissions = $this->app->DB->SelectArr("SELECT * FROM `api_permission`");
+    }
+
     $groupedApiPermissions = [];
     foreach ($apiPermissions as $apiPermission){
       $groupedApiPermissions[$apiPermission['group']][] =$apiPermission;

www/pages/artikel.php

@@ -938,8 +938,8 @@ class Artikel extends GenArtikel {
                     IF(s.art='it','<br><i style=color:#999>- Informationsteil/Dienstleistung</i>',''),IF(s.art='bt','<br><i style=color:#999>- Beistellung</i>',''), COALESCE((SELECT GROUP_CONCAT('<br><i style=color:#999>- ', art.nummer, ' ', art.name_de, ' (', alt.reason, ')', '</i>' SEPARATOR '') FROM parts_list_alternative AS alt INNER JOIN artikel AS art ON art.id = alt.alternative_article_id WHERE alt.parts_list_id = s.id), '')) as artikel,
                     CONCAT('<a href=\"index.php?module=artikel&action=edit&id=',a.id,'\" target=\"_blank\">',a.nummer,'</a>') as nummer,
                     s.referenz,
-                    ".$this->app->erp->FormatMenge('s.menge').' as menge, a.einheit,
+                    trim(s.menge)+0 as menge, a.einheit,
-                    '.$this->app->erp->FormatMenge('ifnull(lag.menge,0)').'  as lager, 
+                    ".$this->app->erp->FormatMenge('ifnull(lag.menge,0)').'  as lager, 
                     CASE WHEN (SELECT SUM(lr.menge) FROM lager_reserviert lr WHERE lr.artikel=a.id)  > 0 
                         THEN (SELECT '.$this->app->erp->FormatMenge('SUM(lr.menge)')." FROM lager_reserviert lr WHERE lr.artikel=a.id)  
                         ELSE 0
@@ -6321,7 +6321,7 @@ class Artikel extends GenArtikel {
 
       $id = (int)$this->app->Secure->GetPOST('id');
         
-      $data = $this->app->DB->SelectRow('SELECT s.id, s.artikel, '.$this->app->erp->FormatMenge("s.menge")." as menge, s.art, s.referenz, s.layer, s.place, s.wert, s.bauform, s.zachse, s.xpos, s.ypos FROM stueckliste s WHERE s.id = '$id' LIMIT 1");
+      $data = $this->app->DB->SelectRow("SELECT s.id, s.artikel, trim(s.menge)+0 as menge, s.art, s.referenz, s.layer, s.place, s.wert, s.bauform, s.zachse, s.xpos, s.ypos FROM stueckliste s WHERE s.id = '$id' LIMIT 1");
       
         if($data){
           if($data['artikel'] == 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/angebot_minidetail.tpl

@@ -45,7 +45,25 @@
 </div>
 </div>
 
-
+<div style="background-color:white" [DBHIDDEN]>
+    <h2 class="greyh2">{|Deckungsbeitrag (netto)|}</h2>
+    <table width="100%">
+        <tbody>
+            <tr>
+                <td>Umsatz EUR</td>
+                <td>Kosten EUR</td>
+                <td>Deckungsbeitrag EUR</td>
+                <td>DB %</td>
+            </tr>
+            <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 style="background-color:white">
 <h2 class="greyh2">Protokoll</h2>
@@ -59,12 +77,6 @@
   [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>
-</div>
 

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/emailbackup_edit.tpl

@@ -1,179 +1,346 @@
 <div id="tabs">
-    <ul>
+	<ul>
-        <li><a href="#tabs-1"></a></li>
+		<li>
-    </ul>
+			<a href="#tabs-1"></a>
-    <!-- Example for multiple tabs
+		</li>
+	</ul>
+	<!-- Example for multiple tabs
     <ul hidden">
         <li><a href="#tabs-1">First Tab</a></li>
         <li><a href="#tabs-2">Second Tab</a></li>
     </ul>
     -->
-    <div id="tabs-1">
+	<div id="tabs-1"> [MESSAGE]
-        [MESSAGE]
+		<form action="" method="post"> [FORMHANDLEREVENT]
-        <form action="" method="post">   
+			<div class="row">
-            [FORMHANDLEREVENT]
+				<div class="row-height">
-            <div class="row">
+					<div class="col-xs-12 col-md-12 col-md-height">
-   	        	<div class="row-height">
+						<div class="inside inside-full-height">
-  	        		<div class="col-xs-12 col-md-12 col-md-height">
+							<fieldset>
-  	        			<div class="inside inside-full-height">
+								<legend>{|Allgemein|}</legend>
-  	        				<fieldset>
+								<input type="submit" name="submit" value="Speichern" style="float:right" />
-                      <legend>{|Allgemein|}</legend>
+								<table width="100%" border="0" class="mkTableFormular">
-                        <table width="100%" border="0" class="mkTableFormular">
+									<tr>
-<tr><td>{|E-Mail-Adresse|}:</td><td><input type="text" name="email" value="[EMAIL]" size="40"></td></tr>
+										<td width="200">{|E-Mail-Adresse|}:</td>
-<tr><td>{|Angezeigter Name|}:</td><td><input type="text" name="angezeigtername" value="[ANGEZEIGTERNAME]" size="40"></td></tr>
+										<td>
-<tr><td>{|Interne Beschreibung|}:</td><td><input type="text" name="internebeschreibung" value="[INTERNEBESCHREIBUNG]" size="40"></td></tr>
+											<input type="text" name="email" value="[EMAIL]" size="40">
-<tr><td>{|Benutzername|}:</td><td><input type="text" name="benutzername" value="[BENUTZERNAME]" size="40"></td></tr>
+										</td>
-<tr><td>{|Passwort|}:</td><td><input type="password" name="passwort" value="[PASSWORT]" size="40"></td></tr>
+									</tr>
-                        </table>
+									<tr>
-                      </fieldset>            
+										<td>{|Angezeigter Name|}:</td>
-                    </div>
+										<td>
-     		      </div>
+											<input type="text" name="angezeigtername" value="[ANGEZEIGTERNAME]" size="40">
-           	    </div>	
+										</td>
-              </div>
+									</tr>
-              <div class="row">
+									<tr>
- 	        	<div class="row-height">
+										<td>{|Interne Beschreibung|}:</td>
-        		    <div class="col-xs-12 col-md-12 col-md-height">
+										<td>
-	        			<div class="inside inside-full-height">
+											<input type="text" name="internebeschreibung" value="[INTERNEBESCHREIBUNG]" size="40">
-	        				<fieldset>
+										</td>
-                            <legend>{|SMTP|}</legend>
+									</tr>
-                            <table width="100%" border="0" class="mkTableFormular">
+									<tr>
-<tr><td>{|SMTP benutzen|}:</td><td><input type="text" name="smtp_extra" value="[SMTP_EXTRA]" size="40"><i>0 = nein, 1 = ja</i></td></tr>
+										<td>{|Benutzername|}:</td>
-<tr><td>{|Server|}:</td><td><input type="text" name="smtp" value="[SMTP]" size="40"></td></tr>
+										<td>
-<tr><td>{|Verschl&uuml;sselung|}:</td><td><input type="text" name="smtp_ssl" value="[SMTP_SSL]" size="40"><i>0 = keine, 1 = TLS, 2 = SSL</i></td></tr>
+											<input type="text" name="benutzername" value="[BENUTZERNAME]" size="40">
-<tr><td>{|Port|}:</td><td><input type="text" name="smtp_port" value="[SMTP_PORT]" size="40"></td></tr>
+										</td>
-<tr><td>{|Authtype|}:</td><td><input type="text" name="smtp_authtype" value="[SMTP_AUTHTYPE]" size="40"><i>'', 'smtp', 'oauth_google'</i></td></tr>
+									</tr>
-<tr><td>{|Authparam|}:</td><td><input type="text" name="smtp_authparam" value="[SMTP_AUTHPARAM]" size="40"></td></tr>
+									<tr>
-<tr><td>{|Client_alias|}:</td><td><input type="text" name="client_alias" value="[CLIENT_ALIAS]" size="40"></td></tr>
+										<td>{|Passwort|}:</td>
-<tr><td>{|Loglevel|}:</td><td><input type="text" name="smtp_loglevel" value="[SMTP_LOGLEVEL]" size="40"></td></tr>
+										<td>
-
+											<input type="password" name="passwort" value="[PASSWORT]" size="40">
-<tr><td width="50">Testmail:</td><td>
+										</td>
-        <input type="submit" form="smtp_test" value="Testmail senden" id="testmail-senden-button">&nbsp;<i>Bitte erst speichern und dann senden!</i>
+									</tr>
-</td></tr>              
+								</table>
-
+							</fieldset>
-                            </table>
+						</div>
-                          </fieldset>            
+					</div>
-                        </div>
+				</div>
-         		      </div>
+			</div>
-               	    </div>	
+			<div class="row">
-                  </div>
+				<div class="row-height">
-                    <div class="row">
+					<div class="col-xs-12 col-md-12 col-md-height">
- 	        	<div class="row-height">
+						<div class="inside inside-full-height">
-        		    <div class="col-xs-12 col-md-12 col-md-height">
+							<fieldset>
-	        			<div class="inside inside-full-height">
+								<legend>{|SMTP|}</legend>
-	        				<fieldset>
+								<table width="100%" border="0" class="mkTableFormular">
-                            <legend>{|IMAP|}</legend>
+									<tr>
-                            <table width="100%" border="0" class="mkTableFormular">
+										<td width="200">{|SMTP benutzen|}:</td>
-<tr><td>{|IMAP server|}:</td><td><input type="text" name="server" value="[SERVER]" size="40"></td></tr>
+										<td>
-<tr><td>{|imap_sentfolder_aktiv|}:</td><td><input type="text" name="imap_sentfolder_aktiv" value="[IMAP_SENTFOLDER_AKTIV]" size="40"></td></tr>
+                                            <input type="checkbox" name="smtp_extra" value="1" [SMTP_EXTRA]>
-<tr><td>{|imap_sentfolder|}:</td><td><input type="text" name="imap_sentfolder" value="[IMAP_SENTFOLDER]" size="40"></td></tr>
+                                        </td>
-<tr><td>{|imap_port|}:</td><td><input type="text" name="imap_port" value="[IMAP_PORT]" size="40"></td></tr>
+									</tr>
-<tr><td>{|imap_type|}:</td><td><input type="text" name="imap_type" value="[IMAP_TYPE]" size="40"><i>1 = standard, 3 = SSL, 5 = OAuth</i></td></tr>
+									<tr>
-<tr><td width="50">Testmail:</td><td>
+										<td>{|Server|}:</td>
-        <input type="submit" form="imap_test" value="IMAP testen" id="testimap-button">&nbsp;<i>Bitte erst speichern und dann testen!</i>
+										<td>
-</td></tr>
+											<input type="text" name="smtp" value="[SMTP]" size="40">
-</table>
+										</td>
-                      </fieldset>            
+									</tr>
-                    </div>
+									<tr>
-     		      </div>
+										<td>{|Verschl&uuml;sselung|}:</td>
-           	    </div>	
+										<td>
-              </div>             
+											<select name="smtp_ssl">
-<div class="row">
+											    [SMTP_SSL_SELECT]
-<div class="row-height">
+                                            </select>
-        		    <div class="col-xs-12 col-md-12 col-md-height">
+                                        </td>
-	        			<div class="inside inside-full-height">
+									</tr>
-	        				<fieldset>
+									<tr>
-                            <legend>{|Archiv|}</legend>
+										<td>{|Port|}:</td>
-                            <table width="100%" border="0" class="mkTableFormular">
+										<td>
-<tr><td>{|E-Mailarchiv aktiv|}:</td><td><input type="text" name="emailbackup" value="[EMAILBACKUP]" size="40"></td></tr>
+											<input type="text" name="smtp_port" value="[SMTP_PORT]" size="40">
-<tr><td>{|Löschen nach wievielen Tagen?|}:</td><td><input type="text" name="loeschtage" value="[LOESCHTAGE]" size="40"></td></tr>
+										</td>
-</table>
+									</tr>
-                      </fieldset>            
+									<tr>
-                    </div>
+										<td>{|Authtype|}:</td>
-     		      </div>
+										<td>
-           	    </div>	
+                                            <select name="smtp_authtype">
-              </div>             
+											    [SMTP_AUTHTYPE_SELECT]
-<div class="row">
+                                            </select>
-<div class="row-height">
+                                        </td>
-        		    <div class="col-xs-12 col-md-12 col-md-height">
+									</tr>
-	        			<div class="inside inside-full-height">
+									<tr>
-	        				<fieldset>
+										<td>{|Authparam|}:</td>
-                            <legend>{|Ticketsystem|}</legend>
+										<td>
-                            <table width="100%" border="0" class="mkTableFormular">
+											<input type="text" name="smtp_authparam" value="[SMTP_AUTHPARAM]" size="40">
-<tr><td>{|ticket|}:</td><td><input type="text" name="ticket" value="[TICKET]" size="40"></td></tr>
+										</td>
-<tr><td>{|ticketprojekt|}:</td><td><input type="text" id="ticketprojekt" name="ticketprojekt" value="[TICKETPROJEKT]" size="40"></td></tr>
+									</tr>
-<tr><td>{|ticketqueue|}:</td><td><input type="text" id="ticketqueue" name="ticketqueue" value="[TICKETQUEUE]" size="40"></td></tr>
+									<tr>
-<tr><td>{|abdatum|}:</td><td><input type="text" name="abdatum" value="[ABDATUM]" size="40"></td></tr>
+										<td>{|Client alias|}:</td>
-<tr><td>{|ticketloeschen|}:</td><td><input type="text" name="ticketloeschen" value="[TICKETLOESCHEN]" size="40"></td></tr>
+										<td>
-<tr><td>{|ticketabgeschlossen|}:</td><td><input type="text" name="ticketabgeschlossen" value="[TICKETABGESCHLOSSEN]" size="40"></td></tr>
+											<input type="text" name="client_alias" value="[CLIENT_ALIAS]" size="40">
-<tr><td>{|ticketemaileingehend|}:</td><td><input type="text" name="ticketemaileingehend" value="[TICKETEMAILEINGEHEND]" size="40"></td></tr>
+										</td>
-</table>
+									</tr>
-                      </fieldset>            
+									<tr>
-                    </div>
+										<td>{|SMTP Debug|}:</td>
-     		      </div>
+										<td>
-           	    </div>	
+											<input type="checkbox" name="smtp_loglevel" value="1" [SMTP_LOGLEVEL]>
-              </div>             
+										</td>
-<div class="row">
+									</tr>
-<div class="row-height">
+									<tr>
-        		    <div class="col-xs-12 col-md-12 col-md-height">
+										<td width="50">Testmail:</td>
-	        			<div class="inside inside-full-height">
+										<td>
-	        				<fieldset>
+											<input type="submit" form="smtp_test" value="Testmail senden" id="testmail-senden-button">&nbsp;<i>Bitte erst speichern und dann senden!</i>
-                            <legend>{|Sonstiges|}</legend>
+                                        </td>
-                            <table width="100%" border="0" class="mkTableFormular">
+									</tr>
-<tr><td>{|autosresponder_blacklist|}:</td><td><input type="text" name="autosresponder_blacklist" value="[AUTOSRESPONDER_BLACKLIST]" size="40"></td></tr>
+								</table>
-<tr><td>{|eigenesignatur|}:</td><td><input type="text" name="eigenesignatur" value="[EIGENESIGNATUR]" size="40"></td></tr>
+							</fieldset>
-<tr><td>{|signatur|}:</td><td><textarea id="signatur" name="signatur" rows="6" style="width:100%;">[SIGNATUR]</textarea></td></tr>
+						</div>
-<tr><td>{|adresse|}:</td><td><input type="text" id="adresse" name="adresse" value="[ADRESSE]" size="40"></td></tr>
+					</div>
-<tr><td>{|firma|}:</td><td><input type="text" name="firma" value="[FIRMA]" size="40"></td></tr>
+				</div>
-<tr><td>{|geloescht|}:</td><td><input type="text" name="geloescht" value="[GELOESCHT]" size="40"></td></tr>
+			</div>
-<tr><td>{|mutex|}:</td><td><input type="text" name="mutex" value="[MUTEX]" size="40"></td></tr>
+			<div class="row">
-<tr><td>{|autoresponder|}:</td><td><input type="text" name="autoresponder" value="[AUTORESPONDER]" size="40"></td></tr>
+				<div class="row-height">
-<tr><td>{|geschaeftsbriefvorlage|}:</td><td><input type="text" name="geschaeftsbriefvorlage" value="[GESCHAEFTSBRIEFVORLAGE]" size="40"></td></tr>
+					<div class="col-xs-12 col-md-12 col-md-height">
-<tr><td>{|autoresponderbetreff|}:</td><td><textarea id="autoresponderbetreff" name="autoresponderbetreff" rows="6" style="width:100%;">[AUTORESPONDERBETREFF]</textarea></td></tr>
+						<div class="inside inside-full-height">
-<tr><td>{|autorespondertext|}:</td><td><textarea id="autorespondertext" name="autorespondertext" rows="6" style="width:100%;">[AUTORESPONDERTEXT]</textarea></td></tr>
+							<fieldset>
-<tr><td>{|projekt|}:</td><td><input type="text" id="projekt" name="projekt" value="[PROJEKT]" size="40"></td></tr>
+								<legend>{|IMAP|}</legend>
-                        </table>
+								<table width="100%" border="0" class="mkTableFormular">
-                      </fieldset>            
+									<tr>
-                    </div>
+										<td width="200">{|IMAP server|}:</td>
-     		      </div>
+										<td>
-           	    </div>	
+											<input type="text" name="server" value="[SERVER]" size="40">
-              </div>             
+										</td>
-              <input type="submit" name="submit" value="Speichern" style="float:right"/>
+									</tr>
-        </form>
+									<tr>
-    </div>    
+										<td>{|Gesendete Mails in IMAP-Ordner legen|}:</td>
-    <!-- Example for 2nd tab
+										<td>
-    <div id="tabs-2">
+											<input type="checkbox" name="imap_sentfolder_aktiv" value="1" [IMAP_SENTFOLDER_AKTIV]>
-        [MESSAGE]
+										</td>
-        <form action="" method="post">   
+									</tr>
-            [FORMHANDLEREVENT]
+									<tr>
-            <div class="row">
+										<td>{|IMAP-Ordner|}:</td>
-            	<div class="row-height">
+										<td>
-            		<div class="col-xs-12 col-md-12 col-md-height">
+											<input type="text" name="imap_sentfolder" value="[IMAP_SENTFOLDER]" size="40">
-            			<div class="inside inside-full-height">
+										</td>
-            				<fieldset>
+									</tr>
-                                <legend>{|...|}</legend>
+									<tr>
-                                <table width="100%" border="0" class="mkTableFormular">
+										<td>{|IMAP-Port|}:</td>
-                                    ...
+										<td>
-                                </table>
+											<input type="text" name="imap_port" value="[IMAP_PORT]" size="40">
-                            </fieldset>            
+										</td>
-                        </div>
+									</tr>
-               		</div>
+									<tr>
-               	</div>	
+										<td>{|IMAP-Typ|}:</td>
-            </div>
+										<td>
-            <input type="submit" name="submit" value="Speichern" style="float:right"/>
+                                            <select name="imap_type">
-        </form>
+                                                [IMAP_TYPE_SELECT]
-    </div>    
+                                            </select>
-    -->
+                                        </td>
-</div>
+									</tr>
-
+									<tr>
-<form id="smtp_test" action = "index.php">
+										<td width="50">Testmail:</td>
-<input type="text" name="module" value="emailbackup" style="display:none">
+										<td>
-<input type="text" name="action" value="test_smtp" style="display:none">
+											<input type="submit" form="imap_test" value="IMAP testen" id="testimap-button">&nbsp;<i>Bitte erst speichern und dann testen!</i>
-<input type="text" name="id" value="[ID]" style="display:none">
+                                        </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>{|Archiv|}</legend>
+								<table width="100%" border="0" class="mkTableFormular">
+									<tr>
+										<td width="200">{|E-Mailarchiv aktiv|}:</td>
+										<td>
+                                            <input type="checkbox" name="emailbackup" value="1" [EMAILBACKUP]>
+										</td>
+									</tr>
+									<tr>
+										<td>{|Löschen nach wievielen Tagen?|}:</td>
+										<td>
+											<input type="text" name="loeschtage" value="[LOESCHTAGE]" size="40">
+										</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>{|Ticketsystem|}</legend>
+								<table width="100%" border="0" class="mkTableFormular">
+									<tr>
+										<td width="200">{|Mails als Ticket importieren|}:</td>
+										<td>
+                                            <input type="checkbox" name="ticket" value="1" [TICKET]>
+										</td>
+									</tr>
+									<tr>
+										<td>{|Projekt f&uuml;r Ticket|}:</td>
+										<td>
+											<input type="text" id="ticketprojekt" name="ticketprojekt" value="[TICKETPROJEKT]" size="40">
+										</td>
+									</tr>
+									<tr>
+										<td>{|Warteschlange f&uuml;r Ticket|}:</td>
+										<td>
+											<input type="text" id="ticketqueue" name="ticketqueue" value="[TICKETQUEUE]" size="40">
+										</td>
+									</tr>
+									<tr>
+										<td>{|E-Mails ab Datum importieren|}:</td>
+										<td>
+											<input type="text" name="abdatum" id="abdatum" value="[ABDATUM]" size="40">
+										</td>
+									</tr>
+									<tr>
+										<td>{|E-Mail nach Import l&ouml;schen|}:</td>
+										<td>
+                                            <input type="checkbox" name="ticketloeschen" value="1" [TICKETLOESCHEN]>
+										</td>
+									</tr>
+									<tr>
+										<td>{|Ticket auf abgeschlossen setzen|}:</td>
+										<td>
+                                            <input type="checkbox" name="ticketabgeschlossen" value="1" [TICKETABGESCHLOSSEN]>
+										</td>
+									</tr>
+									<tr>
+										<td>{|Ausgehende E-Mailadresse|}:</td>
+										<td>
+                                        	<input type="checkbox" name="ticketemaileingehend" value="1" [TICKETEMAILEINGEHEND]>
+										</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>{|Sonstiges|}</legend>
+								<table width="100%" border="0" class="mkTableFormular">
+									<tr>
+										<td>{|Automatisch antworten|}:</td>
+										<td>
+                                            <input type="checkbox" name="autoresponder" value="1" [AUTORESPONDER]>
+										</td>
+									</tr>
+                                	<tr>
+										<td width="200">{|Nur eine Antwort pro Tag|}:</td>
+										<td>
+                                            <input type="checkbox" name="autosresponder_blacklist" value="1" [AUTOSRESPONDER_BLACKLIST]>
+										</td>
+									</tr>								
+									<tr>
+										<td>{|Automatische Antwort Betreff|}:</td>
+										<td>
+											<textarea id="autoresponderbetreff" name="autoresponderbetreff" rows="6" style="width:100%;">[AUTORESPONDERBETREFF]</textarea>
+										</td>
+									</tr>
+									<tr>
+										<td>{|Automatische Antwort Text|}:</td>
+										<td>
+											<textarea id="autorespondertext" name="autorespondertext" rows="6" style="width:100%;">[AUTORESPONDERTEXT]</textarea>
+										</td>
+									</tr>
+									<tr>
+										<td>{|Eigene Signatur verwenden|}:</td>
+										<td>
+                                            <input type="checkbox" name="eigenesignatur" value="1" [EIGENESIGNATUR]>
+										</td>
+									</tr>
+									<tr>
+										<td>{|Signatur|}:</td>
+										<td>
+											<textarea id="signatur" name="signatur" rows="6" style="width:100%;">[SIGNATUR]</textarea>
+										</td>
+									</tr>								
+                                	<tr>
+										<td>{|Adresse|}:</td>
+										<td>
+											<input type="text" id="adresse" name="adresse" value="[ADRESSE]" size="40">
+										</td>
+									</tr>
+									<tr>
+										<td>{|Projekt|}:</td>
+										<td>
+											<input type="text" id="projekt" name="projekt" value="[PROJEKT]" size="40">
+										</td>
+									</tr>
+									<tr>
+    									<td>{|Firma|}:</td>
+										<td>
+											<input type="text" name="firma" value="[FIRMA]" size="40">
+										</td>
+                                	<tr>
+										<td>{|Gesch&auml;ftsbriefvorlage|}:</td>
+										<td>
+											<input type="text" name="geschaeftsbriefvorlage" value="[GESCHAEFTSBRIEFVORLAGE]" size="40">
+										</td>
+									</tr>
+									</tr>																	
+								</table>
+							</fieldset>
+						</div>
+					</div>
+				</div>
+			</div>
+			<input type="submit" name="submit" value="Speichern" style="float:right" />
+	    </form>
+	</div>	
+<form id="smtp_test" action="index.php">
+	<input type="text" name="module" value="emailbackup" style="display:none">
+	<input type="text" name="action" value="test_smtp" style="display:none">
+	<input type="text" name="id" value="[ID]" style="display:none"> 
 </form>
-
+<form id="imap_test" action="index.php">
-<form id="imap_test" action = "index.php">
+	<input type="text" name="module" value="emailbackup" style="display:none">
-<input type="text" name="module" value="emailbackup" style="display:none">
+	<input type="text" name="action" value="test_imap" style="display:none">
-<input type="text" name="action" value="test_imap" style="display:none">
+	<input type="text" name="id" value="[ID]" style="display:none">
-<input type="text" name="id" value="[ID]" style="display:none">
 </form>
-

www/pages/content/firmendaten.tpl

@@ -1412,6 +1412,7 @@
 							<tr><td width="300">[BEZEICHNUNGANGEBOTERSATZ] als Standard:</td><td><input type="checkbox"  name="angebotersatz_standard" [ANGEBOTERSATZ_STANDARD]></td></tr>
 							<tr><td width="300">Beschriftung Abweichend Auftrag:</td><td><input type="text" name="bezeichnungauftragersatz" data-lang="bezeichnungauftragersatz" value="[BEZEICHNUNGAUFTRAGERSATZ]">&nbsp;<i>Beschriftung im Auftrag</i></td></tr>
 							<tr><td width="300">Beschriftung Abweichend Rechnung:</td><td><input type="text" name="bezeichnungrechnungersatz" data-lang="bezeichnungrechnungersatz" value="[BEZEICHNUNGRECHNUNGERSATZ]">&nbsp;<i>Beschriftung in Rechnung</i></td></tr>
+							<tr><td width="300">[BEZEICHNUNGRECHNUNGERSATZ] als Standard:</td><td><input type="checkbox"  name="rechnungersatz_standard" [RECHNUNGERSATZ_STANDARD]></td></tr>
 							<tr><td width="300">Beschriftung Abweichend Gutschrift:</td><td><input type="text" name="bezeichnungstornorechnung" data-lang="bezeichnungstornorechnung" value="[BEZEICHNUNGSTORNORECHNUNG]">&nbsp;<i>laut 06/2013 §14  UStG</i></td></tr>
 							<tr><td width="300">[BEZEICHNUNGSTORNORECHNUNG] als Standard:</td><td><input type="checkbox"  name="stornorechnung_standard" [STORNORECHNUNG_STANDARD]></td></tr>
 							<tr><td width="300">Beschriftung Abweichend Lieferschein:</td><td><input type="text" name="bezeichnunglieferscheinersatz" data-lang="bezeichnunglieferscheinersatz" value="[BEZEICHNUNGLIEFERSCHEINERSATZ]">&nbsp;<i>Beschriftung in Lieferschein</i></td></tr>

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/kostenstellen_edit.tpl

@@ -0,0 +1,119 @@
+<div id="tabs">
+    <ul>
+        <li><a href="#tabs-1"></a></li>
+    </ul>
+    <!-- Example for multiple tabs
+    <ul hidden">
+        <li><a href="#tabs-1">First Tab</a></li>
+        <li><a href="#tabs-2">Second Tab</a></li>
+    </ul>
+    -->
+    <div id="tabs-1">
+        [MESSAGE]
+        <form action="" method="post">   
+            [FORMHANDLEREVENT]
+            <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>{|<!--Legend for this form area goes here>-->kostenstellen|}
+                                <table width="100%" border="0" class="mkTableFormular">
+                                    <tr>
+                                        <td>
+                                            {|Nummer|}:
+                                        </td>
+                                        <td>
+                                            <input type="text" name="nummer" id="nummer" value="[NUMMER]" size="20">
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            {|Beschreibung|}:
+                                        </td>
+                                        <td>
+                                            <input type="text" name="beschreibung" id="beschreibung" value="[BESCHREIBUNG]" size="20">
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            {|Internebemerkung|}:
+                                        </td>
+                                        <td>
+                                            <input type="text" name="internebemerkung" id="internebemerkung" value="[INTERNEBEMERKUNG]" size="20">
+                                        </td>
+                                    </tr>
+                                    
+                                </table>
+                            </fieldset>            
+                        </div>
+               		</div>
+               	</div>	
+            </div>
+            <!-- Example for 2nd row            
+            <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>{|Another legend|}</legend>
+                                <table width="100%" border="0" class="mkTableFormular">
+                                    <tr>
+                                        <td>
+                                            {|Nummer|}:
+                                        </td>
+                                        <td>
+                                            <input type="text" name="nummer" id="nummer" value="[NUMMER]" size="20">
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            {|Beschreibung|}:
+                                        </td>
+                                        <td>
+                                            <input type="text" name="beschreibung" id="beschreibung" value="[BESCHREIBUNG]" size="20">
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            {|Internebemerkung|}:
+                                        </td>
+                                        <td>
+                                            <input type="text" name="internebemerkung" id="internebemerkung" value="[INTERNEBEMERKUNG]" size="20">
+                                        </td>
+                                    </tr>
+                                    
+                                </table>
+                            </fieldset>            
+                        </div>
+               		</div>
+               	</div>	
+            </div> -->
+            <input type="submit" name="submit" value="Speichern" style="float:right"/>
+        </form>
+    </div>    
+    <!-- Example for 2nd tab
+    <div id="tabs-2">
+        [MESSAGE]
+        <form action="" method="post">   
+            [FORMHANDLEREVENT]
+            <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>{|...|}</legend>
+                                <table width="100%" border="0" class="mkTableFormular">
+                                    ...
+                                </table>
+                            </fieldset>            
+                        </div>
+               		</div>
+               	</div>	
+            </div>
+            <input type="submit" name="submit" value="Speichern" style="float:right"/>
+        </form>
+    </div>    
+    -->
+</div>
+

www/pages/content/kostenstellen_list.tpl

@@ -0,0 +1,10 @@
+<div id="tabs">
+    <ul>
+            <li><a href="#tabs-1">[TABTEXT1]</a></li>
+    </ul>
+    <div id="tabs-1">
+        [MESSAGE]
+        [TAB1]
+        [TAB1NEXT]
+    </div>
+</div>

www/pages/content/lager_umlagern_lieferschein.tpl

@@ -0,0 +1,43 @@
+<div id="tabs">
+    <ul>
+            <li><a href="#tabs-1">[TABTEXT1]</a></li>
+    </ul>
+    <div id="tabs-1">
+        [MESSAGE]
+        [MESSAGETABLE]
+        <fieldset>
+            <form action="" method="post" id="eprooform" name="eprooform">
+                <table class="tableborder" border="0" cellpadding="3" cellspacing="0" width="100%">
+                    <tbody>
+                        <tr valign="top" colspan="3">
+                            <td>                                
+                                <table width="80%" align="center">
+                                    <tr valign="top">
+                                    <td align="center">
+                                    <table width="90%">
+                                      <tr><td><b>{|Quelllager|}:</b></td><td><input type="text" id="quelllager" name="quelllager" value="[QUELLLAGER]"  size="27" style="width:200px"></td></tr>
+                                    <tr>
+                                        <td>
+                                        </td>
+                                        <td>
+                                            <button name="submit" value="lieferschein" class="ui-button-icon" style="width:200px;">
+                                                Lieferschein erzeugen
+                                            </button>
+                                        </td>
+                                    </tr>
+                                </table>
+                                <br>
+                            </td>
+                            <td>
+                            </td>
+                        </tr>
+                    </table>
+                    <br>
+                    <br>
+                </td>
+              </tr>
+          </table>
+        </form>
+        </fieldset>
+    </div>
+</div>

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/lieferschein_umlagern.tpl

@@ -0,0 +1,45 @@
+<div id="tabs">
+    <ul>
+            <li><a href="#tabs-1">[TABTEXT1]</a></li>
+    </ul>
+    <div id="tabs-1">
+        [MESSAGE]
+        [MESSAGETABLE]
+        <fieldset>
+            <form action="" method="post" id="eprooform" name="eprooform">
+                <table class="tableborder" border="0" cellpadding="3" cellspacing="0" width="100%">
+                    <tbody>
+                        <tr valign="top" colspan="3">
+                            <td>                                
+                                <table width="80%" align="center">
+                                    <tr valign="top">
+                                    <td align="center">
+                                    <table width="90%">
+                                      <tr><td><b>{|Quelllager|}:</b></td><td><input type="text" id="quelllager" name="quelllager" value="[QUELLLAGER]"  size="27" style="width:200px"></td></tr>
+                                      <tr><td><b>{|Ziellager|}:</b></td><td><input type="text" id="ziellager" name="ziellager" value="[ZIELLAGER]"  size="27" style="width:200px"></td></tr>
+                                    <tr>
+                                        <td>
+                                            <p [ERNEUT_UMLAGERN_HIDDEN]><input type="checkbox" name="erneut" id="erneut" value="1" size="20" [ERNEUT_CHECKED]>{|Erneut umlagern|}</input></p>
+                                        </td>
+                                        <td>
+                                            <button name="submit" value="umlagern" class="ui-button-icon" style="width:200px;">
+                                                Umlagern
+                                            </button>
+                                        </td>
+                                    </tr>
+                                </table>
+                                <br>
+                            </td>
+                            <td>
+                            </td>
+                        </tr>
+                    </table>
+                    <br>
+                    <br>
+                </td>
+              </tr>
+          </table>
+        </form>
+        </fieldset>
+    </div>
+</div>

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/rechnungslauf_list.tpl

@@ -8,6 +8,7 @@ SPDX-License-Identifier: LicenseRef-EGPL-3.1
         <li><a href="#tabs-2">Aufträge</a></li>
     </ul>
     <div id="tabs-1">
+        [MESSAGE]
         [MESSAGE_INVOICES]
         <form method="post" action="#">
             [TAB_INVOICES]
@@ -19,6 +20,7 @@ SPDX-License-Identifier: LicenseRef-EGPL-3.1
         </form>
     </div>
     <div id="tabs-2">
+        [MESSAGE]
         [MESSAGE_ORDERS]
         <form method="post" action="#">
             [TAB_ORDERS]

www/pages/content/report_databaseview.tpl

@@ -0,0 +1,85 @@
+<div id="tabs" class="report">
+	<ul>
+		<li><a href="#tabs-1">Tabellen</a></li>
+		<li><a href="#tabs-2">Struktur</a></li>
+		<li><a href="#tabs-3">Vorschau</a></li>
+	</ul>
+	<!-- ende gehort zu tabview -->
+
+	<!-- erstes tab -->
+	<div id="tabs-1">
+		[MESSAGE]
+		<div class="row" id="report_list_main">
+			<div class="row-height">
+				<div class="col-xs-12 col-sm-10 col-sm-height">
+					<div>
+					    [TAB1]  
+					</div>
+				</div>
+			</div>
+		</div>
+		[TAB1NEXT]
+	</div>
+    <div id="tabs-2">
+		[MESSAGE]
+		<div class="row" id="report_list_main">
+			<div class="row-height">
+				<div class="col-xs-12 col-sm-10 col-sm-height">
+                    <legend style="float:left">
+                        Tabelle&nbsp;[TABLENAME]
+                    </legend>
+                    <form method="post" action="#tabs-3">
+                        <fieldset style="float: right;">
+                            <input type="text" name="table" value="[TABLENAME]" hidden></input>
+                             <table width="100%" border="0" class="mkTableFormular">
+                                <tr>
+                                    <td style="padding-right:10px;"><input type="checkbox" id="auswahlalle" onchange="alleauswaehlen();"/>{|alle markieren|}</td>
+                                    <td><button name="submit" value="vorschau" class="ui-button-icon" style="width:100%;float:right;">Vorschau</button></td>
+                                </tr>                                                          
+                                </table>
+                        </fieldset>
+                        <p></p>
+					    <div id="columnstab">
+					        [TAB2]  
+					    </div>
+                    </form>
+				</div>
+			</div>
+		</div>
+		[TAB2NEXT]
+	</div>
+    <div id="tabs-3">
+		[MESSAGE]
+		<div class="row" id="report_list_main">
+			<div class="row-height">
+				<div class="col-xs-12 col-sm-10 col-sm-height">
+                    <legend style="float:left">
+                        Tabelle&nbsp;[TABLENAME]
+                    </legend>
+                    <form method="post" action="#tabs-3">
+                        <fieldset style="float: right;">
+                            <input type="text" name="table" value="[TABLENAME]" hidden></input>
+                             <table width="100%" border="0" class="mkTableFormular">
+                                <tr>
+                                    <td><button name="submit" value="erzeugen" class="ui-button-icon" style="width:100%;float:right;">Bericht erzeugen</button></td>
+                                </tr>                                                          
+                            </table>
+                        </fieldset>
+                    </form>
+					<div>
+					    [TAB3]  
+					</div>
+				</div>
+			</div>
+		</div>
+		[TAB3NEXT]
+	</div>
+	<!-- tab view schließen -->
+</div>
+<script>
+    function alleauswaehlen()
+    {
+      var wert = $('#auswahlalle').prop('checked');
+      $('#columnstab').find(':checkbox').prop('checked',wert);
+    }
+</script>

www/pages/content/ticket_edit.tpl

@@ -19,12 +19,13 @@
 	        				<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="20"></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>
                                     <tr><td>{|Tags|}:</td><td><input type="text" name="tags" id="tags" value="[TAGS]" size="20"></td></tr>
                                     <tr><td>{|Letzte Aktion|}:</td><td>[ZEIT]</td></tr>
+                                    [TICKET_ANHANG]
                                 </table>
                             </fieldset> 
                         </div>
@@ -49,6 +50,8 @@
                                     <legend>{|Aktionen|}</legend>
                                     <td><button name="submit" value="speichern" class="ui-button-icon" style="width:100%;">Speichern</button></td></tr>
                                     <td><button name="submit" value="neue_email" class="ui-button-icon" style="width:100%;">Neue E-Mail</button></td></tr>
+                                    <td><button name="submit" value="neue_email_alle" class="ui-button-icon" style="width:100%;">Neue E-Mail an alle</button></td></tr>
+                                    <td><button name="submit" formaction="index.php?module=ticketregeln&action=create" value="regel" class="ui-button-icon" style="width:100%;">Ticketregel erstellen</button><input hidden type="text" name="ticketid" value="[ID]"></td></tr>
                                 </table>
                             </fieldset>
                         </div>
@@ -61,4 +64,3 @@
     </div>    
 </div>
 
-

www/pages/content/ticket_list.tpl

@@ -49,7 +49,19 @@
                     <tr><td>{|Status|}:</td><td><select name="status">[STATUS]</select></td></tr>
                      <tr><td>{|Verantwortlich|}:</td><td><input type="text" name="warteschlange" id="warteschlange" value="[WARTESCHLANGE]" size="20"></td></tr>
                     <tr>
-                        <td><input type="checkbox" value="1" id="autoalle" />&nbsp;alle markieren&nbsp;</td><td><input type="submit" class="btnBlue" name="ausfuehren" value="{|Zuordnen|}" /></td>
+                        <td>                            
+                            <input type="checkbox" value="1" id="autoalle" />&nbsp;alle markieren&nbsp;
+                        </td>
+                        <td>
+                            <button name="submit" value="zuordnen" class="ui-button-icon" style="width:100%;">{|Zuordnen|}</button>
+                        </td>
+                    </tr>
+                    <tr [SPAM_HIDDEN]>
+                        <td>
+                        </td>
+                        <td>
+                            <button name="submit" value="spam_filter" class="ui-button-icon" title="Ticket auf Status 'Papierkorb' setzen und Absender-Adresse in Ticketregel eintragen" style="width:100%;" onclick="if(confirm('Wirklich Ticketregel erstellen?'))document.getElementById('form-id').submit(); else return false;">{|Spamregel erstellen|}</button>
+                        </td>
                     </tr>
                 </table>
 

www/pages/content/ticketregeln_edit.tpl

@@ -17,18 +17,20 @@
 	        		<div class="col-xs-12 col-md-12 col-md-height">
 	        			<div class="inside inside-full-height">
 	        				<fieldset>
-                                <legend>{|Ticketregeln|}</legend><i>Ticketregeln f&uuml; die Verarbeitung bei Ticketeingang. Platzhalter werden mit % angegeben.</i>
+                                <legend>{|Ticketregeln|}</legend><i>Ticketregeln f&uuml;r die Verarbeitung bei Ticketeingang. Platzhalter werden mit % angegeben.</i>
                                 <table width="100%" border="0" class="mkTableFormular">
                                     <tr><td>{|E-Mail Empf&auml;nger|}:</td><td><input type="text" name="empfaenger_email" value="[EMPFAENGER_EMAIL]" size="40"></td></tr>
 <tr><td>{|E-Mail Verfasser|}:</td><td><input type="text" name="sender_email" value="[SENDER_EMAIL]" size="40"></td></tr>
 <tr><td>{|Verfasser Name|}:</td><td><input type="text" name="name" value="[NAME]" size="40"></td></tr>
 <tr><td>{|Betreff|}:</td><td><input type="text" name="betreff" value="[BETREFF]" size="40"></td></tr>
-<tr><td>{|Papierkorb|}:</td><td><input type="text" name="spam" value="[SPAM]" size="40"></td></tr>
+<tr><td colspan="2"><hr style="border-style:solid; border-width:1px"></td></tr>
-<tr><td>{|Pers&ouml;nlich|}:</td><td><input type="text" name="persoenlich" value="[PERSOENLICH]" size="40"></td></tr>
+<tr><td>{|Papierkorb|}:</td><td><input type="checkbox" name="spam" value="1" [SPAM] size="40"></td></tr>
-<tr><td>{|Prio|}:</td><td><input type="text" name="prio" value="[PRIO]" size="40"></td></tr>
+<tr><td>{|Pers&ouml;nlich|}:</td><td><input type="checkbox" name="persoenlich" value="1" [PERSOENLICH] size="40"></td></tr>
-<tr><td>{|DSGVO|}:</td><td><input type="text" name="dsgvo" value="[DSGVO]" size="40"></td></tr>
+<tr><td>{|Prio|}:</td><td><input type="checkbox" name="prio" value="1" [PRIO] size="40"></td></tr>
+<tr><td>{|DSGVO|}:</td><td><input type="checkbox" name="dsgvo" value="1" [DSGVO] size="40"></td></tr>
+<tr><td>{|Adresse|}:</td><td><input type="text" name="adresse" id="adresse" value="[ADRESSE]" size="40"></td></tr>
 <tr><td>{|Verantwortliche Warteschlange|}:</td><td><input type="text" name="warteschlange" id="warteschlange" value="[WARTESCHLANGE]" size="40"></td></tr>
-<tr><td>{|Aktiv|}:</td><td><input type="text" name="aktiv" value="[AKTIV]" size="40"></td></tr>
+<tr><td>{|Aktiv|}:</td><td><input type="checkbox" name="aktiv" value="1" [AKTIV] size="40"></td></tr>
 
                                 </table>
                             </fieldset>            
@@ -36,31 +38,6 @@
                		</div>
                	</div>	
             </div>           
-            <!-- Example for 2nd row            
-            <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>{|Another legend|}</legend>
-                                <table width="100%" border="0" class="mkTableFormular">
-                                    <tr><td>{|Empfaenger_email|}:</td><td><input type="text" name="empfaenger_email" value="[EMPFAENGER_EMAIL]" size="40"></td></tr>
-<tr><td>{|Sender_email|}:</td><td><input type="text" name="sender_email" value="[SENDER_EMAIL]" size="40"></td></tr>
-<tr><td>{|Name|}:</td><td><input type="text" name="name" value="[NAME]" size="40"></td></tr>
-<tr><td>{|Betreff|}:</td><td><input type="text" name="betreff" value="[BETREFF]" size="40"></td></tr>
-<tr><td>{|Spam|}:</td><td><input type="text" name="spam" value="[SPAM]" size="40"></td></tr>
-<tr><td>{|Persoenlich|}:</td><td><input type="text" name="persoenlich" value="[PERSOENLICH]" size="40"></td></tr>
-<tr><td>{|Prio|}:</td><td><input type="text" name="prio" value="[PRIO]" size="40"></td></tr>
-<tr><td>{|Dsgvo|}:</td><td><input type="text" name="dsgvo" value="[DSGVO]" size="40"></td></tr>
-<tr><td>{|Warteschlange|}:</td><td><input type="text" name="warteschlange" value="[WARTESCHLANGE]" size="40"></td></tr>
-<tr><td>{|Aktiv|}:</td><td><input type="text" name="aktiv" value="[AKTIV]" size="40"></td></tr>
-
-                                </table>
-                            </fieldset>            
-                        </div>
-               		</div>
-               	</div>	
-            </div> -->
             <input type="submit" name="submit" value="Speichern" style="float:right"/>
         </form>
     </div>    

www/pages/content/ticketregeln_list.tpl

@@ -1,5 +1,10 @@
-<div id="tabs-1">
+<div id="tabs">
-    [MESSAGE]
+    <ul>
-    [TAB1]
+            <li><a href="#tabs-1">[TABTEXT1]</a></li>
-    [TAB1NEXT]
+    </ul>
+    <div id="tabs-1">
+        [MESSAGE]
+        [TAB1]
+        [TAB1NEXT]
+    </div>
 </div>

www/pages/content/verbindlichkeit_edit.tpl

@@ -0,0 +1,215 @@
+<div id="tabs">
+    <ul>
+        <li><a href="#tabs-1">Verbindlichkeit</a></li>
+        <li [POSITIONENHIDDEN]><a href="#tabs-2">Positionen</a></li>
+        <li><a href="#tabs-3">Protokoll</a></li>
+    </ul>
+    <div id="tabs-1">
+        [MESSAGE]
+        <form action="" method="post">   
+            [FORMHANDLEREVENT]
+            <div class="row">
+	        	<div class="row-height">
+	        		<div class="col-xs-12 col-md-6 col-md-height">
+	        			<div class="inside inside-full-height">
+                            <div class="row">
+	                        	<div class="row-height">
+	                        		<div class="col-xs-12 col-md-8 col-md-height">
+	                        			<div class="inside inside-full-height">
+	                        				<fieldset style="float: left;">
+                                                <legend>{|<b>Verbindlichkeit <font color="blue">[BELEGNR]</font></b> Lf-Nr. <a href="index.php?module=adresse&action=edit&id=[ADRESSE_ID]">[LIEFERANTENNUMMER]|}</a></legend>                              
+                                                [STATUSICONS]    
+                                            </fieldset>      
+	                        				<fieldset style="float: right;">
+                                                <button name="submit" value="speichern" class="ui-button-icon" style="width:100%;">Speichern</button>
+                                            </fieldset>
+                                        </div>
+                               		</div>                                    
+                               	</div>	
+                            </div>
+                            <div class="row">
+	                        	<div class="row-height">
+	                        		<div class="col-xs-12 col-md-8 col-md-height">
+	                        			<div class="inside inside-full-height">
+	                        				<fieldset>                                    
+                                                <table width="100%" border="0" class="mkTableFormular">       
+                                                    <tr>
+                                                        <td>
+                                                            {|Status|}:
+                                                        </td>
+                                                        <td>
+                                                            <input type="text" value="[STATUS]" size="20" disabled>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            {|Adresse|}:
+                                                        </td>
+                                                        <td>
+                                                            <input type="text" name="adresse" id="adresse" value="[ADRESSE]" size="20" [SAVEDISABLED] required>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            {|Rechnungs-Nr.|}:
+                                                        </td>
+                                                        <td>
+                                                            <input type="text" name="rechnung" id="rechnung" value="[RECHNUNG]" size="20" [SAVEDISABLED] required>
+                                                        </td>
+                                                    </tr>     
+                                                    <tr>
+                                                        <td>
+                                                            {|Rechnungsdatum|}:
+                                                        </td>
+                                                        <td>
+                                                            <input type="text" name="rechnungsdatum" id="rechnungsdatum" value="[RECHNUNGSDATUM]" size="20" [SAVEDISABLED]>
+                                                        </td>
+                                                    </tr>  
+                                                    <tr>
+                                                        <td>
+                                                            {|Eingangsdatum|}:
+                                                        </td>
+                                                        <td>
+                                                            <input type="text" name="eingangsdatum" id="eingangsdatum" value="[EINGANGSDATUM]" size="20" [SAVEDISABLED]>
+                                                        </td>
+                                                    </tr>   
+                                                    <tr>
+                                                        <td>
+                                                            {|Betrag brutto|}:
+                                                        </td>
+                                                        <td>
+                                                            <input type="number" step="0.01" name="betrag" id="betrag" value="[BETRAG]" size="20" [SAVEDISABLED]>
+                                                            <select name="waehrung" [SAVEDISABLED]>[WAEHRUNGSELECT]</select>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            {|Betrag Positionen brutto|}:
+                                                        </td>
+                                                        <td>
+                                                            <input type="number" step="0.01" name="betragbruttopos" id="betragbruttopos" value="[BETRAGBRUTTOPOS]" size="20" disabled><img class="wawitooltipicon" src="themes/new/images/tooltip_grau.png" title="Rundungsdifferenz [RUNDUNGSDIFFERENZ] wurde automatisch ber&uuml;cksichtigt" [RUNDUNGSDIFFERENZICONHIDDEN]>
+                                                        </td>
+                                                    </tr>          
+                                                    <tr>
+                                                        <td>
+                                                            {|Betrag Positionen netto|}:
+                                                        </td>
+                                                        <td>
+                                                            <input type="number" step="0.01" name="betragnetto" id="betragnetto" value="[BETRAGNETTO]" size="20" disabled [SAVEDISABLED]>
+                                                        </td>
+                                                    </tr>                                                                                                                                              
+                                                    <tr>
+                                                        <td>
+                                                            {|Zahlbar bis|}:
+                                                        </td>
+                                                        <td>
+                                                            <input type="text" name="zahlbarbis" id="zahlbarbis" value="[ZAHLBARBIS]" size="20" [SAVEDISABLED]>
+                                                        </td>
+                                                    </tr>                                               
+                                                    <tr>
+                                                        <td>
+                                                            {|Skonto %|}:
+                                                        </td>
+                                                        <td>
+                                                            <input type="text" name="skonto" id="skonto" value="[SKONTO]" size="20" [SAVEDISABLED]>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            {|Skonto bis|}:
+                                                        </td>
+                                                        <td>
+                                                            <input type="text" name="skontobis" id="skontobis" value="[SKONTOBIS]" size="20" [SAVEDISABLED]>
+                                                        </td>
+                                                    </tr>                                                                                                                                                                                                                                            
+                                                    <tr>
+                                                        <td>
+                                                            {|Bestellung|}:
+                                                        </td>
+                                                        <td>
+                                                            <input type="text" name="bestellung" id="bestellung" value="[BESTELLUNG]" size="20" [SAVEDISABLED]>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            {|Waren-/Leistungsprüfung (Einkauf)|}:
+                                                        </td>
+                                                        <td>
+                                                            <input type="checkbox" id="wareneingang" value="1" [WARENEINGANGCHECKED] size="20" disabled>
+                                                            <a href="index.php?module=verbindlichkeit&action=freigabeeinkauf&id=[ID]" title="freigeben" [FREIGABEEINKAUFHIDDEN]><img src="themes/new/images/forward.svg" border="0" class="textfeld_icon"></a>                                                                                                                
+                                                            <a href="index.php?module=verbindlichkeit&action=ruecksetzeneinkauf&id=[ID]" title="r&uuml;cksetzen" [RUECKSETZENEINKAUFHIDDEN]><img src="themes/new/images/delete.svg" border="0" class="textfeld_icon"></a>
+                                                            <i [EINKAUFINFOHIDDEN]>Wird automatisch gesetzt wenn Positionen vollst&auml;ndig</a>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            {|Rechnungseingangsprüfung (Buchhaltung)|}:
+                                                        </td>
+                                                        <td>
+                                                            <input type="checkbox" id="rechnungsfreigabe" [RECHNUNGSFREIGABECHECKED] size="20" disabled>
+                                                            <a href="index.php?module=verbindlichkeit&action=freigabebuchhaltung&id=[ID]" title="freigeben" [FREIGABEBUCHHALTUNGHIDDEN]><img src="themes/new/images/forward.svg" border="0" class="textfeld_icon"></a>                                                                                                                
+                                                            <a href="index.php?module=verbindlichkeit&action=ruecksetzenbuchhaltung&id=[ID]" title="r&uuml;cksetzen"  [RUECKSETZENBUCHHALTUNGHIDDEN]><img src="themes/new/images/delete.svg" border="0" class="textfeld_icon"></a>                                                                                                                
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            {|Bezahlt|}:
+                                                        </td>
+                                                        <td>
+                                                            <input type="checkbox" id="zahlungsstatus" [BEZAHLTCHECKED] size="20" disabled>
+                                                            <a href="index.php?module=verbindlichkeit&action=freigabebezahlt&id=[ID]" title="auf  &apos;bezahlt&apos; setzen" [FREIGABEBEZAHLTHIDDEN]><img src="themes/new/images/forward.svg" border="0" class="textfeld_icon"></a>
+                                                            <a href="index.php?module=verbindlichkeit&action=ruecksetzenbezahlt&id=[ID]" title="r&uuml;cksetzen"  [RUECKSETZENBEZAHLTHIDDEN]><img src="themes/new/images/delete.svg" border="0" class="textfeld_icon"></a>                                                                                                                                                                                                                                
+                                                        </td>
+                                                    </tr>                                                                         
+                                                    <tr>
+                                                        <td>
+                                                            {|Projekt|}:
+                                                        </td>
+                                                        <td>
+                                                            <input type="text" name="projekt" id="projekt" value="[PROJEKT]" size="20">
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            {|Kostenstelle|}:
+                                                        </td>
+                                                        <td>
+                                                            <input type="text" name="kostenstelle" id="kostenstelle" value="[KOSTENSTELLE]" size="20">
+                                                        </td>
+                                                    </tr>                                                 
+                                                    <tr>
+                                                        <td>
+                                                            {|Internebemerkung|}:
+                                                        </td>
+                                                        <td>
+                                                            <textarea name="internebemerkung" id="internebemerkung" rows="6" style="width:100%;">[INTERNEBEMERKUNG]</textarea>
+                                                        </td>
+                                                    </tr>
+                                                </table>
+                                            </fieldset>            
+                                        </div>
+                               		</div>                 
+                               	</div>	
+                            </div>
+                        </div>
+               		</div>
+                    <div class="col-xs-12 col-md-6 col-md-height">
+                        <div class="inside inside-full-height">
+                            <fieldset>
+                                <legend>{|Vorschau|}</legend>
+                                [INLINEPDF]
+                            </fieldset>
+                        </div>
+                    </div>
+               	</div>	
+            </div>           
+        </form>
+    </div>    
+    <div id="tabs-2">
+        [POSITIONENTAB]        
+    </div>
+    <div id="tabs-3">
+        [MINIDETAIL]
+    </div>
+</div>
+

www/pages/content/verbindlichkeit_list.tpl

@@ -0,0 +1,93 @@
+<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">
+                <li class="filter-item">
+                  <label for="anhang" class="switch">
+                    <input type="checkbox" id="anhang">
+                    <span class="slider round"></span>
+                  </label>
+                  <label for="anhang">{|Anhang fehlt|}</label>
+                </li>
+                 <li class="filter-item">
+                  <label for="wareneingang" class="switch">
+                    <input type="checkbox" id="wareneingang">
+                    <span class="slider round"></span>
+                  </label>
+                  <label for="wareneingang">{|Wareingang/Leistungspr&uuml;fung fehlt|}</label>
+                </li>                        
+                <li class="filter-item">
+                  <label for="rechnungsfreigabe" class="switch">
+                    <input type="checkbox" id="rechnungsfreigabe">
+                    <span class="slider round"></span>
+                  </label>
+                  <label for="rechnungsfreigabe">{|Rechnungseingangspr&uuml;fung fehlt|}</label>
+                </li>
+                <li class="filter-item">
+                  <label for="nichtbezahlt" class="switch">
+                    <input type="checkbox" id="nichtbezahlt">
+                    <span class="slider round"></span>
+                  </label>
+                  <label for="nichtbezahlt">{|Nicht bezahlt|}</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">{|Inkl. stornierte|}</label>
+                </li>
+                <li class="filter-item">
+                  <label for="abgeschlossen" class="switch">
+                    <input type="checkbox" id="abgeschlossen">
+                    <span class="slider round"></span>
+                  </label>
+                  <label for="abgeschlossen">{|Inkl. abgeschlossene|}</label>
+                </li>
+                <li class="filter-item">
+                    <label for="zahlbarbis">{|Zahlbar bis|}:</label>
+                    <input type="text" name="zahlbarbis" id="zahlbarbis" size="10">
+                </li>
+                <li class="filter-item">
+                    <label for="skontobis">{|Skonto bis|}:</label>
+                    <input type="text" name="skontobis" id="skontobis" size="10">
+                </li>
+              </ul>
+              <form method="post" action="#">
+                <button name="submit" value="status_berechnen" class="ui-button-icon">{|Status auffrischen|}</button>
+              </form>              
+            </div>    
+          </div>
+
+        <form method="post" action="#">
+            [TAB1]
+            <fieldset><legend>{|Stapelverarbeitung|}</legend>
+                <input type="checkbox" id="auswahlalle" onchange="alleauswaehlen();" />&nbsp;{|alle markieren|}&nbsp;
+                <select id="sel_aktion" name="sel_aktion">
+                    <option value="">{|bitte w&auml;hlen|} ...</option>
+                    [MANUELLFREIGABEEINKAUF]                    
+                    [MANUELLFREIGABEBUCHHALTUNG]
+                    [ALSBEZAHLTMARKIEREN]
+                </select>
+                <button name="submit" value="ausfuehren" class="ui-button-icon">{|Ausf&uuml;hren|}</button>
+            </fieldset>
+        </form>
+        [TAB1NEXT]
+    </div>
+</div>
+
+<script>
+function alleauswaehlen()
+{
+  var wert = $('#auswahlalle').prop('checked');
+  $('#verbindlichkeit_list').find(':checkbox').prop('checked',wert);
+}
+
+</script>

www/pages/content/verbindlichkeit_minidetail.tpl

@@ -1,176 +1,76 @@
-
 [FORMHANDLEREVENT]
 [MESSAGE]
-
+<style>
-<table class="tableborder" border="0" cellpadding="3" cellspacing="0" width="100%">
+    .auftraginfo_cell {
-    <tbody>
+    color: #636363;border: 1px solid #ccc;padding: 5px;
-      <tr valign="top" colspan="3">
+    }
-        <td >
+    .auftrag_cell {
-<fieldset><legend>{|Rechnungsdaten|}</legend>
+    color: #636363;border: 1px solid #fff;padding: 0px; margin:0px;
-
+    }
+</style>
+<div style="float:left; width:39%; padding-right:1%;">   
     <table width="100%" border="0">
-	  <tr valign="top"><td width="150">Lieferant:</td><td>[ADRESSEAUTOSTART][ADRESSE][MSGADRESSE][ADRESSEAUTOEND]</td>
+        <tr valign="top">
-          <td>&nbsp;</td>
+            <td width="150">Lieferant:</td>
-            <td colspan="2" rowspan="2" align="center"><b style="color:green">[MELDUNG]</b>
+            <td colspan="3">[ADRESSEAUTOSTART][ADRESSE][MSGADRESSE][ADRESSEAUTOEND]</td>
-<br><font size="7">[VERBINDLICHKEIT]</font>
+        </tr>
-</td></tr>
+        <tr>
-
+            <td>Rechnungs-Nr.:</td>
-          <tr><td><br><br>Rechnungs Nr.:</td><td><br><br>[RECHNUNG][MSGRECHNUNG]</td>
+            <td>[RECHNUNG][MSGRECHNUNG]</td>
-          <td>&nbsp;</td>
+        </tr>
-            </tr>
+        <tr>
- 
+            <td>Rechnungsdatum:</td>
-						<tr><td>Bestellung:</td><td width="250">[DISABLESTART]<a href="index.php?module=bestellung&action=edit&id=[BESTELLUNGID]" target="_blank">[BESTELLUNG]</a>[MSGBESTELLUNG][MULTIBESTELLUNG][DISABLEENDE]</td>
+            <td width="250">[RECHNUNGSDATUM][MSGRECHNUNGSDATUM]</td>
-          <td>&nbsp;</td>
+        <tr>
-            <td width="200">Zahlweise:</td><td>[ZAHLUNGSWEISE][MSGZAHLUNGSWEISE]</td></tr>
+        </tr>
-
+        </tr>
-          <tr><td>Rechnungsdatum:</td><td width="250">[RECHNUNGSDATUM][MSGRECHNUNGSDATUM]</td>
+            <td width="200">Zahlbar bis:</td>
-          <td>&nbsp;</td>
+            <td>[ZAHLBARBIS][MSGZAHLBARBIS][DATUM_ZAHLBARBIS]</td>
-            <td width="200">Zahlbar bis:</td><td>[ZAHLBARBIS][MSGZAHLBARBIS][DATUM_ZAHLBARBIS]</td></tr>
+        </tr>
-
+            <td>Betrag/Total (Brutto):</td>
-	  			<tr><td>Betrag/Total (Brutto):</td><td>[BETRAG][MSGBETRAG]&nbsp;[WAEHRUNG][MSGWAEHRUNG]</td><td>&nbsp;</td>
+            <td>[BETRAG][MSGBETRAG]&nbsp;[WAEHRUNG][MSGWAEHRUNG]</td>
-						<td>Skonto in %:</td><td>[SKONTO][MSGSKONTO]</td>
+        <tr>
-				</tr>
+            <td>Skonto in %:</td>
-
+            <td>[SKONTO][MSGSKONTO]</td>
-	  			<tr><td>USt. 19%:</td><td>[SUMMENORMAL][MSGSUMMENORMAL]</td><td>&nbsp;</td>
+        </tr>
-            <td>Skonto bis:</td><td>[SKONTOBIS][MSGSKONTOBIS][DATUM_SKONTOBIS]</td>
+        <tr>
-					</tr>
+            <td>Skonto bis:</td>
-
+            <td>[SKONTOBIS][MSGSKONTOBIS][DATUM_SKONTOBIS]</td>
-          <tr>
+        </tr>
-           <td>USt. 7%:</td><td>[SUMMEERMAESSIGT][MSGSUMMEERMAESSIGT]</td>
+        <tr>
-          <td>&nbsp;</td>
+            <td>Projekt:</td>
-           <td>Umsatzsteuer</td><td>[UMSATZSTEUER][MSGUMSATZSTEUER]</td>
+            <td>[PROJEKT][MSGKOSTENSTELLE]</td>
-
+            <td>&nbsp;</td>                            
-					</tr>
+        </tr>
-          <tr>
+        <tr>
-           <td>[STEUERSATZNAME3]</td><td>[SUMMESATZ3][MSGSUMMESATZ3]</td>
+            <td>Kostenstelle:</td>
-          <td>&nbsp;</td>
+            <td>[KOSTENSTELLE][MSGKOSTENSTELLE]</td>
-           <td>[STEUERSATZNAME4]</td><td>[SUMMESATZ4][MSGSUMMESATZ4]</td>
+            <td>&nbsp;</td>
-					</tr>
+        </tr>
-          <tr>
+        <tr>
-           <td>Verwendungszweck:</td><td>[VERWENDUNGSZWECK][MSGVERWENDUNGSZWECK]</td>
+            <td>Interne Bemerkung:</td>
-          <td>&nbsp;</td>
+            <td colspan="4">[INTERNEBEMERKUNG]</td>
-           <td>Frachtkosten:</td><td>[FRACHTKOSTEN][MSGFRACHTKOSTEN]</td>
+        </tr>
-					</tr>
+    </table>
-
-          <tr>
-           <td>Projekt:</td><td>[PROJEKT][MSGKOSTENSTELLE]</td>
-          <td>&nbsp;</td>
-						<td></td><td></td>
-					</tr>
-
- 
-          <tr>
-           <td>Kostenstelle:</td><td>[KOSTENSTELLE][MSGKOSTENSTELLE]</td>
-          <td>&nbsp;</td>
-	<td>Freigabe:</td><td>[MSGFREIGABE]&nbsp;<i>Wareneingangspr&uuml;fung:</i>&nbsp;[FREIGABE]&nbsp;[MSGRECHNUNGSFREIGABE]&nbsp;<i>Rechnungseingangspr&uuml;fung:</i>&nbsp;[RECHNUNGSFREIGABE]</td>
-					</tr>
-
-          <tr>
-           <td>Sachkonto:</td><td>[SACHKONTO][MSGSACHKONTO]</td>
-          <td>&nbsp;</td>
-	  <td>Aktion:</td><td>[BUTTONBEZAHLT]</td>
-	  </tr>
-          <tr>
-           <td>Interne Bemerkung:</td><td colspan="4">[INTERNEBEMERKUNG]</td>
-	  </tr>
-
-
-
-
-</table>
-
-
-
-</fieldset>
-</td></tr>
-
-    </tbody>
-  </table>
-
-
-<table class="tableborder" border="0" cellpadding="3" cellspacing="0" width="100%">
-<tr valign="top"><td width="50%">
-<table cellspacing="5" width="100%">
-<!--<tr><td><b>Bestellung</b></td><td><b>Bestell-Nr.</b></td><td><b>Teilbetrag</b></td><td><b>Projekt</b></td><td><b>Kostenstelle</b></td><td><b>Bemerkung</b></td></tr>
-<tr><td>Nr. 1</td><td><a href="index.php?module=bestellung&action=edit&id=[BESTELLUNGID1]" target="_blank">[BESTELLUNG1]</a>[MSGBESTELLUNG1]</td><td>[BESTELLUNG1BETRAG][MSGBESTELLUNG1BETRAG]</td>
-<td>[BESTELLUNG1PROJEKT]</td><td>[BESTELLUNG1KOSTENSTELLE]</td>
-<td>[BESTELLUNG1BEMERKUNG][MSGBESTELLUNG1BEMERKUNG]</td></tr>
-<tr><td>Nr. 2</td><td><a href="index.php?module=bestellung&action=edit&id=[BESTELLUNGID2]" target="_blank">[BESTELLUNG2]</a>[MSGBESTELLUNG2]</td><td>[BESTELLUNG2BETRAG][MSGBESTELLUNG2BETRAG]</td>
-<td>[BESTELLUNG2PROJEKT]</td><td>[BESTELLUNG2KOSTENSTELLE]</td>
-<td>[BESTELLUNG2BEMERKUNG][MSGBESTELLUNG2BEMERKUNG]</td></tr>
-<tr><td>Nr. 3</td><td><a href="index.php?module=bestellung&action=edit&id=[BESTELLUNGID3]" target="_blank">[BESTELLUNG3]</a>[MSGBESTELLUNG3]</td><td>[BESTELLUNG3BETRAG][MSGBESTELLUNG3BETRAG]</td>
-<td>[BESTELLUNG3PROJEKT]</td><td>[BESTELLUNG3KOSTENSTELLE]</td>
-<td>[BESTELLUNG3BEMERKUNG][MSGBESTELLUNG3BEMERKUNG]</td></tr>
-<tr><td>Nr. 4</td><td><a href="index.php?module=bestellung&action=edit&id=[BESTELLUNGID4]" target="_blank">[BESTELLUNG4]</a>[MSGBESTELLUNG4]</td><td>[BESTELLUNG4BETRAG][MSGBESTELLUNG4BETRAG]</td>
-<td>[BESTELLUNG4PROJEKT]</td><td>[BESTELLUNG4KOSTENSTELLE]</td>
-<td>[BESTELLUNG4BEMERKUNG][MSGBESTELLUNG4BEMERKUNG]</td></tr>
-<tr><td>Nr. 5</td><td><a href="index.php?module=bestellung&action=edit&id=[BESTELLUNGID5]" target="_blank">[BESTELLUNG5]</a>[MSGBESTELLUNG5]</td><td>[BESTELLUNG5BETRAG][MSGBESTELLUNG5BETRAG]</td>
-<td>[BESTELLUNG5PROJEKT]</td><td>[BESTELLUNG5KOSTENSTELLE]</td>
-<td>[BESTELLUNG5BEMERKUNG][MSGBESTELLUNG5BEMERKUNG]</td></tr>
-<tr><td>Nr. 6</td><td><a href="index.php?module=bestellung&action=edit&id=[BESTELLUNGID6]" target="_blank">[BESTELLUNG6]</a>[MSGBESTELLUNG6]</td><td>[BESTELLUNG6BETRAG][MSGBESTELLUNG6BETRAG]</td>
-<td>[BESTELLUNG6PROJEKT]</td><td>[BESTELLUNG6KOSTENSTELLE]</td>
-<td>[BESTELLUNG6BEMERKUNG][MSGBESTELLUNG6BEMERKUNG]</td></tr>
-<tr><td>Nr. 7</td><td><a href="index.php?module=bestellung&action=edit&id=[BESTELLUNGID7]" target="_blank">[BESTELLUNG7]</a>[MSGBESTELLUNG7]</td><td>[BESTELLUNG7BETRAG][MSGBESTELLUNG7BETRAG]</td>
-<td>[BESTELLUNG7PROJEKT]</td><td>[BESTELLUNG7KOSTENSTELLE]</td>
-<td>[BESTELLUNG7BEMERKUNG][MSGBESTELLUNG7BEMERKUNG]</td></tr>
-<tr><td>Nr. 8</td><td><a href="index.php?module=bestellung&action=edit&id=[BESTELLUNGID8]" target="_blank">[BESTELLUNG8]</a>[MSGBESTELLUNG8]</td><td>[BESTELLUNG8BETRAG][MSGBESTELLUNG8BETRAG]</td>
-<td>[BESTELLUNG8PROJEKT]</td><td>[BESTELLUNG8KOSTENSTELLE]</td>
-<td>[BESTELLUNG8BEMERKUNG][MSGBESTELLUNG8BEMERKUNG]</td></tr>
-<tr><td>Nr. 9</td><td><a href="index.php?module=bestellung&action=edit&id=[BESTELLUNGID9]" target="_blank">[BESTELLUNG9]</a>[MSGBESTELLUNG9]</td><td>[BESTELLUNG9BETRAG][MSGBESTELLUNG9BETRAG]</td>
-<td>[BESTELLUNG9PROJEKT]</td><td>[BESTELLUNG9KOSTENSTELLE]</td>
-<td>[BESTELLUNG9BEMERKUNG][MSGBESTELLUNG9BEMERKUNG]</td></tr>
-<tr><td>Nr. 10</td><td><a href="index.php?module=bestellung&action=edit&id=[BESTELLUNGID10]" target="_blank">[BESTELLUNG10]</a>[MSGBESTELLUNG10]</td><td>[BESTELLUNG10BETRAG][MSGBESTELLUNG10BETRAG]</td>
-<td>[BESTELLUNG10PROJEKT]</td><td>[BESTELLUNG10KOSTENSTELLE]</td>
-<td>[BESTELLUNG10BEMERKUNG][MSGBESTELLUNG10BEMERKUNG]</td></tr>
-<tr><td>Nr. 11</td><td><a href="index.php?module=bestellung&action=edit&id=[BESTELLUNGID11]" target="_blank">[BESTELLUNG11]</a>[MSGBESTELLUNG11]</td><td>[BESTELLUNG11BETRAG][MSGBESTELLUNG11BETRAG]</td>
-<td>[BESTELLUNG11PROJEKT]</td><td>[BESTELLUNG11KOSTENSTELLE]</td>
-<td>[BESTELLUNG11BEMERKUNG][MSGBESTELLUNG11BEMERKUNG]</td></tr>
-<tr><td>Nr. 12</td><td><a href="index.php?module=bestellung&action=edit&id=[BESTELLUNGID12]" target="_blank">[BESTELLUNG12]</a>[MSGBESTELLUNG12]</td><td>[BESTELLUNG12BETRAG][MSGBESTELLUNG12BETRAG]</td>
-<td>[BESTELLUNG12PROJEKT]</td><td>[BESTELLUNG12KOSTENSTELLE]</td>
-<td>[BESTELLUNG12BEMERKUNG][MSGBESTELLUNG12BEMERKUNG]</td></tr>
-<tr><td>Nr. 13</td><td><a href="index.php?module=bestellung&action=edit&id=[BESTELLUNGID13]" target="_blank">[BESTELLUNG13]</a>[MSGBESTELLUNG13]</td><td>[BESTELLUNG13BETRAG][MSGBESTELLUNG13BETRAG]</td>
-<td>[BESTELLUNG13PROJEKT]</td><td>[BESTELLUNG13KOSTENSTELLE]</td>
-<td>[BESTELLUNG13BEMERKUNG][MSGBESTELLUNG13BEMERKUNG]</td></tr>
-<tr><td>Nr. 14</td><td><a href="index.php?module=bestellung&action=edit&id=[BESTELLUNGID14]" target="_blank">[BESTELLUNG14]</a>[MSGBESTELLUNG14]</td><td>[BESTELLUNG14BETRAG][MSGBESTELLUNG14BETRAG]</td>
-<td>[BESTELLUNG14PROJEKT]</td><td>[BESTELLUNG14KOSTENSTELLE]</td>
-<td>[BESTELLUNG14BEMERKUNG][MSGBESTELLUNG14BEMERKUNG]</td></tr>
-<tr><td>Nr. 15</td><td><a href="index.php?module=bestellung&action=edit&id=[BESTELLUNGID15]" target="_blank">[BESTELLUNG15]</a>[MSGBESTELLUNG15]</td><td>[BESTELLUNG15BETRAG][MSGBESTELLUNG15BETRAG]</td>
-<td>[BESTELLUNG15PROJEKT]</td><td>[BESTELLUNG15KOSTENSTELLE]</td>
-<td>[BESTELLUNG15BEMERKUNG][MSGBESTELLUNG15BEMERKUNG]</td></tr>-->
-
-[TABELLEBESTELLUNGEN]
-
-</table>
-</td>
-
-
-<td>
-
-<table width="100%>">                              
-<tr><td>Summe Verbindlichkeit</td><td>Summe Kontierung</td></tr>
-<tr>                                                           
-  <td class="greybox" width="25%">[SUMMEVERBINDLICHKEIT]</td> 
-  <td class="greybox" width="25%">[SUMMEKONTIERUNG]</td>
-</tr>                                                                                                                                                                                              
-</table>  
-
-[MESSAGEVORKONTIERUNG]
-[VORKONTIERUNG]
-[ZAHLUNGEN]
-
-<div style="background-color:white">
-<h2 class="greyh2">{|Protokoll|}</h2>
-<div style="padding:10px">
-  [PROTOKOLL]
 </div>
+<div style="float:left; width:60%">
+    <div style="background-color:white">
+        <h2 class="greyh2">Artikel</h2>
+        <div style="padding:10px">
+            [ARTIKEL]
+        </div>
+    </div>
+    <div style="background-color:white">
+        <h2 class="greyh2">Buchungen</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>
 </div>
 
-</td>
-
-
-</tr>
-
-  
-    </tbody>
-  </table>
-

www/pages/content/verbindlichkeit_position_edit.tpl

@@ -0,0 +1,64 @@
+<div id="tabs">
+    <ul>
+        <li><a href="#tabs-1"></a></li>
+    </ul>
+    <!-- Example for multiple tabs
+    <ul hidden">
+        <li><a href="#tabs-1">First Tab</a></li>
+        <li><a href="#tabs-2">Second Tab</a></li>
+    </ul>
+    -->
+    <div id="tabs-1">
+        [MESSAGE]
+        <form action="" method="post">   
+            [FORMHANDLEREVENT]
+            <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>{|Position bearbeiten|}</legend><i></i>
+                                <table width="100%" border="0" class="mkTableFormular">                                    
+                                    <tr>
+                                        <td>
+                                            {|Menge|}:
+                                        </td>
+                                        <td>
+                                            <input type="number" name="menge" id="menge" value="[MENGE]" size="20" [SAVEDISABLED]>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            {|Preis|}:
+                                        </td>
+                                        <td>
+                                            <input type="number" name="preis" id="preis" step="0.00001" value="[PREIS]" size="20" [SAVEDISABLED]>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            {|Steuersatz %|}:
+                                        </td>
+                                        <td>
+                                            <input type="number" name="steuersatz" id="steuersatz" value="[STEUERSATZ]" size="20" [SAVEDISABLED]>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            {|Sachkonto|}:
+                                        </td>
+                                        <td>
+                                            <input type="text" name="sachkonto" id="sachkonto" value="[SACHKONTO]" size="20" [SACHKONTOSAVEDISABLED]>
+                                        </td>
+                                    </tr>                                    
+                                </table>
+                            </fieldset>            
+                        </div>
+               		</div>
+               	</div>	
+            </div>           
+            <input type="submit" name="submit" value="Speichern" style="float:right"/>
+        </form>
+    </div>        
+</div>
+

www/pages/content/verbindlichkeit_positionen.tpl

@@ -0,0 +1,91 @@
+[POSITIONENMESSAGE]
+<form method="post" action="#tabs-2">   
+    <div class="row" [POSITIONHINZUFUEGENHIDDEN]>        
+        <div class="row-height">
+            <div class="col-xs-14 col-md-12 col-md-height">                
+                <div class="inside inside-full-height">
+                    <fieldset>
+                        <legend style="float:left">Offene Artikel aus Wareneing&auml;ngen:</legend>
+                        <div class="filter-box filter-usersave" style="float:right;">
+                            <div class="filter-block filter-inline">
+                                <div class="filter-title">{|Filter|}</div>
+                                <ul class="filter-list">
+                                    <li class="filter-item">
+                                        <label for="passende" class="switch">
+                                        <input type="checkbox" id="passende">
+                                        <span class="slider round"></span>
+                                      </label>
+                                        <label for="passende">{|Nur passende (Bestellung/Rechnungsnummer)|}</label>
+                                    </li>
+                                </ul>
+                            </div>
+                        </div>
+                        [PAKETDISTRIBUTION]
+                    </fieldset>
+                </div>
+            </div>
+            <div class="col-xs-14 col-md-2 col-md-height">
+                <div class="inside inside-full-height">
+                    <fieldset>
+                        <table width="100%" border="0" class="mkTableFormular">
+                            <legend>{|Aktionen|}</legend>
+                            <tr>
+                                <td><input type="checkbox" id="auswahlallewareneingaenge" onchange="allewareneingaengeauswaehlen();" />{|alle markieren|}</td>
+                            </tr>                          
+                            <tr>
+                                <td><input type="checkbox" name="bruttoeingabe" value="1" />Bruttopreise eingeben</td>
+                            </tr>                                  
+                            <tr>
+                                <td><button [SAVEDISABLED] name="submit" value="positionen_hinzufuegen" class="ui-button-icon" style="width:100%;">Hinzuf&uuml;gen</button></td>
+                            </tr>
+                        </table>
+                    </fieldset>
+                </div>
+            </div>
+        </div>
+    </div>
+</form>
+<form method="post" action="#tabs-2">
+    <div class="row">
+        <div class="row-height">
+            <div class="col-xs-14 col-md-12 col-md-height">
+                <div class="inside inside-full-height">
+                    [POSITIONEN]                 
+                </div>
+            </div>
+            <div class="col-xs-14 col-md-2 col-md-height">
+                <div class="inside inside-full-height">
+                    <fieldset>
+                        <table width="100%" border="0" class="mkTableFormular">
+                            <legend>{|Aktionen|}</legend>
+                            <tr [SACHKONTOCHANGEHIDDEN]>
+                                <td><input type="checkbox" id="auswahlalle" onchange="alleauswaehlen();" />{|alle markieren|}</td>
+                            </tr>                          
+                            <tr [POSITIONHINZUFUEGENHIDDEN]>
+                                <td><button [SAVEDISABLED] name="submit" value="positionen_entfernen" class="ui-button-icon" style="width:100%;">Entfernen</button></td>
+                            </tr>
+                            <tr [SACHKONTOCHANGEHIDDEN]>
+                                <td><input type="text" name="positionen_sachkonto" id="positionen_sachkonto" value="" size="20"></td>
+                            </tr>
+                            <tr [SACHKONTOCHANGEHIDDEN]>
+                                <td><button name="submit" value="positionen_kontorahmen_setzen" class="ui-button-icon" style="width:100%;">Sachkonto setzen</button></td>
+                            </tr>
+                        </table>
+                    </fieldset>
+                </div>
+            </div>
+        </div>
+    </div>
+</form>
+<script>
+    function allewareneingaengeauswaehlen()
+    {
+      var wert = $('#auswahlallewareneingaenge').prop('checked');
+      $('#verbindlichkeit_paketdistribution_list').find(':checkbox').prop('checked',wert);
+    }
+    function alleauswaehlen()
+    {
+      var wert = $('#auswahlalle').prop('checked');
+      $('#verbindlichkeit_positionen').find(':checkbox').prop('checked',wert);
+    }
+</script>

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_list.tpl

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

www/pages/content/wareneingang_manuellerfassen.tpl

@@ -6,15 +6,19 @@
 <table height="80" width="100%"><tr><td>
 <fieldset class="usersave"><legend>&nbsp;Filter</legend>
 <center>
-<table width="100%" cellspacing="5">
+<form method="POST">
-<tr>
+    <table width="100%" cellspacing="5">
-  <td width="33%"><input type="checkbox" id="eigene" title="nur Artikel vom Lieferant anzeigen">&nbsp;<label for="eigene">{|Nur Artikel vom Lieferant anzeigen|}</label></td>
+        <tr>
-  <td width="33%">{|Scannen|}: <form method="POST"><input type="text" size="40" name="artikel" autofocus id="artikel" /></form></td>
+          <td width="33%"><input type="checkbox" id="eigene" title="nur Artikel vom Lieferant anzeigen">&nbsp;<label for="eigene">{|Nur Artikel vom Lieferant anzeigen|}</label></td>
-  <td width="33%"></td>
+          <td width="33%">{|Artikel|}: <input type="text" size="40" name="artikel" autofocus id="artikel" /></td>
-</tr></table>
+          <td width="33%">{|Menge|}: <input type="number" size="40" name="menge" id="menge" value="1"/></td>
-</center>
+          <td width="33%"><button name="submit" class="ui-button-icon" style="width:100%;" value="abschliessen">{|Weiter|}</button></td>
-</fieldset>
+
-</td></tr></table>
+        </tr>
+    </table>
+    </center>
+    </fieldset>
+    </td></tr></table>
 
 [MESSAGE]
 [TAB1]

www/pages/content/wareneingang_minidetail.tpl

@@ -1,7 +1,11 @@
+<!--
 <table id="table[MD5]">
-<tr><td>{|Lieferschein|}:</td><td><input type="checkbox" onchange="lsclick[MD5]();" id="beiback_lieferschein[MD5]" disabled value="1" [BEIPACK_LIEFERSCHEIN] /></td><td><span id="lsnr[MD5]">[LSNR]</span></td><td><input type="button" value="{|Belege &auml;ndern|}" style="cursor:hand;" onclick="editclick[MD5]();" /></td></tr>
+<tr><td>{|Lieferschein|}:</td><td><input type="checkbox" onchange="lsclick[MD5]();" id="beiback_lieferschein[MD5]" disabled value="1" [BEIPACK_LIEFERSCHEIN] /></td><td><span id="lsnr[MD5]">[LSNR]</span></td>
+<td><input type="button" value="{|Belege &auml;ndern|}" style="cursor:hand;" onclick="editclick[MD5]();" /></td>
+</tr>
 <tr><td>{|Rechnung|}:</td><td><input type="checkbox" onchange="reclick[MD5]();" id="beiback_rechnung[MD5]" disabled value="1" [BEIPACK_RECHNUNG] /></td><td><span id="renr[MD5]">[RENR]</span></td><td></td></tr>
 </table>
+-->
 
 <table width="100%">
 <tr><td width="100%">[ARTIKEL]</td></tr>

www/pages/content/wareneingang_mitarbeiter.tpl

@@ -15,14 +15,14 @@
 
 <table height="200" border="0" width="450">
 <tr valign="top"><td><b>Artikel:</b></td><td><u>[NAME]</u></td></tr> 
+<tr valign="top"><td><b>Menge:</b></td><td>[MENGE]</td></tr> 
 <!--<tr valign="top"><td>Lieferant:</td><td>[LIEFERANT]</td></tr> -->
 <tr valign="top"><td><br></td><td align="center"></td></tr> 
 <tr valign="top"><td><b>Bemerkung:</b></td><td><textarea cols="35" rows="2" name="bemerkung">[BEMERKUNG]</textarea>
 </td></tr>
 <tr valign="top"><td><br></td><td align="center"></td></tr>
-<tr valign="top"><td nowrap><b>Anmerkung:</b></td><td>Artikel zu Mitarbeiter [MITARBEITER] bringen
 [DISPLAY_WARENEINGANG_RMA_HOOK1]
-<tr valign="top"><td><br></td><td align="center"><input type="submit" name="submit" value="Speichern" />&nbsp;<input type="button" onclick="window.location.href='index.php?module=wareneingang&action=distriinhalt&id=[ID]'"      value="Abbrechen" /></td></tr>
+<tr valign="top"><td><br></td><td align="center"><input type="submit" name="submit" value="Buchen" />&nbsp;<input type="button" onclick="window.location.href='index.php?module=wareneingang&action=distriinhalt&id=[ID]'"      value="Abbrechen" /></td></tr>
 </td></tr> 
 </table>
 

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

@@ -1,137 +1,231 @@
 <!-- gehort zu tabview -->
 <div id="tabs">
-  <ul>
+	<ul> [BEFORETAB1]
-    [BEFORETAB1]<li><a href="#tabs-1">[TAB1TEXT]</a></li>[AFTERTAB1]
+		<li><a href="#tabs-1">[TAB1TEXT]</a></li>[AFTERTAB1] [BEFORETAB2]
-    [BEFORETAB2]<li><a href="#tabs-2">[TAB2TEXT]</a></li>[AFTERTAB2]
+		<li><a href="#tabs-2">[TAB2TEXT]</a></li>[AFTERTAB2] [BEFORETAB3]
-    [BEFORETAB3]<li><a href="#tabs-3">[TAB3TEXT]</a></li>[AFTERTAB3]
+		<li><a href="#tabs-3">[TAB3TEXT]</a></li>[AFTERTAB3] </ul>
-  </ul>
+	<!-- ende gehort zu tabview -->
-<!-- ende gehort zu tabview -->
+	<!-- erstes tab -->
-
+	<input type="hidden" id="paketannahme_id" value="[ID]" /> [BEFORETAB1]
-<!-- erstes tab -->
+	<form action="" method="post">			
-  <input type="hidden" id="paketannahme_id" value="[ID]" />
+    	<div id="tabs-1"> [TAB1START] [MESSAGE1] [MESSAGE]
-  [BEFORETAB1]
+            <div class="row">
-  <div id="tabs-1">
+                <div class="row-height">
-
+                    <div class="col-xs-12 col-md-5 col-md-height">
-    [TAB1START]
+	                    <div class="inside inside-full-height">
-
+		                    <fieldset>
-    [MESSAGE1]
+			                    <legend>{|[LEGENDE]|}</legend>
-    <form action="" method="post">
+			                    <table>
-      <div class="row">
+				                    <tr>
-        <div class="row-height">
+					                    <td>{|Status|}:</td>
-          <div class="col-xs-12 col-md-10 col-md-height">
+					                    <td>
-            <div class="inside inside-full-height">
+						                    <input type=text size="40" value="[STATUS]" disabled>
-              <fieldset>
+					                    </td>
-                <legend>{|[LEGENDE]|}</legend>
+				                    </tr>
-                <table>
+				                    <tr [ABGESCHLOSSENHIDDEN]>
-                  <tr><td>{|Lieferschein-Nr.|}:</td><td><input type=text size="40" name="lsnr" value=[LSNR]></td></tr>
+					                    <td></td>
-                  <tr><td>{|Rechnung-Nr.|}:</td><td><input type=text size="40" name="renr" value=[RENR]></td></tr>
+					                    <td><i>Abgeschlossen am [DATUM_ABGESCHLOSSEN] durch [BEARBEITER_ABGESCHLOSSEN]</i></td>
-                  <tr><td>{|Bemerkung|}:</td><td><textarea rows="5" cols="40" name="bemerkung">[BEMERKUNG]</textarea></td></tr>
+				                    </tr>				                 
-                  <tr><td><input type="submit" name="speichern" class="btnGreenNew" value="Speichern"></td>
+				                    <tr>
-                </table>
+					                    <td>{|Lieferschein-Nr.|}:</td>
-              </fieldset>
+					                    <td>
+						                    <input type=text size="40" name="lsnr" value="[LSNR]">
+					                    </td>
+				                    </tr>
+				                    <tr>
+					                    <td>{|Rechnung-Nr.|}:</td>
+					                    <td>
+						                    <input type=text size="40" name="renr" value="[RENR]">
+					                    </td>
+				                    </tr>
+                                </table>
+		                    </fieldset>
+	                    </div>
+                    </div>
+                    <div class="col-xs-12 col-md-5 col-md-height">
+	                    <div class="inside inside-full-height">
+		                    <fieldset>
+			                    <table>
+				                    <tr>
+					                    <td>{|Bemerkung|}:</td>
+					                    <td>
+						                    <textarea rows="5" cols="40" name="bemerkung">[BEMERKUNG]</textarea>
+					                    </td>
+				                    </tr> 
+				                    [ISLIEFERANTSTART]
+				                    [ISLIEFERANTENDE] 
+                                </table>
+		                    </fieldset>
+	                    </div>
+                    </div>
+                    <div class="col-xs-12 col-md-2 col-md-height">
+						<div class="inside inside-full-height">
+							<fieldset> [BUTTONS] [BEFOREFRM] [AFTERFRM] [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>
+									<tr>
+										<td>
+											<button name="submit" class="ui-button-icon" style="width:100%;" value="speichern">{|Speichern|}</button>
+										</td>
+									</tr>									
+								</table>
+							</fieldset>
+						</div>
+					</div>
+                </div>
             </div>
-          </div>
+            <div class="row" [HINZUFUEGENHIDDEN]>
-          <div class="col-xs-12 col-md-2 col-md-height">
+                <div class="row-height">
-            <div class="inside inside-full-height">
+                    <div class="col-xs-12 col-md-10 col-md-height">
-              <fieldset>
+                        <div class="inside-white inside-full-height">
-                <legend>{|Aktionen|}</legend>
+                            <div class="filter-box filter-usersave" style="float:right;">
-                [BUTTONS]
+                                <div class="filter-block filter-inline">
-                [BEFOREFRM]
+                                  <div class="filter-title">{|Filter|}</div>
-                [AFTERFRM]
+                                  <ul class="filter-list">
-                  [DISTRIINHALTBUTTONS]
+                                    <li class="filter-item">
-                  <input type="submit" name="abschliessen" id="btnabschliessen" class="btnGreenNew"  value="Paketinhalt ist erfasst">
+                                      <label for="ausfuellen" class="switch">
-                  [BEFOREMANUELLERFASSEN]
+                                        <input type="checkbox" id="ausfuellen">
-                  <input type="submit" name="manuellerfassen" class="btnBlueNew" value="Artikel manuell erfassen">
+                                        <span class="slider round"></span>
-                  [AFTERMANUELLERFASSEN]
+                                      </label>
-                [BEFOREFRM]
+                                      <label for="ausfuellen">{|Aus&uuml;llen|}</label>
-                [AFTERFRM]
+                                    </li>
-              </fieldset>
+                                  </ul>
+                                </div>    
+                            </div>
+                            [TAB1]
+                        </div>
+                    </div>
+                    <div class="col-xs-12 col-md-2 col-md-height">
+						<div class="inside inside-full-height">
+							<fieldset> [BUTTONS] [BEFOREFRM] [AFTERFRM] [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>
+									[ISLIEFERANTSTART]
+									<tr [HINZUFUEGENHIDDEN]>
+										<td>
+											<button name="submit" class="ui-button-icon" style="width:100%;" value="hinzufuegen">{|Hinzuf&uuml;gen|}</button>
+										</td>
+									</tr>
+									[ISLIEFERANTENDE]
+									[ISNOTLIEFERANTSTART]
+                                    <tr [HINZUFUEGENHIDDEN]>
+										<td>
+                                            {|Multifilter|}:
+                                        </td>
+                                    </tr>
+                                    <tr [HINZUFUEGENHIDDEN]>
+										<td>
+                                            <input type="text" name="multifilter" id="multifilter" value="[MULTIFILTER]" size="20" style="width:98%;" form="">
+										</td>
+									</tr>   
+                                    <tr [HINZUFUEGENHIDDEN]>
+										<td>
+											<button name="submit" class="ui-button-icon" style="width:100%;" value="manuell_hinzufuegen">{|Hinzuf&uuml;gen|}</button>
+										</td>
+									</tr>   
+									[ISNOTLIEFERANTENDE]
+								</table>
+							</fieldset>
+						</div>
+					</div>
+                </div>
             </div>
-          </div>
+			<div class="row">
-        </div>
+				<div class="row-height">
-      </div>
+					<div class="col-xs-12 col-md-10 col-md-height">
-      <div class="row">
+						<div class="inside-white inside-full-height">
-        <div class="row-height">
-          <div class="col-xs-12 col-md-10 col-md-height">
-            <div class="inside-white inside-full-height">
-              [TAB1]
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="row">
-        <div class="row-height">
-          <div class="col-xs-12 col-md-10 col-md-height">
-            <div class="inside-white inside-full-height">
-              [TAB1_SECOND]
-            </div>
-          </div>
-        </div>
-      </div>
-    </form>
-    [TAB1ENDE]
-  </div>
-  [AFTERTAB1]
-  [BEFORETAB2]
-  <div id="tabs-2">
                             
-    [TAB2START]
+                        </div>
-    [MESSAGE2]
+					</div>
-
+				</div>
-    <div class="row">
+			</div>
-      <div class="row-height">
+			<div class="row">
-        <div class="col-xs-12 col-md-10 col-md-height">
+				<div class="row-height">
-          <div class="inside-white inside-full-height">
+					<div class="col-xs-12 col-md-10 col-md-height">
-            [TAB2]
+						<div class="inside-white inside-full-height"> [TAB1_SECOND] </div>
-            <div class="center">[BUTTONS2]</div>
+					</div>
-          </div>
+					<div class="col-xs-12 col-md-2 col-md-height">
-        </div>
+						<div class="inside inside-full-height">
-        <div class="col-xs-12 col-md-2 col-md-height">
+							<fieldset>
-          <div class="inside inside-full-height">
+								<button name="submit" class="ui-button-icon" style="width:100%;" value="speichern" hidden="true"></button>
-            <fieldset>
+								<table width="100%" border="0" class="mkTableFormular">
-              <legend>{|Aktionen|}</legend>
+									<legend>{|Aktionen|}</legend>
-              [BUTTONS]
+									<tr [BUCHENHIDDEN]>
-            </fieldset>
+										<td>
-          </div>
+											<button name="submit" class="ui-button-icon" style="width:100%;" value="vorlaeufige_buchen">{|Buchen|}</button>
-        </div>
+										</td>
-      </div>
+									</tr> 
-    </div>
+                                    <tr [BUCHENHIDDEN]>
-    [TAB2ENDE]
+										<td>
-  </div>
+                                            {|Ziellager|}:&nbsp;<img src="./themes/new/images/tooltip_grau.png" border="0" style="position: relative; left: 1px; top: 3px; z-index: 8;" class="wawitooltipicon" title="Wenn nicht angegeben, wird das Standardlager des Artikels bebucht.">
-  [AFTERTAB2]
+                                        </td>
-  [BEFORETAB3]
+                                    </tr>
-  <div id="tabs-3">
+                                    <tr [BUCHENHIDDEN]>
-    [TAB3START]
+										<td>
-    [MESSAGE3]
+											<input type=text name="ziellager" id="ziellager" value="[LAGER]" style="width:98%;">
-    <div class="row">
+                                        </td>
-      <div class="row-height">
+									</tr> 
-        <div class="col-xs-12 col-md-10 col-md-height">
+									<tr [ABSCHLIESSENHIDDEN]>
-          <div class="inside-white inside-full-height">
+										<td>
-            [TAB3]
+											<button name="submit" class="ui-button-icon" style="width:100%;" value="abschliessen">{|Abschlie&szlig;en|}</button>
-          </div>
+										</td>
-        </div>
+									</tr>
-        <div class="col-xs-12 col-md-2 col-md-height">
+								</table>
-          <div class="inside inside-full-height">
+							</fieldset>
-            <fieldset>
+						</div>
-              <legend>{|Aktionen|}</legend>
+					</div>
-              [BUTTONS]
+				</div>
-            </fieldset>
+			</div>
-          </div>
+	        [TAB1ENDE] 
-        </div>
+        </div> [AFTERTAB1] [BEFORETAB2]
-      </div>
+	    <div id="tabs-2"> [TAB2START] [MESSAGE2]
-    </div>
+		    <div class="row">
-    [TAB3ENDE]
+			    <div class="row-height">
-  </div>
+				    <div class="col-xs-12 col-md-10 col-md-height">
-  [AFTERTAB3]
+					    <div class="inside-white inside-full-height"> [TAB2]
+						    <div class="center">[BUTTONS2]</div>
+					    </div>
+				    </div>
+                    <div class="col-xs-12 col-md-2 col-md-height">
+					    <div class="inside inside-full-height">
+						    <fieldset>
+							    <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>
+                                    <tr [HINZUFUEGENHIDDEN]>
+										<td>
+                                            {|Multifilter|}:&nbsp;<img src="./themes/new/images/tooltip_grau.png" border="0" style="position: relative; left: 1px; top: 3px; z-index: 8;" class="wawitooltipicon" title="Auswahl mehrerer Artikel &uuml;ber Name oder Nummer">
+                                        </td>
+                                    </tr>
+                                    <tr [HINZUFUEGENHIDDEN]>
+										<td>
+                                            <input type="text" name="multifilter" id="multifilter" value="[MULTIFILTER]" size="20" style="width:98%;" form="">
+										</td>
+									</tr>   
+								    <tr [HINZUFUEGENHIDDEN]>
+									    <td>
+										    <button name="submit" class="ui-button-icon" style="width:100%;" value="manuell_hinzufuegen">{|Hinzuf&uuml;gen|}</button>
+									    </td>
+								    </tr>                                 
+							    </table>
+						    </fieldset>
+					    </div>
+        			</div>
+			    </div>
+		    </div> [TAB2ENDE] 
+        </div> [AFTERTAB2]
+	</form> 
 </div>
 <script type="text/javascript">
-  $(document).ready(function() {
+$(document).ready(function() {
-    $( "#tabs" ).tabs( "option", "active", [TABINDEX]);
+	$("#tabs").tabs("option", "active", [TABINDEX]);
-    if($('#frmWareneingangDistribution').length) {
+	if($('#frmWareneingangDistribution').length) {
-      $('#btnabschliessen').on('click',function(){
+		$('#btnabschliessen').on('click', function() {
-        $('#frmWareneingangDistribution').append('<input type="hidden" value="1" name="abschliessen" />');
+			$('#frmWareneingangDistribution').append('<input type="hidden" value="1" name="abschliessen" />');
-        $('#frmWareneingangDistribution').find('[name="submit"]').trigger('click');
+			$('#frmWareneingangDistribution').find('[name="submit"]').trigger('click');
-      });
+		});
-    }
+	}
-  });
+});
 </script>

www/pages/emailbackup.php

@@ -116,6 +116,7 @@ $width = array('10%'); // Fill out manually later
             $input['ticketprojekt'] = $this->app->erp->ReplaceProjekt(true,$input['ticketprojekt'],true); // Parameters: Target db?, value, from form?
             $input['adresse'] = $this->app->erp->ReplaceAdresse(true,$input['adresse'],true); // Parameters: Target db?, value, from form?
             $input['ticketqueue'] = explode(" ",$input['ticketqueue'])[0]; // Just the label
+            $input['abdatum'] = $this->app->erp->ReplaceDatum(true,$input['abdatum'],true);
 
             $columns = "id, ";
             $values = "$id, ";
@@ -146,7 +147,6 @@ $width = array('10%'); // Fill out manually later
             else {
               $sql = "INSERT INTO emailbackup (".$columns.") VALUES (".$values.") ON DUPLICATE KEY UPDATE ".$update;
               $this->app->DB->Update($sql);
-
               if ($id == 'NULL') {
                   $msg = $this->app->erp->base64_url_encode("<div class=\"success\">Das Element wurde erfolgreich angelegt.</div>");
                   header("Location: index.php?module=emailbackup&action=list&msg=$msg");
@@ -159,30 +159,68 @@ $width = array('10%'); // Fill out manually later
         // Load values again from database
         $result = $this->app->DB->SelectArr("SELECT id, angezeigtername, internebeschreibung, benutzername, passwort, server, smtp, ticket, imap_sentfolder_aktiv, imap_sentfolder, imap_port, imap_type, autoresponder, geschaeftsbriefvorlage, autoresponderbetreff, autorespondertext, projekt, emailbackup, adresse, firma, loeschtage, geloescht, ticketloeschen, ticketabgeschlossen, ticketqueue, ticketprojekt, ticketemaileingehend, smtp_extra, smtp_ssl, smtp_port, smtp_frommail, smtp_fromname, client_alias, smtp_authtype, smtp_authparam, smtp_loglevel, autosresponder_blacklist, eigenesignatur, signatur, mutex, abdatum, email, id FROM emailbackup"." WHERE id=$id");
 
-        foreach ($result[0] as $key => $value) {
+        if (!empty($result)) {
+            $emailbackup = $result[0];
+        } else {
+            return;
+        }
+
+        foreach ($emailbackup as $key => $value) {
             $this->app->Tpl->Set(strtoupper($key), $value);   
         }
 
-        /*
+        // Checkboxes
-         * Add displayed items later
+        $this->app->Tpl->Set('SMTP_EXTRA', $emailbackup['smtp_extra']?'checked':'');
-         * 
+        $this->app->Tpl->Set('SMTP_LOGLEVEL', $emailbackup['smtp_loglevel']?'checked':'');    
-
+        $this->app->Tpl->Set('IMAP_SENTFOLDER_AKTIV', $emailbackup['imap_sentfolder_aktiv']?'checked':'');
-        $this->app->Tpl->Add('KURZUEBERSCHRIFT2', $email);
+        $this->app->Tpl->Set('EMAILBACKUP', $emailbackup['emailbackup']?'checked':'');
-        $this->app->Tpl->Add('EMAIL', $email);
+        $this->app->Tpl->Set('TICKET', $emailbackup['ticket']?'checked':'');
-        $this->app->Tpl->Add('ANGEZEIGTERNAME', $angezeigtername);         
+        $this->app->Tpl->Set('TICKETLOESCHEN', $emailbackup['ticketloeschen']?'checked':'');
-         */
+        $this->app->Tpl->Set('TICKETABGESCHLOSSEN', $emailbackup['ticketabgeschlossen']?'checked':'');
+        $this->app->Tpl->Set('TICKETEMAILEINGEHEND', $emailbackup['ticketemaileingehend']?'checked':'');
+        $this->app->Tpl->Set('EIGENESIGNATUR', $emailbackup['eigenesignatur']?'checked':'');
+        $this->app->Tpl->Set('AUTORESPONDER', $emailbackup['autoresponder']?'checked':'');
+        $this->app->Tpl->Set('AUTOSRESPONDER_BLACKLIST', $emailbackup['autosresponder_blacklist']?'checked':'');
 
         $this->app->YUI->CkEditor("signatur","internal", null, 'JQUERY');
         $this->app->YUI->CkEditor("autoresponderbetreff","internal", null, 'JQUERY');
         $this->app->YUI->CkEditor("autorespondertext","internal", null, 'JQUERY');
-        $this->app->Tpl->Set('PROJEKT',$this->app->erp->ReplaceProjekt(false,$result[0]['projekt'],false)); // Parameters: Target db?, value, from form?
+        $this->app->Tpl->Set('PROJEKT',$this->app->erp->ReplaceProjekt(false,$emailbackup['projekt'],false)); // Parameters: Target db?, value, from form?
-        $this->app->Tpl->Set('TICKETPROJEKT',$this->app->erp->ReplaceProjekt(false,$result[0]['ticketprojekt'],false)); // Parameters: Target db?, value, from form?
+        $this->app->Tpl->Set('TICKETPROJEKT',$this->app->erp->ReplaceProjekt(false,$emailbackup['ticketprojekt'],false)); // Parameters: Target db?, value, from form?
-        $this->app->Tpl->Set('ADRESSE', $this->app->erp->ReplaceAdresse(false,$result[0]['adresse'],false)); // Convert ID to form display
+        $this->app->Tpl->Set('ADRESSE', $this->app->erp->ReplaceAdresse(false,$emailbackup['adresse'],false)); // Convert ID to form display
         $this->app->YUI->AutoComplete("projekt","projektname",1);
         $this->app->YUI->AutoComplete("ticketprojekt","projektname",1);
         $this->app->YUI->AutoComplete("adresse","adresse");
         $this->app->YUI->AutoComplete("ticketqueue","warteschlangename");
         $this->app->YUI->AutoComplete("ticketprojekt","projektname",1);
+            
+        $this->app->YUI->DatePicker("abdatum");            
+        $this->app->Tpl->Set('ABDATUM',$this->app->erp->ReplaceDatum(false,$emailbackup['abdatum'],false));            
+      
+        $smtp_ssl_select = Array( 
+            '0' => 'Keine',
+            '1' => 'TLS',
+            '2' => 'SSL'
+        );       
+        $smtp_ssl_select = $this->app->erp->GetSelectAsso($smtp_ssl_select,$emailbackup['smtp_ssl']);
+        $this->app->Tpl->Set('SMTP_SSL_SELECT',$smtp_ssl_select);             
+        
+        $smtp_authtype_select = Array( 
+            '' => 'Kein',
+            'smtp' => 'SMTP',
+            'oauth_google' => 'Oauth Google'    
+        );       
+        $smtp_authtype_select = $this->app->erp->GetSelectAsso($smtp_authtype_select,$emailbackup['smtp_authtype']);
+        $this->app->Tpl->Set('SMTP_AUTHTYPE_SELECT',$smtp_authtype_select);   
+        
+        $imap_type_select = Array( 
+            '1' => 'Standard',
+            '3' => 'SSL',
+            '5' => 'Oauth'    
+        );       
+        $imap_type_select = $this->app->erp->GetSelectAsso($imap_type_select,$emailbackup['imap_type']);
+        $this->app->Tpl->Set('IMAP_TYPE_SELECT',$imap_type_select);          
+               
         $this->app->Tpl->Parse('PAGE', "emailbackup_edit.tpl");          
     }
 
@@ -194,47 +232,46 @@ $width = array('10%'); // Fill out manually later
         //$input['EMAIL'] = $this->app->Secure->GetPOST('email');
         
         $input['angezeigtername'] = $this->app->Secure->GetPOST('angezeigtername');
-	$input['internebeschreibung'] = $this->app->Secure->GetPOST('internebeschreibung');
+	    $input['internebeschreibung'] = $this->app->Secure->GetPOST('internebeschreibung');
-	$input['benutzername'] = $this->app->Secure->GetPOST('benutzername');
+	    $input['benutzername'] = $this->app->Secure->GetPOST('benutzername');
-	$input['passwort'] = $this->app->Secure->GetPOST('passwort');
+	    $input['passwort'] = $this->app->Secure->GetPOST('passwort');
-	$input['server'] = $this->app->Secure->GetPOST('server');
+	    $input['server'] = $this->app->Secure->GetPOST('server');
-	$input['smtp'] = $this->app->Secure->GetPOST('smtp');
+	    $input['smtp'] = $this->app->Secure->GetPOST('smtp');
-	$input['ticket'] = $this->app->Secure->GetPOST('ticket');
+	    $input['ticket'] = $this->app->Secure->GetPOST('ticket');
-	$input['imap_sentfolder_aktiv'] = $this->app->Secure->GetPOST('imap_sentfolder_aktiv');
+	    $input['imap_sentfolder_aktiv'] = $this->app->Secure->GetPOST('imap_sentfolder_aktiv');
-	$input['imap_sentfolder'] = $this->app->Secure->GetPOST('imap_sentfolder');
+	    $input['imap_sentfolder'] = $this->app->Secure->GetPOST('imap_sentfolder');
-	$input['imap_port'] = $this->app->Secure->GetPOST('imap_port');
+	    $input['imap_port'] = $this->app->Secure->GetPOST('imap_port');
-	$input['imap_type'] = $this->app->Secure->GetPOST('imap_type');
+	    $input['imap_type'] = $this->app->Secure->GetPOST('imap_type');
-	$input['autoresponder'] = $this->app->Secure->GetPOST('autoresponder');
+	    $input['autoresponder'] = $this->app->Secure->GetPOST('autoresponder');
-	$input['geschaeftsbriefvorlage'] = $this->app->Secure->GetPOST('geschaeftsbriefvorlage');
+	    $input['geschaeftsbriefvorlage'] = $this->app->Secure->GetPOST('geschaeftsbriefvorlage');
-	$input['autoresponderbetreff'] = $this->app->Secure->GetPOST('autoresponderbetreff');
+	    $input['autoresponderbetreff'] = $this->app->Secure->GetPOST('autoresponderbetreff');
-	$input['autorespondertext'] = $this->app->Secure->GetPOST('autorespondertext');
+	    $input['autorespondertext'] = $this->app->Secure->GetPOST('autorespondertext');
-	$input['projekt'] = $this->app->Secure->GetPOST('projekt');
+	    $input['projekt'] = $this->app->Secure->GetPOST('projekt');
-	$input['emailbackup'] = $this->app->Secure->GetPOST('emailbackup');
+	    $input['emailbackup'] = $this->app->Secure->GetPOST('emailbackup');
-	$input['adresse'] = $this->app->Secure->GetPOST('adresse');
+	    $input['adresse'] = $this->app->Secure->GetPOST('adresse');
-	$input['firma'] = $this->app->Secure->GetPOST('firma');
+	    $input['firma'] = $this->app->Secure->GetPOST('firma');
-	$input['loeschtage'] = $this->app->Secure->GetPOST('loeschtage');
+	    $input['loeschtage'] = $this->app->Secure->GetPOST('loeschtage');
-	$input['geloescht'] = $this->app->Secure->GetPOST('geloescht');
+	    $input['geloescht'] = $this->app->Secure->GetPOST('geloescht');
-	$input['ticketloeschen'] = $this->app->Secure->GetPOST('ticketloeschen');
+	    $input['ticketloeschen'] = $this->app->Secure->GetPOST('ticketloeschen');
-	$input['ticketabgeschlossen'] = $this->app->Secure->GetPOST('ticketabgeschlossen');
+	    $input['ticketabgeschlossen'] = $this->app->Secure->GetPOST('ticketabgeschlossen');
-	$input['ticketqueue'] = $this->app->Secure->GetPOST('ticketqueue');
+	    $input['ticketqueue'] = $this->app->Secure->GetPOST('ticketqueue');
-	$input['ticketprojekt'] = $this->app->Secure->GetPOST('ticketprojekt');
+	    $input['ticketprojekt'] = $this->app->Secure->GetPOST('ticketprojekt');
-	$input['ticketemaileingehend'] = $this->app->Secure->GetPOST('ticketemaileingehend');
+	    $input['ticketemaileingehend'] = $this->app->Secure->GetPOST('ticketemaileingehend');
-	$input['smtp_extra'] = $this->app->Secure->GetPOST('smtp_extra');
+	    $input['smtp_extra'] = $this->app->Secure->GetPOST('smtp_extra');
-	$input['smtp_ssl'] = $this->app->Secure->GetPOST('smtp_ssl');
+	    $input['smtp_ssl'] = $this->app->Secure->GetPOST('smtp_ssl');
-	$input['smtp_port'] = $this->app->Secure->GetPOST('smtp_port');
+	    $input['smtp_port'] = $this->app->Secure->GetPOST('smtp_port');
-	$input['smtp_frommail'] = $this->app->Secure->GetPOST('email'); // use only these
+	    $input['smtp_frommail'] = $this->app->Secure->GetPOST('email'); // use only these
-	$input['smtp_fromname'] = $this->app->Secure->GetPOST('angezeigtername'); // use only these
+	    $input['smtp_fromname'] = $this->app->Secure->GetPOST('angezeigtername'); // use only these
-	$input['client_alias'] = $this->app->Secure->GetPOST('client_alias');
+	    $input['client_alias'] = $this->app->Secure->GetPOST('client_alias');
-	$input['smtp_authtype'] = $this->app->Secure->GetPOST('smtp_authtype');
+	    $input['smtp_authtype'] = $this->app->Secure->GetPOST('smtp_authtype');
-	$input['smtp_authparam'] = $this->app->Secure->GetPOST('smtp_authparam');
+	    $input['smtp_authparam'] = $this->app->Secure->GetPOST('smtp_authparam');
-	$input['smtp_loglevel'] = $this->app->Secure->GetPOST('smtp_loglevel');
+	    $input['smtp_loglevel'] = $this->app->Secure->GetPOST('smtp_loglevel');
-	$input['autosresponder_blacklist'] = $this->app->Secure->GetPOST('autosresponder_blacklist');
+	    $input['autosresponder_blacklist'] = $this->app->Secure->GetPOST('autosresponder_blacklist');
-	$input['eigenesignatur'] = $this->app->Secure->GetPOST('eigenesignatur');
+	    $input['eigenesignatur'] = $this->app->Secure->GetPOST('eigenesignatur');
-	$input['signatur'] = $this->app->Secure->GetPOST('signatur');
+	    $input['signatur'] = $this->app->Secure->GetPOST('signatur');
-	$input['mutex'] = $this->app->Secure->GetPOST('mutex');
+	    $input['mutex'] = $this->app->Secure->GetPOST('mutex');
-	$input['abdatum'] = $this->app->Secure->GetPOST('abdatum');
+	    $input['abdatum'] = $this->app->Secure->GetPOST('abdatum');
-	$input['email'] = $this->app->Secure->GetPOST('email');
+	    $input['email'] = $this->app->Secure->GetPOST('email');
-	
 
         return $input;
     }
@@ -245,45 +282,7 @@ $width = array('10%'); // Fill out manually later
     function SetInput($input) {
         // $this->app->Tpl->Set('EMAIL', $input['email']);        
         
-        $this->app->Tpl->Set('ANGEZEIGTERNAME', $input['angezeigtername']);
+  
-	$this->app->Tpl->Set('INTERNEBESCHREIBUNG', $input['internebeschreibung']);
-	$this->app->Tpl->Set('BENUTZERNAME', $input['benutzername']);
-	$this->app->Tpl->Set('PASSWORT', $input['passwort']);
-	$this->app->Tpl->Set('SERVER', $input['server']);
-	$this->app->Tpl->Set('SMTP', $input['smtp']);
-	$this->app->Tpl->Set('TICKET', $input['ticket']);
-	$this->app->Tpl->Set('IMAP_SENTFOLDER_AKTIV', $input['imap_sentfolder_aktiv']);
-	$this->app->Tpl->Set('IMAP_SENTFOLDER', $input['imap_sentfolder']);
-	$this->app->Tpl->Set('IMAP_PORT', $input['imap_port']);
-	$this->app->Tpl->Set('IMAP_TYPE', $input['imap_type']);
-	$this->app->Tpl->Set('AUTORESPONDER', $input['autoresponder']);
-	$this->app->Tpl->Set('GESCHAEFTSBRIEFVORLAGE', $input['geschaeftsbriefvorlage']);
-	$this->app->Tpl->Set('AUTORESPONDERBETREFF', $input['autoresponderbetreff']);
-	$this->app->Tpl->Set('AUTORESPONDERTEXT', $input['autorespondertext']);
-	$this->app->Tpl->Set('PROJEKT', $input['projekt']);
-	$this->app->Tpl->Set('EMAILBACKUP', $input['emailbackup']);
-	$this->app->Tpl->Set('ADRESSE', $input['adresse']);
-	$this->app->Tpl->Set('FIRMA', $input['firma']);
-	$this->app->Tpl->Set('LOESCHTAGE', $input['loeschtage']);
-	$this->app->Tpl->Set('GELOESCHT', $input['geloescht']);
-	$this->app->Tpl->Set('TICKETLOESCHEN', $input['ticketloeschen']);
-	$this->app->Tpl->Set('TICKETABGESCHLOSSEN', $input['ticketabgeschlossen']);
-	$this->app->Tpl->Set('TICKETQUEUE', $input['ticketqueue']);
-	$this->app->Tpl->Set('TICKETPROJEKT', $input['ticketprojekt']);
-	$this->app->Tpl->Set('TICKETEMAILEINGEHEND', $input['ticketemaileingehend']);
-	$this->app->Tpl->Set('SMTP_EXTRA', $input['smtp_extra']);
-	$this->app->Tpl->Set('SMTP_SSL', $input['smtp_ssl']);
-	$this->app->Tpl->Set('SMTP_PORT', $input['smtp_port']);
-	$this->app->Tpl->Set('CLIENT_ALIAS', $input['client_alias']);
-	$this->app->Tpl->Set('SMTP_AUTHTYPE', $input['smtp_authtype']);
-	$this->app->Tpl->Set('SMTP_AUTHPARAM', $input['smtp_authparam']);
-	$this->app->Tpl->Set('SMTP_LOGLEVEL', $input['smtp_loglevel']);
-	$this->app->Tpl->Set('AUTOSRESPONDER_BLACKLIST', $input['autosresponder_blacklist']);
-	$this->app->Tpl->Set('EIGENESIGNATUR', $input['eigenesignatur']);
-	$this->app->Tpl->Set('SIGNATUR', $input['signatur']);
-	$this->app->Tpl->Set('MUTEX', $input['mutex']);
-	$this->app->Tpl->Set('ABDATUM', $input['abdatum']);
-	$this->app->Tpl->Set('EMAIL', $input['email']);
 	
     }
 
@@ -300,7 +299,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

@@ -447,7 +447,8 @@ class Exportbuchhaltung
                 'field_belegnr' => 'b.belegnr',
                 'field_name' => 'b.name',
                 'field_date' => 'datum',
-                'field_auftrag' => 'b.auftrag',
+                'field_auftrag' => 'MAKE_SET(3,b.auftrag,(SELECT auftrag.internet FROM auftrag WHERE auftrag.id = auftragid))',
+                'field_zahlweise' => 'CONCAT(UCASE(LEFT(b.zahlungsweise, 1)),SUBSTRING(b.zahlungsweise, 2))',
                 'field_kontonummer' => 'a.kundennummer_buchhaltung',
                 'field_kundennummer' => 'b.kundennummer',
                 'field_betrag_gesamt' => 'b.soll',
@@ -466,6 +467,7 @@ class Exportbuchhaltung
                 'field_name' => 'b.name',
                 'field_date' => 'datum',
                 'field_auftrag' => '\'\'',
+                'field_zahlweise' => '\'\'',
                 'field_kontonummer' => 'a.kundennummer_buchhaltung',
                 'field_kundennummer' => 'b.kundennummer',
                 'field_betrag_gesamt' => 'b.soll',
@@ -484,6 +486,7 @@ class Exportbuchhaltung
                 'field_name' => 'a.name',
                 'field_date' => 'rechnungsdatum',
                 'field_auftrag' => 'b.auftrag',
+                'field_zahlweise' => '\'\'',
                 'field_kontonummer' => 'a.lieferantennummer_buchhaltung',
                 'field_kundennummer' => 'a.lieferantennummer',
                 'field_betrag_gesamt' => 'b.betrag',
@@ -504,6 +507,7 @@ class Exportbuchhaltung
             $sql = "SELECT  
                 ".$typ['field_belegnr']." as belegnr,
                 ".$typ['field_auftrag']." as auftrag,
+                ".$typ['field_zahlweise']." as zahlweise,
                 if(".$typ['field_kontonummer']." <> '',".$typ['field_kontonummer'].",".$typ['field_kundennummer'].") as kundennummer,
                 ".$typ['field_name']." as name,
                 b.ustid,
@@ -580,6 +584,7 @@ class Exportbuchhaltung
                             $data['Buchungstext'] = "Differenz";
                             $data['EU-Mitgliedstaat u. UStID (Bestimmung)'] = $row['ustid'];
                             $data['Auftragsnummer'] = $row['auftrag'];
+                            $data['Zahlweise'] = $row['zahlweise'];
                 		    $csv .= $this->create_line($datev_buchungsstapel_definition,$data);
                         }                                                       
         		    }                                
@@ -609,7 +614,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
@@ -625,6 +630,7 @@ class Exportbuchhaltung
                 $data['EU-Mitgliedstaat u. UStID (Bestimmung)'] = $row['ustid'];
                 
                 $data['Auftragsnummer'] = ($row['auftrag']!=0)?$row['auftrag']:'';
+                $data['Zahlweise'] = $row['zahlweise'];
                 
                 $csv .= $this->create_line($datev_buchungsstapel_definition,$data);
             }

www/pages/kostenstellen.php

@@ -0,0 +1,207 @@
+<?php
+
+/*
+ * Copyright (c) 2022 OpenXE project
+ */
+
+use Xentral\Components\Database\Exception\QueryFailureException;
+
+class Kostenstellen {
+
+    function __construct($app, $intern = false) {
+        $this->app = $app;
+        if ($intern)
+            return;
+
+        $this->app->ActionHandlerInit($this);
+        $this->app->ActionHandler("list", "kostenstellen_list");        
+        $this->app->ActionHandler("create", "kostenstellen_edit"); // This automatically adds a "New" button
+        $this->app->ActionHandler("edit", "kostenstellen_edit");
+        $this->app->ActionHandler("delete", "kostenstellen_delete");
+        $this->app->DefaultActionHandler("list");
+        $this->app->ActionHandlerListen($app);
+    }
+
+    public function Install() {
+        /* Fill out manually later */
+    }
+
+    static function TableSearch(&$app, $name, $erlaubtevars) {
+        switch ($name) {
+            case "kostenstellen_list":
+                $allowed['kostenstellen_list'] = array('list');
+                $heading = array('','','Nummer', 'Beschreibung', 'Internebemerkung', 'Men&uuml;');
+                $width = array('1%','1%','10%'); // Fill out manually later
+
+                // columns that are aligned right (numbers etc)
+                // $alignright = array(4,5,6,7,8); 
+
+                $findcols = array('k.id','k.id','k.nummer', 'k.beschreibung', 'k.internebemerkung');
+                $searchsql = array('k.nummer', 'k.beschreibung', 'k.internebemerkung');
+
+                $defaultorder = 1;
+                $defaultorderdesc = 0;
+                $aligncenter = array();
+                $alignright = array();
+                $numbercols = array();
+                $sumcol = array();
+
+        		$dropnbox = "'<img src=./themes/new/images/details_open.png class=details>' AS `open`, CONCAT('<input type=\"checkbox\" name=\"auswahl[]\" value=\"',k.id,'\" />') AS `auswahl`";
+
+//                $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=kostenstellen&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=kostenstellen&action=delete&id=%value%\");>" . "<img src=\"themes/{$app->Conf->WFconf['defaulttheme']}/images/delete.svg\" border=\"0\"></a>" . "</td></tr></table>";
+
+                $sql = "SELECT SQL_CALC_FOUND_ROWS k.id, $dropnbox, k.nummer, k.beschreibung, k.internebemerkung, k.id FROM kostenstellen k";
+
+                $where = "1";
+                $count = "SELECT count(DISTINCT id) FROM kostenstellen WHERE $where";
+//                $groupby = "";
+
+                break;
+        }
+
+        $erg = false;
+
+        foreach ($erlaubtevars as $k => $v) {
+            if (isset($$v)) {
+                $erg[$v] = $$v;
+            }
+        }
+        return $erg;
+    }
+    
+    function kostenstellen_list() {
+        $this->app->erp->MenuEintrag("index.php?module=kostenstellen&action=list", "&Uuml;bersicht");
+        $this->app->erp->MenuEintrag("index.php?module=kostenstellen&action=create", "Neu anlegen");
+
+        $this->app->erp->MenuEintrag("index.php", "Zur&uuml;ck");
+
+        $this->app->YUI->TableSearch('TAB1', 'kostenstellen_list', "show", "", "", basename(__FILE__), __CLASS__);
+        $this->app->Tpl->Parse('PAGE', "kostenstellen_list.tpl");
+    }    
+
+    public function kostenstellen_delete() {
+        $id = (int) $this->app->Secure->GetGET('id');
+        
+        $this->app->DB->Delete("DELETE FROM `kostenstellen` WHERE `id` = '{$id}'");        
+        $this->app->Tpl->Set('MESSAGE', "<div class=\"error\">Der Eintrag wurde gel&ouml;scht.</div>");        
+
+        $this->kostenstellen_list();
+    } 
+
+    /*
+     * Edit kostenstellen item
+     * If id is empty, create a new one
+     */
+        
+    function kostenstellen_edit() {
+        $id = $this->app->Secure->GetGET('id');
+        
+        // Check if other users are editing this id
+        if($this->app->erp->DisableModul('artikel',$id))
+        {
+          return;
+        }   
+              
+        $this->app->Tpl->Set('ID', $id);
+
+        $this->app->erp->MenuEintrag("index.php?module=kostenstellen&action=edit&id=$id", "Details");
+        $this->app->erp->MenuEintrag("index.php?module=kostenstellen&action=list", "Zur&uuml;ck zur &Uuml;bersicht");
+        $id = $this->app->Secure->GetGET('id');
+        $input = $this->GetInput();
+        $submit = $this->app->Secure->GetPOST('submit');
+                
+        if (empty($id)) {
+            // New item
+            $id = 'NULL';
+        } 
+
+        if ($submit != '')
+        {
+
+            // Write to database
+            
+            // Add checks here
+
+    //        $input['projekt'] = $this->app->erp->ReplaceProjekt(true,$input['projekt'],true); // Parameters: Target db?, value, from form?
+
+            $columns = "id, ";
+            $values = "$id, ";
+            $update = "";
+    
+            $fix = "";
+
+            foreach ($input as $key => $value) {
+                $columns = $columns.$fix.$key;
+                $values = $values.$fix."'".$value."'";
+                $update = $update.$fix.$key." = '$value'";
+
+                $fix = ", ";
+            }
+
+//            echo($columns."<br>");
+//            echo($values."<br>");
+//            echo($update."<br>");
+
+            $sql = "INSERT INTO kostenstellen (".$columns.") VALUES (".$values.") ON DUPLICATE KEY UPDATE ".$update;
+
+//            echo($sql);
+
+            $this->app->DB->Update($sql);
+
+            if ($id == 'NULL') {
+                $msg = $this->app->erp->base64_url_encode("<div class=\"success\">Das Element wurde erfolgreich angelegt.</div>");
+                header("Location: index.php?module=kostenstellen&action=list&msg=$msg");
+            } else {
+                $this->app->Tpl->Set('MESSAGE', "<div class=\"success\">Die Einstellungen wurden erfolgreich &uuml;bernommen.</div>");
+            }
+        }
+
+    
+        // Load values again from database
+	$dropnbox = "'<img src=./themes/new/images/details_open.png class=details>' AS `open`, CONCAT('<input type=\"checkbox\" name=\"auswahl[]\" value=\"',k.id,'\" />') AS `auswahl`";
+        $result = $this->app->DB->SelectArr("SELECT SQL_CALC_FOUND_ROWS k.id, $dropnbox, k.nummer, k.beschreibung, k.internebemerkung, k.id FROM kostenstellen k"." WHERE id=$id");        
+
+        foreach ($result[0] as $key => $value) {
+            $this->app->Tpl->Set(strtoupper($key), $value);   
+        }
+
+        if (!empty($result)) {
+            $kostenstellen_from_db = $result[0];
+        } else {
+            return;
+        }
+             
+        /*
+         * Add displayed items later
+         * 
+
+        $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->app->Tpl->Parse('PAGE', "kostenstellen_edit.tpl");
+    }
+
+    /**
+     * Get all paramters from html form and save into $input
+     */
+    public function GetInput(): array {
+        $input = array();
+        //$input['EMAIL'] = $this->app->Secure->GetPOST('email');
+        
+        $input['nummer'] = $this->app->Secure->GetPOST('nummer');
+	$input['beschreibung'] = $this->app->Secure->GetPOST('beschreibung');
+	$input['internebemerkung'] = $this->app->Secure->GetPOST('internebemerkung');
+	
+
+        return $input;
+    }
+ }

www/pages/lager.php

@@ -175,30 +175,6 @@ class Lager extends GenLager {
         $where = " l.geloescht=0 AND l.id!=0 AND l.lager='$id' ";
         $count = "SELECT COUNT(id) FROM lager_platz WHERE geloescht=0 AND lager='$id' ";
         break;  
-      case 'lagerletztebewegungen':
-        $allowed['lager'] = array('letztebewegungen');
-
-        // headings
-
-        // headings
-
-        $heading = array('Datum', 'Lager', 'Menge', 'Nummer', 'Artikel', 'Richtung', 'Referenz', 'Bearbeiter', 'Projekt', 'Menü');
-        $width = array('1%', '5%', '5%', '5%', '5%', '5%', '40%', '20%', '5%', '1%');
-        $findcols = array('zeit', 'lager', 'menge', 'nummer', 'name_de', 'Richtung', 'referenz', 'bearbeiter', 'projekt', 'id');
-        $searchsql = array('lpi.referenz', 'lpi.bearbeiter', 'p.abkuerzung', 'DATE_FORMAT(lpi.zeit,\'%d.%m.%Y\')', 'lp.kurzbezeichnung', 'a.name_de', 'a.nummer');
-        $defaultorder = 10; //Optional wenn andere Reihenfolge gewuenscht
-        $alignright = array(3);
-        $defaultorderdesc = 1;
-        $menu = "-";
-
-        $sql = "SELECT SQL_CALC_FOUND_ROWS lpi.id,
-                DATE_FORMAT(lpi.zeit,'%d.%m.%Y') as datum, lp.kurzbezeichnung as lager, trim(lpi.menge)+0 as menge, 
-                a.nummer, a.name_de, if(lpi.eingang,'Eingang','Ausgang') as Richtung, substring(lpi.referenz,1,60) as referenz, lpi.bearbeiter as bearbeiter, p.abkuerzung as projekt, 
-                lpi.id FROM lager_bewegung lpi LEFT JOIN lager_platz as lp ON lpi.lager_platz=lp.id LEFT JOIN projekt p ON lpi.projekt=p.id LEFT JOIN artikel a ON a.id=lpi.artikel";
-
-
-        $count = "SELECT COUNT(lpi.id) FROM lager_bewegung lpi LEFT JOIN lager_platz as lp ON lpi.lager_platz=lp.id LEFT JOIN projekt p ON lpi.projekt=p.id ";
-        break;
       case 'lagertabelle':
         $allowed['lager'] = array('list');
         $defaultCountry = $app->erp->Firmendaten('land');
@@ -832,7 +808,23 @@ class Lager extends GenLager {
 
         $datecols = array(6);
 
-        $sql = "SELECT SQL_CALC_FOUND_ROWS i.id, l.bezeichnung, lp.kurzbezeichnung as regal, a.nummer, a.name_de, IF(i.eingang, 'Eingang', 'Ausgang'), if(i.eingang, CONCAT('+', ' ', trim(i.menge)+0), CONCAT('-', ' ', trim(i.menge)+0)) as menge, DATE_FORMAT(i.zeit,'%d.%m.%Y') as datum, i.referenz, i.bearbeiter, p.abkuerzung AS projektbewegung, i.id FROM lager_bewegung i LEFT JOIN lager_platz lp ON lp.id=i.lager_platz LEFT JOIN lager l ON lp.lager = l.id LEFT JOIN artikel a ON i.artikel=a.id LEFT JOIN projekt p ON l.projekt = p.id";
+        $sql = "SELECT SQL_CALC_FOUND_ROWS 
+                    i.id,
+                    l.bezeichnung,
+                    lp.kurzbezeichnung as regal,
+                    a.nummer,
+                    a.name_de,
+                    IF(i.eingang,
+                    'Eingang',
+                    'Ausgang'),
+                    if(i.eingang,
+                    CONCAT('+',' ',trim(i.menge)+0),CONCAT('-',' ',trim(i.menge)+0)) as menge,
+                    ".$app->erp->FormatDateTimeShort('i.zeit')." as datum,
+                    i.referenz,
+                    i.bearbeiter,
+                    p.abkuerzung AS projektbewegung,
+                    i.id 
+                    FROM lager_bewegung i LEFT JOIN lager_platz lp ON lp.id=i.lager_platz LEFT JOIN lager l ON lp.lager = l.id LEFT JOIN artikel a ON i.artikel=a.id LEFT JOIN projekt p ON l.projekt = p.id";
    
                
         $lager = $app->User->GetParameter("lager_bewegungalle_lager");
@@ -1107,6 +1099,7 @@ class Lager extends GenLager {
     $this->app->ActionHandler("buchenzwischenlagerdelete", "LagerBuchenZwischenlagerDelete");
     $this->app->ActionHandler("bucheneinlagern", "LagerBuchenEinlagern");
     $this->app->ActionHandler("buchenauslagern", "LagerBuchenAuslagern");
+    $this->app->ActionHandler("umlagernlieferschein", "LagerBuchenUmlagernLieferschein");
     $this->app->ActionHandler("artikelentfernenreserviert", "LagerArtikelEntfernenReserviert");
     $this->app->ActionHandler("letztebewegungen", "LagerLetzteBewegungen");
     $this->app->ActionHandler("schnelleinlagern", "LagerSchnellEinlagern");
@@ -3156,12 +3149,50 @@ class Lager extends GenLager {
     $this->app->Tpl->Parse('PAGE', 'tabview.tpl');
   }
 
+    function LagerBuchenUmlagernLieferschein() {
+        $this->LagerBuchenMenu();
+        $this->app->Tpl->AddMessage('info',"Gesamten Lagerplatz in einen neuen Lieferschein zur Umlagerung geben.");   
+        $this->app->YUI->AutoComplete("quelllager", "lagerplatz");    
+        $quelllager = $this->app->Secure->GetPOST('quelllager');
+
+        $submit = $this->app->Secure->GetPOST('submit');
+        if ($submit == 'lieferschein') {
+            $quellager_id = $this->app->erp->ReplaceLagerPlatz(true, $quelllager, true);
+            if (empty($quellager_id)) {
+                $this->app->Tpl->AddMessage('error',"Bitte Quelllager angeben.");
+            } else {
+                $sql = "SELECT artikel, SUM(menge) as menge FROM lager_platz_inhalt WHERE lager_platz=$quellager_id AND menge > 0 GROUP BY artikel";   
+          	    $positionen = $this->app->DB->SelectArr($sql);
+
+                if (empty($positionen)) {
+                    $this->app->Tpl->AddMessage('error',"Lager ist leer.");
+                } else {
+                    $id = $this->app->erp->ImportCreateLieferschein(null);
+                    if (!empty($id)) {
+                        $this->app->erp->LieferscheinProtokoll($id,"Lieferschein aus Lager ".$quelllager." erstellt");
+                        $this->app->DB->Update("UPDATE lieferschein SET standardlager = '$quellager_id' WHERE id = '$id' LIMIT 1");
+
+                        foreach ($positionen as $position) {
+                            //  public function AddLieferscheinPositionArtikelID($lieferschein, $artikel,$menge,$bezeichnung,$beschreibung,$datum)
+                            $this->app->erp->AddLieferscheinPositionArtikelID($id, $position['artikel'],$position['menge'],null,null,null);
+                        }
+
+                        $this->app->Location->execute("index.php?module=lieferschein&action=edit&id=$id");
+                    } else {
+                        $this->app->Tpl->AddMessage('error',"Lieferschein konnte nicht erzeugt werden.");
+                    }
+                }                
+            }
+        }
+
+        $this->app->Tpl->Set('QUELLLAGER',$this->app->erp->ReplaceLagerPlatz(false, $quellager_id, false));
+        $this->app->Tpl->Parse('PAGE', 'lager_umlagern_lieferschein.tpl');
+    }
+
   function LagerLetzteBewegungen()
   {
     $this->LagerBuchenMenu();
-
+    $this->app->YUI->TableSearch('TAB1', 'lager_allebewegungenlist','show','','',basename(__FILE__), __CLASS__);
-    $this->app->YUI->TableSearch('TAB1', 'lagerletztebewegungen','show','','',basename(__FILE__), __CLASS__);
-
     $this->app->Tpl->Parse('PAGE', 'tabview.tpl');
   } 
 
@@ -3171,6 +3202,7 @@ class Lager extends GenLager {
     $this->app->erp->Headlines('Lager');
     if($this->app->erp->Version()!=='stock') {
       $this->app->erp->MenuEintrag("index.php?module=lager&action=buchenauslagern&cmd=umlagern&id=$id", 'Umlagern');
+      $this->app->erp->MenuEintrag("index.php?module=lager&action=umlagernlieferschein&id=$id", 'Umlagern mit Lieferschein');
       $this->app->erp->MenuEintrag("index.php?module=lager&action=buchenauslagern&id=$id", 'Auslagern');
       $this->app->erp->MenuEintrag("index.php?module=lager&action=bucheneinlagern&id=$id", 'Einlagern');
       $this->app->erp->MenuEintrag("index.php?module=lager&action=buchenzwischenlager&id=$id", 'Zwischenlager');

www/pages/lieferschein.php

@@ -194,6 +194,7 @@ class Lieferschein extends GenLieferschein
     $this->app->ActionHandler("abschicken","LieferscheinAbschicken");
     $this->app->ActionHandler("abschliessen","LieferscheinAbschliessen");
     $this->app->ActionHandler("auslagern","LieferscheinAuslagern");
+    $this->app->ActionHandler("umlagern","LieferscheinUmlagern");
     $this->app->ActionHandler("pdf","LieferscheinPDF");
     $this->app->ActionHandler("inlinepdf","LieferscheinInlinePDF");
     $this->app->ActionHandler("protokoll","LieferscheinProtokoll");
@@ -453,6 +454,107 @@ class Lieferschein extends GenLieferschein
     exit;
   }
 
+  function LieferscheinUmlagern()
+  {
+    $id = (int)$this->app->Secure->GetGET("id");
+    $sql = "SELECT belegnr, name, status, umgelagert, standardlager FROM lieferschein WHERE id='$id'";
+    $lieferschein = $this->app->DB->SelectArr($sql)[0];
+    $belegnr = $lieferschein['belegnr'];
+    $name = $lieferschein['name'];
+    $status = $lieferschein['status'];
+    $umgelagert = $lieferschein['umgelagert'];
+
+    $quelllager = $this->app->Secure->GetPOST('quelllager');
+    $ziellager = $this->app->Secure->GetPOST('ziellager');
+
+    $quellager_id = $this->app->erp->ReplaceLagerPlatz(true, $quelllager, true);
+    $ziellager_id = $this->app->erp->ReplaceLagerPlatz(true, $ziellager, true);
+
+    if (empty($quellager_id)) {
+        $quellager_id = $lieferschein['standardlager'];
+    }
+
+    if ($status != "versendet" && $status != "freigegeben") {
+        exit();
+    }
+
+    $submit = $this->app->Secure->GetPOST('submit');
+    $erneut = $this->app->Secure->GetPOST('erneut');
+
+    if ($umgelagert && !$erneut) {
+        $this->app->Tpl->AddMessage('warning',"Lieferschein wurde bereits umgelagert.");
+    } else {
+        $this->app->Tpl->Set('ERNEUT_UMLAGERN_HIDDEN','hidden');
+        $submit = $this->app->Secure->GetPOST('submit');
+        if ($submit == 'umlagern') {
+
+            if (empty($quellager_id) || empty($ziellager_id)) {
+                $this->app->Tpl->AddMessage('error',"Bitte Quell- und Ziellager angeben.");
+            } else {
+                $sql = "SELECT artikel, name_de, a.nummer AS artikelnummer, SUM(menge) AS menge FROM lieferschein_position lp INNER JOIN artikel a ON a.id = lp.artikel WHERE lp.lieferschein = $id GROUP BY lp.artikel";
+	            $positionen = $this->app->DB->SelectArr($sql);
+
+                $menge_ok = true;
+                $fehlt = array();
+
+                foreach ($positionen as $position) {
+                    $sql = "SELECT SUM(menge) as menge FROM lager_platz_inhalt WHERE lager_platz=$quellager_id AND artikel = ".$position['artikel'];           
+            	    $menge_lager = $this->app->DB->SelectArr($sql)[0]['menge'];    
+
+                    if ($menge_lager < $position['menge']) {
+                        $menge_ok = false;
+                        $fehlt[] = array('Nummer' => $position['artikelnummer'],'Artikel' => $position['name_de'],'Lieferschein Menge' => (int) $position['menge'],'Lager Menge' => empty($menge_lager)?'-':(int) $menge_lager);
+                    }
+                }     
+
+                if ($menge_ok) {
+                   foreach ($positionen as $position) {                  
+
+                        $artikel = $position['artikel'];
+                        $menge = $position['menge'];
+                        $projekt = 0;
+                        $grund = "Umlagern Lieferschein ".$belegnr;
+                        $importer = "";
+                        $paketannahme = "";
+                        $doctype = "lieferschein";
+                        $doctypeId = $id;
+
+                        $this->app->erp->LagerAuslagernRegal($artikel,$quellager_id,$menge,$projekt,$grund,$importer,$doctype,$doctypeid);
+                        $this->app->erp->LagerEinlagern($artikel,$menge,$ziellager_id,$projekt,$grund,$importer,$paketannahme,$doctype,$doctypeid);
+                    }
+                    $sql = "UPDATE lieferschein SET umgelagert = 1 WHERE id = ".$id;
+                    $this->app->DB->Update($sql);
+                    $this->app->erp->LieferscheinProtokoll($id,"Lieferschein umgelagert von ".$quelllager." nach ".$ziellager);
+                    $this->app->Tpl->AddMessage('success','Erfolgreich umgelagert.');
+		    $erneut = null;
+                } else {                
+                    $this->app->Tpl->AddMessage('error',"Mengen im Quelllager nicht ausreichend.");   
+                    $tmp = new EasyTable($this->app);
+                    $tmp->headings = array('Nummer','Artikel','Lieferschein Menge','Lager Menge','');
+                    $tmp->datasets = $fehlt;
+                    $tmp->DisplayNew('MESSAGETABLE',null,"noAction");
+                } // Menge ok
+            } // Lager ok
+        } // umlagern
+    } // $umgelagert
+
+    $this->LieferscheinMenu();
+
+    $this->app->YUI->AutoComplete("quelllager", "lagerplatz");
+    $this->app->YUI->AutoComplete("ziellager", "lagerplatz");
+
+    $this->app->Tpl->Set('KURZUEBERSCHRIFT2',"Lieferschein $belegnr umlagern");
+    $this->app->Tpl->Set('TABTEXT',"Umlagern");
+
+    $this->app->Tpl->Set('QUELLLAGER',$this->app->erp->ReplaceLagerPlatz(false, $quellager_id, false));
+
+    $this->app->Tpl->Set('ZIELLAGER',$this->app->erp->ReplaceLagerPlatz(false, $ziellager_id, false));
+
+    $this->app->Tpl->Set('ERNEUT_CHECKED',$erneut?'checked':'');
+
+    $this->app->Tpl->Parse('PAGE',"lieferschein_umlagern.tpl");    
+  }
+
   function LieferscheinPaketmarke()
   {
     $id = (int)$this->app->Secure->GetGET("id");
@@ -468,7 +570,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']);
@@ -536,16 +639,16 @@ class Lieferschein extends GenLieferschein
   function LieferscheinIconMenu($id,$prefix="")
   {
     $status = $this->app->DB->Select("SELECT status FROM lieferschein WHERE id='$id' LIMIT 1");
+    $adresse = $this->app->DB->Select("SELECT adresse FROM lieferschein WHERE id='$id' LIMIT 1");
     $lieferantenretoure = $this->app->DB->Select("SELECT lieferantenretoure FROM lieferschein WHERE id='$id' LIMIT 1");
 
-    if($status=="angelegt" || $status=="")
+    if($adresse > 0 && ($status=="angelegt" || $status==""))
       $freigabe = "<option value=\"freigabe\">Lieferschein freigeben</option>";
 
 
     if(($status=="versendet" || $status=="freigegeben") && $lieferantenretoure=="1")
       $abschliessen = "<option value=\"abschliessen\">Lieferschein abschliessen</option>";
 
-
     $checkifrgexists = $this->app->DB->Select("SELECT id FROM rechnung WHERE lieferschein='$id' LIMIT 1");
 
     $optioncustom = $this->Custom('option');
@@ -573,27 +676,34 @@ class Lieferschein extends GenLieferschein
 
     $mengegeliefert = $mengegeliefert + $this->app->DB->Select("SELECT ifnull(sum(olp.menge),0)+0 FROM objekt_lager_platz olp INNER JOIN lieferschein_position lp ON olp.objekt='lieferschein' AND olp.parameter=lp.id AND lp.lieferschein = '$id'");
 
-    if($mengegeliefert <= 0 && $liefermengelagerartikel > 0  && $schreibschutz=="1" && $status!='angelegt' && $status!='storniert') {
+    if ($status == "versendet" || $status == "freigegeben") {
-      $auslagern = '<option value="auslagern">Lieferschein auslagern</option>';
+
-    }else{
+        if($mengegeliefert <= 0 && $liefermengelagerartikel > 0  && $schreibschutz=="1" && $status!='angelegt' && $status!='storniert') {
-      //12.07.19 LG lieferscheinlager als kommissionierverfahren zum if hinzugefuegt
+          $auslagern = '<option value="auslagern">Lieferschein auslagern</option>';
-      $projektkommissionierverfahren = $this->app->DB->Select("SELECT kommissionierverfahren FROM projekt where id = '$projekt'");
+        }else{
-      if($projekt && ($projektkommissionierverfahren == "" || $projektkommissionierverfahren == "rechnungsmail" || $projektkommissionierverfahren == "lieferschein" || $projektkommissionierverfahren == "lieferscheinscan" || $projektkommissionierverfahren == "lieferscheinlager" || $projektkommissionierverfahren == "lieferscheinlagerscan"))
+          //12.07.19 LG lieferscheinlager als kommissionierverfahren zum if hinzugefuegt
-      {
+          $projektkommissionierverfahren = $this->app->DB->Select("SELECT kommissionierverfahren FROM projekt where id = '$projekt'");
-        if(($bestellmengelagerartikel != $liefermengelagerartikel && $bestellmengelagerartikel != $liefermengelagerartikel2) && $status!='angelegt' && $status!='storniert') {
+          if($projekt && ($projektkommissionierverfahren == "" || $projektkommissionierverfahren == "rechnungsmail" || $projektkommissionierverfahren == "lieferschein" || $projektkommissionierverfahren == "lieferscheinscan" || $projektkommissionierverfahren == "lieferscheinlager" || $projektkommissionierverfahren == "lieferscheinlagerscan"))
-            $auslagern = '<option value="auslagern">Lieferschein auslagern</option>';
+          {
+            if(($bestellmengelagerartikel != $liefermengelagerartikel && $bestellmengelagerartikel != $liefermengelagerartikel2) && $status!='angelegt' && $status!='storniert') {
+                $auslagern = '<option value="auslagern">Lieferschein auslagern</option>';
+            }
+          }
+        }
+
+        $optionumlagern = "<option value=\"umlagern\">Lieferschein umlagern</option>";
+        $abschicken = "<option value=\"abschicken\">Lieferschein abschicken</option>";
+
+       if($status!="angelegt" && $lieferantenretoure!="1")
+        {
+          $alsrechnung = "<option value=\"rechnung\">als Rechnung weiterf&uuml;hren</option>";
+          if($this->app->erp->RechteVorhanden('lieferschein', 'proformarechnung') && $this->app->erp->ModulVorhanden('proformarechnung'))
+          {
+            $alsrechnung .= "<option value=\"proformarechnung\">als Proformarechnung weiterf&uuml;hren</option>";
+          }
         }
-      }
     }
 
-    if($status!="angelegt" && $lieferantenretoure!="1")
-    {
-      $alsrechnung = "<option value=\"rechnung\">als Rechnung weiterf&uuml;hren</option>";
-      if($this->app->erp->RechteVorhanden('lieferschein', 'proformarechnung') && $this->app->erp->ModulVorhanden('proformarechnung'))
-      {
-        $alsrechnung .= "<option value=\"proformarechnung\">als Proformarechnung weiterf&uuml;hren</option>";
-      }
-    }
 
     if($this->app->erp->RechteVorhanden('belegeimport', 'belegcsvexport'))
     { 
@@ -628,6 +738,7 @@ class Lieferschein extends GenLieferschein
           $casehook
           $hookcase 
           $casebelegeimport
+          case 'umlagern': window.location.href='index.php?module=lieferschein&action=umlagern&id=%value%'; break;
         }
 
       }
@@ -638,9 +749,10 @@ class Lieferschein extends GenLieferschein
       <option value=\"storno\">Lieferschein stornieren</option>
       <option value=\"copy\">Lieferschein kopieren</option>
       $freigabe
-      <option value=\"abschicken\">Lieferschein abschicken</option>
+      $abschicken
       $abschliessen
       $auslagern
+      $optionumlagern
       $alsrechnung
       $optionbelegeimport
       <option value=\"pdf\">PDF &ouml;ffnen</option>
@@ -960,6 +1072,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 +1131,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 +2397,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/logfile.php

@@ -253,9 +253,13 @@ class Logfile {
         }
       }
     }
-    if(is_array($meldung)) {
+    
-      $meldung = $this->app->DB->real_escape_string(print_r($meldung, true));
+    $module = $this->app->DB->real_escape_string(is_scalar($module) ? strval($module) : print_r($module, true));
-    }
+    $action = $this->app->DB->real_escape_string(is_scalar($action) ? strval($action) : print_r($action, true));
+    $meldung = $this->app->DB->real_escape_string(is_scalar($meldung) ? strval($meldung) : print_r($meldung, true));
+    $dump = $this->app->DB->real_escape_string(is_scalar($dump) ? strval($dump) : print_r($dump, true));
+    $functionname = $this->app->DB->real_escape_string(is_scalar($functionname) ? strval($functionname) : print_r($functionname, true));
+    
     $this->app->DB->Insert(
       sprintf(
         "INSERT INTO logfile (module,action,meldung,dump,datum,bearbeiter,funktionsname)

www/pages/managementboard.php

@@ -401,7 +401,8 @@ class Managementboard
     /** @var Rechnungslauf $obj */
     $obj = $this->app->erp->LoadModul('rechnungslauf');
     if($obj){
-      $w[24] = $obj->RechnungslaufRechnungslauf(true);
+      // $w[24] = $obj->RechnungslaufRechnungslauf(true); // This does not exist, presumably old xentral function
+      $w[24] = 0;    
     }
     else {
       $w[24] = 0;

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/rechnung.php

@@ -2362,6 +2362,7 @@ class Rechnung extends GenRechnung
 
     $belegmax = '';
     $ohnebriefpapier = $this->app->erp->Firmendaten('rechnung_ohnebriefpapier');
+    $abweichendebezeichnung = $this->app->erp->Firmendaten('rechnungersatz_standard');
 
     $usereditid = 0;
     if(isset($this->app->User) && $this->app->User && method_exists($this->app->User,'GetID')){
@@ -2375,24 +2376,24 @@ class Rechnung extends GenRechnung
           zahlungszieltageskonto,
           zahlungszielskonto,
           lieferdatum,
-          status,projekt,adresse,auftragid,ohne_briefpapier,angelegtam,usereditid)
+          status,projekt,adresse,auftragid,ohne_briefpapier,angelegtam,usereditid,abweichendebezeichnung)
             VALUES ('',NOW(),'','".$this->app->User->GetFirma()."','$belegmax','".$this->app->erp->StandardZahlungsweise($projekt)."',
               '".$this->app->erp->ZahlungsZielTage($projekt)."',
               '".$this->app->erp->ZahlungsZielTageSkonto($projekt)."',
               '".$this->app->erp->ZahlungsZielSkonto($projekt)."',NOW(),
-              'angelegt','$projekt','$adresse',0,'".$ohnebriefpapier."',NOW(),'$usereditid')");
+              'angelegt','$projekt','$adresse',0,'".$ohnebriefpapier."',NOW(),'$usereditid','$abweichendebezeichnung')");
     } else {
       $this->app->DB->Insert("INSERT INTO rechnung (id,datum,bearbeiter,firma,belegnr,zahlungsweise,
           zahlungszieltage,
           zahlungszieltageskonto,
           zahlungszielskonto,
           lieferdatum,
-          status,projekt,adresse,auftragid,ohne_briefpapier,angelegtam,usereditid)
+          status,projekt,adresse,auftragid,ohne_briefpapier,angelegtam,usereditid,abweichendebezeichnung)
             VALUES ('',NOW(),'','".$this->app->User->GetFirma()."','$belegmax','".$this->app->erp->StandardZahlungsweise($projekt)."',
               '0',
               '0',
               '0',NOW(),
-              'angelegt','$projekt','$adresse',0,'".$ohnebriefpapier."',NOW(),'$usereditid')");
+              'angelegt','$projekt','$adresse',0,'".$ohnebriefpapier."',NOW(),'$usereditid','$abweichendebezeichnung')");
     }
 
     $id = $this->app->DB->GetInsertID();
@@ -2518,9 +2519,6 @@ class Rechnung extends GenRechnung
         $this->app->Secure->POST[$value] = str_replace("'", ''',$arr[0][$value]);
         $uparr[$value] = str_replace("'", ''',$arr[0][$value]);
       }
-
-      //$this->app->Secure->POST[$value] = $arr[0][$value];
-      //$uparr[$value] = $arr[0][$value];
     }
 
     $uparr['adresse'] = $adresse;
@@ -2531,6 +2529,10 @@ class Rechnung extends GenRechnung
       $uparr['ohne_briefpapier'] = '1';
     }
 
+    if($this->app->erp->Firmendaten('rechnungersatz_standard')=='1'){
+      $uparr['abweichendebezeichnung']=1;
+    }
+
     $this->app->DB->UpdateArr('rechnung',$id,'id',$uparr,true);
     $uparr=null;
 

www/pages/rechnungslauf.php

@@ -94,7 +94,7 @@ class Rechnungslauf {
                                 DATE_ADD(@start, INTERVAL (FLOOR(TIMESTAMPDIFF(DAY, @start, IF(aa.enddatum = '0000-00-00' OR aa.enddatum > '$scalcdate', '$scalcdate', aa.enddatum)) / 30)+1)*30 DAY )
                         END, '%d.%m.%Y') SEPARATOR '<br>') as end,
                     SUM((100-aa.rabatt)/100 * aa.preis * aa.menge * 
-                        (CASE
+                        (GREATEST(aa.zahlzyklus, CASE
                             WHEN aa.preisart = 'monat' THEN
                                 TIMESTAMPDIFF(MONTH, @start, @end)
                             WHEN aa.preisart = 'jahr' THEN
@@ -102,7 +102,7 @@ class Rechnungslauf {
                             WHEN aa.preisart = '30tage' THEN
                                 FLOOR(TIMESTAMPDIFF(DAY, @start, @end) / 30)
                             END
-                        )
+                        ))
                     ) as amount,
                     adr.id
                     FROM abrechnungsartikel aa
@@ -248,6 +248,17 @@ class Rechnungslauf {
           $this->app->Tpl->addMessage('info', 'Die Aufträge werden nun im Hintergrund erstellt', false, 'MESSAGE_ORDERS');
         }
       }
+
+        $cronjobActive = $this->app->DB->Select(
+            "SELECT ps.id 
+            FROM `prozessstarter` AS `ps` 
+            WHERE ps.aktiv = 1 and (ps.parameter = 'rechnungslauf_manual') 
+            LIMIT 1"
+        );
+        if(!$cronjobActive) {
+            $this->app->Tpl->addMessage('warning', 'Der Prozessstarter \'rechnungslauf_manual\' ist nicht aktiv');
+        }
+
       $this->app->Tpl->Parse('PAGE', 'rechnungslauf_list.tpl');
     }
 

www/pages/report.php

@@ -109,6 +109,7 @@ class Report
         $this->app->ActionHandler('transfer', 'ReportTransfer');
         $this->app->ActionHandler('share', 'HandleActionShare');
         $this->app->ActionHandler('export', 'ReportExport');
+        $this->app->ActionHandler('databaseview', 'DataBaseView');
 
         $this->app->ActionHandlerListen($app);
         $this->app->erp->Headlines('Berichte');
@@ -526,7 +527,29 @@ class Report
                            IF(c.sum = 1, 'Ja', 'Nein') as `sum`, c.sequence, c.id 
                         FROM `report_column` AS `c`";
                 break;
+                case 'databaseview':
 
+                    $selectedtable = $this->app->User->GetParameter('report_databaseview_selectedtable');
+                
+                    $selectedcolumns = $this->app->User->GetParameter('report_databaseview_selectedcolumns');
+                    
+                    if (!empty($selectedcolumns)) {
+                        $columns = explode(',',$selectedcolumns);
+                    } else {
+                        $sql = "SHOW COLUMNS FROM `".$selectedtable."`";                    
+                        $columns = array_column($this->app->DB->SelectArr($sql),'Field');                    
+                        $columns = array_slice($columns,0,10);
+                    }
+
+                    $heading = $columns;
+                    $heading[] = '';
+                    $findcols = $columns;
+                    $searchsql = $columns;
+                  
+
+                    $sql = "SELECT `".$columns[0]."`, `".implode("`,`",$columns)."` from `".$selectedtable."`";  
+
+                break;
         }
 
         $erg = [];
@@ -3098,7 +3121,7 @@ class Report
             'Zurück zur Übersicht'
         );
 
-        if ($action === 'list') {
+        if ($action === 'list' or $action == 'databaseview') {
             $this->app->erp->MenuEintrag('index.php?module=report&action=list', 'Übersicht');
         } else {
             $this->app->erp->MenuEintrag(
@@ -3118,6 +3141,7 @@ class Report
                 'Übertragung'
             );
         }
+        $this->app->erp->MenuEintrag('index.php?module=report&action=databaseview', 'Datenbankansicht');
     }
 
     /**
@@ -3187,4 +3211,91 @@ class Report
             }
         }
     }
+
+    function DataBaseView() {
+        $this->createMenu();
+        $this->template->Set('KURZUEBERSCHRIFT', 'Datenbank');
+
+        $sql = "SHOW TABLES";
+        $tables = $this->app->DB->SelectArr($sql);
+        $table_easytable = new EasyTable($this->app);
+        $table_easytable->headings = array('Tabelle');
+        foreach ($tables as $table) {
+            $table = reset($table);
+            $row = array(
+                '<a href="index.php?module=report&action=databaseview&table='.$table.'#tabs-2">'.$table.'</a>'
+            );
+            $table_easytable->AddRow($row);
+        }        
+        $table_easytable->DisplayNew('TAB1');
+
+        $selectedtable = $this->app->Secure->GetGet('table');
+        if (!empty($selectedtable)) {
+
+            $this->app->User->SetParameter('report_databaseview_selectedtable',$selectedtable);
+            $submit = $this->app->Secure->GetPost('submit');
+            $selectedcolumns = $this->app->Secure->GetPost('auswahl');         
+
+            $sql = "SHOW COLUMNS FROM `".$selectedtable."`";
+            $columns = $this->app->DB->SelectArr($sql);
+            $column_easytable = new EasyTable($this->app);
+            $column_easytable->headings = array_merge(['Auswahl'],array_keys(reset($columns)));
+            foreach ($columns as $column) {
+                $checked = '';
+                if (!empty($selectedcolumns)) {
+                    if (in_array($column['Field'],$selectedcolumns)) {
+                        $checked = 'checked';                        
+                    }
+                }
+                $row = array();
+                $row[] = '<input type="checkbox" name="auswahl[]" '.$checked.' value="'.$column['Field'].'">';                
+                $row = array_merge($row,$column);
+                $column_easytable->AddRow($row);
+            }        
+            $column_easytable->DisplayNew('TAB2');
+            $this->app->Tpl->Set('TABLENAME',ucfirst($selectedtable));
+
+            switch($submit) {
+                case 'vorschau':
+                    if (!empty($selectedcolumns)) {
+                        $this->app->User->SetParameter('report_databaseview_selectedcolumns',implode(',',$selectedcolumns));
+                    } else {
+                        $this->app->YUI->Message('warning','Spalten w&auml;hlen');
+                    } 
+                    $this->app->YUI->TableSearch('TAB3', 'databaseview', 'show', '', '', basename(__FILE__), __CLASS__);
+                break;
+                case 'erzeugen':                
+                    $selectedcolumns = $this->app->User->GetParameter('report_databaseview_selectedcolumns');                
+                    $columns = explode(',',$selectedcolumns);
+                    $sql = "SELECT `".implode("`,`",$columns)."` from `".$selectedtable."`";  
+                    $name = $this->service->generateIncrementedReportName(ucfirst($selectedtable));
+                    $userId = $this->app->User->GetID();
+                    $report = ReportData::fromFormData(['name' => $name, 'sql_query' => $sql, 'description' => 'Erzeugt aus Datenbankansicht Tabelle '.ucfirst($selectedtable)]);
+                    $newId = $this->service->saveReport($report);
+                    if ($newId > 0) {
+                        $this->service->saveReportUserArray([
+                            'report_id' => $newId,
+                            'user_id' => $userId,
+                            'name' => $this->app->User->GetName(),
+                            'chart_enabled' => 0,
+                            'file_enabled' => 0,
+                            'menu_enabled' => 0,
+                            'tab_enabled' => 0,
+                        ]);
+                        $report = $this->gateway->getReportById($newId);
+                        $newReport = $this->service->autoCreateColumns($report);
+                        $newId = $this->service->saveReport($newReport);
+                        header('Location: index.php?module=report&action=edit&id='.$newId);
+                    } else {
+                        $this->app->YUI->Message('error','Bericht konnte nicht erzeugt werden');
+                    }
+                break;
+            }            
+        } else {
+            $this->app->YUI->Message('warning','Tabelle w&auml;hlen');
+        }
+
+        $this->template->Parse('PAGE', 'report_databaseview.tpl');
+    }
+
 }

www/pages/shopexport.php

@@ -610,7 +610,7 @@ class Shopexport
         'SELECT `id` 
         FROM `shopexport` 
         WHERE `aktiv` = 1 AND `autosendarticle` = 1 AND `artikelexport` = 1
-        AND (`autosendarticle_last` IS NULL OR DATE_ADD(`autosendarticle_last` INTERVAL %d MINUTE) <= NOW())',
+        AND (`autosendarticle_last` IS NULL OR DATE_ADD(`autosendarticle_last`, INTERVAL %d MINUTE) <= NOW())',
         $minutes
       )
     );

www/pages/shopimporter_presta.php

@@ -23,6 +23,7 @@ class Shopimporter_Presta extends ShopimporterBase
   // TODO
   private $langidToIso = [3 => 'de', 1 => 'en'];
   private $taxationByDestinationCountry;
+  private $orderSearchLimit;
 
 
   public function __construct($app, $intern = false)
@@ -284,17 +285,20 @@ class Shopimporter_Presta extends ShopimporterBase
 
       $cart['articlelist'] = [];
       foreach ($order->associations->order_rows->order_row as $order_row) {
-
+        $article = [
-        $steuersatz = (strval($order_row->unit_price_tax_incl) / strval($order_row->unit_price_tax_excl)) - 1;
-        $steuersatz = round($steuersatz, 1);
-
-        $cart['articlelist'][] = [
             'articleid' => strval($order_row->product_reference),
             'name' => strval($order_row->product_name),
             'quantity' => strval($order_row->product_quantity),
             'price_netto' => strval($order_row->unit_price_tax_excl),
-            'steuersatz' => $steuersatz
         ];
+
+        if ($order_row->unit_price_tax_excl > 0) {
+          $steuersatz = (strval($order_row->unit_price_tax_incl) / strval($order_row->unit_price_tax_excl)) - 1;
+          $steuersatz = round($steuersatz, 1);
+          $article['steuersatz'] = $steuersatz;
+        }
+
+        $cart['articlelist'][] = $article;
       }
 
       $fetchedOrders[] = [
@@ -333,34 +337,77 @@ class Shopimporter_Presta extends ShopimporterBase
     if (empty($nummer))
       return;
 
-    $searchresult = $this->prestaRequest('GET', 'products?filter[reference]='.$nummer);
+    $productsresult = $this->prestaRequest('GET', 'products?filter[reference]='.$nummer);
-    if (empty($searchresult)) {
+    $combinationsresult = $this->prestaRequest('GET', 'combinations?filter[reference]='.$nummer);
+    $numberOfCombinations = count($combinationsresult->combinations->combination);
+    $numberOfProducts = count($productsresult->products->product);
+    $numberOfResults = $numberOfProducts + $numberOfCombinations;
+    if ($numberOfResults > 1) {
+      $this->Log('Got multiple results from Shop', $this->data);
+      return;
+    }
+    elseif ($numberOfResults < 1) {
       $this->Log('No product found in Shop', $this->data);
       return;
     }
-    if (count($searchresult->products->product) > 1) {
-      $this->Log('Got multiple results from Shop', $this->data);
-    }
 
-    $productid = $searchresult->products->product->attributes()->id;
+    $isCombination = $numberOfCombinations > 0;
-    $product = $this->prestaRequest('GET', "products/$productid");
+    if ($isCombination) {
+      $combinationId = intval($combinationsresult->combinations->combination->attributes()->id);
+      $combination = $this->prestaRequest('GET', "combinations/$combinationId");
+      $productId = intval($combination->combination->id_product);
+    } else {
+      $productId = intval($productsresult->products->product->attributes()->id);
+    }
+    $product = $this->prestaRequest('GET', "products/$productId");
     $res = [];
-    $res['nummer'] = strval($product->product->reference);
+    if ($isCombination) {
-    $res['artikelnummerausshop'] = strval($product->product->reference);
+      $res['nummer'] = strval($combination->combination->reference);
+      $res['artikelnummerausshop'] = strval($combination->combination->reference);
+      $res['ean'] = strval($combination->combination->ean13);
+      $res['preis_netto'] = floatval($product->product->price) + floatval($combination->combination->price);
+    } else {
+      $res['nummer'] = strval($product->product->reference);
+      $res['artikelnummerausshop'] = strval($product->product->reference);
+      $res['ean'] = strval($product->product->ean13);
+      $res['preis_netto'] = floatval($product->product->price);
+    }
     $names = $this->toMultilangArray($product->product->name->language);
     $descriptions = $this->toMultilangArray($product->product->description->language);
     $shortdescriptions = $this->toMultilangArray($product->product->description_short->language);
+    $metadescriptions = $this->toMultilangArray($product->product->meta_description->language);
+    $metakeywords = $this->toMultilangArray($product->product->meta_keywords->language);
+    $metatitles = $this->toMultilangArray($product->product->meta_title->language);
     $res['name'] = $names['de'];
     $res['name_en'] = $names['en'];
     $res['uebersicht_de'] = $descriptions['de'];
     $res['uebersicht_en'] = $descriptions['en'];
-    $res['preis_netto'] = strval($product->product->price);
+    $res['kurztext_de'] = strip_tags($shortdescriptions['de']);
+    $res['kurztext_en'] = strip_tags($shortdescriptions['en']);
     $res['hersteller'] = strval($product->product->manufacturer_name);
-    $res['ean'] = strval($product->product->ean13);
+    $res['metatitle_de'] = $metatitles['de'];
+    $res['metatitle_en'] = $metatitles['en'];
+    $res['metadescription_de'] = $metadescriptions['de'];
+    $res['metadescription_en'] = $metadescriptions['en'];
+
+    $tags = $product->product->associations->tags->tag;
+    $keywords = [];
+    foreach ($tags as $tag) {
+      $tagid = intval($tag->id);
+      $endpoint = "tags/{$tagid}";
+      $tagdata = $this->prestaRequest('GET', $endpoint);
+      $tagiso = $this->langidToIso[intval($tagdata->tag->id_lang)];
+      $tagvalue = strval($tagdata->tag->name);
+      if (!array_key_exists($tagiso, $keywords))
+        $keywords[$tagiso] = [];
+      $keywords[$tagiso][] = $tagvalue;
+    }
+    $res['metakeywords_de'] = join(',', $keywords['de'] ?? []);
+    $res['metakeywords_en'] = join(',', $keywords['en'] ?? []);
 
     $images = [];
     foreach ($product->product->associations->images->image as $img) {
-      $endpoint = "images/products/$productid/$img->id";
+      $endpoint = "images/products/$productId/$img->id";
       $imgdata = $this->prestaRequest('GET', $endpoint, '', true);
       $images[] = [
           'content' => base64_encode($imgdata),

www/pages/shopimporter_shopify.php

@@ -230,10 +230,14 @@ class Shopimporter_Shopify extends ShopimporterBase
     if(isset($this->app->User) && $this->app->User && method_exists($this->app->User, 'GetName')){
       $this->bearbeiter = $this->app->DB->real_escape_string($this->app->User->GetName());
     }
+
     $einstellungen = $this->app->DB->Select("SELECT einstellungen_json FROM shopexport WHERE id = '$shopid' LIMIT 1");
-    if($einstellungen){
+    if(!empty($einstellungen)){
       $einstellungen = json_decode($einstellungen,true);
+    } else {
+        return;
     }
+
     $this->ShopifyURL=trim($einstellungen['felder']['ShopifyURL']);
     if(stripos($this->ShopifyURL,'http') === false){
       $this->ShopifyURL = 'https://'.$this->ShopifyURL;
@@ -396,7 +400,7 @@ class Shopimporter_Shopify extends ShopimporterBase
         $this->adapter->call("products/".$result['data']['product']['id']."/metafields.json", 'POST', array('metafield' => [
           'key' => 'sync_status',
           'value' => 1,
-          'value_type' => 'integer',
+          'type' => 'number_integer',
           'namespace' => 'xentral',
         ]));
         if($result['data']['product']['id'] == $nummer) {
@@ -429,7 +433,7 @@ class Shopimporter_Shopify extends ShopimporterBase
                 $this->adapter->call("variants/".$resultv['variant']['id']."/metafields.json", 'POST', array('metafield' => [
                   'key' => 'sync_status',
                   'value' => 1,
-                  'value_type' => 'integer',
+                  'type' => 'number_integer',
                   'namespace' => 'xentral',
                 ]));
                 $data['nummer'] = $resultv['data']['variant']['sku'];
@@ -690,7 +694,7 @@ class Shopimporter_Shopify extends ShopimporterBase
           $inventoryitemid = $resultv['data']['variant']['inventory_item_id'];
           $resulti = $this->adapter->call("inventory_levels.json?inventory_item_ids=$inventoryitemid&location_ids=$locationid");
           $vorhanden = $resulti['data']['inventory_levels'][0]['available'];
-          $adjust = $lageranzahl - $vorhanden;
+          $adjust = floatval($lageranzahl) - floatval($vorhanden);
           if($adjust != 0){
             $data = array("location_id" => $locationid,
                           "inventory_item_id"=> $inventoryitemid,
@@ -1015,12 +1019,12 @@ class Shopimporter_Shopify extends ShopimporterBase
           $dataproduct['product']['variants'][0]['metafields'] = array(array(
             "key" => "harmonized_system_code",
             "value"=> $zolltarifnummer,
-            "value_type"=> "string",
+            "type"=> "text",
             "namespace"=> "global"),
             [
               'key' => 'sync_status',
               'value' => 1,
-              'value_type' => 'integer',
+              'type' => 'number_integer',
               'namespace' => 'xentral',
             ]);
           if($pseudopreis != ''){
@@ -1185,12 +1189,12 @@ class Shopimporter_Shopify extends ShopimporterBase
           $veigenschaften[] = array(
             "key" => "harmonized_system_code",
             "value"=> $value['zolltarifnummer'],
-            "value_type"=> "string",
+            "type"=> "text",
             "namespace"=> "global");
           $veigenschaften[] = [
             'key' => 'sync_status',
             'value' => 1,
-            'value_type' => 'integer',
+            'type' => 'number_integer',
             'namespace' => 'xentral',
           ];
 
@@ -3334,7 +3338,7 @@ class Shopimporter_Shopify extends ShopimporterBase
     $this->adapter->call('orders/' . $auftrag . '/metafields.json', 'POST', array('metafield' => [
       'key' => 'sync_status',
       'value' => 1,
-      'value_type' => 'integer',
+      'type' => 'number_integer',
       'namespace' => 'xentral',
     ]));
     return 'ok';
@@ -3367,7 +3371,7 @@ class Shopimporter_Shopify extends ShopimporterBase
       $this->adapter->call('orders/' . $auftrag . '/metafields.json', 'POST', array('metafield' => [
         'key' => 'sync_status',
         'value' => 3,
-        'value_type' => 'integer',
+        'type' => 'number_integer',
         'namespace' => 'xentral',
       ]));
     }
@@ -3420,7 +3424,7 @@ class Shopimporter_Shopify extends ShopimporterBase
       $this->adapter->call('orders/' . $auftrag . '/metafields.json', 'POST', array('metafield' => [
         'key' => 'sync_status',
         'value' => 2,
-        'value_type' => 'integer',
+        'type' => 'number_integer',
         'namespace' => 'xentral',
       ]));
     }else{

www/pages/ticket.php

@@ -23,6 +23,7 @@ class Ticket {
         $this->app->ActionHandler("text_ausgang", "ticket_text_ausgang"); // Output text for iframe display
         $this->app->ActionHandler("statusfix", "ticket_statusfix"); // Xentral 20 compatibility set all ticket status to latest ticket_nachricht status
         $this->app->ActionHandler("datefix", "ticket_datefix"); // Xentral 20 compatibility set all ticket dates to latest ticket_nachricht date
+        $this->app->ActionHandler("dateien", "ticket_dateien"); 
         $this->app->DefaultActionHandler("list");
         $this->app->ActionHandlerListen($app);
     }
@@ -68,7 +69,7 @@ class Ticket {
                 $dropnbox = "'<img src=./themes/new/images/details_open.png class=details>' AS `open`,
                               CONCAT('<input type=\"checkbox\" name=\"auswahl[]\" value=\"',t.id,'\" />') AS `auswahl`";
 
-                $priobetreff = "if(t.prio!=1,t.betreff,CONCAT('<b><font color=red>',t.betreff,'</font></b>'))";
+                $priobetreff = "if(t.prio!=1,REGEXP_REPLACE(t.betreff, '<[^>]*>+', ''),CONCAT('<b><font color=red>',REGEXP_REPLACE(t.betreff, '<[^>]*>+', ''),'</font></b>'))"; //+ #20230916 XSS
 
                 $anzahlnachrichten = "(SELECT COUNT(n.id) FROM ticket_nachricht n WHERE n.ticket = t.schluessel)";
 
@@ -186,6 +187,7 @@ class Ticket {
   
         // Process multi action
         $auswahl = $this->app->Secure->GetPOST('auswahl');
+        $submit = $this->app->Secure->GetPOST('submit');
         $selectedIds = [];
         if(!empty($auswahl)) {
           foreach($auswahl as $selectedId) {
@@ -195,19 +197,71 @@ class Ticket {
             }
           }          
 
-          $status = $this->app->Secure->GetPOST('status');
+            switch ($submit) {
-          $warteschlange = $this->app->Secure->GetPOST('warteschlange');
+                case 'zuordnen':
+                    $status = $this->app->Secure->GetPOST('status');
+                    $warteschlange = $this->app->Secure->GetPOST('warteschlange');
 
-          $sql = "UPDATE ticket SET status = '".$status."', zeit = NOW()";
+                    $sql = "UPDATE ticket SET status = '".$status."', zeit = NOW()";
-          if ($warteschlange != '') {
+                    if ($warteschlange != '') {
-            $sql .= ", warteschlange = '".explode(" ",$warteschlange)[0]."'";
+                        $sql .= ", warteschlange = '".explode(" ",$warteschlange)[0]."'";
-          }
+                    }
 
-          $sql .= " WHERE id IN (".implode(",",$selectedIds).")";
+                    $sql .= " WHERE id IN (".implode(",",$selectedIds).")";
-          $this->app->DB->Update($sql);
+                    $this->app->DB->Update($sql);
+                    $this->ticket_set_self_assigned_status($selectedIds);
+                break;
+                case 'spam_filter':
+                    if($this->app->erp->RechteVorhanden('ticketregeln','create')) {
+                        $sql = "UPDATE ticket SET status = 'spam', zeit = NOW()";
+                        $sql .= " WHERE id IN (".implode(",",$selectedIds).")";
+                        $this->app->DB->Update($sql);
 
-          $this->ticket_set_self_assigned_status($selectedIds);
+                        foreach ($selectedIds as $selectedId) {
 
+                            // Check existing
+                            $sql = "SELECT id FROM ticket_regeln WHERE
+                                        empfaenger_email = '' AND
+                                        sender_email = (SELECT mailadresse FROM ticket WHERE id = ".$selectedId." LIMIT 1) AND
+                                        name = '' AND
+                                        betreff = '' AND
+                                        spam = 1 AND
+                                        aktiv = 1
+                                    ";
+
+                            if (!$this->app->DB->Select($sql)) {
+                                $sql = "INSERT IGNORE INTO ticket_regeln (
+                                                        empfaenger_email,
+                                                        sender_email,
+                                                        name,
+                                                        betreff,
+                                                        spam,
+                                                        persoenlich,
+                                                        prio,
+                                                        dsgvo,
+                                                        adresse,
+                                                        warteschlange,
+                                                        aktiv
+                                        ) VALUES (
+                                            '',
+                                            (SELECT mailadresse FROM ticket WHERE id = ".$selectedId." LIMIT 1),
+                                            '',
+                                            '',
+                                            1,
+                                            0,
+                                            0,
+                                            0,
+                                            0,
+                                            '',
+                                            1
+                                        )";
+                                $this->app->DB->Insert($sql);
+                            }
+                        }
+
+                    }
+                break;
+            }    
         }
 
         // List
@@ -222,6 +276,10 @@ class Ticket {
         $this->app->Tpl->Set('STATUS', $this->app->erp->GetStatusTicketSelect('neu'));
         $this->app->YUI->AutoComplete("warteschlange","warteschlangename");
 
+        if(!$this->app->erp->RechteVorhanden('ticketregeln','create')) {
+            $this->app->Tpl->Set('SPAM_HIDDEN', 'hidden');
+        }
+
         $this->app->YUI->TableSearch('TAB1', 'ticket_list', "show", "", "", basename(__FILE__), __CLASS__);
         $this->app->Tpl->Parse('PAGE', "ticket_list.tpl");
     }    
@@ -305,11 +363,34 @@ class Ticket {
         }
     }
 
+    function add_attachments_header_html($ticket_id, $templatepos) {
+        $file_attachments = $this->app->erp->GetDateiSubjektObjekt('%','ticket_header',$ticket_id);       
+
+        if (!empty($file_attachments)) {     
+          $this->app->Tpl->Add($templatepos,"<tr><td>{|Anh&auml;nge|}:</td><td><div class=\"ticket_attachments\">");
+          foreach ($file_attachments as $file_attachment) {
+
+              $this->app->Tpl->Add($templatepos,                    
+                  "<a href=\"index.php?module=dateien&action=send&id=".$file_attachment.
+                  "\">".
+                  htmlentities($this->app->erp->GetDateiName($file_attachment)).
+                  " (".
+                  $this->app->erp->GetDateiSize($file_attachment).
+                  ")".  
+                  "</a>".       
+                  "<br>");
+          }
+          $this->app->Tpl->Add($templatepos,"</div></td></tr>");
+        }
+    }
+
     function add_messages_tpl($messages, $showdrafts) {
 
         // Add Messages now
         foreach ($messages as $message) {
 
+            $message['betreff'] = strip_tags($message['betreff']); //+ #20230916 XSS
+
             // Clear this first
             $this->app->Tpl->Set('NACHRICHT_ANHANG',"");         
 
@@ -588,6 +669,19 @@ class Ticket {
         $this->app->Tpl->Parse('PAGE', "ticket_create.tpl");
     }
 
+
+    function ticket_menu($id) {
+        $this->app->erp->MenuEintrag("index.php?module=ticket&action=edit&id=$id", "Details");
+        $this->app->erp->MenuEintrag("index.php?module=ticket&action=list", "Zur&uuml;ck zur &Uuml;bersicht");
+        $anzahldateien = $this->app->erp->AnzahlDateien("ticket_header",$id);
+        if ($anzahldateien > 0) {
+            $anzahldateien = " (".$anzahldateien.")"; 
+        } else {
+            $anzahldateien="";
+        }
+        $this->app->erp->MenuEintrag("index.php?module=ticket&action=dateien&id=$id", "Dateien".$anzahldateien);
+    }
+
     function ticket_edit() {
         $id = $this->app->Secure->GetGET('id');
 
@@ -595,10 +689,10 @@ class Ticket {
             return;
         }
              
+        $this->ticket_menu($id);
+
         $this->app->Tpl->Set('ID', $id);
 
-        $this->app->erp->MenuEintrag("index.php?module=ticket&action=edit&id=$id", "Details");
-        $this->app->erp->MenuEintrag("index.php?module=ticket&action=list", "Zur&uuml;ck zur &Uuml;bersicht");
         $id = $this->app->Secure->GetGET('id');
         $cmd = $this->app->Secure->GetGET('cmd');
         $input = $this->GetInput();
@@ -622,6 +716,8 @@ class Ticket {
 
         $ticket_from_db = $this->app->DB->SelectArr($sql)[0];
 
+        $ticket_from_db['betreff'] = htmlentities(strip_tags($ticket_from_db['betreff'])); //+ #20230916 XSS
+
         foreach ($ticket_from_db as $key => $value) {
             $this->app->Tpl->Set(strtoupper($key), $value);   
         }
@@ -717,7 +813,12 @@ class Ticket {
         $messages = $this->get_messages_of_ticket($id, 1, NULL);
         $recv_messages = $this->get_messages_of_ticket($id,"n.versendet != 1",NULL);
 
+        $an_alle = false;
+
         switch ($submit) {
+          case 'neue_email_alle':
+            $an_alle = true;
+            // break omitted
           case 'neue_email':
 
             $senderName = $this->app->User->GetName()." (".$this->app->erp->GetFirmaAbsender().")";
@@ -733,23 +834,24 @@ class Ticket {
                 
                 if (!empty($recv_messages)) {
                     if (!str_starts_with(strtoupper($recv_messages[0]['betreff']),"RE:")) {
-                        $betreff = "RE: ".$recv_messages[0]['betreff'];
+                        $betreff = "RE: ".strip_tags($recv_messages[0]['betreff']); //+ #20230916 XSS
                     }
                     else {
-                        $betreff = $recv_messages[0]['betreff'];
+                        $betreff = strip_tags($recv_messages[0]['betreff']); //+ #20230916 XSS
                     }
 
-                    $sql = "SELECT GROUP_CONCAT(DISTINCT `value` ORDER BY `value` SEPARATOR ', ') FROM ticket_header th WHERE th.ticket_nachricht = ".$recv_messages[0]['id']." AND `value` <> '".$senderAddress."' AND type='to'";
-
                     $to = $recv_messages[0]['mail'];
-                    $to_additional = $this->app->DB->Select($sql);
+                    if ($an_alle) {
-
+                        $sql = "SELECT GROUP_CONCAT(DISTINCT `value` ORDER BY `value` SEPARATOR ', ') FROM ticket_header th WHERE th.ticket_nachricht = ".$recv_messages[0]['id']." AND `value` <> '".$senderAddress."' AND type='to'"; 
-                    if (!empty($to_additional)) {
+                        $to_additional = $this->app->DB->Select($sql);
-                      $to .= ", ".$to_additional;
+                        if (!empty($to_additional)) {
+                          $to .= ", ".$to_additional;
+                        }
+                        $sql = "SELECT GROUP_CONCAT(DISTINCT `value` ORDER BY `value` SEPARATOR ', ') FROM ticket_header th WHERE th.ticket_nachricht = ".$recv_messages[0]['id']." AND `value` <> '".$senderAddress."' AND type='cc'";
+                        $cc = $this->app->DB->Select($sql);
+                    } else {
+                        $cc = null;
                     }    
-
-                    $sql = "SELECT GROUP_CONCAT(DISTINCT `value` ORDER BY `value` SEPARATOR ', ') FROM ticket_header th WHERE th.ticket_nachricht = ".$recv_messages[0]['id']." AND `value` <> '".$senderAddress."' AND type='cc'";
-                    $cc = $this->app->DB->Select($sql);
                 }
                 else {
                     $betreff = $ticket_from_db['betreff'];
@@ -891,11 +993,19 @@ class Ticket {
         } 
 
         $this->add_messages_tpl($messages, false);
-
+        $this->add_attachments_header_html($id,'TICKET_ANHANG');
         $this->app->Tpl->Set('MESSAGE', $msg);
         $this->app->Tpl->Parse('PAGE', "ticket_edit.tpl");
     }
 
+    function ticket_dateien()
+    {
+        $id = $this->app->Secure->GetGET("id");
+        $this->ticket_menu($id);
+        $this->app->Tpl->Add('UEBERSCHRIFT'," (Dateien)");
+        $this->app->YUI->DateiUpload('PAGE',"ticket_header",$id);
+    }
+
   /**
    * Get all paramters from html form and save into $input
    */

www/pages/ticketregeln.php

@@ -30,18 +30,36 @@ class Ticketregeln {
         switch ($name) {
             case "ticketregeln_list":
                 $allowed['ticketregeln_list'] = array('list');
-                $heading = array('E-Mail Empfänger', 'E-Mail Verfasser', 'Verfasser Name', 'Betreff', 'Papierkorb', 'Persönlich', 'Prio', 'DSGVO', 'Verantw.', 'Aktiv', 'Menü');
+                $heading = array('E-Mail Empfänger', 'E-Mail Verfasser', 'Verfasser Name', 'Betreff', 'Papierkorb', 'Persönlich', 'Prio', 'DSGVO','Adresse', 'Verantw.', 'Aktiv', 'Menü');
                 $width = array('10%'); // Fill out manually later
 
-                $findcols = array('t.empfaenger_email', 't.sender_email', 't.name', 't.betreff', 't.spam', 't.persoenlich', 't.prio', 't.dsgvo', 't.warteschlange', 't.aktiv');
+                $findcols = array('t.empfaenger_email', 't.sender_email', 't.name', 't.betreff', 't.spam', 't.persoenlich', 't.prio', 't.dsgvo', 'a.name', 't.warteschlange', 't.aktiv');
-                $searchsql = array('t.empfaenger_email', 't.sender_email', 't.name', 't.betreff', 't.spam', 't.persoenlich', 't.prio', 't.dsgvo', 't.warteschlange', 't.aktiv');
+                $searchsql = array('t.empfaenger_email', 't.sender_email', 't.name', 't.betreff', 't.spam', 't.persoenlich', 't.prio', 't.dsgvo', 'a.name', 't.warteschlange', 't.aktiv');
 
                 $defaultorder = 1;
                 $defaultorderdesc = 0;
 
                 $menu = "<table cellpadding=0 cellspacing=0><tr><td nowrap>" . "<a href=\"index.php?module=ticketregeln&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=ticketregeln&action=delete&id=%value%\");>" . "<img src=\"themes/{$app->Conf->WFconf['defaulttheme']}/images/delete.svg\" border=\"0\"></a>" . "</td></tr></table>";
 
-                $sql = "SELECT SQL_CALC_FOUND_ROWS t.id, t.empfaenger_email, t.sender_email, t.name, t.betreff, t.spam, t.persoenlich, t.prio, t.dsgvo, w.warteschlange, t.aktiv, t.id FROM ticket_regeln t LEFT JOIN warteschlangen w ON t.warteschlange = w.label";
+                $sql = "SELECT SQL_CALC_FOUND_ROWS t.id,
+                            t.empfaenger_email,
+                            t.sender_email,
+                            t.name,
+                            t.betreff,
+                            t.spam,
+                            t.persoenlich,
+                            t.prio,
+                            t.dsgvo,
+                            a.name,
+                            w.warteschlange,
+                            t.aktiv,
+                            t.id
+                        FROM 
+                            ticket_regeln t 
+                        LEFT JOIN warteschlangen w ON t.warteschlange = w.label
+                        LEFT JOIN adresse a ON t.adresse = a.id
+                            
+                ";
 
                 $where = "1";
                 $count = "SELECT count(DISTINCT id) FROM ticket_regeln WHERE $where";
@@ -98,68 +116,145 @@ class Ticketregeln {
         if (empty($id)) {
             // New item
             $id = 'NULL';
+
+            // Check for ticketid
+            $ticketid = $this->app->Secure->GetPOST('ticketid');
+            if (!empty($ticketid)) {
+                $sql =  "
+                    SELECT 
+                        n.id,
+                        n.betreff,
+                        n.bearbeiter,
+                        n.verfasser,
+                        n.mail,
+                        t.quelle,
+                        t.warteschlange,
+                        t.adresse,
+                        ".$this->app->erp->FormatDateTimeShort('n.zeit','zeit').",
+                        ".$this->app->erp->FormatDateTimeShort('n.zeitausgang','zeitausgang').",
+                        n.versendet,
+                        n.text,
+                        n.textausgang,
+                        n.verfasser_replyto,
+                        n.mail_replyto,
+                        n.mail_cc,
+                        (SELECT GROUP_CONCAT(value SEPARATOR ', ') FROM ticket_header th WHERE th.ticket_nachricht = n.id AND th.type = 'cc') as mail_cc_recipients,
+                        (SELECT GROUP_CONCAT(value SEPARATOR ', ') FROM ticket_header th WHERE th.ticket_nachricht = n.id AND th.type = 'to') as mail_recipients
+                    FROM ticket_nachricht n INNER JOIN ticket t ON t.schluessel = n.ticket 
+                    WHERE t.id = ".$ticketid." ORDER BY n.zeit DESC LIMIT 1";
+
+                $last_message = $this->app->DB->SelectArr($sql)[0];
+
+                $input['empfaenger_email'] = $last_message['mail_recipients'];
+                $input['sender_email'] = $last_message['mail'];
+                $input['name'] = $last_message['verfasser'];
+                $input['betreff'] = $last_message['betreff'];
+                $input['adresse'] = $last_message['adresse'];
+                $input['warteschlange'] = $last_message['warteschlange'];
+
+                $from_ticket = true;
+
+                $result = array(
+                    'empfaenger_email' => $last_message['mail_recipients'],
+                    'sender_email' => $last_message['mail'],
+                    'name' => $last_message['verfasser'],
+                    'betreff' => $last_message['betreff'],
+                    'adresse' => $last_message['adresse'],
+                    'warteschlange' => $last_message['warteschlange'],
+                    'aktiv' => 1
+                );
+
+            }
+
         } 
 
-        if ($submit != '')
+        if (!$from_ticket) {
-        {
 
-            // Write to database
+            if ($submit != '')
+            {
 
-            // Add checks here
+                // Write to database
-            $input['warteschlange'] = explode(" ",$input['warteschlange'])[0]; // Just the label
                 
-            $columns = "id, ";
+                // Add checks here
-            $values = "$id, ";
+                $input['warteschlange'] = explode(" ",$input['warteschlange'])[0]; // Just the label
-            $update = "";
+                $input['adresse'] = $this->app->erp->ReplaceAdresse(true,$input['adresse'],true); // Parameters: Target db?, value, from form?
 
-            $fix = "";
+                $columns = "id, ";
+                $values = "$id, ";
+                $update = "";
         
-            foreach ($input as $key => $value) {
+                $fix = "";
-                $columns = $columns.$fix.$key;
-                $values = $values.$fix."'".$value."'";
-                $update = $update.$fix.$key." = '$value'";
 
-                $fix = ", ";
+                foreach ($input as $key => $value) {
+                    $columns = $columns.$fix.$key;
+                    $values = $values.$fix."'".$value."'";
+                    $update = $update.$fix.$key." = '$value'";
+
+                    $fix = ", ";
+                }
+
+    //            echo($columns."<br>");
+    //            echo($values."<br>");
+    //            echo($update."<br>");
+
+                $sql = "INSERT INTO ticket_regeln (".$columns.") VALUES (".$values.") ON DUPLICATE KEY UPDATE ".$update;
+
+    //            echo($sql);
+
+                $this->app->DB->Update($sql);
+
+                if ($id == 'NULL') {
+                    $msg = $this->app->erp->base64_url_encode("<div class=\"success\">Das Element wurde erfolgreich angelegt.</div>");
+                    header("Location: index.php?module=ticketregeln&action=list&msg=$msg");
+//                    $this->app->Tpl->Set('MESSAGE', "<div class=\"success\">Das Element wurde erfolgreich angelegt.</div>");                
+//                    $id = $this->app->DB->GetInsertID();
+                } else {
+                    $this->app->Tpl->Set('MESSAGE', "<div class=\"success\">Die Einstellungen wurden erfolgreich &uuml;bernommen.</div>");
+                }
             }
 
-//            echo($columns."<br>");
-//            echo($values."<br>");
-//            echo($update."<br>");
         
-            $sql = "INSERT INTO ticket_regeln (".$columns.") VALUES (".$values.") ON DUPLICATE KEY UPDATE ".$update;
+            // Load values again from database
-
+            $result = $this->app->DB->SelectArr("SELECT t.id,
-//            echo($sql);
+                                                    t.empfaenger_email,
-
+                                                    t.sender_email,
-            $this->app->DB->Update($sql);
+                                                    t.name,
-
+                                                    t.betreff,
-            if ($id == 'NULL') {
+                                                    t.spam,
-                $msg = $this->app->erp->base64_url_encode("<div class=\"success\">Das Element wurde erfolgreich angelegt.</div>");
+                                                    t.persoenlich,
-                header("Location: index.php?module=ticketregeln&action=list&msg=$msg");
+                                                    t.prio,
-            } else {
+                                                    t.dsgvo,
-                $this->app->Tpl->Set('MESSAGE', "<div class=\"success\">Die Einstellungen wurden erfolgreich &uuml;bernommen.</div>");
+                                                    t.adresse,
-            }
+                                                    CONCAT(w.label,' ',w.warteschlange) as warteschlange,
+                                                    t.aktiv,
+                                                    t.id 
+                                                FROM ticket_regeln t
+                                                LEFT JOIN warteschlangen w on t.warteschlange = w.label 
+                                                WHERE t.id=$id")[0];
         } 
        
 
-        // Load values again from database
+        foreach ($result as $key => $value) {
-        $result = $this->app->DB->SelectArr("SELECT t.id, t.empfaenger_email, t.sender_email, t.name, t.betreff, t.spam, t.persoenlich, t.prio, t.dsgvo, t.warteschlange, t.aktiv, t.id FROM ticket_regeln t"." WHERE id=$id");
-
-        foreach ($result[0] as $key => $value) {
             $this->app->Tpl->Set(strtoupper($key), $value);   
         }
              
         /*
          * Add displayed items later
          * 
-
-        $this->app->Tpl->Add('KURZUEBERSCHRIFT2', $email);
-        $this->app->Tpl->Add('EMAIL', $email);
-        $this->app->Tpl->Add('ANGEZEIGTERNAME', $angezeigtername);         
          */
 
-        $this->app->YUI->AutoComplete("warteschlange","warteschlangename");
         
 
+      	$this->app->Tpl->Set('PRIO', $result['prio']==1?"checked":"");
+      	$this->app->Tpl->Set('SPAM', $result['spam']==1?"checked":"");
+      	$this->app->Tpl->Set('PERSOENLICH', $result['persoenlich']==1?"checked":"");
+      	$this->app->Tpl->Set('DSGVO', $result['dsgvo']==1?"checked":"");
+      	$this->app->Tpl->Set('AKTIV', $result['aktiv']==1?"checked":"");
+
+      	$this->app->Tpl->Set('ADRESSE', $this->app->erp->ReplaceAdresse(false,$result['adresse'],false));
+        $this->app->YUI->AutoComplete("adresse","adresse");
+        $this->app->YUI->AutoComplete("warteschlange","warteschlangename");
+
 //        $this->SetInput($input);              
         $this->app->Tpl->Parse('PAGE', "ticketregeln_edit.tpl");
     }
@@ -172,15 +267,16 @@ class Ticketregeln {
         //$input['EMAIL'] = $this->app->Secure->GetPOST('email');
         
         $input['empfaenger_email'] = $this->app->Secure->GetPOST('empfaenger_email');
-	$input['sender_email'] = $this->app->Secure->GetPOST('sender_email');
+	    $input['sender_email'] = $this->app->Secure->GetPOST('sender_email');
-	$input['name'] = $this->app->Secure->GetPOST('name');
+	    $input['name'] = $this->app->Secure->GetPOST('name');
-	$input['betreff'] = $this->app->Secure->GetPOST('betreff');
+	    $input['betreff'] = $this->app->Secure->GetPOST('betreff');
-	$input['spam'] = $this->app->Secure->GetPOST('spam');
+	    $input['spam'] = $this->app->Secure->GetPOST('spam');
-	$input['persoenlich'] = $this->app->Secure->GetPOST('persoenlich');
+	    $input['persoenlich'] = $this->app->Secure->GetPOST('persoenlich');
-	$input['prio'] = $this->app->Secure->GetPOST('prio');
+	    $input['prio'] = $this->app->Secure->GetPOST('prio');
-	$input['dsgvo'] = $this->app->Secure->GetPOST('dsgvo');
+	    $input['dsgvo'] = $this->app->Secure->GetPOST('dsgvo');
-	$input['warteschlange'] = $this->app->Secure->GetPOST('warteschlange');
+	    $input['adresse'] = $this->app->Secure->GetPOST('adresse');
-	$input['aktiv'] = $this->app->Secure->GetPOST('aktiv');
+	    $input['warteschlange'] = $this->app->Secure->GetPOST('warteschlange');
+	    $input['aktiv'] = $this->app->Secure->GetPOST('aktiv');
 	
 
         return $input;

www/pages/upgrade.php

@@ -41,29 +41,71 @@ class upgrade {
         $this->app->Tpl->Set('UPGRADE_VISIBLE', "hidden");
         $this->app->Tpl->Set('UPGRADE_DB_VISIBLE', "hidden");
 
-        //function upgrade_main(string $directory,bool $verbose, bool $check_git, bool $do_git, bool $export_db, bool $check_db, bool $do_db, bool $force, bool $connection, bool $origin) {  
-
         $directory = dirname(getcwd())."/upgrade";
 
         switch ($submit) {
             case 'check_upgrade':
                 $this->app->Tpl->Set('UPGRADE_VISIBLE', "");
                 unlink($logfile);
-                upgrade_main($directory,$verbose,true,false,false,true,false,$force,false,false);
+                upgrade_main(   directory: $directory,
+                                verbose: $verbose,
+                                check_git: true,
+                                do_git: false,
+                                export_db: false,
+                                check_db: true,
+                                strict_db: false,
+                                do_db: false,
+                                force: $force,
+                                connection: false,
+                                origin: false
+                );
             break;
             case 'do_upgrade':
                 unlink($logfile);
-                upgrade_main($directory,$verbose,true,true,false,true,true,$force,false,false);  
+                upgrade_main(   directory: $directory,
+                                verbose: $verbose,
+                                check_git: true,
+                                do_git: true,
+                                export_db: false,
+                                check_db: true,
+                                strict_db: false,
+                                do_db: true,
+                                force: $force,
+                                connection: false,
+                                origin: false
+                );
             break;    
             case 'check_db':
                 $this->app->Tpl->Set('UPGRADE_DB_VISIBLE', "");
                 unlink($logfile);
-                upgrade_main($directory,$db_verbose,false,false,false,true,false,$force,false,false);  
+                upgrade_main(   directory: $directory,
+                                verbose: $db_verbose,
+                                check_git: false,
+                                do_git: false,
+                                export_db: false,
+                                check_db: true,
+                                strict_db: false,
+                                do_db: false,
+                                force: $force,
+                                connection: false,
+                                origin: false
+                );
             break;    
             case 'do_db_upgrade':
                 $this->app->Tpl->Set('UPGRADE_DB_VISIBLE', "");
                 unlink($logfile);
-                upgrade_main($directory,$db_verbose,false,false,false,true,true,$force,false,false);  
+                upgrade_main(   directory: $directory,
+                                verbose: $db_verbose,
+                                check_git: false,
+                                do_git: false,
+                                export_db: false,
+                                check_db: true,
+                                strict_db: false,
+                                do_db: true,
+                                force: $force,
+                                connection: false,
+                                origin: false
+                );
             break;    
             case 'refresh':
             break;

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/setup/setup.css

@@ -1,37 +1,3 @@
-@font-face {
-	font-family: 'Inter';
-	font-style: normal;
-	font-weight: 400;
-	font-display: swap;
-	src: url('../themes/new/fonts/Inter-Regular.woff2?v=3.13') format("woff2"),
-	url('../themes/new/fonts/Inter-Regular.woff?v=3.13') format("woff");
-}
-@font-face {
-	font-family: 'Inter';
-	font-style: italic;
-	font-weight: 400;
-	font-display: swap;
-	src: url('../themes/new/fonts/Inter-Italic.woff2?v=3.13') format("woff2"),
-	url('../themes/new/fonts/Inter-Italic.woff?v=3.13') format("woff");
-}
-
-@font-face {
-	font-family: 'Inter';
-	font-style: normal;
-	font-weight: 700;
-	font-display: swap;
-	src: url('../themes/new/fonts/Inter-Bold.woff2?v=3.13') format("woff2"),
-	url('../themes/new/fonts/Inter-Bold.woff?v=3.13') format("woff");
-}
-@font-face {
-	font-family: 'Inter';
-	font-style: italic;
-	font-weight: 700;
-	font-display: swap;
-	src: url('../themes/new/fonts/Inter-BoldItalic.woff2?v=3.13') format("woff2"),
-	url('../themes/new/fonts/Inter-BoldItalic.woff?v=3.13') format("woff");
-}
-
 body {
 	font-size: 16px;
 	font-family: 'Inter', Arial, Helvetica, sans-serif;

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/login.css

@@ -1,38 +1,3 @@
-@font-face {
-    font-family: 'Inter';
-    font-style:  normal;
-    font-weight: 400;
-    font-display: swap;
-    src: url('../themes/new/fonts/Inter-Regular.woff2?v=3.13') format("woff2"),
-    url('../fonts/Inter-Regular.woff?v=3.13') format("woff");
-}
-@font-face {
-    font-family: 'Inter';
-    font-style:  italic;
-    font-weight: 400;
-    font-display: swap;
-    src: url('../themes/new/fonts/Inter-Italic.woff2?v=3.13') format("woff2"),
-    url('../fonts/Inter-Italic.woff?v=3.13') format("woff");
-}
-
-@font-face {
-    font-family: 'Inter';
-    font-style:  normal;
-    font-weight: 700;
-    font-display: swap;
-    src: url('../fonts/Inter-Bold.woff2?v=3.13') format("woff2"),
-    url('../fonts/Inter-Bold.woff?v=3.13') format("woff");
-}
-@font-face {
-    font-family: 'Inter';
-    font-style:  italic;
-    font-weight: 700;
-    font-display: swap;
-    src: url('../fonts/Inter-BoldItalic.woff2?v=3.13') format("woff2"),
-    url('../fonts/Inter-BoldItalic.woff?v=3.13') format("woff");
-}
-
-
 html {
     box-sizing: border-box;
 }

www/themes/new/css/login_styles.css

@@ -1,39 +1,3 @@
-
-@font-face {
-    font-family: 'Inter';
-    font-style:  normal;
-    font-weight: 400;
-    font-display: swap;
-    src: url('../fonts/Inter-Regular.woff2?v=3.13') format("woff2"),
-    url('../fonts/Inter-Regular.woff?v=3.13') format("woff");
-}
-@font-face {
-    font-family: 'Inter';
-    font-style:  italic;
-    font-weight: 400;
-    font-display: swap;
-    src: url('../fonts/Inter-Italic.woff2?v=3.13') format("woff2"),
-    url('../fonts/Inter-Italic.woff?v=3.13') format("woff");
-}
-
-@font-face {
-    font-family: 'Inter';
-    font-style:  normal;
-    font-weight: 700;
-    font-display: swap;
-    src: url('../fonts/Inter-Bold.woff2?v=3.13') format("woff2"),
-    url('../fonts/Inter-Bold.woff?v=3.13') format("woff");
-}
-@font-face {
-    font-family: 'Inter';
-    font-style:  italic;
-    font-weight: 700;
-    font-display: swap;
-    src: url('../themes/new/fonts/Inter-BoldItalic.woff2?v=3.13') format("woff2"),
-    url('../themes/new/fonts/Inter-BoldItalic.woff?v=3.13') format("woff");
-}
-
-
 html {
     box-sizing: border-box;
 }

www/themes/new/css/styles.css

@@ -1,71 +1,3 @@
-@font-face {
-    font-family: 'Inter';
-    font-style:  normal;
-    font-weight: 400;
-    font-display: swap;
-    src: url('../fonts/Inter-Regular.woff2?v=3.13') format("woff2"),
-    url('../fonts/Inter-Regular.woff?v=3.13') format("woff");
-}
-@font-face {
-    font-family: 'Inter';
-    font-style:  italic;
-    font-weight: 400;
-    font-display: swap;
-    src: url('../fonts/Inter-Italic.woff2?v=3.13') format("woff2"),
-    url('../fonts/Inter-Italic.woff?v=3.13') format("woff");
-}
-
-@font-face {
-    font-family: 'Inter';
-    font-style:  normal;
-    font-weight: 500;
-    font-display: swap;
-    src: url("../fonts/Inter-Medium.woff2?v=3.13") format("woff2"),
-    url("../fonts/Inter-Medium.woff?v=3.13") format("woff");
-}
-@font-face {
-    font-family: 'Inter';
-    font-style:  italic;
-    font-weight: 500;
-    font-display: swap;
-    src: url("../fonts/Inter-MediumItalic.woff2?v=3.13") format("woff2"),
-    url("../fonts/Inter-MediumItalic.woff?v=3.13") format("woff");
-}
-
-@font-face {
-    font-family: 'Inter';
-    font-style:  normal;
-    font-weight: 600;
-    font-display: swap;
-    src: url("../fonts/Inter-SemiBold.woff2?v=3.13") format("woff2"),
-    url("../fonts/Inter-SemiBold.woff?v=3.13") format("woff");
-}
-@font-face {
-    font-family: 'Inter';
-    font-style:  italic;
-    font-weight: 600;
-    font-display: swap;
-    src: url("../fonts/Inter-SemiBoldItalic.woff2?v=3.13") format("woff2"),
-    url("../fonts/Inter-SemiBoldItalic.woff?v=3.13") format("woff");
-}
-
-@font-face {
-    font-family: 'Inter';
-    font-style:  normal;
-    font-weight: 700;
-    font-display: swap;
-    src: url('../fonts/Inter-Bold.woff2?v=3.13') format("woff2"),
-    url('../fonts/Inter-Bold.woff?v=3.13') format("woff");
-}
-@font-face {
-    font-family: 'Inter';
-    font-style:  italic;
-    font-weight: 700;
-    font-display: swap;
-    src: url('../fonts/Inter-BoldItalic.woff2?v=3.13') format("woff2"),
-    url('../fonts/Inter-BoldItalic.woff?v=3.13') format("woff");
-}
-
 body {
     font-size: 12px;
 	font-family: 'Inter', Arial, Helvetica, sans-serif;
@@ -3029,7 +2961,6 @@ div.error > input[type=submit] {
 }
 
 .info,
-.success,
 .error2 {
     background-color: var(--info);
     color: var(--info-color);
@@ -3044,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;
 }
@@ -3108,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);
 }
 
@@ -3724,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;
 }