From abb607bcccf2c703e78f9015c271bcb009e83dcf Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 21 May 2024 00:09:10 +0200 Subject: [PATCH] fix version and bugs --- Admin/Install/Navigation.php | 4 ++-- Admin/Installer.php | 4 ++-- Admin/Routes/Web/Backend.php | 2 +- Admin/Status.php | 4 ++-- Admin/Uninstaller.php | 4 ++-- Admin/Updater.php | 4 ++-- Controller/ApiController.php | 4 ++-- Controller/BackendController.php | 4 ++-- Controller/Controller.php | 4 ++-- LICENSE.txt | 11 ++++------- Models/EUVATRates.php | 4 ++-- Models/NullTaxCode.php | 4 ++-- Models/NullTaxCodeL11n.php | 4 ++-- Models/PermissionCategory.php | 4 ++-- Models/TaxCode.php | 4 ++-- Models/TaxCodeL11n.php | 4 ++-- Models/TaxCodeL11nMapper.php | 4 ++-- Models/TaxCodeMapper.php | 4 ++-- README.md | 4 ++-- Theme/Backend/Lang/Navigation.de.lang.php | 2 +- Theme/Backend/Lang/Navigation.en.lang.php | 2 +- Theme/Backend/Lang/de.lang.php | 2 +- Theme/Backend/Lang/en.lang.php | 2 +- Theme/Backend/taxcode-list.tpl.php | 2 +- Theme/Backend/taxcode-view.tpl.php | 2 +- tests/Admin/AdminTest.php | 2 +- tests/Autoloader.php | 4 ++-- tests/Bootstrap.php | 2 +- tests/Models/NullTaxCodeL11nTest.php | 2 +- tests/Models/NullTaxCodeTest.php | 2 +- 30 files changed, 51 insertions(+), 54 deletions(-) diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php index 7fda27f..58d25ff 100755 --- a/Admin/Install/Navigation.php +++ b/Admin/Install/Navigation.php @@ -6,7 +6,7 @@ * * @package Modules\Finance\Admin\Install * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Application\ApplicationAbstract; * Navigation class. * * @package Modules\Finance\Admin\Install - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Admin/Installer.php b/Admin/Installer.php index fe8d28e..79910f8 100755 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -6,7 +6,7 @@ * * @package Modules\Finance\Admin * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ @@ -25,7 +25,7 @@ use phpOMS\Module\ModuleInfo; * Installer class. * * @package Modules\Finance\Admin - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index 46ab355..6a39131 100755 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -6,7 +6,7 @@ * * @package Modules * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Admin/Status.php b/Admin/Status.php index 7f9c2be..68f0bc9 100755 --- a/Admin/Status.php +++ b/Admin/Status.php @@ -6,7 +6,7 @@ * * @package Modules\Finance\Admin * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Module\StatusAbstract; * Status class. * * @package Modules\Finance\Admin - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Admin/Uninstaller.php b/Admin/Uninstaller.php index 1e8ffe4..8e367e7 100755 --- a/Admin/Uninstaller.php +++ b/Admin/Uninstaller.php @@ -6,7 +6,7 @@ * * @package Modules\Finance\Admin * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Module\UninstallerAbstract; * Uninstaller class. * * @package Modules\Finance\Admin - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Admin/Updater.php b/Admin/Updater.php index 9751b96..8608d3d 100755 --- a/Admin/Updater.php +++ b/Admin/Updater.php @@ -6,7 +6,7 @@ * * @package Modules\Finance\Admin * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Module\UpdaterAbstract; * Updater class. * * @package Modules\Finance\Admin - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 064fdd5..232cacb 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -6,7 +6,7 @@ * * @package Modules\Finance * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ @@ -27,7 +27,7 @@ use phpOMS\Message\ResponseAbstract; * Finance class. * * @package Modules\Finance - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Controller/BackendController.php b/Controller/BackendController.php index ae77b1a..a08e005 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -6,7 +6,7 @@ * * @package Modules\Sales * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ @@ -24,7 +24,7 @@ use phpOMS\Views\View; * Finance class. * * @package Modules\Finance - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 * @codeCoverageIgnore diff --git a/Controller/Controller.php b/Controller/Controller.php index b40175f..690ec4d 100755 --- a/Controller/Controller.php +++ b/Controller/Controller.php @@ -6,7 +6,7 @@ * * @package Modules\Finance * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Module\ModuleAbstract; * Finance class. * * @package Modules\Finance - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 */ diff --git a/LICENSE.txt b/LICENSE.txt index 02b1ff5..4974faf 100755 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,5 +1,6 @@ The OMS License -Version 2.0 + +Version 2.2 1. Definitions @@ -15,7 +16,7 @@ Version 2.0 "Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. -"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). +"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work. "Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. @@ -25,7 +26,7 @@ Version 2.0 2. Grant of Copyright License -Subject to the terms and conditions of this License, each Contributor grants to You after purchase a perpetual, worldwide, non-exclusive, irrevocable copyright license to prepare Derivative Works of, publicly display, publicly perform the Work and such Derivative Works in Source or Object form. You are not allowed to sublicense, reproduce, or distribute the Work and such Derivative Works in Source or Object form. +Subject to the terms and conditions of this License, each Contributor grants to You after purchase a temporary, worldwide, non-exclusive copyright license to publicly display or publicly perform the Work in Source or Object form. You are not allowed to sublicense, reproduce, or distribute the Work and such Derivative Works in Source or Object form. 3. Redistribution @@ -46,7 +47,3 @@ Unless required by applicable law or agreed to in writing, Licensor provides the 7. Limitation of Liability In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. - -8. Future Changes - -The Licensor may change the License for future versions as he sees fit. diff --git a/Models/EUVATRates.php b/Models/EUVATRates.php index bb82f50..3927baf 100755 --- a/Models/EUVATRates.php +++ b/Models/EUVATRates.php @@ -6,7 +6,7 @@ * * @package Modules\Finance\Models * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\EnumArray; * EU VAT rates * * @package Modules\Finance\Models - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/NullTaxCode.php b/Models/NullTaxCode.php index 1fbe38a..68bf66b 100755 --- a/Models/NullTaxCode.php +++ b/Models/NullTaxCode.php @@ -6,7 +6,7 @@ * * @package Modules\Finance\Models * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace Modules\Finance\Models; * Null model * * @package Modules\Finance\Models - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/NullTaxCodeL11n.php b/Models/NullTaxCodeL11n.php index 40dd6d1..b65e07d 100755 --- a/Models/NullTaxCodeL11n.php +++ b/Models/NullTaxCodeL11n.php @@ -6,7 +6,7 @@ * * @package Modules\Finance\Models * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace Modules\Finance\Models; * Null model * * @package Modules\Finance\Models - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/PermissionCategory.php b/Models/PermissionCategory.php index ef800f5..4e0c756 100755 --- a/Models/PermissionCategory.php +++ b/Models/PermissionCategory.php @@ -6,7 +6,7 @@ * * @package Modules\Finance\Models * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Permission category enum. * * @package Modules\Finance\Models - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/TaxCode.php b/Models/TaxCode.php index ce2105c..0cedc03 100755 --- a/Models/TaxCode.php +++ b/Models/TaxCode.php @@ -6,7 +6,7 @@ * * @package Modules\Finance\Models * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace Modules\Finance\Models; * Finance class. * * @package Modules\Finance\Models - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/TaxCodeL11n.php b/Models/TaxCodeL11n.php index b77843d..ee8dfbf 100755 --- a/Models/TaxCodeL11n.php +++ b/Models/TaxCodeL11n.php @@ -6,7 +6,7 @@ * * @package Modules\Finance\Models * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Localization\ISO639x1Enum; * Localization of the item class. * * @package Modules\Finance\Models - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/TaxCodeL11nMapper.php b/Models/TaxCodeL11nMapper.php index 892a992..6cc09ff 100755 --- a/Models/TaxCodeL11nMapper.php +++ b/Models/TaxCodeL11nMapper.php @@ -6,7 +6,7 @@ * * @package Modules\Finance\Models * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory; * TaxCode mapper class. * * @package Modules\Finance\Models - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 * diff --git a/Models/TaxCodeMapper.php b/Models/TaxCodeMapper.php index c3325cd..d9c5a2b 100755 --- a/Models/TaxCodeMapper.php +++ b/Models/TaxCodeMapper.php @@ -6,7 +6,7 @@ * * @package Modules\Finance\Models * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory; * TaxCode mapper class. * * @package Modules\Finance\Models - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 * diff --git a/README.md b/README.md index 51f9ea4..24751e7 100755 --- a/README.md +++ b/README.md @@ -18,8 +18,8 @@ With Karaka you have one partner who can provide many tools and software solutio ## Requirements -* PHP 8.2 -* PHP extension: php8.2-dev php8.2-cli php8.2-common php8.2-intl php8.2-mysql php8.2-pgsql php8.2-xdebug php8.2-opcache php8.2-pdo php8.2-sqlite php8.2-mbstring php8.2-curl php8.2-imap php8.2-bcmath php8.2-zip php8.2-dom php8.2-xml php8.2-phar php8.2-gd php-pear +* PHP 8.3 +* PHP extension: php8.3-dev php8.3-cli php8.3-common php8.3-intl php8.3-mysql php8.3-pgsql php8.3-xdebug php8.3-opcache php8.3-pdo php8.3-sqlite php8.3-mbstring php8.3-curl php8.3-imap php8.3-bcmath php8.3-zip php8.3-dom php8.3-xml php8.3-phar php8.3-gd php-pear * apache2 (recommended) or nginx * mysql-server (recommended) or postgresql postgresql-contrib * Tools: tesseract-ocr, pdftotext, pdftoppm diff --git a/Theme/Backend/Lang/Navigation.de.lang.php b/Theme/Backend/Lang/Navigation.de.lang.php index ba7419d..9dfe0d8 100755 --- a/Theme/Backend/Lang/Navigation.de.lang.php +++ b/Theme/Backend/Lang/Navigation.de.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php index 48d377d..5f1cf2c 100755 --- a/Theme/Backend/Lang/Navigation.en.lang.php +++ b/Theme/Backend/Lang/Navigation.en.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php index 70d2924..fe8685c 100755 --- a/Theme/Backend/Lang/de.lang.php +++ b/Theme/Backend/Lang/de.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php index 1dc0c2a..abeecdd 100755 --- a/Theme/Backend/Lang/en.lang.php +++ b/Theme/Backend/Lang/en.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/taxcode-list.tpl.php b/Theme/Backend/taxcode-list.tpl.php index 3bed3ed..01aa205 100644 --- a/Theme/Backend/taxcode-list.tpl.php +++ b/Theme/Backend/taxcode-list.tpl.php @@ -6,7 +6,7 @@ * * @package Modules\Accounting * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/taxcode-view.tpl.php b/Theme/Backend/taxcode-view.tpl.php index 338a911..c8df24f 100644 --- a/Theme/Backend/taxcode-view.tpl.php +++ b/Theme/Backend/taxcode-view.tpl.php @@ -6,7 +6,7 @@ * * @package Modules\Accounting * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Admin/AdminTest.php b/tests/Admin/AdminTest.php index 6b97eac..9b966bc 100755 --- a/tests/Admin/AdminTest.php +++ b/tests/Admin/AdminTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Autoloader.php b/tests/Autoloader.php index 5fdcf27..7b6ac4e 100755 --- a/tests/Autoloader.php +++ b/tests/Autoloader.php @@ -6,7 +6,7 @@ * * @package Modules/tests * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ namespace Modules\Finance\tests; * Autoloader class. * * @package tests - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 */ diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php index 42753f2..43fa2c7 100755 --- a/tests/Bootstrap.php +++ b/tests/Bootstrap.php @@ -6,7 +6,7 @@ * * @package Modules\Finance\tests * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Models/NullTaxCodeL11nTest.php b/tests/Models/NullTaxCodeL11nTest.php index 78221eb..707a17c 100644 --- a/tests/Models/NullTaxCodeL11nTest.php +++ b/tests/Models/NullTaxCodeL11nTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Models/NullTaxCodeTest.php b/tests/Models/NullTaxCodeTest.php index 842af38..5583322 100644 --- a/tests/Models/NullTaxCodeTest.php +++ b/tests/Models/NullTaxCodeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */