From 548a4aab7b8cb0b5776a64e9bcd27f8ec99556f3 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 21 May 2024 00:09:06 +0200 Subject: [PATCH] fix version and bugs --- Admin/Install/Admin.install.php | 2 +- Admin/Install/Admin.php | 4 +- Admin/Install/Media.php | 4 +- Admin/Install/Media/bill.pdf.php | 2 +- Admin/Install/Media/lang.php | 2 +- Admin/Install/Messages.php | 4 +- Admin/Install/Navigation.php | 4 +- Admin/Install/Tag.php | 4 +- Admin/Install/WarehouseManagement.php | 4 +- Admin/Install/Workflow.php | 4 +- Admin/Installer.php | 4 +- Admin/Routes/Web/Api.php | 2 +- Admin/Routes/Web/Backend.php | 2 +- Admin/Status.php | 4 +- Admin/Uninstaller.php | 4 +- Admin/Updater.php | 4 +- Controller/ApiAttributeController.php | 4 +- Controller/ApiBillController.php | 4 +- Controller/ApiBillTypeController.php | 4 +- Controller/ApiController.php | 4 +- Controller/ApiPriceController.php | 4 +- Controller/ApiPurchaseController.php | 4 +- Controller/ApiTaxController.php | 4 +- Controller/BackendController.php | 4 +- Controller/CliController.php | 97 ++++++++++++++----- Controller/Controller.php | 4 +- Docs/Help/en/SUMMARY.md | 1 + Docs/Help/en/introduction.md | 6 +- Docs/Help/en/invoice_recognition.md | 19 ++++ Models/Attribute/BillAttributeMapper.php | 4 +- .../Attribute/BillAttributeTypeL11nMapper.php | 4 +- Models/Attribute/BillAttributeTypeMapper.php | 4 +- .../BillAttributeValueL11nMapper.php | 4 +- Models/Attribute/BillAttributeValueMapper.php | 4 +- Models/Bill.php | 4 +- Models/BillElement.php | 4 +- Models/BillElementMapper.php | 4 +- Models/BillMapper.php | 4 +- Models/BillPaymentStatus.php | 4 +- Models/BillStatus.php | 4 +- Models/BillTransferType.php | 4 +- Models/BillType.php | 4 +- Models/BillTypeL11nMapper.php | 4 +- Models/BillTypeMapper.php | 4 +- Models/InvoiceRecognition.php | 4 +- Models/NullBill.php | 4 +- Models/NullBillElement.php | 4 +- Models/NullBillType.php | 4 +- Models/NullSubscription.php | 4 +- Models/PaymentTermL11nMapper.php | 4 +- Models/PaymentTermMapper.php | 4 +- Models/PermissionCategory.php | 4 +- Models/Price/NullPrice.php | 4 +- Models/Price/Price.php | 4 +- Models/Price/PriceMapper.php | 4 +- Models/Price/PriceStatus.php | 4 +- Models/Price/PriceType.php | 4 +- Models/PurchaseBillMapper.php | 4 +- Models/SalesBillMapper.php | 4 +- Models/SettingsEnum.php | 4 +- Models/ShippingTermL11nMapper.php | 4 +- Models/ShippingTermMapper.php | 4 +- Models/StockBillMapper.php | 4 +- Models/Subscription.php | 4 +- Models/SubscriptionMapper.php | 4 +- Models/Tax/BillTaxType.php | 4 +- Models/Tax/NullTaxCombination.php | 4 +- Models/Tax/TaxCombination.php | 4 +- Models/Tax/TaxCombinationMapper.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/bill-create.tpl.php | 2 +- .../finance-taxcombination-list.tpl.php | 2 +- .../finance-taxcombination-view.tpl.php | 2 +- Theme/Backend/payment-type-list.tpl.php | 2 +- Theme/Backend/payment-view.tpl.php | 2 +- Theme/Backend/purchase-bill-list.tpl.php | 2 +- Theme/Backend/purchase-bill-upload.tpl.php | 2 +- Theme/Backend/purchase-bill.tpl.php | 2 +- Theme/Backend/sales-bill-list.tpl.php | 2 +- Theme/Backend/shipping-type-list.tpl.php | 2 +- Theme/Backend/shipping-view.tpl.php | 2 +- Theme/Cli/Lang/de.lang.php | 2 +- Theme/Cli/Lang/en.lang.php | 2 +- tests/Admin/AdminTest.php | 2 +- tests/Autoloader.php | 4 +- tests/Bootstrap.php | 2 +- .../Controller/Api/ApiBillControllerTrait.php | 2 +- .../Api/ApiPurchaseControllerTrait.php | 2 +- tests/Controller/ApiControllerTest.php | 2 +- tests/Models/BillElementTest.php | 2 +- tests/Models/BillTest.php | 2 +- tests/Models/BillTypeTest.php | 2 +- tests/Models/InvoiceRecognitionTest.php | 2 +- tests/Models/NullBillElementTest.php | 2 +- tests/Models/NullBillTest.php | 2 +- tests/Models/NullBillTypeTest.php | 2 +- tests/Models/NullSubscriptionTest.php | 2 +- tests/Models/Price/NullPriceTest.php | 2 +- tests/Models/PurchaseBillMapperTest.php | 2 +- tests/Models/SalesBillMapperTest.php | 2 +- tests/Models/StockBillMapperTest.php | 2 +- tests/Models/Tax/NullTaxCombinationTest.php | 2 +- 106 files changed, 264 insertions(+), 187 deletions(-) create mode 100644 Docs/Help/en/invoice_recognition.md diff --git a/Admin/Install/Admin.install.php b/Admin/Install/Admin.install.php index 9f802bd..65eb6d5 100644 --- a/Admin/Install/Admin.install.php +++ b/Admin/Install/Admin.install.php @@ -6,7 +6,7 @@ * * @package Modules\Billing\Admin * @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/Install/Admin.php b/Admin/Install/Admin.php index 8e824c4..dce6e8a 100755 --- a/Admin/Install/Admin.php +++ b/Admin/Install/Admin.php @@ -6,7 +6,7 @@ * * @package Modules\Billing\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; * Admin class. * * @package Modules\Billing\Admin\Install - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Admin/Install/Media.php b/Admin/Install/Media.php index 503da26..eb33e66 100755 --- a/Admin/Install/Media.php +++ b/Admin/Install/Media.php @@ -6,7 +6,7 @@ * * @package Modules\Billing\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; * Media class. * * @package Modules\Billing\Admin\Install - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Admin/Install/Media/bill.pdf.php b/Admin/Install/Media/bill.pdf.php index 1210ee9..8a1fcd3 100755 --- a/Admin/Install/Media/bill.pdf.php +++ b/Admin/Install/Media/bill.pdf.php @@ -6,7 +6,7 @@ * * @package Modules\Media * @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/Install/Media/lang.php b/Admin/Install/Media/lang.php index 052825a..4ce7e6d 100755 --- a/Admin/Install/Media/lang.php +++ b/Admin/Install/Media/lang.php @@ -8,7 +8,7 @@ * * @package Modules\Media * @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/Install/Messages.php b/Admin/Install/Messages.php index 65290cf..5052e41 100755 --- a/Admin/Install/Messages.php +++ b/Admin/Install/Messages.php @@ -6,7 +6,7 @@ * * @package Modules\Billing\Admin\Install * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ @@ -23,7 +23,7 @@ use phpOMS\Message\Http\HttpResponse; * Media class. * * @package Modules\Billing\Admin\Install - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php index 53726b5..a617595 100755 --- a/Admin/Install/Navigation.php +++ b/Admin/Install/Navigation.php @@ -6,7 +6,7 @@ * * @package Modules\Billing\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\Billing\Admin\Install - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Admin/Install/Tag.php b/Admin/Install/Tag.php index 9553481..cb9cdf4 100644 --- a/Admin/Install/Tag.php +++ b/Admin/Install/Tag.php @@ -6,7 +6,7 @@ * * @package Modules\Billing\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; * Tag class. * * @package Modules\Billing\Admin\Install - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Admin/Install/WarehouseManagement.php b/Admin/Install/WarehouseManagement.php index 5481bca..64a6a04 100755 --- a/Admin/Install/WarehouseManagement.php +++ b/Admin/Install/WarehouseManagement.php @@ -6,7 +6,7 @@ * * @package Modules\Billing\Admin\Install * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ @@ -22,7 +22,7 @@ use phpOMS\DataStorage\Database\Schema\Builder; * WarehouseManagement class. * * @package Modules\Billing\Admin\Install - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Admin/Install/Workflow.php b/Admin/Install/Workflow.php index af99cf5..6bc658d 100755 --- a/Admin/Install/Workflow.php +++ b/Admin/Install/Workflow.php @@ -6,7 +6,7 @@ * * @package Modules\Billing\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; * Workflow class. * * @package Modules\Billing\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 d169c1d..a884df1 100755 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -6,7 +6,7 @@ * * @package Modules\Billing\Admin * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ @@ -29,7 +29,7 @@ use phpOMS\Module\ModuleInfo; * Installer class. * * @package Modules\Billing\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/Api.php b/Admin/Routes/Web/Api.php index 02b502f..2a05923 100755 --- a/Admin/Routes/Web/Api.php +++ b/Admin/Routes/Web/Api.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/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index e383429..c0f7a7a 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 dd2c072..8599b3d 100755 --- a/Admin/Status.php +++ b/Admin/Status.php @@ -6,7 +6,7 @@ * * @package Modules\Billing\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\Billing\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 4c4a813..76f8fe8 100755 --- a/Admin/Uninstaller.php +++ b/Admin/Uninstaller.php @@ -6,7 +6,7 @@ * * @package Modules\Billing\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\Billing\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 aac801a..1ddf78b 100755 --- a/Admin/Updater.php +++ b/Admin/Updater.php @@ -6,7 +6,7 @@ * * @package Modules\Billing\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\Billing\Admin - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Controller/ApiAttributeController.php b/Controller/ApiAttributeController.php index 092907f..c65058d 100755 --- a/Controller/ApiAttributeController.php +++ b/Controller/ApiAttributeController.php @@ -6,7 +6,7 @@ * * @package Modules\Billing * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ @@ -31,7 +31,7 @@ use phpOMS\Message\ResponseAbstract; * Billing class. * * @package Modules\Billing - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Controller/ApiBillController.php b/Controller/ApiBillController.php index 075e539..b9be93a 100755 --- a/Controller/ApiBillController.php +++ b/Controller/ApiBillController.php @@ -6,7 +6,7 @@ * * @package Modules\Billing * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ @@ -69,7 +69,7 @@ use phpOMS\Views\View; * Billing class. * * @package Modules\Billing - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 * diff --git a/Controller/ApiBillTypeController.php b/Controller/ApiBillTypeController.php index 7f1f86f..0c2041c 100755 --- a/Controller/ApiBillTypeController.php +++ b/Controller/ApiBillTypeController.php @@ -7,7 +7,7 @@ * * @package Modules\Billing * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ @@ -30,7 +30,7 @@ use phpOMS\Message\ResponseAbstract; * Billing class. * * @package Modules\Billing - * @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 fd007a5..6996c5c 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -7,7 +7,7 @@ * * @package Modules\Billing * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ @@ -30,7 +30,7 @@ use phpOMS\Message\ResponseAbstract; * Billing class. * * @package Modules\Billing - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Controller/ApiPriceController.php b/Controller/ApiPriceController.php index 0b2f1e1..3f4c6c5 100755 --- a/Controller/ApiPriceController.php +++ b/Controller/ApiPriceController.php @@ -7,7 +7,7 @@ * * @package Modules\Billing * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ @@ -40,7 +40,7 @@ use phpOMS\Stdlib\Base\FloatInt; * Billing class. * * @package Modules\Billing - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 * diff --git a/Controller/ApiPurchaseController.php b/Controller/ApiPurchaseController.php index cdd85a3..eb3eab3 100755 --- a/Controller/ApiPurchaseController.php +++ b/Controller/ApiPurchaseController.php @@ -6,7 +6,7 @@ * * @package Modules\Billing * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ @@ -33,7 +33,7 @@ use phpOMS\System\SystemUtils; * Billing class. * * @package Modules\Billing - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 * diff --git a/Controller/ApiTaxController.php b/Controller/ApiTaxController.php index a8ae470..f267b4b 100755 --- a/Controller/ApiTaxController.php +++ b/Controller/ApiTaxController.php @@ -6,7 +6,7 @@ * * @package Modules\Billing * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ @@ -38,7 +38,7 @@ use phpOMS\Stdlib\Base\Address; * Billing class. * * @package Modules\Billing - * @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 758fc0a..7303d70 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -6,7 +6,7 @@ * * @package Modules\Billing * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ @@ -43,7 +43,7 @@ use phpOMS\Views\View; * Billing class. * * @package Modules\Billing - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 * @codeCoverageIgnore diff --git a/Controller/CliController.php b/Controller/CliController.php index 0ad2d65..9b9635b 100755 --- a/Controller/CliController.php +++ b/Controller/CliController.php @@ -6,7 +6,7 @@ * * @package Modules\Billing * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ @@ -41,7 +41,7 @@ use phpOMS\Views\View; * Billing controller class. * * @package Modules\Billing - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 */ @@ -126,16 +126,14 @@ final class CliController extends Controller ->where('attributes/type/name', ['bill_match_pattern', 'bill_date_format'], 'IN') ->executeGetArray(); - $supplierId = $this->matchSupplier($content, $suppliers); - $bill->supplier = new NullSupplier($supplierId); - $supplier = $suppliers[$supplierId] ?? new NullSupplier(); + $bill->supplier = this->matchSupplier($content, $suppliers); - if ($supplier->id !== 0) { - $bill->billTo = $supplier->account->name1; - $bill->billAddress = $supplier->mainAddress->address; - $bill->billCity = $supplier->mainAddress->city; - $bill->billZip = $supplier->mainAddress->postal; - $bill->billCountry = $supplier->mainAddress->country; + if ($bill->supplier->id !== 0) { + $bill->billTo = $bill->supplier->account->name1; + $bill->billAddress = $bill->supplier->mainAddress->address; + $bill->billCity = $bill->supplier->mainAddress->city; + $bill->billZip = $bill->supplier->mainAddress->postal; + $bill->billCountry = $bill->supplier->mainAddress->country; } else { $bill->billCountry = InvoiceRecognition::findCountry($lines, $identifiers, $language); } @@ -176,13 +174,13 @@ final class CliController extends Controller /* Date */ $billDateTemp = InvoiceRecognition::findBillDate($lines, $identifiers['bill_date'][$language]); - $billDate = InvoiceRecognition::parseDate($billDateTemp, $identifiers['date_format'], $supplier->getAttribute('bill_date_format')->value->valueStr ?? ''); + $billDate = InvoiceRecognition::parseDate($billDateTemp, $identifiers['date_format'], $bill->supplier->getAttribute('bill_date_format')->value->valueStr ?? ''); $bill->billDate = $billDate; /* Due */ $billDueTemp = InvoiceRecognition::findBillDue($lines, $identifiers['bill_due'][$language]); - $billDue = InvoiceRecognition::parseDate($billDueTemp, $identifiers['date_format'], $supplier->getAttribute('bill_date_format')->value->valueStr ?? ''); + $billDue = InvoiceRecognition::parseDate($billDueTemp, $identifiers['date_format'], $bill->supplier->getAttribute('bill_date_format')->value->valueStr ?? ''); // @todo implement multiple due dates for bills /* Total */ @@ -232,7 +230,6 @@ final class CliController extends Controller /* Item lines */ $itemLines = InvoiceRecognition::findBillItemLines($lines, $identifiers['item_table'][$language]); - // @todo Try to find item from item database // @todo Some of the element value setting is unnecessary as it happens also in the recalculatePrices() // Same goes for the bill element creations further down below if (empty($bill->elements)) { @@ -246,7 +243,25 @@ final class CliController extends Controller $billElement->taxR->value = $taxRates; if (isset($itemLine['description'])) { - $billElement->itemName = \trim($itemLine['description']); + $description = \trim($itemLine['description']); + $item = new NullItem(); + + if ($bill->supplier->id !== 0) { + $possibleItems = PriceMapper::getAll() + ->with('item') + ->with('item/l11n') + ->where('supplier', $bill->supplier->id) + + $item = $this->matchItem($content, $items); + } + + if ($item->id !== 0) { + $billElement->item = $item; + $billElement->itemNumber = $item->number; + $billElement->itemName = $item->getL11n('name1')->content; + } else { + $billElement->itemName = \trim($itemLine['description']); + } } if (isset($itemLine['quantity'])) { @@ -455,19 +470,19 @@ final class CliController extends Controller * @param string $content Content to analyze * @param Supplier[] $suppliers Suppliers * - * @return int + * @return Supplier * * @since 1.0.0 */ - private function matchSupplier(string $content, array $suppliers) : int + private function matchSupplier(string $content, array $suppliers) : Supplier { // bill_match_pattern foreach ($suppliers as $supplier) { - // @todo consider to support regex? + // @question consider to support regex? if ((!empty($supplier->getAttribute('bill_match_pattern')->value->valueStr) && \stripos($content, $supplier->getAttribute('bill_match_pattern')->value->valueStr) !== false) ) { - return $supplier->id; + return $supplier; } } @@ -477,7 +492,7 @@ final class CliController extends Controller $ibans = $supplier->getPaymentsByType(PaymentType::SWIFT); foreach ($ibans as $iban) { if (\stripos($content, $iban->content2) !== false) { - return $supplier->id; + return $supplier; } } } @@ -492,10 +507,48 @@ final class CliController extends Controller && \stripos($content, $supplier->mainAddress->address) !== false) ) ) { - return $supplier->id; + return $supplier; } } - return 0; + return new NullSupplier(); + } + + /** + * Find possible item id + * + * Priorities: + * 1. bill_match_pattern + * 2. name1 + name2 + * + * @param string $content Content to analyze + * @param Item[] $items Items + * + * @return Item + * + * @since 1.0.0 + */ + private function matchItem(string $content, array $items) : Item + { + // bill_match_pattern + foreach ($items as $item) { + // @question consider to support regex? + if ((!empty($item->getAttribute('bill_match_pattern')->value->valueStr) + && \stripos($content, $item->getAttribute('bill_match_pattern')->value->valueStr) !== false) + ) { + return $item; + } + } + + // name1 + name2 + foreach ($items as $item) { + if (\stripos($content, $item->getL11n('name1')->content) !== false + && \stripos($content, $item->getL11n('name2')->content) !== false + ) { + return $item; + } + } + + return new NullItem(); } } diff --git a/Controller/Controller.php b/Controller/Controller.php index a55c965..d2e0df5 100755 --- a/Controller/Controller.php +++ b/Controller/Controller.php @@ -6,7 +6,7 @@ * * @package Modules\Billing * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ use phpOMS\Module\WebInterface; * Billing class. * * @package Modules\Billing - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Docs/Help/en/SUMMARY.md b/Docs/Help/en/SUMMARY.md index 40ade73..7acade8 100644 --- a/Docs/Help/en/SUMMARY.md +++ b/Docs/Help/en/SUMMARY.md @@ -3,3 +3,4 @@ * [Bill]({%}&page=Help/bill) * [Bill Types]({%}&page=Help/bill_types) * [Taxes]({%}&page=Help/taxes) +* [Invoice Recognition]({%}&page=Help/invoice_recognition) diff --git a/Docs/Help/en/introduction.md b/Docs/Help/en/introduction.md index 879406b..36a2553 100644 --- a/Docs/Help/en/introduction.md +++ b/Docs/Help/en/introduction.md @@ -8,7 +8,11 @@ The target group for this module is the sales and purchase department. # Setup -This module doesn't have any additional setup requirements. +If you want to use parts of the automatic invoice recognition for supplier invoices, the following tools must be installed on the server: + +* [pdftotext](https://www.xpdfreader.com/pdftotext-man.html) (extract text from PDFs) +* [pdftoppm](https://www.xpdfreader.com/pdftoppm-man.html) (turn pdf to image if text cannot be read from PDF) +* [tesseract-ocr](https://tesseract-ocr.github.io/tessdoc/Downloads.html) (text recognition from images) # Features diff --git a/Docs/Help/en/invoice_recognition.md b/Docs/Help/en/invoice_recognition.md new file mode 100644 index 0000000..69c1abb --- /dev/null +++ b/Docs/Help/en/invoice_recognition.md @@ -0,0 +1,19 @@ +# Invoice recognition + +When you upload a invoice the application will automatically try to recognize as many aspects of the invoice as possible using the supplier and item information you provide in the [Supplier Management]({/}?id=SupplierManagement) and [Item Management]({/}?id=ItemManagement). + +## Suppliers + +Even though the application tries to automatically match the supplier against the suppliers in the datbase using various techniques it may be necessary to provide additional information to improve the matching process. + +If you open a supplier you can define the attribute **Bill match pattern** (`bill_match_pattern`) where you can store a unique text identifier for this supplier that appears on all of his invoices. This text identifier will then be used to match invoices against this supplier. + +Examples of such identifiers can be telephone numbers, an email address that is printed on the invoice or the name of the CEO. + +> By default the matching algorithm will use the supplier name, supplier address and banking information (e.g. IBAN) + +## Items + +Items are recognized by their `name1` and `name2` localization (both must match). The matching process also only consideres items that have a price defined from the respective supplier. That price can be 0 though. + +If the item name on the supplier invoice is different from your `name1` and `name2` defined name you can define the item attribute **Bill match pattern** (`bill_match_pattern`) where you can store a text identifier/name for this specific item. This text identifier will then be used to match the supplier item name against your items. diff --git a/Models/Attribute/BillAttributeMapper.php b/Models/Attribute/BillAttributeMapper.php index 71cabaa..2ce0055 100755 --- a/Models/Attribute/BillAttributeMapper.php +++ b/Models/Attribute/BillAttributeMapper.php @@ -6,7 +6,7 @@ * * @package Modules\Billing\Models\Attribute * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory; * Bill mapper class. * * @package Modules\Billing\Models\Attribute - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 * diff --git a/Models/Attribute/BillAttributeTypeL11nMapper.php b/Models/Attribute/BillAttributeTypeL11nMapper.php index 65aacd0..7d588bd 100755 --- a/Models/Attribute/BillAttributeTypeL11nMapper.php +++ b/Models/Attribute/BillAttributeTypeL11nMapper.php @@ -6,7 +6,7 @@ * * @package Modules\Billing\Models\Attribute * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ use phpOMS\Localization\BaseStringL11n; * Bill mapper class. * * @package Modules\Billing\Models\Attribute - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 * diff --git a/Models/Attribute/BillAttributeTypeMapper.php b/Models/Attribute/BillAttributeTypeMapper.php index 11b97f0..1974e27 100755 --- a/Models/Attribute/BillAttributeTypeMapper.php +++ b/Models/Attribute/BillAttributeTypeMapper.php @@ -6,7 +6,7 @@ * * @package Modules\Billing\Models\Attribute * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory; * Bill mapper class. * * @package Modules\Billing\Models\Attribute - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 * diff --git a/Models/Attribute/BillAttributeValueL11nMapper.php b/Models/Attribute/BillAttributeValueL11nMapper.php index f1604be..8b564ba 100755 --- a/Models/Attribute/BillAttributeValueL11nMapper.php +++ b/Models/Attribute/BillAttributeValueL11nMapper.php @@ -6,7 +6,7 @@ * * @package Modules\Billing\Models\Attribute * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ use phpOMS\Localization\BaseStringL11n; * Bill mapper class. * * @package Modules\Billing\Models\Attribute - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 * diff --git a/Models/Attribute/BillAttributeValueMapper.php b/Models/Attribute/BillAttributeValueMapper.php index c698c3e..5be143a 100755 --- a/Models/Attribute/BillAttributeValueMapper.php +++ b/Models/Attribute/BillAttributeValueMapper.php @@ -6,7 +6,7 @@ * * @package Modules\Billing\Models\Attribute * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory; * Bill mapper class. * * @package Modules\Billing\Models\Attribute - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 * diff --git a/Models/Bill.php b/Models/Bill.php index 5f9b7b5..da0bf9e 100755 --- a/Models/Bill.php +++ b/Models/Bill.php @@ -6,7 +6,7 @@ * * @package Modules\Billing\Models * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ @@ -28,7 +28,7 @@ use phpOMS\Stdlib\Base\FloatInt; * Bill class. * * @package Modules\Billing\Models - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/BillElement.php b/Models/BillElement.php index 8938dab..9fd2426 100755 --- a/Models/BillElement.php +++ b/Models/BillElement.php @@ -6,7 +6,7 @@ * * @package Modules\Billing\Models * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ @@ -26,7 +26,7 @@ use phpOMS\Stdlib\Base\SmartDateTime; * Bill class. * * @package Modules\Billing\Models - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/BillElementMapper.php b/Models/BillElementMapper.php index 1eb5200..ad3300b 100755 --- a/Models/BillElementMapper.php +++ b/Models/BillElementMapper.php @@ -6,7 +6,7 @@ * * @package Modules\Billing\Models * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ @@ -23,7 +23,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory; * Billelement mapper class. * * @package Modules\Billing\Models - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 * diff --git a/Models/BillMapper.php b/Models/BillMapper.php index 1c7b443..6961b48 100755 --- a/Models/BillMapper.php +++ b/Models/BillMapper.php @@ -6,7 +6,7 @@ * * @package Modules\Billing\Models * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ @@ -29,7 +29,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory; * WARNING: This mapper may use a trigger to update the sequence number on insert. * * @package Modules\Billing\Models - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 * diff --git a/Models/BillPaymentStatus.php b/Models/BillPaymentStatus.php index ad777fa..7532d0d 100755 --- a/Models/BillPaymentStatus.php +++ b/Models/BillPaymentStatus.php @@ -6,7 +6,7 @@ * * @package Modules\Billing\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; * Status for external references * * @package Modules\Billing\Models - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/BillStatus.php b/Models/BillStatus.php index 01e15ba..2c58a48 100755 --- a/Models/BillStatus.php +++ b/Models/BillStatus.php @@ -6,7 +6,7 @@ * * @package Modules\Billing\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; * Bill status enum. * * @package Modules\Billing\Models - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/BillTransferType.php b/Models/BillTransferType.php index c48aa53..16ae506 100755 --- a/Models/BillTransferType.php +++ b/Models/BillTransferType.php @@ -6,7 +6,7 @@ * * @package Modules\Billing\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; * Bill transfer type enum. * * @package Modules\Billing\Models - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/BillType.php b/Models/BillType.php index bdfe2aa..852e8ba 100755 --- a/Models/BillType.php +++ b/Models/BillType.php @@ -6,7 +6,7 @@ * * @package Modules\Billing\Models * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ @@ -22,7 +22,7 @@ use phpOMS\Localization\ISO639x1Enum; * Bill type enum. * * @package Modules\Billing\Models - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/BillTypeL11nMapper.php b/Models/BillTypeL11nMapper.php index d6abb8c..930d29b 100755 --- a/Models/BillTypeL11nMapper.php +++ b/Models/BillTypeL11nMapper.php @@ -6,7 +6,7 @@ * * @package Modules\Billing\Models * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ use phpOMS\Localization\BaseStringL11n; * Bill type mapper class. * * @package Modules\Billing\Models - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 * diff --git a/Models/BillTypeMapper.php b/Models/BillTypeMapper.php index 67cee1c..7c99def 100755 --- a/Models/BillTypeMapper.php +++ b/Models/BillTypeMapper.php @@ -6,7 +6,7 @@ * * @package Modules\Billing\Models * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory; * Billing mapper class. * * @package Modules\Billing\Models - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 * diff --git a/Models/InvoiceRecognition.php b/Models/InvoiceRecognition.php index 7cf37df..2262222 100644 --- a/Models/InvoiceRecognition.php +++ b/Models/InvoiceRecognition.php @@ -6,7 +6,7 @@ * * @package Modules\Billing\Models * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ @@ -29,7 +29,7 @@ use phpOMS\Validation\Finance\IbanEnum; * Bill type enum. * * @package Modules\Billing\Models - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/NullBill.php b/Models/NullBill.php index f917b91..c6b0f90 100755 --- a/Models/NullBill.php +++ b/Models/NullBill.php @@ -6,7 +6,7 @@ * * @package Modules\Billing\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\Billing\Models; * Null bill class. * * @package Modules\Billing\Models - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/NullBillElement.php b/Models/NullBillElement.php index 916e768..d99db58 100755 --- a/Models/NullBillElement.php +++ b/Models/NullBillElement.php @@ -6,7 +6,7 @@ * * @package Modules\Billing\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\Billing\Models; * Null bill element class. * * @package Modules\Billing\Models - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/NullBillType.php b/Models/NullBillType.php index 4ee3e0f..98ec2f8 100755 --- a/Models/NullBillType.php +++ b/Models/NullBillType.php @@ -6,7 +6,7 @@ * * @package Modules\Billing\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\Billing\Models; * Null bill type class. * * @package Modules\Billing\Models - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/NullSubscription.php b/Models/NullSubscription.php index 29c54c5..87ef102 100755 --- a/Models/NullSubscription.php +++ b/Models/NullSubscription.php @@ -6,7 +6,7 @@ * * @package Modules\Billing\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\Billing\Models; * Null subscription class. * * @package Modules\Billing\Models - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/PaymentTermL11nMapper.php b/Models/PaymentTermL11nMapper.php index d0072f8..1ed7d4f 100644 --- a/Models/PaymentTermL11nMapper.php +++ b/Models/PaymentTermL11nMapper.php @@ -6,7 +6,7 @@ * * @package Modules\Billing\Models * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ use phpOMS\Localization\BaseStringL11n; * PaymentTermL11n mapper class. * * @package Modules\Billing\Models - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 * diff --git a/Models/PaymentTermMapper.php b/Models/PaymentTermMapper.php index baf5b4c..7db049a 100644 --- a/Models/PaymentTermMapper.php +++ b/Models/PaymentTermMapper.php @@ -6,7 +6,7 @@ * * @package Modules\Billing\Models * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ use phpOMS\Localization\BaseStringL11nType; * PaymentTerm mapper class. * * @package Modules\Billing\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 e0c41b1..a5eeee4 100755 --- a/Models/PermissionCategory.php +++ b/Models/PermissionCategory.php @@ -6,7 +6,7 @@ * * @package Modules\Billing\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\Billing\Models - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/Price/NullPrice.php b/Models/Price/NullPrice.php index c0ff963..8988992 100755 --- a/Models/Price/NullPrice.php +++ b/Models/Price/NullPrice.php @@ -6,7 +6,7 @@ * * @package Modules\Billing\Models\Price * @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\Billing\Models\Price; * Null bill type class. * * @package Modules\Billing\Models\Price - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/Price/Price.php b/Models/Price/Price.php index 6079d04..fc7173e 100755 --- a/Models/Price/Price.php +++ b/Models/Price/Price.php @@ -6,7 +6,7 @@ * * @package Modules\Billing\Models\Price * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ @@ -29,7 +29,7 @@ use phpOMS\Stdlib\Base\FloatInt; * Bill class. * * @package Modules\Billing\Models\Price - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 * diff --git a/Models/Price/PriceMapper.php b/Models/Price/PriceMapper.php index 6567819..6f12b3a 100755 --- a/Models/Price/PriceMapper.php +++ b/Models/Price/PriceMapper.php @@ -6,7 +6,7 @@ * * @package Modules\Billing\Models\Price * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ @@ -26,7 +26,7 @@ use phpOMS\Localization\Defaults\CountryMapper; * Billing mapper class. * * @package Modules\Billing\Models\Price - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 * diff --git a/Models/Price/PriceStatus.php b/Models/Price/PriceStatus.php index ad42907..da4b6b7 100644 --- a/Models/Price/PriceStatus.php +++ b/Models/Price/PriceStatus.php @@ -6,7 +6,7 @@ * * @package Modules\Billing\Models\Price * @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; * Module settings enum. * * @package Modules\Billing\Models\Price - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/Price/PriceType.php b/Models/Price/PriceType.php index 1f165f8..dc7134d 100755 --- a/Models/Price/PriceType.php +++ b/Models/Price/PriceType.php @@ -6,7 +6,7 @@ * * @package Modules\Billing\Models\Price * @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; * Module settings enum. * * @package Modules\Billing\Models\Price - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/PurchaseBillMapper.php b/Models/PurchaseBillMapper.php index e7c9947..f9a9d06 100755 --- a/Models/PurchaseBillMapper.php +++ b/Models/PurchaseBillMapper.php @@ -6,7 +6,7 @@ * * @package Modules\Billing\Models * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ @@ -23,7 +23,7 @@ use phpOMS\Stdlib\Base\FloatInt; * PurchaseBill mapper class. * * @package Modules\Billing\Models - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 * diff --git a/Models/SalesBillMapper.php b/Models/SalesBillMapper.php index 54583ac..e88d79b 100755 --- a/Models/SalesBillMapper.php +++ b/Models/SalesBillMapper.php @@ -6,7 +6,7 @@ * * @package Modules\Billing\Models * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ @@ -23,7 +23,7 @@ use phpOMS\Stdlib\Base\FloatInt; * SalesBill mapper class. * * @package Modules\Billing\Models - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 * diff --git a/Models/SettingsEnum.php b/Models/SettingsEnum.php index 6ed7f93..89cfffd 100755 --- a/Models/SettingsEnum.php +++ b/Models/SettingsEnum.php @@ -6,7 +6,7 @@ * * @package Modules\Billing\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; * Module settings enum. * * @package Modules\Billing\Models - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/ShippingTermL11nMapper.php b/Models/ShippingTermL11nMapper.php index bee9b76..3bae190 100644 --- a/Models/ShippingTermL11nMapper.php +++ b/Models/ShippingTermL11nMapper.php @@ -6,7 +6,7 @@ * * @package Modules\Billing\Models * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ use phpOMS\Localization\BaseStringL11n; * ShippingTermL11n mapper class. * * @package Modules\Billing\Models - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 * diff --git a/Models/ShippingTermMapper.php b/Models/ShippingTermMapper.php index 2a81ea2..a4f1133 100644 --- a/Models/ShippingTermMapper.php +++ b/Models/ShippingTermMapper.php @@ -6,7 +6,7 @@ * * @package Modules\Billing\Models * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ use phpOMS\Localization\BaseStringL11nType; * ShippingTerm mapper class. * * @package Modules\Billing\Models - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 * diff --git a/Models/StockBillMapper.php b/Models/StockBillMapper.php index 7ce3e43..6646e07 100755 --- a/Models/StockBillMapper.php +++ b/Models/StockBillMapper.php @@ -6,7 +6,7 @@ * * @package Modules\Billing\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\Query\Builder; * StockBill mapper class. * * @package Modules\Billing\Models - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 * diff --git a/Models/Subscription.php b/Models/Subscription.php index 0a151eb..35f2033 100755 --- a/Models/Subscription.php +++ b/Models/Subscription.php @@ -6,7 +6,7 @@ * * @package Modules\Billing\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\FloatInt; * Subscription class. * * @package Modules\Billing\Models - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/SubscriptionMapper.php b/Models/SubscriptionMapper.php index 61befbe..f4bb7c6 100755 --- a/Models/SubscriptionMapper.php +++ b/Models/SubscriptionMapper.php @@ -6,7 +6,7 @@ * * @package Modules\Billing\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; * Subscription mapper class. * * @package Modules\Billing\Models - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 * diff --git a/Models/Tax/BillTaxType.php b/Models/Tax/BillTaxType.php index 7bc2fb8..0319796 100755 --- a/Models/Tax/BillTaxType.php +++ b/Models/Tax/BillTaxType.php @@ -6,7 +6,7 @@ * * @package Modules\Billing\Models\Tax * @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; * Bill transfer type enum. * * @package Modules\Billing\Models\Tax - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/Tax/NullTaxCombination.php b/Models/Tax/NullTaxCombination.php index 41bb20a..9c1af3d 100755 --- a/Models/Tax/NullTaxCombination.php +++ b/Models/Tax/NullTaxCombination.php @@ -6,7 +6,7 @@ * * @package Modules\Billing\Models\Tax * @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\Billing\Models\Tax; * Null model * * @package Modules\Billing\Models\Tax - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/Tax/TaxCombination.php b/Models/Tax/TaxCombination.php index 4e8ca72..393b710 100755 --- a/Models/Tax/TaxCombination.php +++ b/Models/Tax/TaxCombination.php @@ -6,7 +6,7 @@ * * @package Modules\Billing\Models\Tax * @copyright Dennis Eichhorn - * @license OMS License 2.0 + * @license OMS License 2.2 * @version 1.0.0 * @link https://jingga.app */ @@ -23,7 +23,7 @@ use Modules\Finance\Models\TaxCode; * Billing class. * * @package Modules\Billing\Models\Tax - * @license OMS License 2.0 + * @license OMS License 2.2 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/Tax/TaxCombinationMapper.php b/Models/Tax/TaxCombinationMapper.php index 9e5b43a..1a139c2 100755 --- a/Models/Tax/TaxCombinationMapper.php +++ b/Models/Tax/TaxCombinationMapper.php @@ -6,7 +6,7 @@ * * @package Modules\Billing\Models\Tax * @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\DataStorage\Database\Mapper\DataMapperFactory; * Billing mapper class. * * @package Modules\Billing\Models\Tax - * @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 39ac363..8c50796 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 27abb42..1d64849 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 99fcdf4..d642ed0 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 5bb71d3..65b5473 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/bill-create.tpl.php b/Theme/Backend/bill-create.tpl.php index c88342c..cbccb79 100755 --- a/Theme/Backend/bill-create.tpl.php +++ b/Theme/Backend/bill-create.tpl.php @@ -6,7 +6,7 @@ * * @package Modules\Billing * @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/finance-taxcombination-list.tpl.php b/Theme/Backend/finance-taxcombination-list.tpl.php index 2144e8c..5222ada 100644 --- a/Theme/Backend/finance-taxcombination-list.tpl.php +++ b/Theme/Backend/finance-taxcombination-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/finance-taxcombination-view.tpl.php b/Theme/Backend/finance-taxcombination-view.tpl.php index 7e52e5d..78295fb 100644 --- a/Theme/Backend/finance-taxcombination-view.tpl.php +++ b/Theme/Backend/finance-taxcombination-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/Theme/Backend/payment-type-list.tpl.php b/Theme/Backend/payment-type-list.tpl.php index 21d8cec..3965aff 100644 --- a/Theme/Backend/payment-type-list.tpl.php +++ b/Theme/Backend/payment-type-list.tpl.php @@ -6,7 +6,7 @@ * * @package Modules\ItemManagement * @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/payment-view.tpl.php b/Theme/Backend/payment-view.tpl.php index 5fb9110..ae02e5c 100644 --- a/Theme/Backend/payment-view.tpl.php +++ b/Theme/Backend/payment-view.tpl.php @@ -6,7 +6,7 @@ * * @package Modules\Billing * @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/purchase-bill-list.tpl.php b/Theme/Backend/purchase-bill-list.tpl.php index 6393246..c9bfb15 100755 --- a/Theme/Backend/purchase-bill-list.tpl.php +++ b/Theme/Backend/purchase-bill-list.tpl.php @@ -6,7 +6,7 @@ * * @package Modules\Billing * @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/purchase-bill-upload.tpl.php b/Theme/Backend/purchase-bill-upload.tpl.php index f442ac8..fdf9137 100644 --- a/Theme/Backend/purchase-bill-upload.tpl.php +++ b/Theme/Backend/purchase-bill-upload.tpl.php @@ -6,7 +6,7 @@ * * @package Modules\Billing * @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/purchase-bill.tpl.php b/Theme/Backend/purchase-bill.tpl.php index 7693231..ed95342 100755 --- a/Theme/Backend/purchase-bill.tpl.php +++ b/Theme/Backend/purchase-bill.tpl.php @@ -6,7 +6,7 @@ * * @package Modules\Billing * @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/sales-bill-list.tpl.php b/Theme/Backend/sales-bill-list.tpl.php index 67ff78e..e086328 100755 --- a/Theme/Backend/sales-bill-list.tpl.php +++ b/Theme/Backend/sales-bill-list.tpl.php @@ -6,7 +6,7 @@ * * @package Modules\Billing * @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/shipping-type-list.tpl.php b/Theme/Backend/shipping-type-list.tpl.php index 54d3239..01f240f 100644 --- a/Theme/Backend/shipping-type-list.tpl.php +++ b/Theme/Backend/shipping-type-list.tpl.php @@ -6,7 +6,7 @@ * * @package Modules\ItemManagement * @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/shipping-view.tpl.php b/Theme/Backend/shipping-view.tpl.php index 480e744..225d425 100644 --- a/Theme/Backend/shipping-view.tpl.php +++ b/Theme/Backend/shipping-view.tpl.php @@ -6,7 +6,7 @@ * * @package Modules\Billing * @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/Cli/Lang/de.lang.php b/Theme/Cli/Lang/de.lang.php index 1949f83..ffe0920 100644 --- a/Theme/Cli/Lang/de.lang.php +++ b/Theme/Cli/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/Cli/Lang/en.lang.php b/Theme/Cli/Lang/en.lang.php index 1949f83..ffe0920 100755 --- a/Theme/Cli/Lang/en.lang.php +++ b/Theme/Cli/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/tests/Admin/AdminTest.php b/tests/Admin/AdminTest.php index f559565..44034c5 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 525390b..9604d4d 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\Billing\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 165c4ac..6af0588 100755 --- a/tests/Bootstrap.php +++ b/tests/Bootstrap.php @@ -6,7 +6,7 @@ * * @package Modules\Billing\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/Controller/Api/ApiBillControllerTrait.php b/tests/Controller/Api/ApiBillControllerTrait.php index 862273a..bf64a8d 100644 --- a/tests/Controller/Api/ApiBillControllerTrait.php +++ b/tests/Controller/Api/ApiBillControllerTrait.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/Controller/Api/ApiPurchaseControllerTrait.php b/tests/Controller/Api/ApiPurchaseControllerTrait.php index 7038509..1ce1d10 100644 --- a/tests/Controller/Api/ApiPurchaseControllerTrait.php +++ b/tests/Controller/Api/ApiPurchaseControllerTrait.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/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php index 164da5f..4b04175 100755 --- a/tests/Controller/ApiControllerTest.php +++ b/tests/Controller/ApiControllerTest.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/BillElementTest.php b/tests/Models/BillElementTest.php index 53d7a1d..418ff61 100755 --- a/tests/Models/BillElementTest.php +++ b/tests/Models/BillElementTest.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/BillTest.php b/tests/Models/BillTest.php index 94197ae..0485ff4 100755 --- a/tests/Models/BillTest.php +++ b/tests/Models/BillTest.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/BillTypeTest.php b/tests/Models/BillTypeTest.php index 6b54725..8606d7c 100755 --- a/tests/Models/BillTypeTest.php +++ b/tests/Models/BillTypeTest.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/InvoiceRecognitionTest.php b/tests/Models/InvoiceRecognitionTest.php index d7e9711..168e3d8 100644 --- a/tests/Models/InvoiceRecognitionTest.php +++ b/tests/Models/InvoiceRecognitionTest.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/NullBillElementTest.php b/tests/Models/NullBillElementTest.php index 881b47f..67cf841 100755 --- a/tests/Models/NullBillElementTest.php +++ b/tests/Models/NullBillElementTest.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/NullBillTest.php b/tests/Models/NullBillTest.php index 7eecab9..7a73cb2 100755 --- a/tests/Models/NullBillTest.php +++ b/tests/Models/NullBillTest.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/NullBillTypeTest.php b/tests/Models/NullBillTypeTest.php index a451822..084f247 100755 --- a/tests/Models/NullBillTypeTest.php +++ b/tests/Models/NullBillTypeTest.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/NullSubscriptionTest.php b/tests/Models/NullSubscriptionTest.php index 3fd5dcd..7a2021c 100644 --- a/tests/Models/NullSubscriptionTest.php +++ b/tests/Models/NullSubscriptionTest.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/Price/NullPriceTest.php b/tests/Models/Price/NullPriceTest.php index 8368a48..d0129d7 100644 --- a/tests/Models/Price/NullPriceTest.php +++ b/tests/Models/Price/NullPriceTest.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/PurchaseBillMapperTest.php b/tests/Models/PurchaseBillMapperTest.php index bf52365..0daa735 100755 --- a/tests/Models/PurchaseBillMapperTest.php +++ b/tests/Models/PurchaseBillMapperTest.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/SalesBillMapperTest.php b/tests/Models/SalesBillMapperTest.php index 3d6aac0..3050239 100755 --- a/tests/Models/SalesBillMapperTest.php +++ b/tests/Models/SalesBillMapperTest.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/StockBillMapperTest.php b/tests/Models/StockBillMapperTest.php index 7a32459..cb9c645 100755 --- a/tests/Models/StockBillMapperTest.php +++ b/tests/Models/StockBillMapperTest.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/Tax/NullTaxCombinationTest.php b/tests/Models/Tax/NullTaxCombinationTest.php index c035f17..d281933 100644 --- a/tests/Models/Tax/NullTaxCombinationTest.php +++ b/tests/Models/Tax/NullTaxCombinationTest.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 */