Merge pull request #95 from RETROTEC-AG/pr/locale-des-gui-users-ermitteln

Locale des GUI-Users ermitteln

.gitignore

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

SERVER_INSTALL.md

@@ -54,11 +54,14 @@ 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 mariadb-secure-installation`
+`sudo mysql_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/I18n/Bootstrap.php

@@ -0,0 +1,151 @@
+<?php
+/**
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n;
+
+use Xentral\Components\Database\Database;
+use Xentral\Components\Http\Request;
+use Xentral\Components\Http\Session\Session;
+use Xentral\Core\DependencyInjection\ServiceContainer;
+
+/**
+ * Factory for localization object.
+ *
+ * @see Localization
+ * @author   Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ */
+final class Bootstrap
+{
+    /**
+     * @return array
+     */
+    public static function registerServices(): array
+    {
+        return [
+            'Localization' => 'onInitLocalization',
+        ];
+    }
+    
+    
+    
+    /**
+     * Replaces umlauts with their 2 character representation.
+     *
+     * @param string $string
+     *
+     * @return array|string|string[]
+     */
+    public static function replaceUmlauts(string $string)
+    {
+        $search = ['ä', 'ö', 'ü', 'Ä', 'Ö', 'Ü', 'ß'];
+        $replace = ['ae', 'oe', 'ue', 'Ae', 'Oe', 'Ue', 'ss'];
+        return str_replace($search, $replace, $string);
+    }
+    
+    
+    
+    /**
+     * Find the language information from the given string.
+     *
+     * @param string $lang
+     *
+     * @return array|null
+     */
+    public static function findLanguage(string $lang): ?array
+    {
+        $subject = strtolower($lang);
+        foreach ((new Iso639()) as $key => $val) {
+            if (array_filter($val, function ($str) use ($subject) {
+                return $str && ((strtolower($str) == $subject) || (self::replaceUmlauts(strtolower($str)) == $subject));
+            })) {
+                return $val;
+            }
+        }
+        return null;
+    }
+    
+    
+    
+    /**
+     * Find the region information from the given string.
+     *
+     * @param string $region
+     *
+     * @return array|null
+     */
+    public static function findRegion(string $region): ?array
+    {
+        $subject = strtolower($region);
+        foreach ((new Iso3166()) as $key => $val) {
+            if (array_filter($val, function ($str) use ($subject) {
+                return $str && ((strtolower($str) == $subject) || (self::replaceUmlauts(strtolower($str)) == $subject));
+            })) {
+                return $val;
+            }
+        }
+        return null;
+    }
+    
+    
+    
+    /**
+     * This is the factory for the Localization object.
+     *
+     * @param ServiceContainer $container
+     *
+     * @return Localization
+     */
+    public static function onInitLocalization(ServiceContainer $container): Localization
+    {
+        /** @var Request $request */
+        $request = $container->get('Request');
+        /** @var Session $session */
+        $session = $container->get('Session');
+        /** @var \erpooSystem $app */
+        $app = $container->get('LegacyApplication');
+        /** @var Database $db */
+        $db = $container->get('Database');
+        
+        $config=[];
+        $firmaLang=null;
+        $firmaRegion=null;
+        // Get language from system settings and normalize to 3-letter-code and 2-letter-code
+        if ($firmaLang = self::findLanguage($app->erp->Firmendaten('preferredLanguage'))) {
+            $config[Localization::LANGUAGE_DEFAULT] = $firmaLang[Iso639\Key::ALPHA_3];
+        }
+        
+        // Get region from system settings and normalize to 2-letter-code
+        if ($firmaLang && ($firmaRegion = self::findRegion($app->erp->Firmendaten('land')))) {
+            $config[Localization::LOCALE_DEFAULT] = "{$firmaLang[Iso639\Key::ALPHA_2]}_{$firmaRegion[Iso3166\Key::ALPHA_2]}";
+        }
+        
+        
+        // Get User
+        $usersettings = [];
+        if ($user = $app->User) {
+            // Get User's address from user
+            $userAddress = $db->fetchRow(
+                $db->select()->cols(['*'])->from('adresse')->where('id=:id'),
+                ['id' => $user->GetAdresse()]
+            );
+            
+            // Get language from user account and normalize to 3-letter-code and 2-letter-code
+            if ($userLang = self::findLanguage($user->GetSprache())) {
+                $usersettings['language'] = $userLang[Iso639\Key::ALPHA_3];
+            }
+            
+            // Get region from user account and normalize to 2-letter-code
+            if ($userLang && ($userRegion = self::findRegion($userAddress['land']))) {
+                $usersettings['locale'] = "{$userLang[Iso639\Key::ALPHA_2]}_{$userRegion[Iso3166\Key::ALPHA_2]}";
+            }
+        }
+        
+        // Create Localization object
+        return new Localization($request, $session, $usersettings, $config);
+    }
+}

classes/Components/I18n/Dataaccess/ArrayAccessTrait.php

@@ -0,0 +1,73 @@
+<?php
+/*
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n\Dataaccess;
+
+/**
+ * Provides array access functions to the data provider.
+ *
+ * @see      \ArrayAccess
+ * @see      DataProvider
+ * @see      DataProviderInterface
+ * @author   Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ */
+trait ArrayAccessTrait
+{
+    /**
+     * Whether an offset exists.
+     *
+     * @param string $offset
+     *
+     * @return bool
+     */
+    public function offsetExists($offset): bool
+    {
+        return array_key_exists($offset, $this->DataProvider_DATA);
+    }
+    
+    
+    
+    /**
+     * Offset to retrieve.
+     *
+     * @param string $offset
+     *
+     * @return array
+     */
+    public function offsetGet($offset): array
+    {
+        return $this->DataProvider_DATA[$offset];
+    }
+    
+    
+    
+    /**
+     * Assign a value to the specified offset.
+     * No function since data set is read only.
+     *
+     * @param string $offset
+     * @param array  $value
+     */
+    public function offsetSet($offset, $value)
+    {
+// $this->DataProvider_DATA[$offset]=$value;
+    }
+    
+    
+    
+    /**
+     * Unset an offset.
+     * No function since data set is read only.
+     *
+     * @param string $offset
+     */
+    public function offsetUnset($offset)
+    {
+// unset($this->DataProvider_DATA[$offset]);
+    }
+}

classes/Components/I18n/Dataaccess/CountableTrait.php

@@ -0,0 +1,30 @@
+<?php
+/*
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n\Dataaccess;
+
+/**
+ * Provides countable functions to the data provider.
+ *
+ * @see      \Countable
+ * @see      DataProvider
+ * @see      DataProviderInterface
+ * @author   Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ */
+trait CountableTrait
+{
+    /**
+     * Counts the number of records in the private $data array.
+     *
+     * @return int Number of records
+     */
+    public function count(): int
+    {
+        return count($this->DataProvider_DATA);
+    }
+}

classes/Components/I18n/Dataaccess/DataFilter.php

@@ -0,0 +1,80 @@
+<?php
+/*
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n\Dataaccess;
+
+
+/**
+ * Abstract filter class.
+ *
+ * @see      DataFilterInterface
+ * @author   Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ */
+abstract class DataFilter implements DataFilterInterface
+{
+    /**
+     * Pointer to next filter in chain.
+     *
+     * @var DataFilterInterface
+     */
+    private $nextFilter = null;
+    
+    
+    
+    /**
+     * {@inheritDoc}
+     * @see \Xentral\Components\I18n\Dataaccess\DataFilterInterface::then()
+     */
+    public function then(DataFilterInterface $filter): DataFilterInterface
+    {
+        if (!$this->nextFilter) {
+            $this->nextFilter = $filter;
+        } else {
+            $this->nextFilter->then($filter);
+        }
+        return $this;
+    }
+    
+    
+    
+    /**
+     * Applies the filter to the data and executes the next filter
+     * if present.
+     *
+     * @see \Xentral\Components\I18n\Dataaccess\DataFilterInterface::__invoke()
+     */
+    public function __invoke(array $data): array
+    {
+// 		echo get_called_class()."::__invoke(\$data)".PHP_EOL;
+        
+        $filteredData = [];
+        foreach ($data as $key => $val) {
+            if ($this->selectItem($key, $val)) {
+                $filteredData[$key] = $val;
+            }
+        }
+        
+        if ($this->nextFilter) {
+            $filteredData = ($this->nextFilter)($filteredData);
+        }
+        return $filteredData;
+    }
+    
+    
+    
+    /**
+     * Check if the current item is to be selected for
+     * the dataset.
+     *
+     * @param mixed $key
+     * @param mixed $val
+     *
+     * @return bool
+     */
+    abstract protected function selectItem(&$key, &$val): bool;
+}

classes/Components/I18n/Dataaccess/DataFilterInterface.php

@@ -0,0 +1,38 @@
+<?php
+/*
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n\Dataaccess;
+
+
+/**
+ * Filter Interface.
+ *
+ * @see      DataFilter
+ * @author   Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ */
+interface DataFilterInterface
+{
+    /**
+     * Add a filter to the end of the filter chain.
+     *
+     * @param DataFilterInterface $filter Filter to add
+     *
+     * @return DataFilterInterface Start of filter chain
+     */
+    function then(DataFilterInterface $filter): DataFilterInterface;
+    
+    
+    
+    /**
+     * Applies the filter to the data and executes the next filter
+     * if present.
+     *
+     * @see \Ruga\I18n\Dataaccess\DataFilterInterface::__invoke()
+     */
+    function __invoke(array $data): array;
+}

classes/Components/I18n/Dataaccess/DataProvider.php

@@ -0,0 +1,125 @@
+<?php
+/*
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n\Dataaccess;
+
+use ArrayAccess;
+use Countable;
+use Iterator;
+
+/**
+ * Abstract implementation of a general data provider.
+ *
+ * @see      DataProviderInterface
+ * @author   Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ */
+abstract class DataProvider implements Countable, Iterator, ArrayAccess, DataProviderInterface
+{
+    use CountableTrait;
+    use IteratorTrait;
+    use ArrayAccessTrait;
+    
+    
+    /**
+     * Holds filtered data.
+     *
+     * @var mixed
+     */
+    private $DataProvider_DATA = null;
+    
+    
+    
+    /**
+     * Create the object and apply data filter.
+     *
+     * @param DataFilterInterface|null $filter
+     */
+    public function __construct(DataFilterInterface $filter = null)
+    {
+        if ($filter) {
+            $this->DataProvider_DATA = $filter($this->getOriginalData());
+        } else {
+            $this->DataProvider_DATA = $this->getOriginalData();
+        }
+    }
+    
+    
+    
+    /**
+     * Returns the original data array).
+     * Raw data before any filtering takes place.
+     *
+     * @return array
+     */
+    abstract protected function getOriginalData(): array;
+    
+    
+    
+    /**
+     * Returns an array suitable for select fields.
+     * The key of the filtered data set is used as key of the
+     * array and $desiredName field is used as value.
+     *
+     * @param string $desiredName
+     *
+     * @return array;
+     */
+    public function getMultiOptions($desiredName = 'NAME_deu'): array
+    {
+        $a = [];
+        foreach ($this as $key => $l) {
+            $a[$key] = $l[$desiredName];
+        }
+        return $a;
+    }
+    
+    
+    
+    /**
+     * Returns the field $desiredName from the record $id.
+     *
+     * @param mixed  $id
+     * @param string $desiredName
+     *
+     * @return string
+     */
+    public function getString($id, $desiredName): string
+    {
+        if (!isset($this[$id])) {
+            throw new Exception\OutOfRangeException("Index '{$id}' not found");
+        }
+        $d = $this[$id];
+        if ($desiredName) {
+            if ($desiredName == 'POST') {
+                return strtoupper($this->getString($id, 'NAME_eng'));
+            }
+            return $d[$desiredName];
+        }
+        throw new Exception\OutOfRangeException("No '{$desiredName}' data for '{$id}'");
+    }
+    
+    
+    
+    /**
+     * Returns the item at position $id.
+     *
+     * @param string $id
+     *
+     * @return mixed
+     */
+    public function getData($id)
+    {
+        if (empty($id)) {
+            return null;
+        }
+        if (!isset($this[$id])) {
+            throw new Exception\OutOfRangeException("Index '{$id}' not found.");
+        }
+        return $this[$id];
+    }
+}

classes/Components/I18n/Dataaccess/DataProviderInterface.php

@@ -0,0 +1,53 @@
+<?php
+/*
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n\Dataaccess;
+
+
+/**
+ * Interface to the general data provider class.
+ *
+ * @see      DataProvider
+ * @author   Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ */
+interface DataProviderInterface
+{
+    /**
+     * Returns an array suitable for select fields.
+     * The key of the filtered data set is used as key of the
+     * array and $desiredName field is used as value.
+     *
+     * @param string $desiredName
+     *
+     * @return array;
+     */
+    public function getMultiOptions($desiredName): array;
+    
+    
+    
+    /**
+     * Returns the field $desiredName from the record $id.
+     *
+     * @param mixed  $id
+     * @param string $desiredName
+     *
+     * @return string
+     */
+    public function getString($id, $desiredName): string;
+    
+    
+    
+    /**
+     * Returns the item at position $id.
+     *
+     * @param string $id
+     *
+     * @return mixed
+     */
+    public function getData($id);
+}

classes/Components/I18n/Dataaccess/Exception/OutOfRangeException.php

@@ -0,0 +1,14 @@
+<?php
+/*
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n\Dataaccess\Exception;
+
+class OutOfRangeException extends \OutOfRangeException
+{
+    
+}

classes/Components/I18n/Dataaccess/IteratorTrait.php

@@ -0,0 +1,100 @@
+<?php
+/*
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n\Dataaccess;
+
+/**
+ * Provides iterator functions to the data provider.
+ *
+ * @see      \Iterator
+ * @see      DataProvider
+ * @see      DataProviderInterface
+ * @author   Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ */
+trait IteratorTrait
+{
+    /**
+     * Index of the current element's key.
+     *
+     * @var string
+     */
+    private $IteratorTrait_index = null;
+    
+    /**
+     * Array of keys of the data set.
+     *
+     * @var array
+     */
+    private $IteratorTrait_keys = null;
+    
+    
+    
+    /**
+     * Return the current element.
+     *
+     * @return mixed
+     */
+    public function current()
+    {
+        return $this->valid() ? $this->DataProvider_DATA[$this->key()] : null;
+    }
+    
+    
+    
+    /**
+     * Return the key of the current element.
+     *
+     * @return mixed
+     */
+    public function key()
+    {
+        return static::valid() ? $this->IteratorTrait_keys[$this->IteratorTrait_index] : null;
+    }
+    
+    
+    
+    /**
+     * Move forward to next element.
+     *
+     * @return bool false if invalid
+     */
+    public function next()
+    {
+        $this->IteratorTrait_index++;
+        if (!$this->valid()) {
+            $this->IteratorTrait_index = null;
+        }
+        return $this->valid();
+    }
+    
+    
+    
+    /**
+     * Rewind the Iterator to the first element.
+     */
+    public function rewind()
+    {
+        $this->IteratorTrait_keys = array_keys($this->DataProvider_DATA);
+        sort($this->IteratorTrait_keys);
+        $this->IteratorTrait_index = 0;
+    }
+    
+    
+    
+    /**
+     * Checks if current position is valid.
+     *
+     * @return bool
+     */
+    public function valid(): bool
+    {
+        return ($this->IteratorTrait_index !== null)
+            && array_key_exists($this->IteratorTrait_index, $this->IteratorTrait_keys)
+            && array_key_exists($this->IteratorTrait_keys[$this->IteratorTrait_index], $this->DataProvider_DATA);
+    }
+}

classes/Components/I18n/Exception/LanguageNotInitializedException.php

@@ -0,0 +1,14 @@
+<?php
+/**
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n\Exception;
+
+class LanguageNotInitializedException extends \RuntimeException
+{
+    
+}

classes/Components/I18n/Exception/UnsupportedLocaleStringException.php

@@ -0,0 +1,14 @@
+<?php
+/*
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n\Exception;
+
+class UnsupportedLocaleStringException extends \RuntimeException
+{
+    
+}

classes/Components/I18n/Iso3166.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n;
+
+use Xentral\Components\I18n\Dataaccess\DataProvider;
+
+/**
+ * Country Codes - ISO 3166.
+ * Loads the data and holds the filtered (if desired) list.
+ *
+ * @see      https://www.iso.org/iso-3166-country-codes.html
+ * @see      DataProvider
+ * @author   Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * @license  AGPL-3.0-only
+ */
+class Iso3166 extends DataProvider
+{
+    /**
+     * {@inheritDoc}
+     * @see \Xentral\Components\I18n\Dataaccess\DataProvider::getOriginalData()
+     */
+    protected function getOriginalData(): array
+    {
+        return include(__DIR__ . '/data/Iso3166data.php');
+    }
+}

classes/Components/I18n/Iso3166/Filter/All.php

@@ -0,0 +1,31 @@
+<?php
+/**
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n\Iso3166\Filter;
+
+use Xentral\Components\I18n\Dataaccess\DataFilter;
+use Xentral\Components\I18n\Dataaccess\DataFilterInterface;
+
+/**
+ * This filter returns all records from the data set (aka dummy filter).
+ *
+ * @see      \Xentral\Components\I18n\Dataaccess\DataFilter
+ * @see      \Xentral\Components\I18n\Dataaccess\DataFilterInterface
+ * @author   Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ */
+class All extends DataFilter implements DataFilterInterface
+{
+    /**
+     * {@inheritDoc}
+     * @see \Xentral\Components\I18n\Dataaccess\DataFilterInterface::selectItem()
+     */
+    function selectItem(&$key, &$val): bool
+    {
+        return true;
+    }
+}

classes/Components/I18n/Iso3166/Filter/CentralEurope.php

@@ -0,0 +1,41 @@
+<?php
+/**
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n\Iso3166\Filter;
+
+use Xentral\Components\I18n\Dataaccess\DataFilterInterface;
+use Xentral\Components\I18n\Iso3166\Key;
+
+
+/**
+ * Applies a filter to only select central european countries.
+ *
+ * @see      Custom
+ * @see      \Xentral\Components\I18n\Dataaccess\DataFilter
+ * @see      \Xentral\Components\I18n\Dataaccess\DataFilterInterface
+ * @author   Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ */
+class CentralEurope extends Custom implements DataFilterInterface
+{
+    /**
+     * Countries in Europe.
+     *
+     * @var array
+     */
+    const CentralEurope_Countries = ['CHE', 'DEU', 'AUT', 'ITA', 'FRA', 'ESP', 'PRT', 'GBR'];
+    
+    
+    
+    /**
+     * Set predefined values.
+     */
+    public function __construct()
+    {
+        parent::__construct(static::CentralEurope_Countries, Key::ALPHA_3);
+    }
+}

classes/Components/I18n/Iso3166/Filter/ChangeKey.php

@@ -0,0 +1,55 @@
+<?php
+/**
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n\Iso3166\Filter;
+
+use Xentral\Components\I18n\Dataaccess\DataFilterInterface;
+use Xentral\Components\I18n\Dataaccess\DataFilter;
+
+
+/**
+ * This filter can be used to change the main key
+ * of the data set.
+ *
+ * @see      \Xentral\Components\I18n\Dataaccess\DataFilter
+ * @see      \Xentral\Components\I18n\Dataaccess\DataFilterInterface
+ * @author   Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ */
+class ChangeKey extends DataFilter implements DataFilterInterface
+{
+    /**
+     * New key to use for the data set.
+     *
+     * @var string
+     */
+    private $ChangeKey_key = null;
+    
+    
+    
+    /**
+     * Initialize filter and set the new key.
+     *
+     * @param mixed $key
+     */
+    public function __construct($key)
+    {
+        $this->ChangeKey_key = $key;
+    }
+    
+    
+    
+    /**
+     * {@inheritDoc}
+     * @see \Xentral\Components\I18n\Dataaccess\DataFilterInterface::selectItem()
+     */
+    protected function selectItem(&$key, &$val): bool
+    {
+        $key = $val[$this->ChangeKey_key];
+        return true;
+    }
+}

classes/Components/I18n/Iso3166/Filter/Custom.php

@@ -0,0 +1,63 @@
+<?php
+/**
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n\Iso3166\Filter;
+
+use Xentral\Components\I18n\Dataaccess\DataFilter;
+use Xentral\Components\I18n\Dataaccess\DataFilterInterface;
+
+
+/**
+ * Apply a custom filter to the data set.
+ *
+ * @see      \Xentral\Components\I18n\Dataaccess\DataFilter
+ * @see      \Xentral\Components\I18n\Dataaccess\DataFilterInterface
+ * @author   Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ */
+class Custom extends DataFilter implements DataFilterInterface
+{
+    /**
+     * Array of wanted values.
+     *
+     * @var array
+     */
+    private $Custom_values = null;
+    
+    /**
+     * Key to check for the values in $this->Custom_values.
+     *
+     * @var string
+     */
+    private $Custom_key = null;
+    
+    
+    
+    /**
+     * Set values for filter.
+     *
+     * @param array $values
+     * @param mixed $key
+     */
+    public function __construct(array $values, $key)
+    {
+        $this->Custom_values = $values;
+        $this->Custom_key = $key;
+    }
+    
+    
+    
+    /**
+     * {@inheritDoc}
+     * @see \Xentral\Components\I18n\Dataaccess\DataFilterInterface::selectItem()
+     */
+    protected function selectItem(&$key, &$val): bool
+    {
+        $needle = $val[$this->Custom_key];
+        return in_array($needle, $this->Custom_values);
+    }
+}

classes/Components/I18n/Iso3166/Filter/Europe.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n\Iso3166\Filter;
+
+use Xentral\Components\I18n\Dataaccess\DataFilterInterface;
+use Xentral\Components\I18n\Iso3166\Key;
+
+
+/**
+ * Applies a filter to only select european countries.
+ *
+ * @see      Custom
+ * @see      \Xentral\Components\I18n\Dataaccess\DataFilter
+ * @see      \Xentral\Components\I18n\Dataaccess\DataFilterInterface
+ * @author   Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ */
+class Europe extends Custom implements DataFilterInterface
+{
+    /**
+     * Set predefined values.
+     */
+    public function __construct()
+    {
+        parent::__construct(['150'], Key::REGION_CODE);
+    }
+}

classes/Components/I18n/Iso3166/Key.php

@@ -0,0 +1,75 @@
+<?php
+/**
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n\Iso3166;
+
+
+/**
+ * Keys for the iso3166 list.
+ *
+ * @see      \Xentral\Components\I18n\Iso3166
+ * @author   Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ */
+abstract class Key/* extends Ruga_Enum*/
+{
+    /** Key: Alpha-2 code */
+    const ALPHA_2 = 'A2';
+    
+    /** Key: Alpha-3 code */
+    const ALPHA_3 = 'A3';
+    
+    /** Key: Numeric code */
+    const NUMERIC = 'NUM';
+    
+    /** Key: Top Level Domain */
+    const TLD = 'TLD';
+    
+    /** Key: Currency Code */
+    const CURRENCY_CODE = 'CURRENCY_CODE';
+    const TELEPHONE_CODE = 'TEL_CODE';
+    const REGION = 'REGION';
+    const REGION_CODE = 'REGION_CODE';
+    const SUBREGION = 'SUBREGION';
+    const SUBREGION_CODE = 'SUBREGION_CODE';
+    const INTERMEDIATEREGION = 'INTERMEDIATEREGION';
+    const INTERMEDIATEREGION_CODE = 'INTERMEDIATEREGION_CODE';
+    const NAME_eng = 'NAME_eng';
+    const NAME_fra = 'NAME_fra';
+    const NAME_deu = 'NAME_deu';
+    
+    
+    /** Key: Postal country name */
+    const POST = 'POST';
+    
+    
+    const DEFAULT = self::ALPHA_3;
+    
+    
+    protected static $fullnameMap = [
+        self::ALPHA_2 => 'ISO 3166 Alpha-2',
+        self::ALPHA_3 => 'ISO 3166 Alpha-3',
+        self::NUMERIC => 'ISO 3166 Numerisch',
+        self::TLD => 'Top Level Domain',
+        self::CURRENCY_CODE => 'Währung',
+        self::TELEPHONE_CODE => 'Landesvorwahl',
+        self::REGION => 'Region',
+        self::REGION_CODE => 'Region Code',
+        self::SUBREGION => 'Unter-Region',
+        self::SUBREGION_CODE => 'Unter-Region Code',
+        self::INTERMEDIATEREGION => 'Intermediate-Region',
+        self::INTERMEDIATEREGION_CODE => 'Intermediate-Region Code',
+        self::NAME_eng => 'Englische Bezeichnung',
+        self::NAME_fra => 'Französische Bezeichnung',
+        self::NAME_deu => 'Deutsche Bezeichnung',
+        
+        self::POST => 'Landesbezeichung Postadresse',
+    ];
+    
+    
+}
+

classes/Components/I18n/Iso3166/Name.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n\Iso3166;
+
+/**
+ * Names for the iso3166 list.
+ *
+ * @see      \Xentral\Components\I18n\Iso3166
+ * @author   Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ */
+abstract class Name/* extends Ruga_Enum */
+{
+    /** Englisch */
+    const ENG = 'NAME_eng';
+    /** Französisch */
+    const FRA = 'NAME_fra';
+    /** Deutsch */
+    const DEU = 'NAME_deu';
+    
+    
+    protected static $fullnameMap = [
+        self::ENG => 'Englische Bezeichnung',
+        self::FRA => 'Französische Bezeichnung',
+        self::DEU => 'Deutsche Bezeichnung',
+    ];
+}

classes/Components/I18n/Iso639.php

@@ -0,0 +1,73 @@
+<?php
+/**
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n;
+
+use Xentral\Components\I18n\Dataaccess\DataProvider;
+use Xentral\Components\I18n\Dataaccess\Exception\OutOfRangeException;
+
+/**
+ * Codes for the Representation of Names of Languages - ISO 639.
+ * Loads the data and holds the filtered (if desired) list.
+ *
+ * @see      https://www.iso.org/iso-639-language-codes.html
+ * @see      DataProvider
+ * @author   Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ */
+class Iso639 extends DataProvider
+{
+    /**
+     * {@inheritDoc}
+     * @see \Xentral\Components\I18n\Dataaccess\DataProvider::getOriginalData()
+     */
+    protected function getOriginalData(): array
+    {
+        return include(__DIR__ . '/data/Iso639data.php');
+    }
+    
+    
+    
+    /**
+     * Returns the field $desiredName from the record $id.
+     *
+     * @param mixed  $id
+     * @param string $desiredName
+     * @param null   $default
+     *
+     * @return string
+     */
+    public function find($id, $desiredName, $default = null): string
+    {
+        $id = strtolower($id);
+        try {
+            return $this->getString($id, $desiredName);
+        } catch (OutOfRangeException $e) {
+            try {
+                return (new \Xentral\Components\I18n\Iso639(
+                    (new \Xentral\Components\I18n\Iso639\Filter\All())
+                        ->then(new \Xentral\Components\I18n\Iso639\Filter\ChangeKey(\Xentral\Components\I18n\Iso639\Key::ALPHA_2))
+                ))->getString($id, $desiredName);
+            } catch (OutOfRangeException $e) {
+                try {
+                    $id = strtoupper($id);
+                    return (new \Xentral\Components\I18n\Iso639(
+                        (new \Xentral\Components\I18n\Iso639\Filter\All())
+                            ->then(new \Xentral\Components\I18n\Iso639\Filter\ChangeKey(\Xentral\Components\I18n\Iso639\Key::ONELETTER))
+                    ))->getString($id, $desiredName);
+                } catch (OutOfRangeException $e) {
+                    if ($default === null) {
+                        throw $e;
+                    } else {
+                        return $this->getString($default, $desiredName);
+                    }
+                }
+            }
+        }
+    }
+    
+}

classes/Components/I18n/Iso639/Filter/All.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n\Iso639\Filter;
+
+use Xentral\Components\I18n\Dataaccess\DataFilter;
+use Xentral\Components\I18n\Dataaccess\DataFilterInterface;
+
+
+/**
+ * This filter returns all records from the data set (aka dummy filter).
+ *
+ * @see      \Xentral\Components\I18n\Dataaccess\DataFilter
+ * @see      \Xentral\Components\I18n\Dataaccess\DataFilterInterface
+ * @author   Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ */
+class All extends DataFilter implements DataFilterInterface
+{
+    /**
+     * {@inheritDoc}
+     * @see \Xentral\Components\I18n\Dataaccess\DataFilterInterface::selectItem()
+     */
+    function selectItem(&$key, &$val): bool
+    {
+        return true;
+    }
+}

classes/Components/I18n/Iso639/Filter/CentralEurope.php

@@ -0,0 +1,41 @@
+<?php
+/**
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n\Iso639\Filter;
+
+use Xentral\Components\I18n\Dataaccess\DataFilterInterface;
+use Xentral\Components\I18n\Iso639\Key;
+
+
+/**
+ * Applies a filter to only select central european countries.
+ *
+ * @see      Custom
+ * @see      \Xentral\Components\I18n\Dataaccess\DataFilter
+ * @see      \Xentral\Components\I18n\Dataaccess\DataFilterInterface
+ * @author   Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ */
+class CentralEurope extends Custom implements DataFilterInterface
+{
+    /**
+     * Countries in Europe.
+     *
+     * @var array
+     */
+    const CentralEurope_Languages = ['deu', 'fra', 'ita', 'roh', 'spa', 'por', 'eng'];
+    
+    
+    
+    /**
+     * Set predefined values.
+     */
+    public function __construct()
+    {
+        parent::__construct(static::CentralEurope_Languages, Key::ALPHA_3);
+    }
+}

classes/Components/I18n/Iso639/Filter/ChangeKey.php

@@ -0,0 +1,55 @@
+<?php
+/**
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n\Iso639\Filter;
+
+use Xentral\Components\I18n\Dataaccess\DataFilterInterface;
+use Xentral\Components\I18n\Dataaccess\DataFilter;
+
+
+/**
+ * This filter can be used to change the main key
+ * of the data set.
+ *
+ * @see      \Xentral\Components\I18n\Dataaccess\DataFilter
+ * @see      \Xentral\Components\I18n\Dataaccess\DataFilterInterface
+ * @author   Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ */
+class ChangeKey extends DataFilter implements DataFilterInterface
+{
+    /**
+     * New key to use for the data set.
+     *
+     * @var string
+     */
+    private $ChangeKey_key = null;
+    
+    
+    
+    /**
+     * Initialize filter and set the new key.
+     *
+     * @param mixed $key
+     */
+    public function __construct($key)
+    {
+        $this->ChangeKey_key = $key;
+    }
+    
+    
+    
+    /**
+     * {@inheritDoc}
+     * @see \Xentral\Components\I18n\Dataaccess\DataFilterInterface::selectItem()
+     */
+    protected function selectItem(&$key, &$val): bool
+    {
+        $key = $val[$this->ChangeKey_key] ?? null;
+        return true;
+    }
+}

classes/Components/I18n/Iso639/Filter/Custom.php

@@ -0,0 +1,63 @@
+<?php
+/**
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n\Iso639\Filter;
+
+use Xentral\Components\I18n\Dataaccess\DataFilter;
+use Xentral\Components\I18n\Dataaccess\DataFilterInterface;
+
+
+/**
+ * Apply a custom filter to the data set.
+ *
+ * @see      \Xentral\Components\I18n\Dataaccess\DataFilter
+ * @see      \Xentral\Components\I18n\Dataaccess\DataFilterInterface
+ * @author   Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ */
+class Custom extends DataFilter implements DataFilterInterface
+{
+    /**
+     * Array of wanted values.
+     *
+     * @var array
+     */
+    private $Custom_values = null;
+    
+    /**
+     * Key to check for the values in $this->Custom_values.
+     *
+     * @var string
+     */
+    private $Custom_key = null;
+    
+    
+    
+    /**
+     * Set values for filter.
+     *
+     * @param array $values
+     * @param mixed $key
+     */
+    public function __construct(array $values, $key)
+    {
+        $this->Custom_values = $values;
+        $this->Custom_key = $key;
+    }
+    
+    
+    
+    /**
+     * {@inheritDoc}
+     * @see \Xentral\Components\I18n\Dataaccess\DataFilterInterface::selectItem()
+     */
+    protected function selectItem(&$key, &$val): bool
+    {
+        $needle = $val[$this->Custom_key];
+        return in_array($needle, $this->Custom_values);
+    }
+}

classes/Components/I18n/Iso639/Key.php

@@ -0,0 +1,51 @@
+<?php
+/**
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n\Iso639;
+
+
+/**
+ * Keys for the iso639 list.
+ *
+ * @see      \Xentral\Components\I18n\Iso639
+ * @author   Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ */
+abstract class Key/* extends Ruga_Enum*/
+{
+    /** Key: Alpha-2 code */
+    const ALPHA_2 = '639-1';
+    const ISO639_1 = '639-1';
+    
+    /** Key: Alpha-3 code */
+    const ALPHA_3 = '639-2';
+    const ISO639_2 = '639-2';
+    
+    /** Key: Top Level Domain */
+    const ONELETTER = '1L';
+    
+    /** Key: Name */
+    const NAME_eng = 'NAME_eng';
+    const NAME_fra = 'NAME_fra';
+    const NAME_deu = 'NAME_deu';
+    
+    
+    const DEFAULT = self::ALPHA_3;
+    
+    
+    protected static $fullnameMap = [
+        self::ALPHA_2 => 'ISO 639 Alpha-2',
+        self::ALPHA_3 => 'ISO 639 Alpha-3',
+        self::ONELETTER => 'ISO 639 Alpha-1',
+        self::NAME_eng => 'Englische Bezeichnung',
+        self::NAME_fra => 'Französische Bezeichnung',
+        self::NAME_deu => 'Deutsche Bezeichnung',
+    ];
+    
+    
+}
+

classes/Components/I18n/Iso639/Name.php

@@ -0,0 +1,33 @@
+<?php
+/**
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n\Iso639;
+
+
+/**
+ * Names for the iso639 list.
+ *
+ * @see      \Xentral\Components\I18n\Iso639
+ * @author   Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ */
+abstract class Name/* extends Ruga_Enum */
+{
+    /** Englisch */
+    const ENG = 'NAME_eng';
+    /** Französisch */
+    const FRA = 'NAME_fra';
+    /** Deutsch */
+    const DEU = 'NAME_deu';
+    
+    
+    protected static $fullnameMap = [
+        self::ENG => 'Englische Bezeichnung',
+        self::FRA => 'Französische Bezeichnung',
+        self::DEU => 'Deutsche Bezeichnung',
+    ];
+}

classes/Components/I18n/Localization.php

@@ -0,0 +1,244 @@
+<?php
+/*
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n;
+
+use Locale;
+use Xentral\Components\Http\Request;
+use Xentral\Components\Http\Session\Session;
+use Xentral\Components\I18n\Exception\LanguageNotInitializedException;
+use Xentral\Components\I18n\Exception\UnsupportedLocaleStringException;
+
+/**
+ * Provides a central service for localization.
+ *
+ * @author   Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ */
+final class Localization implements LocalizationInterface
+{
+    private array $config;
+    
+    private ?Request $request;
+    
+    private ?Session $session;
+    
+    private array $usersettings = [];
+    
+    private array $language = [];
+    
+    private array $locale = [];
+    
+    
+    
+    public function __construct(?Request $request, ?Session $session, array $usersettings = [], array $config = [])
+    {
+        $this->request = $request;
+        $this->session = $session;
+        $this->usersettings = $usersettings;
+        $this->config = $config;
+        $this->process();
+    }
+    
+    
+    
+    public function process()
+    {
+        // Hardcoded defaults if config is not available
+        $localeDefault = $this->config[Localization::LOCALE_DEFAULT] ?? 'de_DE';
+        $localeAttrName = $this->config[Localization::LOCALE_ATTRIBUTE_NAME] ?? 'locale';
+        $langDefault = $this->config[Localization::LANGUAGE_DEFAULT] ?? 'deu';
+        $langAttrName = $this->config[Localization::LANGUAGE_ATTRIBUTE_NAME] ?? 'language';
+        
+        $segmentName = 'i18n';
+        
+        // Get the locale from the session, if available
+        if ($this->session && ($locale = $this->session->getValue($segmentName, $localeAttrName))) {
+        } else {
+            // Get locale from request, fallback to the user's browser preference
+            if ($this->request) {
+                $locale = $this->request->attributes->get(
+                    $localeAttrName,
+                    Locale::acceptFromHttp(
+                        $this->request->getHeader('Accept-Language', $localeDefault)
+                    ) ?? $localeDefault
+                );
+            } else {
+                $locale = Locale::acceptFromHttp($_SERVER['HTTP_ACCEPT_LANGUAGE'] ?? $localeDefault);
+            }
+        }
+        // Get locale from user
+        // This overrides all previous attempts to find a locale
+        if (array_key_exists('locale', $this->usersettings)) {
+            $locale = $this->usersettings['locale'];
+        }
+        // Get locale from query string
+        // This overrides all previous attempts to find a locale
+        if ($this->request) {
+            $locale = $this->request->getParam($localeAttrName, $locale ?? $localeDefault);
+        } else {
+            $locale = $_GET[$localeAttrName] ?? $locale ?? $localeDefault;
+        }
+        
+        
+        // Get the language from the session, if available
+        if ($this->session && ($language = $this->session->getValue($segmentName, $langAttrName))) {
+        } else {
+            // Get language from request, fallback to the current locale
+            if ($this->request) {
+                $language = $this->request->attributes->get($langAttrName, Locale::getPrimaryLanguage($locale));
+            } else {
+                $language = Locale::getPrimaryLanguage($locale);
+            }
+        }
+        // Get language from user
+        // This overrides all previous attempts to find a language
+        if (array_key_exists('language', $this->usersettings)) {
+            $language = $this->usersettings['language'];
+        }
+        // Get language from query string
+        // This overrides all previous attempts to find a language
+        if ($this->request) {
+            $language = $this->request->getParam($langAttrName, $language ?? $langDefault);
+        } else {
+            $language = $language ?? $langDefault;
+        }
+        
+        // Check language against the data from Iso639 (and normalize to 3-letter-code)
+        $language = (new Iso639())->find($language, Iso639\Key::DEFAULT, $langDefault);
+        
+        
+        // Store the locale and language to the LocalizationInterface
+        $this->setLanguage($language);
+        $this->setLocale($locale);
+        
+        // Store the locale and language to the session
+        if ($this->session) {
+            $this->session->setValue($segmentName, $localeAttrName, $locale);
+            $this->session->setValue($segmentName, $langAttrName, $language);
+        }
+        
+        // Store the locale and language as a request attribute
+        if ($this->request) {
+            $this->request->attributes->set($localeAttrName, $locale);
+            $this->request->attributes->set($langAttrName, $language);
+        }
+        
+        // Set the default locale
+        Locale::setDefault($locale);
+//        error_log(self::class . ": {$locale}");
+    }
+    
+    
+    
+    /**
+     * Set the language.
+     *
+     * @param string $language
+     */
+    public function setLanguage(string $language)
+    {
+        $this->language[Iso639\Key::DEFAULT] = (new \Xentral\Components\I18n\Iso639())->find(
+            $language,
+            Iso639\Key::DEFAULT
+        );
+    }
+    
+    
+    
+    /**
+     * Return the language string as defined by $key.
+     *
+     * @param string|null $key A constant from Iso639\Key
+     *
+     * @return string
+     */
+    public function getLanguage(string $key = null): string
+    {
+        if (!$key) {
+            $key = Iso639\Key::DEFAULT;
+        }
+        if (!($this->language[$key] ?? null)) {
+            if (!($this->language[Iso639\Key::DEFAULT] ?? null)) {
+                throw new LanguageNotInitializedException("Language is not set for key '" . Iso639\Key::DEFAULT . "'");
+            }
+            $this->language[$key] = (new \Xentral\Components\I18n\Iso639())->find(
+                $this->language[Iso639\Key::DEFAULT],
+                $key
+            );
+        }
+        return $this->language[$key];
+    }
+    
+    
+    
+    /**
+     * Set the locale.
+     *
+     * @param string $locale
+     */
+    public function setLocale(string $locale)
+    {
+        $parsedLocale = Locale::parseLocale($locale);
+        $locale = Locale::composeLocale([
+                                            'language' => $parsedLocale['language'],
+                                            'region' => $parsedLocale['region'],
+                                        ]);
+        
+        if(!$locale) throw new UnsupportedLocaleStringException("The given locale string '{$locale}' is not supported");
+        
+        $this->locale[Iso3166\Key::DEFAULT] = $locale;
+    }
+    
+    
+    
+    /**
+     * Return the locale string as defined by $key.
+     *
+     * @param string|null $key A constant from Iso3166\Key
+     *
+     * @return string
+     */
+    public function getLocale(string $key = null): string
+    {
+        return $this->locale[Iso3166\Key::DEFAULT];
+    }
+    
+    
+    
+    /**
+     * Return a new localization object using the given adresse array as source for language and region.
+     *
+     * @param array $adresse
+     *
+     * @return $this
+     */
+    public function withAdresse(array $adresse): self
+    {
+        $localization = clone $this;
+        
+        // Find language from address array or keep current language
+        if (!$lang = Bootstrap::findLanguage($adresse['sprache'])) {
+            $lang = Bootstrap::findLanguage($this->getLanguage());
+        }
+        if ($lang) {
+            $localization->setLanguage($lang[Iso639\Key::ALPHA_3]);
+        }
+        
+        // Find region from address or keep current region
+        if (!$region = Bootstrap::findRegion($adresse['land'])) {
+            $parsedLocale = Locale::parseLocale($this->getLocale());
+            $region = Bootstrap::findRegion($parsedLocale['region']);
+        }
+        if ($lang && $region) {
+            $localization->setLocale("{$lang[Iso639\Key::ALPHA_2]}_{$region[Iso3166\Key::ALPHA_2]}");
+        }
+        
+        return $localization;
+    }
+    
+}

classes/Components/I18n/LocalizationInterface.php

@@ -0,0 +1,62 @@
+<?php
+/*
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n;
+
+/**
+ * Interface LocalizationInterface
+ *
+ * @author   Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ */
+interface LocalizationInterface
+{
+    const LOCALE_DEFAULT = 'locale_default';
+    const LOCALE_ATTRIBUTE_NAME = 'locale_attr_name';
+    const LANGUAGE_DEFAULT = 'language_default';
+    const LANGUAGE_ATTRIBUTE_NAME = 'language_attr_name';
+    
+    
+    
+    /**
+     * Set the language.
+     *
+     * @param string $language
+     */
+    public function setLanguage(string $language);
+    
+    
+    
+    /**
+     * Return the language string as defined by $key.
+     *
+     * @param string|null $key A constant from Iso639\Key
+     *
+     * @return string
+     */
+    public function getLanguage(string $key = null): string;
+    
+    
+    
+    /**
+     * Set the locale.
+     *
+     * @param string $locale
+     */
+    public function setLocale(string $locale);
+    
+    
+    
+    /**
+     * Return the locale string as defined by $key.
+     *
+     * @param string|null $key A constant from Iso3166\Key
+     *
+     * @return string
+     */
+    public function getLocale(string $key = null): string;
+}

classes/Components/I18n/data/Iso639data.php

@@ -0,0 +1,159 @@
+<?php
+/*
+ * Data extracted from https://www.iso.org/iso-639-language-codes.html
+ */
+return [
+    
+    'aar' => [
+        '639-2' => 'aar',
+        '639-1' => 'aa',
+        'NAME_eng' => 'Afar',
+        'NAME_fra' => 'afar',
+        'NAME_deu' => 'Danakil-Sprache',
+    ],
+    'abk' => [
+        '639-2' => 'abk',
+        '639-1' => 'ab',
+        'NAME_eng' => 'Abkhazian',
+        'NAME_fra' => 'abkhaze',
+        'NAME_deu' => 'Abchasisch',
+    ],
+    'ace' => [
+        '639-2' => 'ace',
+        '639-1' => null,
+        'NAME_eng' => 'Achinese',
+        'NAME_fra' => 'aceh',
+        'NAME_deu' => 'Aceh-Sprache',
+    ],
+    'ach' => [
+        '639-2' => 'ach',
+        '639-1' => null,
+        'NAME_eng' => 'Acoli',
+        'NAME_fra' => 'acoli',
+        'NAME_deu' => 'Acholi-Sprache',
+    ],
+    'ada' => [
+        '639-2' => 'ada',
+        '639-1' => null,
+        'NAME_eng' => 'Adangme',
+        'NAME_fra' => 'adangme',
+        'NAME_deu' => 'Adangme-Sprache',
+    ],
+    'ady' => [
+        '639-2' => 'ady',
+        '639-1' => null,
+        'NAME_eng' => 'Adyghe',
+        'NAME_fra' => 'adyghé',
+        'NAME_deu' => 'Adygisch',
+    ],
+    'afa' => [
+        '639-2' => 'afa',
+        '639-1' => null,
+        'NAME_eng' => 'Afro-Asiatic languages',
+        'NAME_fra' => 'afro-asiatiques, langues',
+        'NAME_deu' => 'Hamitosemitische Sprachen (Andere)',
+    ],
+    'afh' => [
+        '639-2' => 'afh',
+        '639-1' => null,
+        'NAME_eng' => 'Afrihili',
+        'NAME_fra' => 'afrihili',
+        'NAME_deu' => 'Afrihili',
+    ],
+    'afr' => [
+        '639-2' => 'afr',
+        '639-1' => 'af',
+        'NAME_eng' => 'Afrikaans',
+        'NAME_fra' => 'afrikaans',
+        'NAME_deu' => 'Afrikaans',
+    ],
+    'ain' => [
+        '639-2' => 'ain',
+        '639-1' => null,
+        'NAME_eng' => 'Ainu',
+        'NAME_fra' => 'aïnou',
+        'NAME_deu' => 'Ainu-Sprache',
+    ],
+    'aka' => [
+        '639-2' => 'aka',
+        '639-1' => 'ak',
+        'NAME_eng' => 'Akan',
+        'NAME_fra' => 'akan',
+        'NAME_deu' => 'Akan-Sprache',
+    ],
+    'akk' => [
+        '639-2' => 'akk',
+        '639-1' => null,
+        'NAME_eng' => 'Akkadian',
+        'NAME_fra' => 'akkadien',
+        'NAME_deu' => 'Akkadisch',
+    ],
+    'sqi' => [
+        '639-2' => 'sqi',
+        '639-1' => 'sq',
+        'NAME_eng' => 'Albanian',
+        'NAME_fra' => 'albanais',
+        'NAME_deu' => 'Albanisch',
+        '639-2-B' => 'alb',
+    ],
+    
+    'deu' => [
+        '639-2' => 'deu',
+        '639-1' => 'de',
+        'NAME_eng' => 'German',
+        'NAME_fra' => 'allemand',
+        'NAME_deu' => 'Deutsch',
+        '639-2-B' => 'ger',
+        '1L' => 'D',
+    ],
+    'eng' => [
+        '639-2' => 'eng',
+        '639-1' => 'en',
+        'NAME_eng' => 'English',
+        'NAME_fra' => 'anglais',
+        'NAME_deu' => 'Englisch',
+        '1L' => 'E',
+    ],
+    'fra' => [
+        '639-2' => 'fra',
+        '639-1' => 'fr',
+        'NAME_eng' => 'French',
+        'NAME_fra' => 'français',
+        'NAME_deu' => 'Französisch',
+        '639-2-B' => 'fre',
+        '1L' => 'F',
+    ],
+    'ita' => [
+        '639-2' => 'ita',
+        '639-1' => 'it',
+        'NAME_eng' => 'Italian',
+        'NAME_fra' => 'italien',
+        'NAME_deu' => 'Italienisch',
+        '1L' => 'I',
+    ],
+    'spa' => [
+        '639-2' => 'spa',
+        '639-1' => 'es',
+        'NAME_eng' => 'Spanish',
+        'NAME_fra' => 'espagnol',
+        'NAME_deu' => 'Spanisch',
+    ],
+    'por' => [
+        '639-2' => 'por',
+        '639-1' => 'pt',
+        'NAME_eng' => 'Portuguese',
+        'NAME_fra' => 'portugais',
+        'NAME_deu' => 'Portugiesisch',
+    ],
+    'roh' => [
+        '639-2' => 'roh',
+        '639-1' => 'rm',
+        'NAME_eng' => 'Romansh',
+        'NAME_fra' => 'romanche',
+        'NAME_deu' => 'Rätoromanisch',
+    ],
+    'dut' => ['639-2' => 'dut', '639-1' => 'nl', 'NAME_eng' => 'Dutch', 'NAME_fra' => 'néerlandais', 'NAME_deu' => 'Niederländisch', 'NAME_deu_alt' => 'Holländisch'],
+    'swe' => ['639-2' => 'swe', '639-1' => 'sv', 'NAME_eng' => 'Swedish', 'NAME_fra' => 'suédois', 'NAME_deu' => 'Schwedisch'],
+    'dan' => ['639-2' => 'dan', '639-1' => 'da', 'NAME_eng' => 'Danish', 'NAME_fra' => 'danois', 'NAME_deu' => 'Dänisch'],
+    'nor' => ['639-2' => 'nor', '639-1' => 'no', 'NAME_eng' => 'Norwegian', 'NAME_fra' => 'norvégien', 'NAME_deu' => 'Norwegisch'],
+];

classes/Core/ErrorHandler/ErrorPageData.php

@@ -20,7 +20,7 @@ final class ErrorPageData implements JsonSerializable
     public function __construct($exception, $title = null)
     {
         $this->exception = $exception;
-        $this->title = !empty($title) ? (string)$title : 'DBXE: Es ist ein unerwarteter Fehler aufgetreten!';
+        $this->title = !empty($title) ? (string)$title : 'OpenXE: Es ist ein unerwarteter Fehler aufgetreten!';
 
     }
 

classes/Modules/Shopware6/Client/Shopware6Client.php

@@ -73,7 +73,7 @@ final class Shopware6Client
 
         $request = new ClientRequest(
             $method,
-            $this->url . $endpoint,
+            $this->url . 'v2/' . $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 := GREATEST(aa.zahlzyklus, CASE
+        @cycles := 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,7 +285,6 @@ 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
@@ -465,7 +464,7 @@ class TicketImportHelper
                 $status = 'neu';
             }
 
-            $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."'";
+            $sql = "UPDATE `ticket` SET `dsgvo` = '".$rule['is_gdpr_relevant']."', `privat` = '".$rule['is_private']."', `prio` = '".$rule['priority']."', `warteschlange` = '".$rule['queue_id']."', `status` = '".$status."' WHERE `id` = '".$ticketId."'";
 
             $this->logger->debug('ticket rule sql',['sql' => $sql]);
 

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()." Trace: ".$e->GetTraceAsString()
+            'Prozessstarter Fehler bei Aufruf des Moduls ' . $task[$task_index]['parameter'] . ': ' . $e->getMessage()
           )
         );
       }

database/struktur.sql

@@ -16729,9 +16729,7 @@ 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
@@ -16751,44 +16749,6 @@ 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);
 
-
-/* DBXE 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);
-/* DBXE 2024-01-24 für datatablelabel */
-
-/* OpenXE 2024-02-03 für belegvorlagen */
-INSERT INTO `hook` (`name`, `aktiv`, `parametercount`, `alias`, `description`) VALUES
-('BelegPositionenButtons', 1, 3, '', ''),
-('AARLGPositionen_cmds_end', 1, 1, '', ''),
-('ajax_filter_hook1', 1, 1, '', '');
-
-INSERT INTO `hook_register` (`hook_action`, `function`, `aktiv`, `position`, `hook`, `module`, `module_parameter`) VALUES
-(0, 'BelegevorlagenAARLGPositionen_cmds_end', 1, 2, (SELECT id FROM hook WHERE name = 'AARLGPositionen_cmds_end' LIMIT 1), 'belegevorlagen', 0),
-(0, 'Belegevorlagenajax_filter_hook1', 1, 2, (SELECT id FROM hook WHERE name = 'ajax_filter_hook1' LIMIT 1), 'belegevorlagen', 0),
-(0, 'BelegevorlagenBelegPositionenButtons', 1, 2, (SELECT id FROM hook WHERE name = 'BelegPositionenButtons' LIMIT 1), 'belegevorlagen', 0)
-;
-/* DBXE 2024-02-03 für belegvorlagen */
-
-/*
-BelegPositionenButtons
-
-Id,Hook_action,Function,Aktiv,Position,Hook,Module,Module_parameter
-20,0,BelegevorlagenBelegPositionenButtons,1,2,16,belegevorlagen,0
-*/
-
 INSERT INTO `hook_menu` (`id`, `module`, `aktiv`) VALUES
 (1, 'artikel', 1),
 (2, 'provisionenartikel', 1),
@@ -18210,7 +18170,7 @@ INSERT INTO `wiedervorlage_stages` (`id`, `kurzbezeichnung`, `name`, `hexcolor`,
 (12, 'Stay', 'Stay (Erhalt)', '#A2D624', 0, 1, 4, 4, NULL),
 (13, 'Okay', 'Okay (Befürwortung)', '#A2D624', 0, 1, 5, 4, NULL);
 INSERT INTO `wiki` (`id`, `name`, `content`, `lastcontent`) VALUES
-(1, 'StartseiteWiki', '\n<p>Herzlich Willkommen in Ihrem DBXE, dem freien ERP.<br><br>Wir freuen uns Sie als Benutzer begrüßen zu dürfen. Mit DBXE organisieren Sie Ihre Firma schnell und einfach. Sie haben alle wichtigen Zahlen und Vorgänge im Überblick.<br><br>Für Einsteiger sind die folgenden Themen wichtig:<br><br></p>\n<ul>\n<li> <a href="index.php?module=firmendaten&amp;action=edit" target="_blank"> Firmendaten</a> (dort richten Sie Ihr Briefpapier ein)</li>\n<li> <a href="index.php?module=adresse&amp;action=list" target="_blank"> Stammdaten / Adressen</a> (Kunden und Lieferanten anlegen)</li>\n<li> <a href="index.php?module=artikel&amp;action=list" target="_blank"> Artikel anlegen</a> (Ihr Artikelstamm)</li>\n<li> <a href="index.php?module=angebot&amp;action=list" target="_blank"> Angebot</a> / <a href="index.php?module=auftrag&amp;action=list" target="_blank"> Auftrag</a> (Alle Dokumente für Ihr Geschäft)</li>\n<li> <a href="index.php?module=rechnung&amp;action=list" target="_blank"> Rechnung</a> / <a href="index.php?module=gutschrift&amp;action=list" target="_blank"> Gutschrift</a></li>\n<li> <a href="index.php?module=lieferschein&amp;action=list" target="_blank"> Lieferschein</a></li>\n</ul>\n<p><br><br>Kennen Sie unsere Zusatzmodule die Struktur und Organisation in das tägliche Geschäft bringen?<br><br></p>\n<ul>\n<li> <a href="index.php?module=kalender&amp;action=list" target="_blank"> Kalender</a></li>\n<li> <a href="index.php?module=wiki&amp;action=list" target="_blank"> Wiki</a></li>\n</ul>', NULL);
+(1, 'StartseiteWiki', '\n<p>Herzlich Willkommen in Ihrem OpenXE, dem freien ERP.<br><br>Wir freuen uns Sie als Benutzer begrüßen zu dürfen. Mit OpenXE organisieren Sie Ihre Firma schnell und einfach. Sie haben alle wichtigen Zahlen und Vorgänge im Überblick.<br><br>Für Einsteiger sind die folgenden Themen wichtig:<br><br></p>\n<ul>\n<li> <a href="index.php?module=firmendaten&amp;action=edit" target="_blank"> Firmendaten</a> (dort richten Sie Ihr Briefpapier ein)</li>\n<li> <a href="index.php?module=adresse&amp;action=list" target="_blank"> Stammdaten / Adressen</a> (Kunden und Lieferanten anlegen)</li>\n<li> <a href="index.php?module=artikel&amp;action=list" target="_blank"> Artikel anlegen</a> (Ihr Artikelstamm)</li>\n<li> <a href="index.php?module=angebot&amp;action=list" target="_blank"> Angebot</a> / <a href="index.php?module=auftrag&amp;action=list" target="_blank"> Auftrag</a> (Alle Dokumente für Ihr Geschäft)</li>\n<li> <a href="index.php?module=rechnung&amp;action=list" target="_blank"> Rechnung</a> / <a href="index.php?module=gutschrift&amp;action=list" target="_blank"> Gutschrift</a></li>\n<li> <a href="index.php?module=lieferschein&amp;action=list" target="_blank"> Lieferschein</a></li>\n</ul>\n<p><br><br>Kennen Sie unsere Zusatzmodule die Struktur und Organisation in das tägliche Geschäft bringen?<br><br></p>\n<ul>\n<li> <a href="index.php?module=kalender&amp;action=list" target="_blank"> Kalender</a></li>\n<li> <a href="index.php?module=wiki&amp;action=list" target="_blank"> Wiki</a></li>\n</ul>', NULL);
 
 
 INSERT INTO `konten` (`id`, `bezeichnung`, `kurzbezeichnung`, `type`, `erstezeile`, `datevkonto`, `blz`, `konto`, `swift`, `iban`, `lastschrift`, `hbci`, `hbcikennung`, `inhaber`, `aktiv`, `keineemail`, `firma`, `schreibbar`, `importletztenzeilenignorieren`, `liveimport`, `liveimport_passwort`, `liveimport_online`, `importtrennzeichen`, `codierung`, `importerstezeilenummer`, `importdatenmaskierung`, `importnullbytes`, `glaeubiger`, `geloescht`, `projekt`, `saldo_summieren`, `saldo_betrag`, `saldo_datum`, `importfelddatum`, `importfelddatumformat`, `importfelddatumformatausgabe`, `importfeldbetrag`, `importfeldbetragformat`, `importfeldbuchungstext`, `importfeldbuchungstextformat`, `importfeldwaehrung`, `importfeldwaehrungformat`, `importfeldhabensollkennung`, `importfeldkennunghaben`, `importfeldkennungsoll`, `importextrahabensoll`, `importfeldhaben`, `importfeldsoll`, `cronjobaktiv`, `cronjobverbuchen`) VALUES

languages/german/tooltip.php

@@ -765,7 +765,6 @@ $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.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)) {

phpwf/plugins/class.stringcleaner.php

@@ -426,12 +426,10 @@
         }
       }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,15 +28,6 @@ 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(){
@@ -736,10 +727,9 @@ 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");
-            //$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");
-            //$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($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");
@@ -2588,19 +2578,11 @@ 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,
+
-                        CONCAT(".$this->app->erp->FormatPreis("ROUND(deckungsbeitrag*100,2)",2).",'%') AS DB,
+               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, ";
-                        ";
+        
-            }             
                
         $sql .= "b.id as id
                  FROM $table b
@@ -2839,94 +2821,22 @@ 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,' *')),
                          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,
+                              p.abkuerzung as projekt, a.nummer as nummer, b.nummer as nummer, DATE_FORMAT(lieferdatum,'%d.%m.%Y') as lieferdatum, trim(b.menge)+0 as menge,  ".$this->FormatPreis($preiscell)." as preis
-                        a.nummer as nummer,
+                              
-                        b.nummer as nummer,
+                              
-                        DATE_FORMAT(lieferdatum,
+                              ,b.waehrung, b.rabatt as rabatt,";
-                        '%d.%m.%Y') as lieferdatum,
-                        trim(b.menge)+0 as menge,
-                        ".$this->FormatPreis($preiscell)." as preis,
-                        b.waehrung,
-                        b.rabatt as rabatt,
-                        '' AS Einkaufspreis,
-                        '' AS DB,
-                        ";
         }
                             $sql .=  "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'";
-      } 
+
-        else if ($module == "verbindlichkeit") // OpenXE
+      } else {
-        {     
-            $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){
@@ -3612,26 +3522,34 @@ class YUI {
   
   function IconsSQLVerbindlichkeit() {
 
-    $go_ware = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/lagergo.png\" style=\"margin-right:1px\" title=\"Wareneingangspr&uuml;fung OK\" border=\"0\">";
+    $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\">";
-    $stop_ware = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/lagerstop.png\" style=\"margin-right:1px\" title=\"Wareneingangspr&uuml;fung fehlt\" 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\">";
-    
+    $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\">";
-    $go_pdf = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/summe_go.png\" style=\"margin-right:1px\" title=\"Anhang 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\">";
-    $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=\"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\">";
     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.bezahlt,'$go_betragbezahlt','$stop_betragbezahlt'),
+    IF( v.betragbezahlt = 0 OR (v.betrag > 0 AND v.betragbezahlt < 0),'$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>')";
   }
   
@@ -3696,121 +3614,6 @@ 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");
@@ -4148,7 +3951,6 @@ 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");
@@ -4157,8 +3959,13 @@ 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'];
+        }
 
-        $objekt = $this->dateien_module_objekt_map($queries['module']);
+        //if(!ctype_alpha($objekt))$objekt="";
 
         if(!preg_match('/[A-Za-z_]/', $objekt)) {
           $objekt='';
@@ -5895,8 +5702,12 @@ 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']))
         {
@@ -5930,7 +5741,7 @@ url:strUrl, success:function(html){strReturn = html;}, async:false
         }
         
         if($versandjoin)$sql .= $versandjoin;
-        */
+        
         
         if($more_data4 || (isset($parameter['ohnerechnung']) && !empty($parameter['ohnerechnung']))) {
 
@@ -6006,21 +5817,6 @@ 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');
 
@@ -12312,6 +12108,9 @@ url:strUrl, success:function(html){strReturn = html;}, async:false
     </tr>
     </tfoot>
     </table></div>
+    <br>
+    <br>
+    <br>
     ');
     
         if((empty($disableautosavefilter)) && $this->anzusersaves < 2) {
@@ -14137,7 +13936,11 @@ 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");
-        $objekt = $this->dateien_module_objekt_map($module);
+        switch($module)
+        {
+          case "adresse": $objekt="adressen"; break;
+          default: $objekt=$module;
+        }
 
         if(!preg_match('/[A-Za-z_]/', $objekt))$objekt="";
         $parameter=$id;
@@ -14166,7 +13969,11 @@ 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");
-        $objekt = $this->dateien_module_objekt_map($module);
+        switch($module)
+        {
+          case "adresse": $objekt="adressen"; break;
+          default: $objekt=$module;
+        }
 
         if(!preg_match('/[A-Za-z_]/', $objekt))$objekt="";
         $parameter=$id;
@@ -14265,7 +14072,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');
-          $objekt = $this->dateien_module_objekt_map($objekt);
+          if($objekt == 'adresse')$objekt = 'adressen';          
           $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 ");         
@@ -14332,7 +14139,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');
-          $objekt = $this->dateien_module_objekt_map($objekt);
+          if($objekt == 'adresse')$objekt = 'adressen';
           $typmodul = $this->app->Secure->GetPOST('typ');
           if($objekt == 'dateien' && $typmodul == 'geschaeftsbrief_vorlagen'){
             $objekt = $typmodul;
@@ -14788,7 +14595,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) {
@@ -14927,6 +14734,8 @@ 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';
@@ -14949,11 +14758,9 @@ 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") {
+        if ($module == "angebot" || $module == "auftrag" || $module == "rechnung" || $module == "gutschrift") $table->headings[7] = 'W&auml;hrung';
-            $table->headings[7] = 'W&auml;hrung';
+        if ($module == "angebot" || $module == "auftrag" || $module == "rechnung" || $module == "gutschrift") $table->headings[8] = 'Rabatt';
-            $table->headings[8] = 'Rabatt';
+        if ($module == "angebot" || $module == "auftrag" || $module == "rechnung" || $module == "gutschrift") $rabattcol = 8;
-            $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 = true;
+              $einkaufspreiseerlaubt = false;
               if($einkaufspreiseerlaubt)
               {
                 $editcols =array(4,5,6,7,8,9);

tools/module_creator/module_creator_php_template.txt

@@ -41,17 +41,9 @@ class PLACEHOLDER_MODULECLASSNAME {
 
                 $defaultorder = 1;
                 $defaultorderdesc = 0;
-                $aligncenter = array();
-                $alignright = array();
-                $numbercols = array();
-                $sumcol = array();
 
 		$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>";
 
                 $sql = "PLACEHOLDER_SQL_LIST";
@@ -101,7 +93,7 @@ class PLACEHOLDER_MODULECLASSNAME {
         $id = $this->app->Secure->GetGET('id');
         
         // Check if other users are editing this id
-        if($this->app->erp->DisableModul('PLACEHOLDER_MODULENAME',$id))
+        if($this->app->erp->DisableModul('artikel',$id))
         {
           return;
         }   
@@ -126,8 +118,6 @@ 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 = "";
@@ -169,12 +159,6 @@ 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
          * 
@@ -182,11 +166,9 @@ class PLACEHOLDER_MODULECLASSNAME {
         $this->app->Tpl->Add('KURZUEBERSCHRIFT2', $email);
         $this->app->Tpl->Add('EMAIL', $email);
         $this->app->Tpl->Add('ANGEZEIGTERNAME', $angezeigtername);         
-
-        $this->app->YUI->AutoComplete("artikel", "artikelnummer");
-
          */
 
+//        $this->SetInput($input);              
         $this->app->Tpl->Parse('PAGE', "PLACEHOLDER_MODULENAME_edit.tpl");
     }
 
@@ -201,4 +183,14 @@ 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/remote.json

@@ -1,4 +1,4 @@
 {
-    "host": "http://repo.dbxe.de/dbxe/dbxe.git",
+    "host": "https://github.com/openxe-org/openxe.git",
     "branch": "master"
 }

upgrade/data/upgrade.php

@@ -113,12 +113,6 @@ 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;
@@ -133,17 +127,7 @@ if (php_sapi_name() == "cli") {
         }
 
         if ($check_git || $check_db || $do_git || $do_db) {
-            upgrade_main(   directory: $directory,
+            upgrade_main($directory,$verbose,$check_git,$do_git,$export_db,$check_db,$do_db,$force,$connection,$origin);
-                            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();
         }
@@ -155,7 +139,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 $strict_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 $do_db, bool $force, bool $connection, bool $origin) {  
   
     $mainfolder = dirname($directory);
     $datafolder = $directory."/data";
@@ -163,7 +147,7 @@ function upgrade_main(string $directory,bool $verbose, bool $check_git, bool $do
     $remote_file_name = $datafolder."/remote.json";
     $schema_file_name = "db_schema.json";
 
-    echo_out("--------------- DBXE upgrade ---------------\n");
+    echo_out("--------------- OpenXE upgrade ---------------\n");
     echo_out("--------------- ".date("Y-m-d H:i:s")." ---------------\n");
 
     //require_once($directory.'/../cronjobs/githash.php');
@@ -395,7 +379,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, $strict_db);
+        $result =  mustal_calculate_db_upgrade($compare_def, $db_def, $upgrade_sql, $mustal_replacers);
 
         if (!empty($result)) {
             abort(count($result)." errors.\n");
@@ -485,8 +469,8 @@ function upgrade_main(string $directory,bool $verbose, bool $check_git, bool $do
 }
 
 function info() {
-    echo_out("DBXE upgrade tool\n");
+    echo_out("OpenXE upgrade tool\n");
-    echo_out("Copyright 2024 (c) DBXE project\n");
+    echo_out("Copyright 2022 (c) OpenXE project\n");
     echo_out("\n");
     echo_out("Upgrade files and database\n");
     echo_out("Options:\n");
@@ -498,7 +482,6 @@ 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, bool $strict) : int
+function mustal_calculate_db_upgrade(array $compare_def, array $db_def, array &$upgrade_sql) : int
 Generate the SQL needed to upgrade the database to match the definition, based on a comparison.
 
 Data structure in Array and JSON
@@ -542,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, bool $strict) : array {
+function mustal_calculate_db_upgrade(array $compare_def, array $db_def, array &$upgrade_sql, array $replacers) : array {
 
     $result = array();
     $upgrade_sql = array();    
@@ -752,10 +752,8 @@ 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';");
+
-        if (!$strict) {
+        array_unshift($upgrade_sql,"SET SQL_MODE='ALLOW_INVALID_DATES';","SET SESSION innodb_strict_mode=OFF;");
-            array_unshift($upgrade_sql,"SET SESSION innodb_strict_mode=OFF;");
-        }
     }
 
     return($result);

version.php

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

www/eproosystem.php

@@ -589,7 +589,7 @@ class erpooSystem extends Application
 
       $version = '';
       if(isset($version_revision) && $version_revision != '') {
-        $version .= '<div class="sidebar-software-version">DBXE V.'. $version_revision .'</div>';
+        $version .= '<div class="sidebar-software-version">OpenXE V.'. $version_revision .'</div>';
       }
 
       if($userId = $this->User->GetID()){
@@ -1133,7 +1133,7 @@ if (typeof document.hidden !== \"undefined\") { // Opera 12.10 and Firefox 18 an
 
     $this->Tpl->SetText('MODUL',ucfirst($module));
 
-    $this->Tpl->Set('HTMLTITLE','{|[MODUL]|} | DBXE ');
+    $this->Tpl->Set('HTMLTITLE','{|[MODUL]|} | OpenXE ');
 
 
     switch($module)
@@ -1699,6 +1699,7 @@ 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 (
@@ -1707,7 +1708,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 <> ''
+              INNER JOIN lieferschein l ON lp.lieferschein = l.id WHERE s.seriennummer <> '' AND l.id NOT IN (SELECT lieferscheinid FROM retoure LIMIT 1)
               GROUP BY s.seriennummer, lp.artikel 
 
 

www/lib/class.remote.php

@@ -1586,20 +1586,14 @@ 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') 
-            GROUP BY ca.artikel, ca.art";
+            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");
-        $gegenseitigzugewiesen = $this->app->DB->SelectArr($sql);
-
         if (!empty($gegenseitigzugewiesen)) {
           foreach ($gegenseitigzugewiesen as $gegenseitigzugewiesenercrosssellingartikel) {
             $data[$i]['crosssellingartikel'][] = $gegenseitigzugewiesenercrosssellingartikel;

www/lib/class.versanddienstleister.php

@@ -76,7 +76,6 @@ 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']);
@@ -128,7 +127,7 @@ abstract class Versanddienstleister
       if (!empty($docArr['ihrebestellnummer'])) {
         $orderNumberParts[] = $docArr['ihrebestellnummer'];
       }
-      $orderNumberParts[] = ucfirst($sid)." ".$docArr['belegnr'];
+      $orderNumberParts[] = $docArr['belegnr'];
       $ret['order_number'] = implode(' / ', $orderNumberParts);
     }
 
@@ -370,7 +369,7 @@ abstract class Versanddienstleister
     return true;
   }
 
-  public function Paketmarke(string $target, string $docType, int $docId, $versandpaket = null): void
+  public function Paketmarke(string $target, string $docType, int $docId): void
   {
     $address = $this->GetAdressdaten($docId, $docType);
     if (isset($_SERVER['CONTENT_TYPE']) && ($_SERVER['CONTENT_TYPE'] === 'application/json')) {
@@ -379,61 +378,21 @@ abstract class Versanddienstleister
       if ($json->submit == 'print') {
         $result = $this->CreateShipment($json, $address);
         if ($result->Success) {
-            if (empty($versandpaket)) {
+          $sql = "INSERT INTO versand 
-                $sql = "INSERT INTO versandpakete 
+          (adresse, lieferschein, versandunternehmen, gewicht, tracking, tracking_link, anzahlpakete) 
-                      (
-                        lieferschein_ohne_pos,
-                        gewicht,
-                        tracking,
-                        tracking_link,
-                        status,
-                        versandart,
-                        versender
-                      ) 
           VALUES 
-                      (
+          ({$address['addressId']}, {$address['lieferscheinId']}, '$this->type',
-                        {$address['lieferscheinId']},
+           '$json->weight', '$result->TrackingNumber', '$result->TrackingUrl', 1)";
-                        '$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 = join('_', [$this->type, 'Label', $result->TrackingNumber]) . '.pdf';
+          $filename = $this->app->erp->GetTMP() . join('_', [$this->type, 'Label', $result->TrackingNumber]) . '.pdf';
-            $filefullpath = $this->app->erp->GetTMP() . $filename;
+          file_put_contents($filename, $result->Label);
-            file_put_contents($filefullpath, $result->Label);
+          $this->app->printer->Drucken($this->labelPrinterId, $filename);
-            $this->app->erp->CreateDateiWithStichwort(
-                $filename,
-                'Paketmarke '.$this->type.' '.$result->TrackingNumber,
-                'Paketmarke Versandpaket Nr. '.$versandpaket,
-                '',
-                $filefullpath,
-                $this->app->User->GetName(),
-                'paketmarke',
-                'versandpaket',
-                $versandpaket
-            );
-
-            $this->app->printer->Drucken($this->labelPrinterId, $filefullpath);
 
           if (isset($result->ExportDocuments)) {
-                $filefullpath = $this->app->erp->GetTMP() . join('_', [$this->type, 'ExportDoc', $result->TrackingNumber]) . '.pdf';
+            $filename = $this->app->erp->GetTMP() . join('_', [$this->type, 'ExportDoc', $result->TrackingNumber]) . '.pdf';
-                file_put_contents($filefullpath, $result->ExportDocuments);
+            file_put_contents($filename, $result->ExportDocuments);
-                $this->app->printer->Drucken($this->documentPrinterId, $filefullpath);
+            $this->app->printer->Drucken($this->documentPrinterId, $filename);
           }
           $ret['messages'][] = ['class' => 'info', 'text' => "Paketmarke wurde erfolgreich erstellt: $result->TrackingNumber"];
         } else {
@@ -451,12 +410,7 @@ 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");
-    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.angebot.php

@@ -41,15 +41,8 @@ class AngebotPDF extends BriefpapierCustom {
     {
       // pruefe ob es mehr als ein steuersatz gibt // wenn ja dann darf man sie nicht ausblenden
       $check = $this->app->erp->SteuerAusBeleg($this->doctype,$id);
-
+      if(!empty($check)?count($check):0>1)$this->ust_spalteausblende=false;  
-      $this->ust_spalteausblende=false;  
+      else $this->ust_spalteausblende=true;
-
-      if(!empty($check)) {
-        if (count($check) == 1) {    
-          $this->ust_spalteausblende=true;      
-        }
-      }
-
     }
  
     $briefpapier_bearbeiter_ausblenden = $this->app->erp->Firmendaten('briefpapier_bearbeiter_ausblenden');
@@ -498,29 +491,30 @@ class AngebotPDF extends BriefpapierCustom {
             "rabatt"=>$value['rabatt'],
             "steuertext"=>$value['steuertext']));
       if($positionenkaufmaenischrunden == 3){
-        if (!$value['nicht_einrechnen']) {        
         $netto_gesamt = $value['menge'] * round($value['preis'] - ($value['preis'] / 100 * $value['rabatt']),2);
-        }
+      }else{
-      }else if (!$value['nicht_einrechnen']) {
         $netto_gesamt = $value['menge'] * ($value['preis'] - ($value['preis'] / 100 * $value['rabatt']));
       }
       if($positionenkaufmaenischrunden)
       {
         $netto_gesamt = round($netto_gesamt, 2);
       }
-      if(!isset($summen[$value['steuersatz']])) {            
-        $summen[$value['steuersatz']] = 0;
-      }
       if($value['optional']!="1"){
         if($value['explodiert_parent'] == 0 || !$berechnen_aus_teile)
         {
-          $summen[$value['steuersatz']] += ($netto_gesamt/100)*$value['steuersatz'];
           $summe = $summe + $netto_gesamt;
+          if(!isset($summen[$value['steuersatz']]))$summen[$value['steuersatz']] = 0;
+          $summen[$value['steuersatz']] += ($netto_gesamt/100)*$value['steuersatz'];
           $gesamtsteuern +=($netto_gesamt/100)*$value['steuersatz'];
         }
-      } else {
+        /*
-        $summe_netto_optional += $netto_gesamt;
+        if($value['umsatzsteuer']=="" || $value['umsatzsteuer']=="normal")
-        $steuern_optional +=($netto_gesamt/100)*$value['steuersatz'];
+        {
+          $summeV = $summeV + (($netto_gesamt/100)*$this->app->erp->GetSteuersatzNormal(false,$id,"angebot"));
+        }
+        else {
+          $summeR = $summeR + (($netto_gesamt/100)*$this->app->erp->GetSteuersatzErmaessigt(false,$id,"angebot"));
+        }*/
       }
     }
     
@@ -542,7 +536,7 @@ class AngebotPDF extends BriefpapierCustom {
 
     if($this->app->erp->AngebotMitUmsatzeuer($id))
     {
-      $this->setTotals(array("totalArticles"=>$summe,"total"=>$summe + $gesamtsteuern,"summen"=>$summen,"totalTaxV"=>0,"totalTaxR"=>0,"optional"=>$summe_netto_optional+$steuern_optional,"optional_netto"=>$summe_netto_optional));
+      $this->setTotals(array("totalArticles"=>$summe,"total"=>$summe + $gesamtsteuern,"summen"=>$summen,"totalTaxV"=>0,"totalTaxR"=>0));
       //$this->setTotals(array("totalArticles"=>$summe,"totalTaxV"=>$summeV,"totalTaxR"=>$summeR,"total"=>$summe+$summeV+$summeR));
     } else {
       $this->setTotals(array("totalArticles"=>$summe,"total"=>$summe));

www/lib/dokumente/class.auftrag.php

@@ -43,13 +43,8 @@ class AuftragPDF extends BriefpapierCustom {
     { 
       // pruefe ob es mehr als ein steuersatz gibt // wenn ja dann darf man sie nicht ausblenden
       $check = $this->app->erp->SteuerAusBeleg($this->doctype,$id);
-      $this->ust_spalteausblende=false;  
+      if(!empty($check)?count($check):0>1)$this->ust_spalteausblende=false;
-
+      else $this->ust_spalteausblende=true;
-        if(!empty($check)) {
-          if (count($check) == 1) {    
-            $this->ust_spalteausblende=true;      
-          }
-        }
     }
 
     $briefpapier_bearbeiter_ausblenden = $this->app->erp->Firmendaten('briefpapier_bearbeiter_ausblenden');

www/lib/dokumente/class.bestellung.php

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

www/lib/dokumente/class.briefpapier.php

@@ -658,7 +658,7 @@ class Briefpapier extends SuperFPDF {
 
   public function addItem($rdata){
     // add rabatt
-    if($rdata['price']!='-' && is_numeric($rdata['price'])){
+    if($rdata['price']!='-'){
       if($rdata['rabatt'] == 100){
         $rdata['tprice'] = round($rdata['amount'] * ((double)$rdata['price'] - (double)($rdata['price'] / 100.00 * (double)$rdata['rabatt'])), 13);
       }else{
@@ -1775,12 +1775,7 @@ class Briefpapier extends SuperFPDF {
     $total=$totalFullTax=$totalReducedTax=0;
     $citems = !empty($this->items)?count($this->items):0;
     for($i=0;$i<$citems;$i++) {
-      if (!$this->items[$i]['optional']) {
       $total += $this->items[$i]['tprice'];
-      } else {
-          $totalOptional += $this->items[$i]['tprice'];        
-      }
-
       if($this->items[$i]['tax']=="USTV") {
         $totalFullTax+= $this->items[$i]['tprice']*USTV;
       }
@@ -1788,7 +1783,7 @@ class Briefpapier extends SuperFPDF {
         $totalReducedTax+= $this->items[$i]['tprice']*USTR;
       }
     }
-    return array($total,$totalFullTax,$totalReducedTax,$totalOptional);
+    return array($total,$totalFullTax,$totalReducedTax);
   }
 
   function GetFont()
@@ -2503,6 +2498,7 @@ class Briefpapier extends SuperFPDF {
   }
 
   public function renderItems() {
+
     $this->app->erp->RunHook('briefpapier_renderitems',1, $this);
     //		if($this->bestellungohnepreis) $this->doctype="lieferschein";
     $posWidth     = $this->getStyleElement("breite_position");
@@ -2946,6 +2942,7 @@ class Briefpapier extends SuperFPDF {
           if($this->doctype!=='zahlungsavis')
           {
             if($item['tax']!=='hidden'){
+
               if($anzeigeBelegNettoAdrese){
                 //if(($this->anrede=="firma" || $this->app->erp->AnzeigeBelegNetto($this->anrede,$projekt) || $this->doctype=="bestellung" || $this->getStyleElement("immernettorechnungen",$projekt)=="1")
                 //&& $this->getStyleElement("immerbruttorechnungen",$projekt)!="1")
@@ -3071,18 +3068,16 @@ class Briefpapier extends SuperFPDF {
               //   && $this->getStyleElement("immerbruttorechnungen",$projekt)!="1")
               {
                 if(!$inventurohnepreis){
-//                  $this->Cell_typed($priceWidth,$cellhoehe,$item['ohnepreis']?'':$this->formatMoney((double)$item['tprice']),0,0,'R');
+                  $this->Cell_typed($priceWidth,$cellhoehe,$item['ohnepreis']?'':$this->formatMoney((double)$item['tprice']),0,0,'R');
-                    $price_displayed = $item['ohnepreis']?'':$this->formatMoney((double)$item['tprice']);
                 }
               }
               else{
                 if(!$inventurohnepreis){
-//                  $this->Cell_typed($priceWidth, $cellhoehe, $item['ohnepreis'] ? '' : $this->formatMoney((double)$item['tprice'] * $item['tmptax']), 0, 0, 'R');
+                  $this->Cell_typed($priceWidth, $cellhoehe, $item['ohnepreis'] ? '' : $this->formatMoney((double)$item['tprice'] * $item['tmptax']), 0, 0, 'R');
-                    $price_displayed = $item['ohnepreis'] ? '' : $this->formatMoney((double)$item['tprice'] * $item['tmptax']);
                 }
               }
 
-             // $this->Cell_typed($rabattWidth,$cellhoehe,"",0,0,'R');
+              $this->Cell_typed($rabattWidth,$cellhoehe,"",0,0,'R');
             }
           }
         }
@@ -3112,14 +3107,12 @@ class Briefpapier extends SuperFPDF {
                 //if(($this->anrede=="firma" || $this->app->erp->AnzeigeBelegNetto($this->anrede,$projekt) || $this->doctype=="bestellung" || $this->getStyleElement("immernettorechnungen",$projekt)=="1")
                 //   && $this->getStyleElement("immerbruttorechnungen",$projekt)!="1")
                 if(!$inventurohnepreis){
-//                  $this->Cell_typed($sumWidth, $cellhoehe, $item['ohnepreis'] ? '' : $this->formatMoney((double)$item['tprice']), 0, 0, 'R');
+                  $this->Cell_typed($sumWidth, $cellhoehe, $item['ohnepreis'] ? '' : $this->formatMoney((double)$item['tprice']), 0, 0, 'R');
-                  $price_displayed = $item['ohnepreis'] ? '' : $this->formatMoney((double)$item['tprice']);
                 }
               }
               else{
                 if(!$inventurohnepreis){
-//                  $this->Cell_typed($sumWidth, $cellhoehe, $item['ohnepreis'] ? '' : $this->formatMoney((double)$item['tprice'] * $item['tmptax']), 0, 0, 'R');
+                  $this->Cell_typed($sumWidth, $cellhoehe, $item['ohnepreis'] ? '' : $this->formatMoney((double)$item['tprice'] * $item['tmptax']), 0, 0, 'R');
-                  $price_displayed = $item['ohnepreis'] ? '' : $this->formatMoney((double)$item['tprice'] * $item['tmptax']);
                 }
               }
             }
@@ -3128,29 +3121,18 @@ class Briefpapier extends SuperFPDF {
                 // if(($this->anrede=="firma" || $this->app->erp->AnzeigeBelegNetto($this->anrede,$projekt) || $this->doctype=="bestellung" || $this->getStyleElement("immernettorechnungen",$projekt)=="1")
                 //   && $this->getStyleElement("immerbruttorechnungen",$projekt)!="1")
                 if(!$inventurohnepreis){
-//                  $this->Cell_typed($sumWidth, $cellhoehe, $item['ohnepreis'] ? '' : $this->formatMoney((double)$item['tprice']), 0, 0, 'R');
+                  $this->Cell_typed($sumWidth, $cellhoehe, $item['ohnepreis'] ? '' : $this->formatMoney((double)$item['tprice']), 0, 0, 'R');
-                  $price_displayed = $item['ohnepreis'] ? '' : $this->formatMoney((double)$item['tprice']);
                 }
               }
               else{
                 if(!$inventurohnepreis){
-//                  $this->Cell_typed($sumWidth, $cellhoehe, $item['ohnepreis'] ? '' : $this->formatMoney((double)$item['tprice'] * $item['tmptax']), 0, 0, 'R');
+                  $this->Cell_typed($sumWidth, $cellhoehe, $item['ohnepreis'] ? '' : $this->formatMoney((double)$item['tprice'] * $item['tmptax']), 0, 0, 'R');
-                  $price_displayed = $item['ohnepreis'] ? '' : $this->formatMoney((double)$item['tprice'] * $item['tmptax']);
                 }
               }
             }
           }
         }
 
-        // OpenXE add price here
-        if (!empty($price_displayed)) {
-            if ($item['optional']) {
-                $this->Cell_typed($sumWidth, $cellhoehe, "(".$price_displayed.")", 0, 0, 'R');
-            } else {
-                $this->Cell_typed($sumWidth, $cellhoehe, $price_displayed, 0, 0, 'R');
-            }
-        }
-
       }
       else if(($this->doctype==='lieferschein' || $this->doctype==='preisanfrage') && $this->getStyleElement('artikeleinheit')=='1')
         {
@@ -4339,16 +4321,6 @@ class Briefpapier extends SuperFPDF {
       $this->Line($differenz_wegen_abstand+5, $this->GetY()+1, 210-$this->getStyleElement('abstand_seitenrandrechts'),$this->GetY()+1);
     }
 
-    if(isset($this->totals['optional'])) {
-        $this->SetFont($this->GetFont(),'',$this->getStyleElement('schriftgroesse_gesamt'));
-        $this->Ln(2);
-        $this->Cell_typed($differenz_wegen_abstand,1,'',0);       
-        $this->Cell_typed(30,5,"(".$this->app->erp->Beschriftung('dokument_gesamt_optional'),0,0,'L');
-        $this->Cell_typed(40,5,$this->formatMoney(round($this->totals['optional'],2), 2).' '.$this->waehrung.")",0,0,'R');
-        $this->Ln();
-    }
-
-
     $this->SetY($this->GetY()+10);
   }
 

www/lib/dokumente/class.etiketten.php

@@ -22,7 +22,6 @@ class EtikettenPDF extends SuperFPDF {
   function __construct($app,$projekt="") {
     $this->app=$app;
     $this->page_definded=false;
-    $this->images = array();
   }
 
   function SetXML($xml)

www/lib/dokumente/class.gutschrift.php

@@ -43,13 +43,8 @@ class GutschriftPDF extends BriefpapierCustom {
     { 
       // pruefe ob es mehr als ein steuersatz gibt // wenn ja dann darf man sie nicht ausblenden
       $check = $this->app->erp->SteuerAusBeleg($this->doctype,$id);
-      $this->ust_spalteausblende=false;  
+      if(!empty($check)?count($check):0>1)$this->ust_spalteausblende=false;  
-
+      else $this->ust_spalteausblende=true;
-        if(!empty($check)) {
-          if (count($check) == 1) {    
-            $this->ust_spalteausblende=true;      
-          }
-        }
     }
 
     $briefpapier_bearbeiter_ausblenden = $this->app->erp->Firmendaten('briefpapier_bearbeiter_ausblenden');

www/lib/dokumente/class.rechnung.php

@@ -50,13 +50,8 @@ class RechnungPDF extends BriefpapierCustom {
     { 
       // pruefe ob es mehr als ein steuersatz gibt // wenn ja dann darf man sie nicht ausblenden
       $check = $this->app->erp->SteuerAusBeleg($this->doctype,$id);
-      $this->ust_spalteausblende=false;  
+      if(!empty($check)?count($check):0>1)$this->ust_spalteausblende=false;
-
+      else $this->ust_spalteausblende=true;
-        if(!empty($check)) {
-          if (count($check) == 1) {    
-            $this->ust_spalteausblende=true;      
-          }
-        }
     }
     $lvl = null;
     $briefpapier_bearbeiter_ausblenden = $this->app->erp->Firmendaten('briefpapier_bearbeiter_ausblenden');

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)</b>|}:</td>
+                        <td>{|Gewicht (in kg)|}:</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><i>F&uuml;r Produktwahl Gewicht eingeben!</i>
+                            </select>
                         </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>{|Sonstiges|}</h2>
+                <h2>{|Bestellung|}</h2>
                 <table>
                     <tbody>
                         <tr>
-                            <td>{|Referenzen|}:</td>
+                            <td>{|Bestellnummer|}:</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,7 +38,6 @@ class ObjGenVerbindlichkeit_Position
   private  $preis;
   private  $menge;
   private  $kostenstelle;
-  private  $sachkonto;
 
   public $app;            //application object 
 
@@ -77,13 +76,12 @@ $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}','{$this->sachkonto}')"; 
+      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->app->DB->Insert($sql);
     $this->id = $this->app->DB->GetInsertID();
@@ -115,8 +113,7 @@ $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);
@@ -155,7 +152,6 @@ $result = $result[0];
     $this->preis='';
     $this->menge='';
     $this->kostenstelle='';
-    $this->sachkonto='';
   }
 
   public function Copy()
@@ -238,7 +234,5 @@ $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/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'){
-      $module = strtolower($objekt);
+        $objekt = 'Adressen';
-      $objekt = $this->app->YUI->dateien_module_objekt_map($objekt);   
+      }
 
       $data = $this->app->DB->SelectRow(
         "SELECT d.*, s.subjekt 
@@ -363,6 +363,12 @@ class Ajax {
         LIMIT 1"
       );
 
+
+      $module = strtolower($objekt);
+      if($module === 'adressen'){
+        $module = 'adresse';
+      }
+
       $typen = $this->app->erp->getDateiTypen($module);
       $found = false;
       foreach($typen as $typ) {
@@ -425,10 +431,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 = $this->app->YUI->dateien_module_objekt_map($module);      
+        $objekt = 'Adressen';
-
+      }
       $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)
@@ -648,9 +654,6 @@ 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(
@@ -658,7 +661,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') 
+          WHERE dv.datei = %d AND (ds.objekt like '%s'".($cmd === 'adresse'?" OR ds.objekt like 'Adressen' ":'').") 
           ORDER BY  dv.datei DESC, dv.version DESC 
           LIMIT 1",
           $id, $cmd
@@ -674,7 +677,6 @@ class Ajax {
         echo $str;
         exit;
       }
-
       if(!empty($datei['parameter'])) {
         if($cmd === 'projekt') {
           if(!$this->app->erp->UserProjektRecht($datei['parameter'])) {
@@ -692,7 +694,7 @@ class Ajax {
           $projekt = $this->app->DB->Select(
             sprintf(
               'SELECT `projekt` FROM `%s` WHERE `id` = %d LIMIT 1',
-              $module, $datei[0]['parameter']
+              $cmd, $datei[0]['parameter']
             )
           );
           if(!$this->app->erp->UserProjektRecht($projekt)) {
@@ -709,6 +711,7 @@ class Ajax {
         }
       }
       //Rechte prüfen
+      
       $userdata = isset($this->app->Conf->WFuserdata)
         ?$this->app->Conf->WFuserdata
         :(str_replace('index.php', '', $_SERVER['SCRIPT_FILENAME']).'../userdata');
@@ -746,12 +749,29 @@ class Ajax {
               exit;
             break;
             case 'application/pdf':
-              $str = file_get_contents(dirname(__DIR__) . '/themes/new/images/pdf.png');
+              $str = file_get_contents(dirname(__DIR__) . '/themes/new/images/pdf.svg');
               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;
           }
         }
@@ -1577,17 +1597,11 @@ 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);
-        $sql = "SELECT CONCAT(art.nummer,' ',art.name_de) as name FROM artikel art
+        $arr = $this->app->DB->SelectArr("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 
+        WHERE art.geloescht=0 AND  ($artikel_freitext1_suche) AND art.geloescht=0 AND art.intern_gesperrt!=1 LIMIT 20");
-            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'];
@@ -2362,14 +2376,7 @@ 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");
@@ -2448,7 +2455,6 @@ 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'];
@@ -2473,7 +2479,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(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')) 
+        $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') 
         ".($adresse?" AND adresse = '$adresse' ":'')."   ".$this->app->erp->ProjektRechte('projekt')."
         ORDER by belegnr LIMIT 20");
         $carr = !empty($arr)?count($arr):0;
@@ -2489,7 +2495,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(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') 
+        $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') 
         ".($adresse?" AND adresse = '$adresse' ":'')."  ".$this->app->erp->ProjektRechte('projekt')."
         ORDER by belegnr LIMIT 20" );
         $carr = !empty($arr)?count($arr):0;
@@ -3832,13 +3838,10 @@ select a.kundennummer, (SELECT name FROM adresse a2 WHERE a2.kundennummer = a.ku
           $term = str_replace(',','',$term);
         }
 
-        $adresse = (int)$this->app->Secure->GetGET('adresse');
-        if (!empty($adresse)) {
-            $subwhere .= " AND a.id = ".$adresse;
-        }
-
         $sql =
-          "SELECT CONCAT(v.belegnr,
+          "SELECT CONCAT(v.id,
+          IF(IFNULL(v.belegnr, '') <> '' AND v.belegnr!=v.id,
+          CONCAT(' Nr. ',v.belegnr),''),
           ' Betrag: ',".$this->app->erp->FormatPreis('v.betrag',2).",
           if(v.skonto <> 0,CONCAT(' mit Skonto ',v.skonto,'% ',
           ".$this->app->erp->FormatPreis("v.betrag-((v.betrag/100.0)*v.skonto)",2)."),''),' ',
@@ -3851,7 +3854,7 @@ select a.kundennummer, (SELECT name FROM adresse a2 WHERE a2.kundennummer = a.ku
           a.name,' (Lieferant ',a.lieferantennummer,if(a.lieferantennummer_buchhaltung!='' AND a.lieferantennummer <> a.lieferantennummer_buchhaltung,CONCAT(' ',a.lieferantennummer_buchhaltung),''),') RE ',v.rechnung,' Rechnungsdatum ',DATE_FORMAT(v.rechnungsdatum,'%d.%m.%Y')) as bezeichnung 
           FROM verbindlichkeit AS v 
           LEFT JOIN adresse AS a ON a.id=v.adresse 
-        WHERE ($subwhere) AND bezahlt!=1 AND status!='storniert' AND belegnr <> '' 
+        WHERE ($subwhere) AND bezahlt!=1 AND status!='storniert' 
         ORDER by v.id DESC"; //AND v.status!='bezahlt' // heute wieder raus
 
         $arr = $this->app->DB->SelectArr($sql);

www/pages/angebot.php

@@ -307,52 +307,21 @@ class Angebot extends GenAngebot
   {
     $id = $this->app->Secure->GetGET('id');
     
-    // Deckungsbeitrag
+    if(!$this->app->DB->Select("SELECT deckungsbeitragcalc FROM angebot WHERE  id='$id' LIMIT 1")) {
-    if (!$this->app->erp->RechteVorhanden('angebot','einkaufspreise')) {
+      $this->app->erp->BerechneDeckungsbeitrag($id,'angebot');
-        $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));
+    $auftragArr = $this->app->DB->SelectArr("SELECT * FROM angebot WHERE id='$id' LIMIT 1");
-        $this->app->Tpl->Set('KOSTEN',$this->app->erp->number_format_variable($kosten_gesamt,2));
+    $kundennummer = $this->app->DB->Select("SELECT kundennummer FROM adresse WHERE id='{$auftragArr[0]['adresse']}' LIMIT 1");
-        $this->app->Tpl->Set('DECKUNGSBEITRAG',$this->app->erp->number_format_variable($db_gesamt,2));
+    $projekt = $this->app->DB->Select("SELECT abkuerzung FROM projekt WHERE id='{$auftragArr[0]['projekt']}' LIMIT 1");
-        $this->app->Tpl->Set(   'DBPROZENT',
+    $kundenname = $this->app->DB->Select("SELECT name FROM adresse WHERE id='{$auftragArr[0]['adresse']}' LIMIT 1");
-                                $umsatz_gesamt==0?
-                                "-":
-                                $this->app->erp->number_format_variable(
-                                    round(
-                                        $db_gesamt/$umsatz_gesamt*100,2
-                                    )                                
-                                )."%"
-                            );
-    }
 
 
+    $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>");
     }
@@ -1726,11 +1695,6 @@ 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;
     }
 
-    function fillApiPermissions()
+    private function fillApiPermissions()
     {
       foreach ($this->getGroupedPermissions() as $group => $permissions){
         foreach ($permissions as $permission){

www/pages/api_account.php

@@ -267,12 +267,6 @@ 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

@@ -1800,35 +1800,22 @@ class Artikel extends GenArtikel {
         // SQL statement
 
         if (!empty($this->app->Conf->WFdbType) && $this->app->Conf->WFdbType == 'postgre') {
-          $sql = 'SELECT 
+          $sql = 'SELECT s.id, a.name_de as artikel,a.nummer as nummer, trim(s.menge)+0 as menge, 
-                    s.id,
+                CASE WHEN (SELECT SUM(l.menge) FROM lager_platz_inhalt l WHERE l.artikel=a.id) > 0
-                    a.name_de as artikel,
-                    a.nummer as nummer, 
-                    trim(SUM(s.menge))+0 as menge, 
-                    CASE 
-                        WHEN (SELECT SUM(l.menge) FROM lager_platz_inhalt l WHERE l.artikel=a.id) > 0
                 THEN (SELECT SUM(l.menge) FROM lager_platz_inhalt l WHERE l.artikel=a.id)
                 ELSE 0
-                    END as lager,
+                END  as lager, s.artikel as menu
-                    s.artikel as menu
                 FROM stueckliste s LEFT JOIN artikel a ON s.artikel=a.id ';
         } else {
-          $sql = '  SELECT SQL_CALC_FOUND_ROWS
+          $sql = 'SELECT SQL_CALC_FOUND_ROWS s.id, a.name_de as artikel,a.nummer as nummer, trim(s.menge)+0 as menge,
-                        s.id,
+                s.stuecklistevonartikel
-                        a.name_de as artikel,
+                  as menu
-                        a.nummer as nummer,
+                  FROM stueckliste s LEFT JOIN artikel a ON s.stuecklistevonartikel=a.id ';
-                        trim(SUM(s.menge))+0 as menge,
-                        s.stuecklistevonartikel AS menu
-                    FROM 
-                        stueckliste s 
-                    LEFT JOIN artikel a ON s.stuecklistevonartikel=a.id ';
         }
 
         // Fester filter
         $where = "s.artikel='$id' ";
 
-        $groupby = " GROUP BY a.id";
-
         // gesamt anzahl
         $count = "SELECT COUNT(s.id) FROM stueckliste s WHERE s.stuecklistevonartikel='$id' ";
         break;

www/pages/auftrag.php

@@ -1990,52 +1990,8 @@ 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);
-    // Deckungsbeitrag
+    $this->app->Tpl->Set('DBPROZENT',0);
-    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){
@@ -2314,7 +2270,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),
@@ -2397,39 +2353,6 @@ 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();
@@ -4993,10 +4916,6 @@ 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')){
@@ -5775,14 +5694,9 @@ Die Gesamtsumme stimmt nicht mehr mit urspr&uuml;nglich festgelegten Betrag '.
         }
 
         $this->app->DB->Update("UPDATE lieferschein SET 
-                                    belegnr='$ls_belegnr',  
+            belegnr='$ls_belegnr', status='freigegeben', versand='".$this->app->User->GetDescription()."' 
-                                    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');
 
         if(!($kommissionierverfahren==='lieferscheinlager' ||
@@ -6428,7 +6342,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','Versand&uuml;bergabe');
+    $this->app->erp->MenuEintrag('index.php?module=auftrag&action=versandzentrum','Versandzentrum');
 
     if(strlen($backurl)>5){
       $this->app->erp->MenuEintrag("$backurl", 'Zur&uuml;ck zur &Uuml;bersicht');
@@ -6473,7 +6387,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. <a class="button" href="index.php?module=versandpakete&action=lieferungen">Zum Versand</a></div>');
+    $this->app->Tpl->Add('MESSAGE','<div class="info">Auftr&auml;ge an Versand übergeben mit automatischem Druck und Mailversand.</div>');
 
     $autoshipmentEnabled = true;
     $this->app->erp->RunHook('OrderAutoShipment', 2, $targetMessage, $autoshipmentEnabled);

www/pages/belegevorlagen.php

@@ -1,238 +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 Belegevorlagen 
-{
-  static function TableSearch(&$app, $name, $erlaubtevars)
-  {
-    switch($name)
-    {
-      case "belegevorlagen_list":
-        $heading = array('Bezeichnung','Belegtyp','Projekt','Men&uuml;');
-        $width = array('40%','20%','29%','1%');
-        $findcols = array('b.bezeichnung','b.belegtyp','pr.abkuerzung','b.id');
-        $searchsql = array('b.bezeichnung','b.belegtyp','pr.abkuerzung');
-        $menu = "<table><tr><td nowrap><a href=\"#\" onclick=\"deletevorlage(%value%);\"><img src=\"themes/{$app->Conf->WFconf['defaulttheme']}/images/delete.svg\" border=\"0\"></a></td></tr></table>";      
-        $sql = "SELECT SQL_CALC_FOUND_ROWS b.id, b.bezeichnung,CONCAT(UCASE(LEFT(b.belegtyp, 1)), SUBSTRING(b.belegtyp, 2)), pr.abkuerzung, b.id  FROM belegevorlagen b LEFT JOIN projekt pr ON b.projekt = pr.id";
-        $where = $app->erp->ProjektRechte('b.projekt');      
-      break;
-      case "belegevorlagen_list2":
-        $belegtyp = $app->Secure->GetGET('smodule');
-        $heading = array('Bezeichnung','Projekt','Men&uuml;');
-        $width = array('50%','49%','1%');
-        $findcols = array('b.bezeichnung','pr.abkuerzung','b.id');
-        $searchsql = array('b.bezeichnung','pr.abkuerzung');
-        $menu = "<table><tr><td nowrap><a href=\"#\" onclick=\"loadbelegvorlage(%value%);\"><img src=\"themes/{$app->Conf->WFconf['defaulttheme']}/images/forward.svg\" border=\"0\"></a>&nbsp;<a href=\"#\" onclick=\"deletevorlage(%value%);\"><img src=\"themes/{$app->Conf->WFconf['defaulttheme']}/images/delete.svg\" border=\"0\"></a></td></tr></table>";      
-        $sql = "SELECT SQL_CALC_FOUND_ROWS b.id, b.bezeichnung, pr.abkuerzung, b.id  FROM belegevorlagen b LEFT JOIN projekt pr ON b.projekt = pr.id";
-        $where = "belegtyp = '$belegtyp' ".$app->erp->ProjektRechte('b.projekt');
-      break;
-    }
-    
-    $erg = false;
-    foreach($erlaubtevars as $k => $v)
-    {
-      if(isset($$v))$erg[$v] = $$v;
-    }
-    return $erg; 
-  }
-  function __construct(&$app, $intern = false)
-  {
-    $this->app=&$app;
-    $this->artikel = $this->app->erp->GetKonfiguration('gesamtrabatt_artikel');
-    if($intern)return;
-    $this->app->ActionHandlerInit($this);
-    $this->app->ActionHandler("list","BelegevorlagenList");
-    $this->app->ActionHandler("einstellungen","BelegevorlagenEinstellungen");
-    $this->app->DefaultActionHandler("list");
-    $this->app->ActionHandlerListen($app);
-  }
-  
-  function BelegevorlagenMenu(){
-    $this->app->erp->MenuEintrag("index.php?module=belegevorlagen&action=list","&Uuml;bersicht");
-    $this->app->erp->MenuEintrag("index.php?module=belegevorlagen&action=einstellungen","Einstellungen");
-    
-  }
-
-  function BelegevorlagenList()
-  {
-    if($this->app->Secure->GetGET('cmd') == 'delvorlage')
-    {
-      $id = (int)$this->app->Secure->GetPOST('lid');
-      $this->app->DB->Delete("DELETE FROM belegevorlagen WHERE id = '$id' LIMIT 1");
-      echo json_encode(array('status'=>1));
-      exit;
-    }
-    $this->BelegevorlagenMenu();
-    $this->app->YUI->TableSearch('TAB1', "belegevorlagen_list", "show","","",basename(__FILE__), __CLASS__);
-    $this->app->Tpl->Parse('PAGE','belegevorlagen_list.tpl');
-  }
-  
-  function BelegevorlagenEinstellungen()
-  {
-    $this->BelegevorlagenMenu();
-
-    $this->app->Tpl->Set('PREISEAKTUALISIEREN',$this->app->erp->GetKonfiguration('belegevorlagen_preiseaktualisieren')=='on'?'checked':'');
-    $this->app->YUI->AutoSaveKonfiguration('preiseaktualisieren','belegevorlagen_preiseaktualisieren');
-      
-    $this->app->Tpl->Parse('PAGE','belegevorlagen_einstellungen.tpl');
-  }
-
-  function Install()
-  {
-    $this->app->erp->CheckTable('belegevorlagen');
-    $this->app->erp->CheckColumn("id","int(11)","belegevorlagen","DEFAULT '0' NOT NULL AUTO_INCREMENT");
-    $this->app->erp->CheckColumn("belegtyp", "varchar(255)", "belegevorlagen", "DEFAULT '' NOT NULL");
-    $this->app->erp->CheckColumn("bezeichnung", "varchar(255)", "belegevorlagen", "DEFAULT '' NOT NULL");
-    $this->app->erp->CheckColumn("projekt", "int(11)", "belegevorlagen", "DEFAULT '0' NOT NULL");
-    $this->app->erp->CheckColumn("json", "MEDIUMTEXT", "belegevorlagen", "DEFAULT '' NOT NULL");
-    $this->app->erp->CheckColumn("bearbeiter", "varchar(255)", "belegevorlagen", "DEFAULT '' NOT NULL");
-    $this->app->erp->CheckColumn("zeitstempel", "timestamp", "belegevorlagen","DEFAULT CURRENT_TIMESTAMP NOT NULL");
-    
-    $this->app->erp->RegisterHook('BelegPositionenButtons', 'belegevorlagen', 'BelegevorlagenBelegPositionenButtons');
-    $this->app->erp->RegisterHook('AARLGPositionen_cmds_end', 'belegevorlagen', 'BelegevorlagenAARLGPositionen_cmds_end');
-    $this->app->erp->RegisterHook('ajax_filter_hook1', 'belegevorlagen', 'Belegevorlagenajax_filter_hook1');
-  }
-  
-  function Belegevorlagenajax_filter_hook1($filtername,&$newarr, $term, $term2, $term3)
-  {
-    if($filtername == 'belegvorlagen')
-    {
-      $arr = $this->app->DB->SelectArr("SELECT CONCAT(b.id,' ',b.bezeichnung) as bezeichnung FROM belegevorlagen  b
-         WHERE (b.bezeichnung LIKE '%$term%')  ".$this->app->erp->ProjektRechte('b.projekt'));
-      if($arr)
-      {
-        for($i=0;$i<count($arr);$i++)
-          $newarr[] = $arr[$i]['bezeichnung'];
-      }
-    }
-  }
-  
-  function BelegevorlagenBelegPositionenButtons($target, $module, $id)
-  {
-    if($module=="angebot" || $module=="auftrag" || $module=="rechnung" || $module=="lieferschein" || $module=="gutschrift" || $module=="proformarechnung")
-    {
-      $this->app->Tpl->Set('ID', $id);
-      $this->app->Tpl->Set('MODULE', $module);
-      $this->app->YUI->AutoComplete('bestehendevorlage','belegvorlagen');
-      $this->app->YUI->TableSearch('BELEGEVORLAGENTABELLE', "belegevorlagen_list2", "show","","",basename(__FILE__), __CLASS__);
-      $this->app->Tpl->Add($target, "<input type=\"button\" id=\"belegevorlagen\" value=\"Belegevorlagen\">&nbsp;".$this->app->Tpl->Parse($target,'belegevorlagen_widget.tpl'));
-    }
-  }
-  
-  function BelegevorlagenAARLGPositionen_cmds_end($id){
-    $module = $this->app->Secure->GetGET('module');
-    if(!$module)return;
-
-    $projekt = $this->app->DB->Select("SELECT projekt FROM $module WHERE id='$id' LIMIT 1");
-    if($projekt <=0) $projekt=0;
-
-    if($this->app->Secure->GetGET('cmd') == 'deletebelegvorlage')
-    {
-      $status = 1;
-      $lid = (int)$this->app->Secure->GetPOST('lid');
-      $this->app->DB->Delete("DELETE FROM belegevorlagen WHERE id = '$lid' AND belegtyp = '$module' LIMIT 1");
-      echo json_encode(array('status'=>$status));
-      exit;
-    }
-    
-    if($this->app->Secure->GetGET('cmd') == 'loadbelegvorlage')
-    {
-      $status = 0;
-      $lid = (int)$this->app->Secure->GetPOST('lid');
-      $json = (String)$this->app->DB->Select("SELECT json FROM belegevorlagen WHERE id = '$lid' AND belegtyp = '$module' LIMIT 1");
-      if($json !== '')
-      {
-        $json = json_decode($json, true);
-        $maxsort = (int)$this->app->DB->Select("SELECT max(sort) FROM $module"."_position WHERE $module = '$id' LIMIT 1");
-        if(isset($json['positionen']))
-        {
-          foreach($json['positionen'] as $v)
-          {
-            $v[$module] = $id;
-            if($this->app->erp->GetKonfiguration('belegevorlagen_preiseaktualisieren')=='on'){
-              if($v['artikel'] != '0'){
-                $v['preis'] = $this->app->erp->GetVerkaufspreis($v['artikel'],$v['menge']);
-              }
-            }
-            $v['sort'] += $maxsort;
-            $this->app->DB->Insert("INSERT INTO $module"."_position (id) VALUES ('')");
-            $idnew = $this->app->DB->GetInsertID();
-            $oldtonew[$v['id']] = $idnew;
-            if($v['explodiert_parent'] && isset($oldtonew) && isset($oldtonew[$v['explodiert_parent']]))$v['explodiert_parent'] = $oldtonew[$v['explodiert_parent']];
-            unset($v['id']);
-            $this->app->DB->UpdateArr($module.'_position',$idnew,"id",$v, true);
-            if(is_null($v['steuersatz']))$this->app->DB->Update("UPDATE ".$module."_position SET steuersatz = NULL WHERE id = '$idnew' LIMIT 1");
-          }
-        }
-        if(isset($json['zwischenpositionen']))
-        {
-          $maxpos = $this->app->DB->SelectArr("SELECT id,sort FROM beleg_zwischenpositionen WHERE doctype = '$module' AND doctypeid = '$id' AND pos='$maxsort' ORDER BY sort DESC LIMIT 1");
-          if($maxpos)
-          {
-            $sortoffset = 1 + $maxpos[0]['sort'];
-          }else{
-            $sortoffset = 0;
-          }
-          foreach($json['zwischenpositionen'] as $v)
-          {
-            if($v['pos'] == 0)$v['sort'] += $sortoffset;
-            $v['doctypeid'] = $id;
-            $v['pos'] += $maxsort;
-            unset($v['id']);
-            $this->app->DB->Insert("INSERT INTO beleg_zwischenpositionen (id) VALUES ('')");
-            $idnew = $this->app->DB->GetInsertID();
-            $this->app->DB->UpdateArr('beleg_zwischenpositionen',$idnew,"id",$v, true);
-          }
-        }
-        $status = 1;
-        $this->app->erp->ANABREGSNeuberechnen($id,$module);
-      }
-      echo json_encode(array('status'=>$status));
-      exit;
-    }
-    if($this->app->Secure->GetGET('cmd') == 'savebelegevorlage')
-    {
-      $json = null;
-      $status = 0;
-      $bestehendevorlage = (int)reset(explode(' ',$this->app->Secure->GetPOST('bestehendevorlage')));
-      $bezeichnung = (String)$this->app->Secure->GetPOST('bezeichnung');
-      $vorlagetyp = $this->app->Secure->GetPOST('vorlagetyp');
-      $bearbeiter = $this->app->DB->real_escape_string($this->app->User->GetName());
-      $lid = null;
-      if($vorlagetyp == 'neu')
-      {
-        if($bezeichnung !== '')
-        {
-          $this->app->DB->Insert("INSERT INTO belegevorlagen (bezeichnung, belegtyp, bearbeiter, zeitstempel,projekt) VALUES ('$bezeichnung','$module','$bearbeiter',now(),'$projekt')");
-          $lid = $this->app->DB->GetInsertID();
-        }
-      }else{
-        $lid = $this->app->DB->Select("SELECT id FROM belegevorlagen WHERE id = '$bestehendevorlage' LIMIT 1");
-        if($lid && $bezeichnung !== '')$this->app->DB->Update("UPDATE belegevorlagen set bezeichnung = '$bezeichnung' WHERE id = '$bestehendevorlage' LIMIT 1");
-      }
-      if($lid)
-      {
-        $json['positionen'] = $this->app->DB->SelectArr("SELECT * FROM $module"."_position WHERE $module = '$id' ORDER BY sort");
-        $json['zwischenpositionen'] = $this->app->DB->SelectArr("SELECT * FROM beleg_zwischenpositionen WHERE doctype = '$module' AND doctypeid = '$id' ORDER BY pos, sort");
-        $json = $this->app->DB->real_escape_string(json_encode($json));
-        $this->app->DB->Update("UPDATE belegevorlagen set json = '$json', zeitstempel = now(), bearbeiter = '$bearbeiter' WHERE id = '$lid' LIMIT 1");
-        $status = 1;
-      }
-      echo json_encode(array('status'=>$status));
-      exit;
-    }
-  }
-}
-?>

www/pages/content/angebot_minidetail.tpl

@@ -45,25 +45,7 @@
 </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>
@@ -77,6 +59,12 @@
   [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">{|Pakete|}:</td><td class="auftraginfo_cell" >[TRACKING]</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>
 </table>
 
 <table width="100%">
@@ -48,14 +48,19 @@
   <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>
@@ -64,55 +69,63 @@
 <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]>
+<!--    
-    <h2 class="greyh2">{|Deckungsbeitrag (netto)|}</h2>
+<div style="background-color:white;">
-    <table width="100%">
+<h2 class="greyh2">Lieferkette</h2>
-        <tbody>
+<div style="padding:10px">
-            <tr>
+<table class="mkTable">
-                <td>Umsatz EUR</td>
+<tr><th>Art</th><th>Beleg</th><th>Datum</th><th>Lieferant</th><th>Status</th></tr>
-                <td>Kosten 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>Deckungsbeitrag 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>DB %</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>
-            </tr>
+<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>
-              <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>
 <div style="padding:10px">
   [RMA]
 </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/belegevorlagen_einstellungen.tpl

@@ -1,20 +0,0 @@
-<div id="tabs">
-    <ul>
-        <li><a href="#tabs-1"><!--[TABTEXT]--></a></li>
-    </ul>
-<!-- ende gehort zu tabview -->
-
-<!-- erstes tab -->
-<div id="tabs-1">
-[MESSAGE]
-<fieldset>
-	<legend>Einstellungen</legend>	
-	<input type="checkbox" name="preiseaktualisieren" id="preiseaktualisieren" [PREISEAKTUALISIEREN] /> <label for="preiseaktualisieren">Aktuelle Artikelpreise verwenden wenn Belegvorlage geladen wird.</label>
-</fieldset>
-
-[TAB1]
-[TAB1NEXT]
-</div>
-
-<!-- tab view schließen -->
-</div>

www/pages/content/belegevorlagen_list.tpl

@@ -1,38 +0,0 @@
-<div id="tabs">
-    <ul>
-        <li><a href="#tabs-1"><!--[TABTEXT]--></a></li>
-    </ul>
-<!-- ende gehort zu tabview -->
-
-<!-- erstes tab -->
-<div id="tabs-1">
-[MESSAGE]
-[TAB1]
-[TAB1NEXT]
-</div>
-
-<!-- tab view schließen -->
-</div>
-
-<script type="text/javascript">
-  function deletevorlage(belegid)
-  {
-    if(confirm('Vorlage wirklich löschen?'))
-    {
-      $('#belegevorlagendiv').dialog('close');
-      $.ajax({
-        url: 'index.php?module=belegevorlagen&action=list&cmd=delvorlage',
-        type: 'POST',
-        dataType: 'json',
-        data: {lid:belegid},
-        success: function(data) {
-          var oTable = $('#belegevorlagen_list').DataTable( );
-          oTable.ajax.reload();
-        },
-        beforeSend: function() {
-
-        }
-      });
-    }
-  }
-</script>

www/pages/content/emailbackup_edit.tpl

@@ -1,8 +1,6 @@
 <div id="tabs">
     <ul>
-		<li>
+        <li><a href="#tabs-1"></a></li>
-			<a href="#tabs-1"></a>
-		</li>
     </ul>
     <!-- Example for multiple tabs
     <ul hidden">
@@ -10,46 +8,22 @@
         <li><a href="#tabs-2">Second Tab</a></li>
     </ul>
     -->
-	<div id="tabs-1"> [MESSAGE]
+    <div id="tabs-1">
-		<form action="" method="post"> [FORMHANDLEREVENT]
+        [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>{|Allgemein|}</legend>
-								<input type="submit" name="submit" value="Speichern" style="float:right" />
                         <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>
-									<tr>
-										<td>{|Angezeigter Name|}:</td>
-										<td>
-											<input type="text" name="angezeigtername" value="[ANGEZEIGTERNAME]" size="40">
-										</td>
-									</tr>
-									<tr>
-										<td>{|Interne Beschreibung|}:</td>
-										<td>
-											<input type="text" name="internebeschreibung" value="[INTERNEBESCHREIBUNG]" size="40">
-										</td>
-									</tr>
-									<tr>
-										<td>{|Benutzername|}:</td>
-										<td>
-											<input type="text" name="benutzername" value="[BENUTZERNAME]" size="40">
-										</td>
-									</tr>
-									<tr>
-										<td>{|Passwort|}:</td>
-										<td>
-											<input type="password" name="passwort" value="[PASSWORT]" size="40">
-										</td>
-									</tr>
                         </table>
                       </fieldset>            
                     </div>
@@ -63,64 +37,19 @@
 	        				<fieldset>
                             <legend>{|SMTP|}</legend>
                             <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 width="200">{|SMTP benutzen|}:</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="checkbox" name="smtp_extra" value="1" [SMTP_EXTRA]>
+<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>{|Server|}:</td>
+<tr><td>{|Loglevel|}:</td><td><input type="text" name="smtp_loglevel" value="[SMTP_LOGLEVEL]" size="40"></td></tr>
-										<td>
+
-											<input type="text" name="smtp" value="[SMTP]" size="40">
+<tr><td width="50">Testmail:</td><td>
-										</td>
-									</tr>
-									<tr>
-										<td>{|Verschl&uuml;sselung|}:</td>
-										<td>
-											<select name="smtp_ssl">
-											    [SMTP_SSL_SELECT]
-                                            </select>
-                                        </td>
-									</tr>
-									<tr>
-										<td>{|Port|}:</td>
-										<td>
-											<input type="text" name="smtp_port" value="[SMTP_PORT]" size="40">
-										</td>
-									</tr>
-									<tr>
-										<td>{|Authtype|}:</td>
-										<td>
-                                            <select name="smtp_authtype">
-											    [SMTP_AUTHTYPE_SELECT]
-                                            </select>
-                                        </td>
-									</tr>
-									<tr>
-										<td>{|Authparam|}:</td>
-										<td>
-											<input type="text" name="smtp_authparam" value="[SMTP_AUTHPARAM]" size="40">
-										</td>
-									</tr>
-									<tr>
-										<td>{|Client alias|}:</td>
-										<td>
-											<input type="text" name="client_alias" value="[CLIENT_ALIAS]" size="40">
-										</td>
-									</tr>
-									<tr>
-										<td>{|SMTP Debug|}:</td>
-										<td>
-											<input type="checkbox" name="smtp_loglevel" value="1" [SMTP_LOGLEVEL]>
-										</td>
-									</tr>
-									<tr>
-										<td width="50">Testmail:</td>
-										<td>
         <input type="submit" form="smtp_test" value="Testmail senden" id="testmail-senden-button">&nbsp;<i>Bitte erst speichern und dann senden!</i>
-                                        </td>
+</td></tr>              
-									</tr>
+
                             </table>
                           </fieldset>            
                         </div>
@@ -134,44 +63,14 @@
 	        				<fieldset>
                             <legend>{|IMAP|}</legend>
                             <table width="100%" border="0" class="mkTableFormular">
-									<tr>
+<tr><td>{|IMAP server|}:</td><td><input type="text" name="server" value="[SERVER]" size="40"></td></tr>
-										<td width="200">{|IMAP server|}:</td>
+<tr><td>{|imap_sentfolder_aktiv|}:</td><td><input type="text" name="imap_sentfolder_aktiv" value="[IMAP_SENTFOLDER_AKTIV]" size="40"></td></tr>
-										<td>
+<tr><td>{|imap_sentfolder|}:</td><td><input type="text" name="imap_sentfolder" value="[IMAP_SENTFOLDER]" size="40"></td></tr>
-											<input type="text" name="server" value="[SERVER]" size="40">
+<tr><td>{|imap_port|}:</td><td><input type="text" name="imap_port" value="[IMAP_PORT]" size="40"></td></tr>
-										</td>
+<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>
-									<tr>
-										<td>{|Gesendete Mails in IMAP-Ordner legen|}:</td>
-										<td>
-											<input type="checkbox" name="imap_sentfolder_aktiv" value="1" [IMAP_SENTFOLDER_AKTIV]>
-										</td>
-									</tr>
-									<tr>
-										<td>{|IMAP-Ordner|}:</td>
-										<td>
-											<input type="text" name="imap_sentfolder" value="[IMAP_SENTFOLDER]" size="40">
-										</td>
-									</tr>
-									<tr>
-										<td>{|IMAP-Port|}:</td>
-										<td>
-											<input type="text" name="imap_port" value="[IMAP_PORT]" size="40">
-										</td>
-									</tr>
-									<tr>
-										<td>{|IMAP-Typ|}:</td>
-										<td>
-                                            <select name="imap_type">
-                                                [IMAP_TYPE_SELECT]
-                                            </select>
-                                        </td>
-									</tr>
-									<tr>
-										<td width="50">Testmail:</td>
-										<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>
-									</tr>
 </table>
                       </fieldset>            
                     </div>
@@ -185,18 +84,8 @@
 	        				<fieldset>
                             <legend>{|Archiv|}</legend>
                             <table width="100%" border="0" class="mkTableFormular">
-									<tr>
+<tr><td>{|E-Mailarchiv aktiv|}:</td><td><input type="text" name="emailbackup" value="[EMAILBACKUP]" size="40"></td></tr>
-										<td width="200">{|E-Mailarchiv aktiv|}:</td>
+<tr><td>{|Löschen nach wievielen Tagen?|}:</td><td><input type="text" name="loeschtage" value="[LOESCHTAGE]" size="40"></td></tr>
-										<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>
@@ -210,48 +99,13 @@
 	        				<fieldset>
                             <legend>{|Ticketsystem|}</legend>
                             <table width="100%" border="0" class="mkTableFormular">
-									<tr>
+<tr><td>{|ticket|}:</td><td><input type="text" name="ticket" value="[TICKET]" size="40"></td></tr>
-										<td width="200">{|Mails als Ticket importieren|}:</td>
+<tr><td>{|ticketprojekt|}:</td><td><input type="text" id="ticketprojekt" name="ticketprojekt" value="[TICKETPROJEKT]" size="40"></td></tr>
-										<td>
+<tr><td>{|ticketqueue|}:</td><td><input type="text" id="ticketqueue" name="ticketqueue" value="[TICKETQUEUE]" size="40"></td></tr>
-                                            <input type="checkbox" name="ticket" value="1" [TICKET]>
+<tr><td>{|abdatum|}:</td><td><input type="text" name="abdatum" value="[ABDATUM]" size="40"></td></tr>
-										</td>
+<tr><td>{|ticketloeschen|}:</td><td><input type="text" name="ticketloeschen" value="[TICKETLOESCHEN]" size="40"></td></tr>
-									</tr>
+<tr><td>{|ticketabgeschlossen|}:</td><td><input type="text" name="ticketabgeschlossen" value="[TICKETABGESCHLOSSEN]" size="40"></td></tr>
-									<tr>
+<tr><td>{|ticketemaileingehend|}:</td><td><input type="text" name="ticketemaileingehend" value="[TICKETEMAILEINGEHEND]" size="40"></td></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>
@@ -265,66 +119,18 @@
 	        				<fieldset>
                             <legend>{|Sonstiges|}</legend>
                             <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>
-										<td>{|Automatisch antworten|}:</td>
+<tr><td>{|eigenesignatur|}:</td><td><input type="text" name="eigenesignatur" value="[EIGENESIGNATUR]" size="40"></td></tr>
-										<td>
+<tr><td>{|signatur|}:</td><td><textarea id="signatur" name="signatur" rows="6" style="width:100%;">[SIGNATUR]</textarea></td></tr>
-                                            <input type="checkbox" name="autoresponder" value="1" [AUTORESPONDER]>
+<tr><td>{|adresse|}:</td><td><input type="text" id="adresse" name="adresse" value="[ADRESSE]" size="40"></td></tr>
-										</td>
+<tr><td>{|firma|}:</td><td><input type="text" name="firma" value="[FIRMA]" size="40"></td></tr>
-									</tr>
+<tr><td>{|geloescht|}:</td><td><input type="text" name="geloescht" value="[GELOESCHT]" size="40"></td></tr>
-                                	<tr>
+<tr><td>{|mutex|}:</td><td><input type="text" name="mutex" value="[MUTEX]" size="40"></td></tr>
-										<td width="200">{|Nur eine Antwort pro Tag|}:</td>
+<tr><td>{|autoresponder|}:</td><td><input type="text" name="autoresponder" value="[AUTORESPONDER]" size="40"></td></tr>
-										<td>
+<tr><td>{|geschaeftsbriefvorlage|}:</td><td><input type="text" name="geschaeftsbriefvorlage" value="[GESCHAEFTSBRIEFVORLAGE]" size="40"></td></tr>
-                                            <input type="checkbox" name="autosresponder_blacklist" value="1" [AUTOSRESPONDER_BLACKLIST]>
+<tr><td>{|autoresponderbetreff|}:</td><td><textarea id="autoresponderbetreff" name="autoresponderbetreff" rows="6" style="width:100%;">[AUTORESPONDERBETREFF]</textarea></td></tr>
-										</td>
+<tr><td>{|autorespondertext|}:</td><td><textarea id="autorespondertext" name="autorespondertext" rows="6" style="width:100%;">[AUTORESPONDERTEXT]</textarea></td></tr>
-									</tr>								
+<tr><td>{|projekt|}:</td><td><input type="text" id="projekt" name="projekt" value="[PROJEKT]" size="40"></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>
@@ -334,13 +140,40 @@
               <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>
+
 <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">
 <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="id" value="[ID]" style="display:none">
 </form>
+

www/pages/content/exportbuchhaltung_export.tpl

@@ -27,10 +27,6 @@
                                     <td>{|Verbindlichkeiten:|}</td>
                                     <td><input type="checkbox" name="verbindlichkeit" value="1" [VBCHECKED] /></td>
                                 </tr>
-                                <tr>
-                                    <td>{|Lieferantengutschriften:|}</td>
-                                    <td><input type="checkbox" name="lieferantengutschrift" value="1" [LGCHECKED] /></td>
-                                </tr>
                                 <tr>
                                     <td>Datum von:</td>
                                     <td><input type="text" name="von" id="von" value="[VON]" /></td>

www/pages/content/firmendaten.tpl

@@ -775,10 +775,6 @@
 								<td>Nächste Verbindlichkeitsnummer:</td><td><input type="text" name="next_verbindlichkeit" readonly value="[NEXT_VERBINDLICHKEIT]" size="40">
 								<input type="button" onclick="next_number('verbindlichkeit','[NEXT_VERBINDLICHKEIT]');" value="bearbeiten"></td>
 							</tr>
-							<tr>
-								<td>Nächste Lieferantengutschriftnummer:</td><td><input type="text" name="next_lieferantengutschrift" readonly value="[NEXT_LIEFERANTENGUTSCHRIFT]" size="40">
-								<input type="button" onclick="next_number('lieferantengutschrift','[NEXT_LIEFERANTENGUTSCHRIFT]');" value="bearbeiten"></td>
-							</tr>
 							<tr>
 								<td>N&auml;chste Kundennummer:</td><td><input type="text" name="next_kundennummer"  readonly value="[NEXT_KUNDENNUMMER]" size="40">
 								<input type="button" onclick="next_number('kundennummer','[NEXT_KUNDENNUMMER]');" value="bearbeiten"></td>
@@ -1416,7 +1412,6 @@
 							<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}, {TRACKINGLINK}, {NAME}, {ANSCHREIBEN}, {BELEGNR}, {IHREBESTELLNUMMER}, {INTERNET}, {AUFTRAGDATUM}, {LIEFERADRESSE}, {LIEFERADRESSELANG}</i></li>
+                <li>{|Versand|} <i>{|Variablen|}: {VERSAND}, {VERSANDTYPE}, {VERSANDBEZEICHNUNG}, {TRACKINGNUMMER}, {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

@@ -1,119 +0,0 @@
-<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

@@ -1,10 +0,0 @@
-<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

@@ -1,43 +0,0 @@
-<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/lieferantengutschrift_artikel_manuell.tpl

@@ -1,55 +0,0 @@
-[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">Artikel hinzuf&uuml;gen:</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>
-                        [ARTIKELMANUELL]
-                    </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 [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>
-                                <td><input type="checkbox" name="bruttoeingabe" value="1" />Bruttopreise eingeben</td>
-                            </tr>                                  
-                            <tr [HINZUFUEGENHIDDEN]>
-								<td>
-                                    <input type="text" name="multifilter" id="multifilter" value="[MULTIFILTER]" size="20" style="width:98%;" form="">
-								</td>
-							</tr>   
-                            <tr>
-                                <td><button [SAVEDISABLED] name="submit" value="artikel_manuell_hinzufuegen" class="ui-button-icon" style="width:100%;">Hinzuf&uuml;gen</button></td>
-                            </tr>
-                        </table>
-                    </fieldset>
-                </div>
-            </div>
-        </div>
-    </div>
-</form>
-

www/pages/content/lieferantengutschrift_edit.tpl

@@ -1,219 +0,0 @@
-<div id="tabs">
-    <ul>
-        <li><a href="#tabs-1">Lieferantengutschrift</a></li>
-        <li [POSITIONENHIDDEN]><a href="#tabs-2">Positionen</a></li>
-        <li [POSITIONENHIDDEN]><a href="#tabs-4">Artikel manuell</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>Lieferantengutschrift <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" [ADRESSESAVEDISABLED] required>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td>
-                                                            {|Lieferantengutschrifts-Nr.|}:
-                                                        </td>
-                                                        <td>
-                                                            <input type="text" name="rechnung" id="rechnung" value="[RECHNUNG]" size="20" [SAVEDISABLED] required>
-                                                        </td>
-                                                    </tr>     
-                                                    <tr>
-                                                        <td>
-                                                            {|Lieferantengutschriftsdatum|}:
-                                                        </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=lieferantengutschrift&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=lieferantengutschrift&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>
-                                                            {|Lieferantengutschriftseingangsprüfung (Buchhaltung)|}:
-                                                        </td>
-                                                        <td>
-                                                            <input type="checkbox" id="rechnungsfreigabe" [RECHNUNGSFREIGABECHECKED] size="20" disabled>
-                                                            <a href="index.php?module=lieferantengutschrift&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=lieferantengutschrift&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=lieferantengutschrift&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=lieferantengutschrift&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-4">
-        [POSITIONENMANUELLTAB]        
-    </div>
-    <div id="tabs-3">
-        [MINIDETAIL]
-    </div>
-</div>
-

www/pages/content/lieferantengutschrift_list.tpl

@@ -1,93 +0,0 @@
-<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">{|Lieferantengutschriftseingangspr&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');
-  $('#lieferantengutschrift_list').find(':checkbox').prop('checked',wert);
-}
-
-</script>

www/pages/content/lieferantengutschrift_minidetail.tpl

@@ -1,76 +0,0 @@
-[FORMHANDLEREVENT]
-[MESSAGE]
-<style>
-    .auftraginfo_cell {
-    color: #636363;border: 1px solid #ccc;padding: 5px;
-    }
-    .auftrag_cell {
-    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 colspan="3">[ADRESSEAUTOSTART][ADRESSE][MSGADRESSE][ADRESSEAUTOEND]</td>
-        </tr>
-        <tr>
-            <td>Lieferantengutschrifts-Nr.:</td>
-            <td>[RECHNUNG][MSGRECHNUNG]</td>
-        </tr>
-        <tr>
-            <td>Lieferantengutschriftsdatum:</td>
-            <td width="250">[RECHNUNGSDATUM][MSGRECHNUNGSDATUM]</td>
-        <tr>
-        </tr>
-        </tr>
-            <td width="200">Zahlbar bis:</td>
-            <td>[ZAHLBARBIS][MSGZAHLBARBIS][DATUM_ZAHLBARBIS]</td>
-        </tr>
-            <td>Betrag/Total (Brutto):</td>
-            <td>[BETRAG][MSGBETRAG]&nbsp;[WAEHRUNG][MSGWAEHRUNG]</td>
-        <tr>
-            <td>Skonto in %:</td>
-            <td>[SKONTO][MSGSKONTO]</td>
-        </tr>
-        <tr>
-            <td>Skonto bis:</td>
-            <td>[SKONTOBIS][MSGSKONTOBIS][DATUM_SKONTOBIS]</td>
-        </tr>
-        <tr>
-            <td>Projekt:</td>
-            <td>[PROJEKT][MSGKOSTENSTELLE]</td>
-            <td>&nbsp;</td>                            
-        </tr>
-        <tr>
-            <td>Kostenstelle:</td>
-            <td>[KOSTENSTELLE][MSGKOSTENSTELLE]</td>
-            <td>&nbsp;</td>
-        </tr>
-        <tr>
-            <td>Interne Bemerkung:</td>
-            <td colspan="4">[INTERNEBEMERKUNG]</td>
-        </tr>
-    </table>
-</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>
-

www/pages/content/lieferantengutschrift_position_edit.tpl

@@ -1,64 +0,0 @@
-<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/lieferantengutschrift_positionen.tpl

@@ -1,88 +0,0 @@
-[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">Artikel hinzuf&uuml;gen:</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><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_positionen').find(':checkbox').prop('checked',wert);
-    }
-    function alleauswaehlen()
-    {
-      var wert = $('#auswahlalle').prop('checked');
-      $('#lieferantengutschrift_positionen').find(':checkbox').prop('checked',wert);
-    }
-</script>

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

@@ -1,45 +0,0 @@
-<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,6 +17,33 @@
 				<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]
@@ -29,7 +56,6 @@
 <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,7 +8,6 @@ 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]
@@ -20,7 +19,6 @@ 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

@@ -1,85 +0,0 @@
-<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,13 +19,12 @@
 	        				<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]" style="width: 100%;"></td></tr>
+                                    <tr><td>{|Betreff|}:</td><td><input type="text" name="betreff" id="betreff" value="[BETREFF]" size="20"></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>
@@ -50,7 +49,6 @@
                                     <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>

www/pages/content/ticket_list.tpl

@@ -49,19 +49,7 @@
                     <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>                            
+                        <td><input type="checkbox" value="1" id="autoalle" />&nbsp;alle markieren&nbsp;</td><td><input type="submit" class="btnBlue" name="ausfuehren" value="{|Zuordnen|}" /></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

@@ -23,12 +23,10 @@
 <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 colspan="2"><hr style="border-style:solid; border-width:1px"></td></tr>
 <tr><td>{|Papierkorb|}:</td><td><input type="checkbox" name="spam" value="1" [SPAM] 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>{|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="checkbox" name="aktiv" value="1" [AKTIV] size="40"></td></tr>
 

www/pages/content/ticketregeln_list.tpl

@@ -1,10 +1,5 @@
-<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/upgrade.tpl

@@ -15,7 +15,7 @@
         		<div class="col-xs-14 col-md-12 col-md-height">
         			<div class="inside inside-full-height">
         				<fieldset>
-                            <legend>{|DBXE Upgrade-System|}</legend>
+                            <legend>{|OpenXE Upgrade-System|}</legend>
 Das Upgrade funktioniert in 2 Schritten: Dateien aktualisieren, Datenbank auffrischen. Wenn das Upgrade lange l&auml;uft, kann der Fortschritt in einem neuen Fenster mit "Anzeige auffrischen" angezeigt werden.<br><br>
 Falls nach einem Abbruch oder schwerwiegenden Fehler kein Upgrade möglich ist, im Hauptordner den Ordner ".git" l&ouml;schen und das Upgrade in der Konsole erneut durchf&uuml;hren.
 Dazu im Unterordner "upgrade" diesen Befehl starten: <pre>./upgrade.sh -do</pre>
@@ -37,7 +37,7 @@ Dazu im Unterordner "upgrade" diesen Befehl starten: <pre>./upgrade.sh -do</pre>
 	                        				<fieldset>
                                                 <legend>{|Aktuelle Version|}</legend>
                                                 <table width="100%" border="0" class="mkTableFormular">
-                                                    <b>DBXE [CURRENT]</b>
+                                                    <b>OpenXE [CURRENT]</b>
                                                 </table>
                                             </fieldset>            
                                         </div>

www/pages/content/verbindlichkeit_edit.tpl

@@ -1,215 +0,0 @@
-<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

@@ -1,93 +0,0 @@
-<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>