diff --git a/Admin/Install/Media/bill.pdf.php b/Admin/Install/Media/bill.pdf.php index c71d8f2..e60edad 100755 --- a/Admin/Install/Media/bill.pdf.php +++ b/Admin/Install/Media/bill.pdf.php @@ -260,8 +260,6 @@ foreach ($taxes as $rate => $tax) { $pdf->Ln(); } -// @todo: add currency - $pdf->setFillColor(255, 162, 7); $pdf->setTextColor(255); $pdf->setDrawColor(255, 162, 7); diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json index 4f01255..2845692 100755 --- a/Admin/Install/Navigation.install.json +++ b/Admin/Install/Navigation.install.json @@ -217,8 +217,8 @@ "pid": "/", "type": 2, "subtype": 1, - "name": "Purchase", - "uri": "{/base}/private/purchase/billing/dashboard?{?}", + "name": "InvoiceRecognition", + "uri": "{/base}/private/purchase/recognition/dashboard?{?}", "target": "self", "icon": null, "order": 5, @@ -232,7 +232,7 @@ "type": 3, "subtype": 1, "name": "List", - "uri": "{/base}/private/purchase/billing/dashboard?{?}", + "uri": "{/base}/private/purchase/recognition/dashboard?{?}", "target": "self", "icon": null, "order": 1, @@ -248,7 +248,7 @@ "type": 3, "subtype": 1, "name": "Upload", - "uri": "{/base}/private/purchase/billing/upload?{?}", + "uri": "{/base}/private/purchase/recognition/upload?{?}", "target": "self", "icon": null, "order": 5, @@ -259,5 +259,53 @@ ] } ] + }, + { + "id": 1005110001, + "pid": "/", + "type": 2, + "subtype": 1, + "name": "InvoiceRecognition", + "uri": "{/base}/purchase/recognition/dashboard?{?}", + "target": "self", + "icon": null, + "order": 5, + "from": "Billing", + "permission": { "permission": 2, "category": null, "element": null }, + "parent": 1003401001, + "children": [ + { + "id": 1005110101, + "pid": "/", + "type": 3, + "subtype": 1, + "name": "List", + "uri": "{/base}/purchase/recognition/dashboard?{?}", + "target": "self", + "icon": null, + "order": 1, + "from": "Billing", + "permission": { "permission": 2, "category": null, "element": null }, + "parent": 1005110001, + "children": [ + ] + }, + { + "id": 1005110201, + "pid": "/", + "type": 3, + "subtype": 1, + "name": "Upload", + "uri": "{/base}/purchase/recognition/upload?{?}", + "target": "self", + "icon": null, + "order": 5, + "from": "Billing", + "permission": { "permission": 2, "category": null, "element": null }, + "parent": 1005110001, + "children": [ + ] + } + ] } ] diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index ff44bbb..082061c 100755 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -131,7 +131,7 @@ return [ ], ], - '^.*/private/purchase/billing/dashboard.*$' => [ + '^.*/private/purchase/recognition/dashboard.*$' => [ [ 'dest' => '\Modules\Billing\Controller\BackendController:viewPrivatePurchaseBillDashboard', 'verb' => RouteVerb::GET, @@ -142,7 +142,7 @@ return [ ], ], ], - '^.*/private/purchase/billing/upload.*$' => [ + '^.*/private/purchase/recognition/upload.*$' => [ [ 'dest' => '\Modules\Billing\Controller\BackendController:viewPrivatePurchaseBillUpload', 'verb' => RouteVerb::GET, @@ -153,7 +153,40 @@ return [ ], ], ], - '^.*/private/purchase/billing/bill.*$' => [ + '^.*/private/purchase/recognition/bill.*$' => [ + [ + 'dest' => '\Modules\Billing\Controller\BackendController:viewPrivateBillingPurchaseInvoice', + 'verb' => RouteVerb::GET, + 'permission' => [ + 'module' => BackendController::NAME, + 'type' => PermissionType::READ, + 'state' => PermissionCategory::PRIVATE_DASHBOARD, + ], + ], + ], + '^.*/purchase/recognition/dashboard.*$' => [ + [ + 'dest' => '\Modules\Billing\Controller\BackendController:viewPrivatePurchaseBillDashboard', + 'verb' => RouteVerb::GET, + 'permission' => [ + 'module' => BackendController::NAME, + 'type' => PermissionType::READ, + 'state' => PermissionCategory::PRIVATE_DASHBOARD, + ], + ], + ], + '^.*/purchase/recognition/upload.*$' => [ + [ + 'dest' => '\Modules\Billing\Controller\BackendController:viewPrivatePurchaseBillUpload', + 'verb' => RouteVerb::GET, + 'permission' => [ + 'module' => BackendController::NAME, + 'type' => PermissionType::READ, + 'state' => PermissionCategory::PRIVATE_BILL_UPLOAD, + ], + ], + ], + '^.*/purchase/recognition/bill.*$' => [ [ 'dest' => '\Modules\Billing\Controller\BackendController:viewPrivateBillingPurchaseInvoice', 'verb' => RouteVerb::GET, diff --git a/Controller/ApiAttributeController.php b/Controller/ApiAttributeController.php index a2c8f80..d61aa61 100755 --- a/Controller/ApiAttributeController.php +++ b/Controller/ApiAttributeController.php @@ -61,7 +61,7 @@ final class ApiAttributeController extends Controller return; } - $type = BillAttributeTypeMapper::get()->where('id', (int) $request->getData('type'))->execute(); + $type = BillAttributeTypeMapper::get()->with('defaults')->where('id', (int) $request->getData('type'))->execute(); $attribute = $this->createAttributeFromRequest($request, $type); $this->createModel($request->header->account, $attribute, BillAttributeMapper::class, 'attribute', $request->getOrigin()); $this->createStandardCreateResponse($request, $response, $attribute); @@ -359,7 +359,7 @@ final class ApiAttributeController extends Controller } /** @var AttributeType $old */ - $old = BillAttributeTypeMapper::get()->where('id', (int) $request->getData('id'))->execute(); + $old = BillAttributeTypeMapper::get()->with('defaults')->where('id', (int) $request->getData('id'))->execute(); $new = $this->updateAttributeTypeFromRequest($request, clone $old); $this->updateModel($request->header->account, $old, $new, BillAttributeTypeMapper::class, 'bill_attribute_type', $request->getOrigin()); @@ -391,7 +391,7 @@ final class ApiAttributeController extends Controller } /** @var AttributeType $billAttributeType */ - $billAttributeType = BillAttributeTypeMapper::get()->where('id', (int) $request->getData('id'))->execute(); + $billAttributeType = BillAttributeTypeMapper::get()->with('defaults')->where('id', (int) $request->getData('id'))->execute(); $this->deleteModel($request->header->account, $billAttributeType, BillAttributeTypeMapper::class, 'bill_attribute_type', $request->getOrigin()); $this->createStandardDeleteResponse($request, $response, $billAttributeType); } diff --git a/Controller/ApiBillController.php b/Controller/ApiBillController.php index e0e1e11..984b8ba 100755 --- a/Controller/ApiBillController.php +++ b/Controller/ApiBillController.php @@ -182,8 +182,10 @@ final class ApiBillController extends Controller { $this->createModel($request->header->account, $bill, BillMapper::class, 'bill', $request->getOrigin()); - // We ned to get the bill again since the bill has a trigger which is executed on insert - // @todo: consider to remove the trigger and select the latest bill here and add + 1 to the new sequence since we have to tdo an update anyways + // We need to get the bill again since the bill has a trigger which is executed on insert + // Doing this manually would cause concurrency issues because there are times (up to 200ms) + // when the previous element doesn't have a sequence defined. + /** @var Bill $bill */ $tmp = BillMapper::get() ->where('id', $bill->id) @@ -192,7 +194,7 @@ final class ApiBillController extends Controller $bill->sequence = $tmp->sequence; $old = clone $bill; - $bill->buildNumber(); // The bill id is part of the number + $bill->buildNumber(); // The bill sequence number is part of the number $this->updateModel($request->header->account, $old, $bill, BillMapper::class, 'bill', $request->getOrigin()); } @@ -537,7 +539,7 @@ final class ApiBillController extends Controller ->execute(); if (\count($billCollection) !== 1) { - // For some reason there are multiple collections with the same virtual path? + // @todo: For some reason there are multiple collections with the same virtual path? // @todo: check if this is the correct way to handle it or if we need to make sure that it is a collection return; } diff --git a/Controller/ApiPriceController.php b/Controller/ApiPriceController.php index 9ed86ed..4ee4b38 100755 --- a/Controller/ApiPriceController.php +++ b/Controller/ApiPriceController.php @@ -106,7 +106,6 @@ final class ApiPriceController extends Controller } // Get all relevant prices - // @todo: allow to define NOT IN somehow (e.g. not in France -> simple solution to define export prices etc.) $queryMapper = PriceMapper::getAll(); if ($request->hasData('price_name')) { diff --git a/Theme/Backend/Lang/Navigation.ar.lang.php b/Theme/Backend/Lang/Navigation.ar.lang.php index c03a246..7aa0f42 100755 --- a/Theme/Backend/Lang/Navigation.ar.lang.php +++ b/Theme/Backend/Lang/Navigation.ar.lang.php @@ -13,9 +13,10 @@ declare(strict_types=1); return ['Navigation' => [ - 'Archive' => 'أرشيف', - 'Bill' => 'فاتورة', - 'Billing' => 'الفواتير', - 'Open' => '', - 'Upload' => '', + 'Archive' => 'أرشيف', + 'Bill' => 'فاتورة', + 'Billing' => 'الفواتير', + 'InvoiceRecognition' => '', + 'Open' => '', + 'Upload' => '', ]]; diff --git a/Theme/Backend/Lang/Navigation.cs.lang.php b/Theme/Backend/Lang/Navigation.cs.lang.php index edabf77..ea42018 100755 --- a/Theme/Backend/Lang/Navigation.cs.lang.php +++ b/Theme/Backend/Lang/Navigation.cs.lang.php @@ -13,9 +13,10 @@ declare(strict_types=1); return ['Navigation' => [ - 'Archive' => 'Archiv', - 'Bill' => 'Účtovat', - 'Billing' => 'Fakturační', - 'Open' => '', - 'Upload' => '', + 'Archive' => 'Archiv', + 'Bill' => 'Účtovat', + 'Billing' => 'Fakturační', + 'InvoiceRecognition' => '', + 'Open' => '', + 'Upload' => '', ]]; diff --git a/Theme/Backend/Lang/Navigation.da.lang.php b/Theme/Backend/Lang/Navigation.da.lang.php index bdea83c..f877e46 100755 --- a/Theme/Backend/Lang/Navigation.da.lang.php +++ b/Theme/Backend/Lang/Navigation.da.lang.php @@ -13,9 +13,10 @@ declare(strict_types=1); return ['Navigation' => [ - 'Archive' => 'Arkiv', - 'Bill' => 'Regning', - 'Billing' => 'Fakturering', - 'Open' => '', - 'Upload' => '', + 'Archive' => 'Arkiv', + 'Bill' => 'Regning', + 'Billing' => 'Fakturering', + 'InvoiceRecognition' => '', + 'Open' => '', + 'Upload' => '', ]]; diff --git a/Theme/Backend/Lang/Navigation.de.lang.php b/Theme/Backend/Lang/Navigation.de.lang.php index eda8fab..38cca7d 100755 --- a/Theme/Backend/Lang/Navigation.de.lang.php +++ b/Theme/Backend/Lang/Navigation.de.lang.php @@ -13,9 +13,10 @@ declare(strict_types=1); return ['Navigation' => [ - 'Archive' => 'Archiv', - 'Bill' => 'Rechnung', - 'Billing' => 'Billing', - 'Open' => '', - 'Upload' => '', + 'Archive' => 'Archiv', + 'Bill' => 'Rechnung', + 'Billing' => 'Billing', + 'InvoiceRecognition' => 'Rechnungserkennung', + 'Open' => 'Offen', + 'Upload' => 'Hochladen', ]]; diff --git a/Theme/Backend/Lang/Navigation.el.lang.php b/Theme/Backend/Lang/Navigation.el.lang.php index f511be7..d354442 100755 --- a/Theme/Backend/Lang/Navigation.el.lang.php +++ b/Theme/Backend/Lang/Navigation.el.lang.php @@ -13,9 +13,10 @@ declare(strict_types=1); return ['Navigation' => [ - 'Archive' => 'Αρχειοθέτηση', - 'Bill' => 'Νομοσχέδιο', - 'Billing' => 'Χρέωση', - 'Open' => '', - 'Upload' => '', + 'Archive' => 'Αρχειοθέτηση', + 'Bill' => 'Νομοσχέδιο', + 'Billing' => 'Χρέωση', + 'InvoiceRecognition' => '', + 'Open' => '', + 'Upload' => '', ]]; diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php index 6ea27d2..f446247 100755 --- a/Theme/Backend/Lang/Navigation.en.lang.php +++ b/Theme/Backend/Lang/Navigation.en.lang.php @@ -13,9 +13,10 @@ declare(strict_types=1); return ['Navigation' => [ - 'Archive' => 'Archive', - 'Bill' => 'Bill', - 'Billing' => 'Billing', - 'Open' => 'Open', - 'Upload' => 'Upload', + 'Archive' => 'Archive', + 'Bill' => 'Bill', + 'Billing' => 'Billing', + 'InvoiceRecognition' => 'Invoice Recognition', + 'Open' => 'Open', + 'Upload' => 'Upload', ]]; diff --git a/Theme/Backend/Lang/Navigation.es.lang.php b/Theme/Backend/Lang/Navigation.es.lang.php index c87183d..bb891a5 100755 --- a/Theme/Backend/Lang/Navigation.es.lang.php +++ b/Theme/Backend/Lang/Navigation.es.lang.php @@ -13,9 +13,10 @@ declare(strict_types=1); return ['Navigation' => [ - 'Archive' => 'Archivo', - 'Bill' => 'Factura', - 'Billing' => 'Facturación', - 'Open' => '', - 'Upload' => '', + 'Archive' => 'Archivo', + 'Bill' => 'Factura', + 'Billing' => 'Facturación', + 'InvoiceRecognition' => '', + 'Open' => '', + 'Upload' => '', ]]; diff --git a/Theme/Backend/Lang/Navigation.fi.lang.php b/Theme/Backend/Lang/Navigation.fi.lang.php index 9d63807..af202a4 100755 --- a/Theme/Backend/Lang/Navigation.fi.lang.php +++ b/Theme/Backend/Lang/Navigation.fi.lang.php @@ -13,9 +13,10 @@ declare(strict_types=1); return ['Navigation' => [ - 'Archive' => 'Arkisto', - 'Bill' => 'Laskuttaa', - 'Billing' => 'Laskutus', - 'Open' => '', - 'Upload' => '', + 'Archive' => 'Arkisto', + 'Bill' => 'Laskuttaa', + 'Billing' => 'Laskutus', + 'InvoiceRecognition' => '', + 'Open' => '', + 'Upload' => '', ]]; diff --git a/Theme/Backend/Lang/Navigation.fr.lang.php b/Theme/Backend/Lang/Navigation.fr.lang.php index 6ee96e2..b03b3f9 100755 --- a/Theme/Backend/Lang/Navigation.fr.lang.php +++ b/Theme/Backend/Lang/Navigation.fr.lang.php @@ -13,9 +13,10 @@ declare(strict_types=1); return ['Navigation' => [ - 'Archive' => 'Archiver', - 'Bill' => 'Facture', - 'Billing' => 'Facturation', - 'Open' => '', - 'Upload' => '', + 'Archive' => 'Archiver', + 'Bill' => 'Facture', + 'Billing' => 'Facturation', + 'InvoiceRecognition' => '', + 'Open' => '', + 'Upload' => '', ]]; diff --git a/Theme/Backend/Lang/Navigation.hu.lang.php b/Theme/Backend/Lang/Navigation.hu.lang.php index 33229e9..3ed9664 100755 --- a/Theme/Backend/Lang/Navigation.hu.lang.php +++ b/Theme/Backend/Lang/Navigation.hu.lang.php @@ -13,9 +13,10 @@ declare(strict_types=1); return ['Navigation' => [ - 'Archive' => 'Archívum', - 'Bill' => 'Számla', - 'Billing' => 'Számlázás', - 'Open' => '', - 'Upload' => '', + 'Archive' => 'Archívum', + 'Bill' => 'Számla', + 'Billing' => 'Számlázás', + 'InvoiceRecognition' => '', + 'Open' => '', + 'Upload' => '', ]]; diff --git a/Theme/Backend/Lang/Navigation.it.lang.php b/Theme/Backend/Lang/Navigation.it.lang.php index ffb3031..b6b0fa5 100755 --- a/Theme/Backend/Lang/Navigation.it.lang.php +++ b/Theme/Backend/Lang/Navigation.it.lang.php @@ -13,9 +13,10 @@ declare(strict_types=1); return ['Navigation' => [ - 'Archive' => 'Archivio', - 'Bill' => 'Conto', - 'Billing' => 'Fatturazione', - 'Open' => '', - 'Upload' => '', + 'Archive' => 'Archivio', + 'Bill' => 'Conto', + 'Billing' => 'Fatturazione', + 'InvoiceRecognition' => '', + 'Open' => '', + 'Upload' => '', ]]; diff --git a/Theme/Backend/Lang/Navigation.ja.lang.php b/Theme/Backend/Lang/Navigation.ja.lang.php index 1faecd1..cf31987 100755 --- a/Theme/Backend/Lang/Navigation.ja.lang.php +++ b/Theme/Backend/Lang/Navigation.ja.lang.php @@ -13,9 +13,10 @@ declare(strict_types=1); return ['Navigation' => [ - 'Archive' => 'アーカイブ', - 'Bill' => '明細書', - 'Billing' => '請求する', - 'Open' => '', - 'Upload' => '', + 'Archive' => 'アーカイブ', + 'Bill' => '明細書', + 'Billing' => '請求する', + 'InvoiceRecognition' => '', + 'Open' => '', + 'Upload' => '', ]]; diff --git a/Theme/Backend/Lang/Navigation.ko.lang.php b/Theme/Backend/Lang/Navigation.ko.lang.php index 12222ea..3bf7a27 100755 --- a/Theme/Backend/Lang/Navigation.ko.lang.php +++ b/Theme/Backend/Lang/Navigation.ko.lang.php @@ -13,9 +13,10 @@ declare(strict_types=1); return ['Navigation' => [ - 'Archive' => '보관소', - 'Bill' => '청구서', - 'Billing' => '청구자', - 'Open' => '', - 'Upload' => '', + 'Archive' => '보관소', + 'Bill' => '청구서', + 'Billing' => '청구자', + 'InvoiceRecognition' => '', + 'Open' => '', + 'Upload' => '', ]]; diff --git a/Theme/Backend/Lang/Navigation.no.lang.php b/Theme/Backend/Lang/Navigation.no.lang.php index 181cf36..eff6adc 100755 --- a/Theme/Backend/Lang/Navigation.no.lang.php +++ b/Theme/Backend/Lang/Navigation.no.lang.php @@ -13,9 +13,10 @@ declare(strict_types=1); return ['Navigation' => [ - 'Archive' => 'Arkivet', - 'Bill' => 'Regning', - 'Billing' => 'Fakturering', - 'Open' => '', - 'Upload' => '', + 'Archive' => 'Arkivet', + 'Bill' => 'Regning', + 'Billing' => 'Fakturering', + 'InvoiceRecognition' => '', + 'Open' => '', + 'Upload' => '', ]]; diff --git a/Theme/Backend/Lang/Navigation.pl.lang.php b/Theme/Backend/Lang/Navigation.pl.lang.php index dc706cf..c73685d 100755 --- a/Theme/Backend/Lang/Navigation.pl.lang.php +++ b/Theme/Backend/Lang/Navigation.pl.lang.php @@ -13,9 +13,10 @@ declare(strict_types=1); return ['Navigation' => [ - 'Archive' => 'Archiwum.', - 'Bill' => 'Rachunek', - 'Billing' => 'Dane do faktury', - 'Open' => '', - 'Upload' => '', + 'Archive' => 'Archiwum.', + 'Bill' => 'Rachunek', + 'Billing' => 'Dane do faktury', + 'InvoiceRecognition' => '', + 'Open' => '', + 'Upload' => '', ]]; diff --git a/Theme/Backend/Lang/Navigation.pt.lang.php b/Theme/Backend/Lang/Navigation.pt.lang.php index f7aac44..3b1a805 100755 --- a/Theme/Backend/Lang/Navigation.pt.lang.php +++ b/Theme/Backend/Lang/Navigation.pt.lang.php @@ -13,9 +13,10 @@ declare(strict_types=1); return ['Navigation' => [ - 'Archive' => 'Arquivo', - 'Bill' => 'Conta', - 'Billing' => 'Cobrança', - 'Open' => '', - 'Upload' => '', + 'Archive' => 'Arquivo', + 'Bill' => 'Conta', + 'Billing' => 'Cobrança', + 'InvoiceRecognition' => '', + 'Open' => '', + 'Upload' => '', ]]; diff --git a/Theme/Backend/Lang/Navigation.ru.lang.php b/Theme/Backend/Lang/Navigation.ru.lang.php index b3f20b5..34375fd 100755 --- a/Theme/Backend/Lang/Navigation.ru.lang.php +++ b/Theme/Backend/Lang/Navigation.ru.lang.php @@ -13,9 +13,10 @@ declare(strict_types=1); return ['Navigation' => [ - 'Archive' => 'Архив', - 'Bill' => 'Счет', - 'Billing' => 'Биллинг', - 'Open' => '', - 'Upload' => '', + 'Archive' => 'Архив', + 'Bill' => 'Счет', + 'Billing' => 'Биллинг', + 'InvoiceRecognition' => '', + 'Open' => '', + 'Upload' => '', ]]; diff --git a/Theme/Backend/Lang/Navigation.sv.lang.php b/Theme/Backend/Lang/Navigation.sv.lang.php index 5306ef0..2804b86 100755 --- a/Theme/Backend/Lang/Navigation.sv.lang.php +++ b/Theme/Backend/Lang/Navigation.sv.lang.php @@ -13,9 +13,10 @@ declare(strict_types=1); return ['Navigation' => [ - 'Archive' => 'Arkiv', - 'Bill' => 'Räkningen', - 'Billing' => 'Fakturering', - 'Open' => '', - 'Upload' => '', + 'Archive' => 'Arkiv', + 'Bill' => 'Räkningen', + 'Billing' => 'Fakturering', + 'InvoiceRecognition' => '', + 'Open' => '', + 'Upload' => '', ]]; diff --git a/Theme/Backend/Lang/Navigation.th.lang.php b/Theme/Backend/Lang/Navigation.th.lang.php index 57ae735..22105de 100755 --- a/Theme/Backend/Lang/Navigation.th.lang.php +++ b/Theme/Backend/Lang/Navigation.th.lang.php @@ -13,9 +13,10 @@ declare(strict_types=1); return ['Navigation' => [ - 'Archive' => 'คลังเก็บเอกสารสำคัญ', - 'Bill' => 'ใบแจ้งหนี้', - 'Billing' => 'การเรียกเก็บเงิน', - 'Open' => '', - 'Upload' => '', + 'Archive' => 'คลังเก็บเอกสารสำคัญ', + 'Bill' => 'ใบแจ้งหนี้', + 'Billing' => 'การเรียกเก็บเงิน', + 'InvoiceRecognition' => '', + 'Open' => '', + 'Upload' => '', ]]; diff --git a/Theme/Backend/Lang/Navigation.tr.lang.php b/Theme/Backend/Lang/Navigation.tr.lang.php index 586f95f..6a59987 100755 --- a/Theme/Backend/Lang/Navigation.tr.lang.php +++ b/Theme/Backend/Lang/Navigation.tr.lang.php @@ -13,9 +13,10 @@ declare(strict_types=1); return ['Navigation' => [ - 'Archive' => 'Arşiv', - 'Bill' => 'Fatura', - 'Billing' => 'Fatura', - 'Open' => '', - 'Upload' => '', + 'Archive' => 'Arşiv', + 'Bill' => 'Fatura', + 'Billing' => 'Fatura', + 'InvoiceRecognition' => '', + 'Open' => '', + 'Upload' => '', ]]; diff --git a/Theme/Backend/Lang/Navigation.uk.lang.php b/Theme/Backend/Lang/Navigation.uk.lang.php index 05624c8..326287b 100755 --- a/Theme/Backend/Lang/Navigation.uk.lang.php +++ b/Theme/Backend/Lang/Navigation.uk.lang.php @@ -13,9 +13,10 @@ declare(strict_types=1); return ['Navigation' => [ - 'Archive' => 'Архів', - 'Bill' => 'Вексель', - 'Billing' => 'Платіж', - 'Open' => '', - 'Upload' => '', + 'Archive' => 'Архів', + 'Bill' => 'Вексель', + 'Billing' => 'Платіж', + 'InvoiceRecognition' => '', + 'Open' => '', + 'Upload' => '', ]]; diff --git a/Theme/Backend/Lang/Navigation.zh.lang.php b/Theme/Backend/Lang/Navigation.zh.lang.php index 056f9dc..15de1af 100755 --- a/Theme/Backend/Lang/Navigation.zh.lang.php +++ b/Theme/Backend/Lang/Navigation.zh.lang.php @@ -13,9 +13,10 @@ declare(strict_types=1); return ['Navigation' => [ - 'Archive' => '档案', - 'Bill' => '账单', - 'Billing' => '结算', - 'Open' => '', - 'Upload' => '', + 'Archive' => '档案', + 'Bill' => '账单', + 'Billing' => '结算', + 'InvoiceRecognition' => '', + 'Open' => '', + 'Upload' => '', ]]; diff --git a/Theme/Backend/Lang/ar.lang.php b/Theme/Backend/Lang/ar.lang.php index dfae789..1f81fe3 100755 --- a/Theme/Backend/Lang/ar.lang.php +++ b/Theme/Backend/Lang/ar.lang.php @@ -71,7 +71,6 @@ return ['Billing' => [ 'Other' => '', 'Payment' => 'دفع', 'PaymentPlan' => '', - 'PazmentPlan' => '', 'Postal' => 'بريدي', 'Prepaid' => 'مسبقة الدفع', 'Preview' => 'معاينة', diff --git a/Theme/Backend/Lang/cs.lang.php b/Theme/Backend/Lang/cs.lang.php index f52fbb5..0c5f3bd 100755 --- a/Theme/Backend/Lang/cs.lang.php +++ b/Theme/Backend/Lang/cs.lang.php @@ -71,7 +71,6 @@ return ['Billing' => [ 'Other' => '', 'Payment' => 'Způsob platby', 'PaymentPlan' => '', - 'PazmentPlan' => '', 'Postal' => 'Poštovní', 'Prepaid' => 'Předplacený', 'Preview' => 'Náhled', diff --git a/Theme/Backend/Lang/da.lang.php b/Theme/Backend/Lang/da.lang.php index 4f70016..3495b7f 100755 --- a/Theme/Backend/Lang/da.lang.php +++ b/Theme/Backend/Lang/da.lang.php @@ -71,7 +71,6 @@ return ['Billing' => [ 'Other' => '', 'Payment' => 'Betaling', 'PaymentPlan' => '', - 'PazmentPlan' => '', 'Postal' => 'Postal.', 'Prepaid' => 'Forudbetalt', 'Preview' => 'Preview.', diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php index 3bdbf2c..876e11e 100755 --- a/Theme/Backend/Lang/de.lang.php +++ b/Theme/Backend/Lang/de.lang.php @@ -31,7 +31,7 @@ return ['Billing' => [ 'CIS' => 'CIS', 'Cashback' => 'Kennzeichnen', 'City' => 'Stadt', - 'Client' => 'Klient', + 'Client' => 'Kunde', 'ClientID' => 'Kunden ID', 'ComparisonTime' => 'Vergleichszeit', 'Confirmation' => 'Bestätigung', @@ -70,8 +70,7 @@ return ['Billing' => [ 'Original' => 'Original', 'Other' => 'Sonstige', 'Payment' => 'Zahlung', - 'PaymentPlan' => '', - 'PazmentPlan' => 'Zahlplan', + 'PaymentPlan' => 'Zahlungsplan', 'Postal' => 'Post', 'Prepaid' => 'Vorausbezahlt', 'Preview' => 'Vorschau', diff --git a/Theme/Backend/Lang/el.lang.php b/Theme/Backend/Lang/el.lang.php index 6cc4abe..f79d7b5 100755 --- a/Theme/Backend/Lang/el.lang.php +++ b/Theme/Backend/Lang/el.lang.php @@ -71,7 +71,6 @@ return ['Billing' => [ 'Other' => '', 'Payment' => 'Πληρωμή', 'PaymentPlan' => '', - 'PazmentPlan' => '', 'Postal' => 'Ταχυδρομικός', 'Prepaid' => 'Προπληρωμένος', 'Preview' => 'Προεπισκόπηση', diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php index 71d82bd..5aa7212 100755 --- a/Theme/Backend/Lang/en.lang.php +++ b/Theme/Backend/Lang/en.lang.php @@ -71,7 +71,6 @@ return ['Billing' => [ 'Other' => 'Other', 'Payment' => 'Payment', 'PaymentPlan' => 'Payment Plan', - 'PazmentPlan' => '', 'Postal' => 'Postal', 'Prepaid' => 'Prepaid', 'Preview' => 'Preview', diff --git a/Theme/Backend/Lang/es.lang.php b/Theme/Backend/Lang/es.lang.php index 1c0c8c3..4338aa8 100755 --- a/Theme/Backend/Lang/es.lang.php +++ b/Theme/Backend/Lang/es.lang.php @@ -71,7 +71,6 @@ return ['Billing' => [ 'Other' => '', 'Payment' => 'Pago', 'PaymentPlan' => '', - 'PazmentPlan' => '', 'Postal' => 'Postal', 'Prepaid' => 'Pagado por adelantado', 'Preview' => 'Avance', diff --git a/Theme/Backend/Lang/fi.lang.php b/Theme/Backend/Lang/fi.lang.php index ee681cb..f026bb7 100755 --- a/Theme/Backend/Lang/fi.lang.php +++ b/Theme/Backend/Lang/fi.lang.php @@ -71,7 +71,6 @@ return ['Billing' => [ 'Other' => '', 'Payment' => 'Maksu', 'PaymentPlan' => '', - 'PazmentPlan' => '', 'Postal' => 'Posti-', 'Prepaid' => 'Prepaid', 'Preview' => 'Esikatselu', diff --git a/Theme/Backend/Lang/fr.lang.php b/Theme/Backend/Lang/fr.lang.php index c082907..bfeff4d 100755 --- a/Theme/Backend/Lang/fr.lang.php +++ b/Theme/Backend/Lang/fr.lang.php @@ -71,7 +71,6 @@ return ['Billing' => [ 'Other' => '', 'Payment' => 'Paiement', 'PaymentPlan' => '', - 'PazmentPlan' => '', 'Postal' => 'Postal', 'Prepaid' => 'Prépayé', 'Preview' => 'Aperçu', diff --git a/Theme/Backend/Lang/hu.lang.php b/Theme/Backend/Lang/hu.lang.php index c2fdcfa..f27a41b 100755 --- a/Theme/Backend/Lang/hu.lang.php +++ b/Theme/Backend/Lang/hu.lang.php @@ -71,7 +71,6 @@ return ['Billing' => [ 'Other' => '', 'Payment' => 'Fizetés', 'PaymentPlan' => '', - 'PazmentPlan' => '', 'Postal' => 'Postai', 'Prepaid' => 'Előre kifizetett', 'Preview' => 'Előnézet', diff --git a/Theme/Backend/Lang/it.lang.php b/Theme/Backend/Lang/it.lang.php index a7643a8..a4f4b6b 100755 --- a/Theme/Backend/Lang/it.lang.php +++ b/Theme/Backend/Lang/it.lang.php @@ -71,7 +71,6 @@ return ['Billing' => [ 'Other' => '', 'Payment' => 'Pagamento', 'PaymentPlan' => '', - 'PazmentPlan' => '', 'Postal' => 'postale', 'Prepaid' => 'Prepagato', 'Preview' => 'Anteprima', diff --git a/Theme/Backend/Lang/ja.lang.php b/Theme/Backend/Lang/ja.lang.php index 686dac3..301905e 100755 --- a/Theme/Backend/Lang/ja.lang.php +++ b/Theme/Backend/Lang/ja.lang.php @@ -71,7 +71,6 @@ return ['Billing' => [ 'Other' => '', 'Payment' => '支払い', 'PaymentPlan' => '', - 'PazmentPlan' => '', 'Postal' => '郵便', 'Prepaid' => '前払い', 'Preview' => 'プレビュー', diff --git a/Theme/Backend/Lang/ko.lang.php b/Theme/Backend/Lang/ko.lang.php index 06c37e6..f168827 100755 --- a/Theme/Backend/Lang/ko.lang.php +++ b/Theme/Backend/Lang/ko.lang.php @@ -71,7 +71,6 @@ return ['Billing' => [ 'Other' => '', 'Payment' => '지불', 'PaymentPlan' => '', - 'PazmentPlan' => '', 'Postal' => '우편 엽서', 'Prepaid' => '선불', 'Preview' => '시사', diff --git a/Theme/Backend/Lang/no.lang.php b/Theme/Backend/Lang/no.lang.php index 4850a16..5211e39 100755 --- a/Theme/Backend/Lang/no.lang.php +++ b/Theme/Backend/Lang/no.lang.php @@ -71,7 +71,6 @@ return ['Billing' => [ 'Other' => '', 'Payment' => 'innbetaling', 'PaymentPlan' => '', - 'PazmentPlan' => '', 'Postal' => 'Postal.', 'Prepaid' => 'Forhåndsbetalt', 'Preview' => 'Forhåndsvisning', diff --git a/Theme/Backend/Lang/pl.lang.php b/Theme/Backend/Lang/pl.lang.php index 25bb5bc..90fcfa8 100755 --- a/Theme/Backend/Lang/pl.lang.php +++ b/Theme/Backend/Lang/pl.lang.php @@ -71,7 +71,6 @@ return ['Billing' => [ 'Other' => '', 'Payment' => 'Zapłata', 'PaymentPlan' => '', - 'PazmentPlan' => '', 'Postal' => 'Pocztowy', 'Prepaid' => 'Opłacony z góry', 'Preview' => 'Zapowiedź', diff --git a/Theme/Backend/Lang/pt.lang.php b/Theme/Backend/Lang/pt.lang.php index 869d9ac..b411655 100755 --- a/Theme/Backend/Lang/pt.lang.php +++ b/Theme/Backend/Lang/pt.lang.php @@ -71,7 +71,6 @@ return ['Billing' => [ 'Other' => '', 'Payment' => 'Pagamento', 'PaymentPlan' => '', - 'PazmentPlan' => '', 'Postal' => 'Postal', 'Prepaid' => 'Pré-pago', 'Preview' => 'Pré-visualização', diff --git a/Theme/Backend/Lang/ru.lang.php b/Theme/Backend/Lang/ru.lang.php index f533428..385b0a8 100755 --- a/Theme/Backend/Lang/ru.lang.php +++ b/Theme/Backend/Lang/ru.lang.php @@ -71,7 +71,6 @@ return ['Billing' => [ 'Other' => '', 'Payment' => 'Оплата', 'PaymentPlan' => '', - 'PazmentPlan' => '', 'Postal' => 'Почтовый', 'Prepaid' => 'Предоплаты', 'Preview' => 'Превью', diff --git a/Theme/Backend/Lang/sv.lang.php b/Theme/Backend/Lang/sv.lang.php index 002f9f1..22c7ea2 100755 --- a/Theme/Backend/Lang/sv.lang.php +++ b/Theme/Backend/Lang/sv.lang.php @@ -71,7 +71,6 @@ return ['Billing' => [ 'Other' => '', 'Payment' => 'Betalning', 'PaymentPlan' => '', - 'PazmentPlan' => '', 'Postal' => 'Post', 'Prepaid' => 'Förbetalt', 'Preview' => 'Förhandsvisning', diff --git a/Theme/Backend/Lang/th.lang.php b/Theme/Backend/Lang/th.lang.php index 313dd1a..82955dc 100755 --- a/Theme/Backend/Lang/th.lang.php +++ b/Theme/Backend/Lang/th.lang.php @@ -71,7 +71,6 @@ return ['Billing' => [ 'Other' => '', 'Payment' => 'การชำระเงิน', 'PaymentPlan' => '', - 'PazmentPlan' => '', 'Postal' => 'เกี่ยวกับการไปรษณีย์', 'Prepaid' => 'ชำระล่วงหน้า', 'Preview' => 'ดูตัวอย่าง', diff --git a/Theme/Backend/Lang/tr.lang.php b/Theme/Backend/Lang/tr.lang.php index 9036539..7d4a468 100755 --- a/Theme/Backend/Lang/tr.lang.php +++ b/Theme/Backend/Lang/tr.lang.php @@ -71,7 +71,6 @@ return ['Billing' => [ 'Other' => '', 'Payment' => 'Ödeme', 'PaymentPlan' => '', - 'PazmentPlan' => '', 'Postal' => 'Posta', 'Prepaid' => 'Ön ödemeli', 'Preview' => 'Ön izleme', diff --git a/Theme/Backend/Lang/uk.lang.php b/Theme/Backend/Lang/uk.lang.php index 198a054..bd1dafd 100755 --- a/Theme/Backend/Lang/uk.lang.php +++ b/Theme/Backend/Lang/uk.lang.php @@ -71,7 +71,6 @@ return ['Billing' => [ 'Other' => '', 'Payment' => 'Платіж', 'PaymentPlan' => '', - 'PazmentPlan' => '', 'Postal' => 'Поштовий', 'Prepaid' => 'Передплачений', 'Preview' => 'Попередній перегляд', diff --git a/Theme/Backend/Lang/zh.lang.php b/Theme/Backend/Lang/zh.lang.php index 5381aaa..57a23db 100755 --- a/Theme/Backend/Lang/zh.lang.php +++ b/Theme/Backend/Lang/zh.lang.php @@ -71,7 +71,6 @@ return ['Billing' => [ 'Other' => '', 'Payment' => '支付', 'PaymentPlan' => '', - 'PazmentPlan' => '', 'Postal' => '邮政', 'Prepaid' => '预付款', 'Preview' => '预览',