From dfa38a1b123d27e09c91255c32bbae338b864cbb Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nnes.com@googlemail.com>
Date: Mon, 9 Oct 2023 22:06:37 +0000
Subject: [PATCH] update

---
 Admin/Install/Navigation.install.json  |   17 +-
 Admin/Installer.php                    |    8 +-
 Admin/Routes/Web/Backend.php           |   34 -
 Controller/ApiAttributeController.php  |    3 +-
 Controller/BackendController.php       |  314 -----
 Models/BillElement.php                 |    2 +-
 Theme/Backend/Lang/ar.lang.php         |   36 +-
 Theme/Backend/Lang/cs.lang.php         |   36 +-
 Theme/Backend/Lang/da.lang.php         |   36 +-
 Theme/Backend/Lang/el.lang.php         |   36 +-
 Theme/Backend/Lang/es.lang.php         |   36 +-
 Theme/Backend/Lang/fi.lang.php         |   36 +-
 Theme/Backend/Lang/fr.lang.php         |   36 +-
 Theme/Backend/Lang/hu.lang.php         |   36 +-
 Theme/Backend/Lang/it.lang.php         |   36 +-
 Theme/Backend/Lang/ja.lang.php         |   36 +-
 Theme/Backend/Lang/ko.lang.php         |   36 +-
 Theme/Backend/Lang/no.lang.php         |   36 +-
 Theme/Backend/Lang/pl.lang.php         |   36 +-
 Theme/Backend/Lang/pt.lang.php         |   36 +-
 Theme/Backend/Lang/ru.lang.php         |   36 +-
 Theme/Backend/Lang/sv.lang.php         |   36 +-
 Theme/Backend/Lang/th.lang.php         |   36 +-
 Theme/Backend/Lang/tr.lang.php         |   36 +-
 Theme/Backend/Lang/uk.lang.php         |   36 +-
 Theme/Backend/Lang/zh.lang.php         |   36 +-
 Theme/Backend/bill-analysis.tpl.php    |   21 -
 Theme/Backend/purchase-bill.tpl.php    |    5 +-
 Theme/Backend/region-analysis.tpl.php  | 1756 ------------------------
 Theme/Backend/rep-analysis.tpl.php     |  344 -----
 tests/Controller/ApiControllerTest.php |   12 +-
 31 files changed, 377 insertions(+), 2859 deletions(-)
 delete mode 100755 Theme/Backend/bill-analysis.tpl.php
 delete mode 100755 Theme/Backend/region-analysis.tpl.php
 delete mode 100755 Theme/Backend/rep-analysis.tpl.php

diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json
index 6b6e789..4f01255 100755
--- a/Admin/Install/Navigation.install.json
+++ b/Admin/Install/Navigation.install.json
@@ -197,21 +197,6 @@
             }
         ]
     },
-    {
-        "id": 1005107001,
-        "pid": "/sales/analysis",
-        "type": 3,
-        "subtype": 1,
-        "name": "Bill",
-        "uri": "{/base}/sales/analysis/bill",
-        "target": "self",
-        "icon": null,
-        "order": 15,
-        "from": "Billing",
-        "permission": { "permission": 2, "category": null, "element": null },
-        "parent": 1001602001,
-        "children": []
-    },
     {
         "id": 1005108001,
         "pid": "/purchase/analysis",
@@ -224,7 +209,7 @@
         "order": 15,
         "from": "Billing",
         "permission": { "permission": 2, "category": null, "element": null },
-        "parent": 1001602001,
+        "parent": 1002101001,
         "children": []
     },
     {
diff --git a/Admin/Installer.php b/Admin/Installer.php
index 7ced5b7..38d9f93 100755
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -135,7 +135,7 @@ final class Installer extends InstallerAbstract
 
             $module->apiBillAttributeTypeCreate($request, $response);
 
-            $responseData = $response->get('');
+            $responseData = $response->getData('');
 
             if (!\is_array($responseData)) {
                 continue;
@@ -207,7 +207,7 @@ final class Installer extends InstallerAbstract
 
                 $module->apiBillAttributeValueCreate($request, $response);
 
-                $responseData = $response->get('');
+                $responseData = $response->getData('');
                 if (!\is_array($responseData)) {
                     continue;
                 }
@@ -293,7 +293,7 @@ final class Installer extends InstallerAbstract
 
             $module->apiTaxCombinationCreate($request, $response);
 
-            $responseData = $response->get('');
+            $responseData = $response->getData('');
             if (!\is_array($responseData)) {
                 continue;
             }
@@ -345,7 +345,7 @@ final class Installer extends InstallerAbstract
 
             $module->apiBillTypeCreate($request, $response);
 
-            $responseData = $response->get('');
+            $responseData = $response->getData('');
             if (!\is_array($responseData)) {
                 continue;
             }
diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php
index fd20f01..ff44bbb 100755
--- a/Admin/Routes/Web/Backend.php
+++ b/Admin/Routes/Web/Backend.php
@@ -131,40 +131,6 @@ return [
         ],
     ],
 
-    '^.*/sales/analysis/bill(\?.*|$)$' => [
-        [
-            'dest'       => '\Modules\Billing\Controller\BackendController:viewBillAnalysis',
-            'verb'       => RouteVerb::GET,
-            'permission' => [
-                'module' => BackendController::NAME,
-                'type'   => PermissionType::READ,
-                'state'  => PermissionCategory::SALES_INVOICE,
-            ],
-        ],
-    ],
-    '^.*/sales/analysis/rep(\?.*|$)$' => [
-        [
-            'dest'       => '\Modules\Billing\Controller\BackendController:viewSalesRepAnalysis',
-            'verb'       => RouteVerb::GET,
-            'permission' => [
-                'module' => BackendController::NAME,
-                'type'   => PermissionType::READ,
-                'state'  => PermissionCategory::SALES_ANALYSIS,
-            ],
-        ],
-    ],
-    '^.*/sales/analysis/region(\?.*|$)$' => [
-        [
-            'dest'       => '\Modules\Billing\Controller\BackendController:viewRegionAnalysis',
-            'verb'       => RouteVerb::GET,
-            'permission' => [
-                'module' => BackendController::NAME,
-                'type'   => PermissionType::READ,
-                'state'  => PermissionCategory::SALES_ANALYSIS,
-            ],
-        ],
-    ],
-
     '^.*/private/purchase/billing/dashboard.*$' => [
         [
             'dest'       => '\Modules\Billing\Controller\BackendController:viewPrivatePurchaseBillDashboard',
diff --git a/Controller/ApiAttributeController.php b/Controller/ApiAttributeController.php
index 318b120..a2c8f80 100755
--- a/Controller/ApiAttributeController.php
+++ b/Controller/ApiAttributeController.php
@@ -61,7 +61,8 @@ final class ApiAttributeController extends Controller
             return;
         }
 
-        $attribute = $this->createAttributeFromRequest($request);
+        $type      = BillAttributeTypeMapper::get()->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);
     }
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 09ead1d..3969848 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -367,320 +367,6 @@ final class BackendController extends Controller
         return $view;
     }
 
-    /**
-     * Routing end-point for application behaviour.
-     *
-     * @param RequestAbstract  $request  Request
-     * @param ResponseAbstract $response Response
-     * @param array            $data     Generic data
-     *
-     * @return RenderableInterface
-     *
-     * @since 1.0.0
-     * @codeCoverageIgnore
-     */
-    public function viewRegionAnalysis(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface
-    {
-        $head  = $response->data['Content']->head;
-        $nonce = $this->app->appSettings->getOption('script-nonce');
-
-        $head->addAsset(AssetType::CSS, 'Resources/chartjs/Chartjs/chart.css');
-        $head->addAsset(AssetType::JSLATE, 'Resources/chartjs/Chartjs/chart.js', ['nonce' => $nonce]);
-        $head->addAsset(AssetType::JSLATE, 'Modules/ClientManagement/Controller.js', ['nonce' => $nonce, 'type' => 'module']);
-
-        $view = new View($this->app->l11nManager, $request, $response);
-        $view->setTemplate('/Modules/Billing/Theme/Backend/region-analysis');
-        $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001602001, $request, $response);
-
-        $monthlySalesCosts = [];
-        for ($i = 1; $i < 13; ++$i) {
-            $monthlySalesCosts[] = [
-                'net_sales' => $sales = \mt_rand(1200000000, 2000000000),
-                'net_costs' => (int) ($sales * \mt_rand(25, 55) / 100),
-                'year'      => 2020,
-                'month'     => $i,
-            ];
-        }
-
-        $view->data['monthlySalesCosts'] = $monthlySalesCosts;
-
-        /////
-        $currentCustomerRegion = [
-            'Europe'  => (int) (\mt_rand(200, 400) / 4),
-            'America' => (int) (\mt_rand(200, 400) / 4),
-            'Asia'    => (int) (\mt_rand(200, 400) / 4),
-            'Africa'  => (int) (\mt_rand(200, 400) / 4),
-            'CIS'     => (int) (\mt_rand(200, 400) / 4),
-            'Other'   => (int) (\mt_rand(200, 400) / 4),
-        ];
-
-        $view->data['currentCustomerRegion'] = $currentCustomerRegion;
-
-        $annualCustomerRegion = [];
-        for ($i = 1; $i < 11; ++$i) {
-            $annualCustomerRegion[] = [
-                'year'    => 2020 - 10 + $i,
-                'Europe'  => $a = (int) (\mt_rand(200, 400) / 4),
-                'America' => $b = (int) (\mt_rand(200, 400) / 4),
-                'Asia'    => $c = (int) (\mt_rand(200, 400) / 4),
-                'Africa'  => $d = (int) (\mt_rand(200, 400) / 4),
-                'CIS'     => $e = (int) (\mt_rand(200, 400) / 4),
-                'Other'   => $f = (int) (\mt_rand(200, 400) / 4),
-                'Total'   => $a + $b + $c + $d + $e + $f,
-            ];
-        }
-
-        $view->data['annualCustomerRegion'] = $annualCustomerRegion;
-
-        /////
-        $monthlySalesCustomer = [];
-        for ($i = 1; $i < 13; ++$i) {
-            $monthlySalesCustomer[] = [
-                'net_sales' => $sales = \mt_rand(1200000000, 2000000000),
-                'customers' => \mt_rand(200, 400),
-                'year'      => 2020,
-                'month'     => $i,
-            ];
-        }
-
-        $view->data['monthlySalesCustomer'] = $monthlySalesCustomer;
-
-        $annualSalesCustomer = [];
-        for ($i = 1; $i < 11; ++$i) {
-            $annualSalesCustomer[] = [
-                'net_sales' => $sales = \mt_rand(1200000000, 2000000000) * 12,
-                'customers' => \mt_rand(200, 400) * 6,
-                'year'      => 2020 - 10 + $i,
-            ];
-        }
-
-        $view->data['annualSalesCustomer'] = $annualSalesCustomer;
-
-        /////
-        $monthlyCustomerRetention = [];
-        for ($i = 1; $i < 10; ++$i) {
-            $monthlyCustomerRetention[] = [
-                'customers' => \mt_rand(200, 400),
-                'year'      => \date('y') - 9 + $i,
-            ];
-        }
-
-        $view->data['monthlyCustomerRetention'] = $monthlyCustomerRetention;
-
-        /////
-        $currentCustomerRegion = [
-            'Europe'  => (int) (\mt_rand(200, 400) / 4),
-            'America' => (int) (\mt_rand(200, 400) / 4),
-            'Asia'    => (int) (\mt_rand(200, 400) / 4),
-            'Africa'  => (int) (\mt_rand(200, 400) / 4),
-            'CIS'     => (int) (\mt_rand(200, 400) / 4),
-            'Other'   => (int) (\mt_rand(200, 400) / 4),
-        ];
-
-        $view->data['currentCustomerRegion'] = $currentCustomerRegion;
-
-        $annualCustomerRegion = [];
-        for ($i = 1; $i < 11; ++$i) {
-            $annualCustomerRegion[] = [
-                'year'    => 2020 - 10 + $i,
-                'Europe'  => $a = (int) (\mt_rand(200, 400) / 4),
-                'America' => $b = (int) (\mt_rand(200, 400) / 4),
-                'Asia'    => $c = (int) (\mt_rand(200, 400) / 4),
-                'Africa'  => $d = (int) (\mt_rand(200, 400) / 4),
-                'CIS'     => $e = (int) (\mt_rand(200, 400) / 4),
-                'Other'   => $f = (int) (\mt_rand(200, 400) / 4),
-                'Total'   => $a + $b + $c + $d + $e + $f,
-            ];
-        }
-
-        $view->data['annualCustomerRegion'] = $annualCustomerRegion;
-
-        /////
-        $currentCustomersRep = [];
-        for ($i = 1; $i < 13; ++$i) {
-            $currentCustomersRep['Rep ' . $i] = [
-                'customers' => (int) (\mt_rand(200, 400) / 12),
-            ];
-        }
-
-        \uasort($currentCustomersRep, function($a, $b) {
-            return $b['customers'] <=> $a['customers'];
-        });
-
-        $view->data['currentCustomersRep'] = $currentCustomersRep;
-
-        $annualCustomersRep = [];
-        for ($i = 1; $i < 13; ++$i) {
-            $annualCustomersRep['Rep ' . $i] = [];
-
-            for ($j = 1; $j < 11; ++$j) {
-                $annualCustomersRep['Rep ' . $i][] = [
-                    'customers' => (int) (\mt_rand(200, 400) / 12),
-                    'year'      => 2020 - 10 + $j,
-                ];
-            }
-        }
-
-        $view->data['annualCustomersRep'] = $annualCustomersRep;
-
-        /////
-        $currentCustomersCountry = [];
-        for ($i = 1; $i < 51; ++$i) {
-            $country                                           = (string) ISO3166NameEnum::getRandom();
-            $currentCustomersCountry[\substr($country, 0, 20)] = [
-                'customers' => (int) (\mt_rand(200, 400) / 12),
-            ];
-        }
-
-        \uasort($currentCustomersCountry, function($a, $b) {
-            return $b['customers'] <=> $a['customers'];
-        });
-
-        $view->data['currentCustomersCountry'] = $currentCustomersCountry;
-
-        $annualCustomersCountry = [];
-        for ($i = 1; $i < 51; ++$i) {
-            $countryCode                                          = ISO3166CharEnum::getRandom();
-            $countryName                                          = (string) ISO3166NameEnum::getByName('_' . $countryCode);
-            $annualCustomersCountry[\substr($countryName, 0, 20)] = [];
-
-            for ($j = 1; $j < 11; ++$j) {
-                $annualCustomersCountry[\substr($countryName, 0, 20)][] = [
-                    'customers' => (int) (\mt_rand(200, 400) / 12),
-                    'year'      => 2020 - 10 + $j,
-                    'name'      => $countryName,
-                    'code'      => $countryCode,
-                ];
-            }
-        }
-
-        $view->data['annualCustomersCountry'] = $annualCustomersCountry;
-
-        /////
-        $customerGroups = [];
-        for ($i = 1; $i < 7; ++$i) {
-            $customerGroups['Group ' . $i] = [
-                'customers' => (int) (\mt_rand(200, 400) / 12),
-            ];
-        }
-
-        $view->data['customerGroups'] = $customerGroups;
-
-        return $view;
-    }
-
-    /**
-     * Routing end-point for application behaviour.
-     *
-     * @param RequestAbstract  $request  Request
-     * @param ResponseAbstract $response Response
-     * @param array            $data     Generic data
-     *
-     * @return RenderableInterface
-     *
-     * @since 1.0.0
-     * @codeCoverageIgnore
-     */
-    public function viewBillAnalysis(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface
-    {
-        $head  = $response->data['Content']->head;
-        $nonce = $this->app->appSettings->getOption('script-nonce');
-
-        $head->addAsset(AssetType::CSS, 'Resources/chartjs/Chartjs/chart.css');
-        $head->addAsset(AssetType::JSLATE, 'Resources/chartjs/Chartjs/chart.js', ['nonce' => $nonce]);
-        $head->addAsset(AssetType::JSLATE, 'Modules/ClientManagement/Controller.js', ['nonce' => $nonce, 'type' => 'module']);
-
-        $view = new View($this->app->l11nManager, $request, $response);
-        $view->setTemplate('/Modules/Billing/Theme/Backend/bill-analysis');
-        $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001602001, $request, $response);
-
-        return $view;
-    }
-
-    /**
-     * Routing end-point for application behaviour.
-     *
-     * @param RequestAbstract  $request  Request
-     * @param ResponseAbstract $response Response
-     * @param array            $data     Generic data
-     *
-     * @return RenderableInterface
-     *
-     * @since 1.0.0
-     * @codeCoverageIgnore
-     */
-    public function viewSalesRepAnalysis(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface
-    {
-        $head  = $response->data['Content']->head;
-        $nonce = $this->app->appSettings->getOption('script-nonce');
-
-        $head->addAsset(AssetType::CSS, 'Resources/chartjs/Chartjs/chart.css');
-        $head->addAsset(AssetType::JSLATE, 'Resources/chartjs/Chartjs/chart.js', ['nonce' => $nonce]);
-        $head->addAsset(AssetType::JSLATE, 'Modules/ClientManagement/Controller.js', ['nonce' => $nonce, 'type' => 'module']);
-
-        $view = new View($this->app->l11nManager, $request, $response);
-        $view->setTemplate('/Modules/Billing/Theme/Backend/rep-analysis');
-        $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001602001, $request, $response);
-
-        /////
-        $currentCustomerRegion = [
-            'Europe'  => (int) (\mt_rand(200, 400) / 4),
-            'America' => (int) (\mt_rand(200, 400) / 4),
-            'Asia'    => (int) (\mt_rand(200, 400) / 4),
-            'Africa'  => (int) (\mt_rand(200, 400) / 4),
-            'CIS'     => (int) (\mt_rand(200, 400) / 4),
-            'Other'   => (int) (\mt_rand(200, 400) / 4),
-        ];
-
-        $view->data['currentCustomerRegion'] = $currentCustomerRegion;
-
-        $annualCustomerRegion = [];
-        for ($i = 1; $i < 11; ++$i) {
-            $annualCustomerRegion[] = [
-                'year'    => 2020 - 10 + $i,
-                'Europe'  => $a = (int) (\mt_rand(200, 400) / 4),
-                'America' => $b = (int) (\mt_rand(200, 400) / 4),
-                'Asia'    => $c = (int) (\mt_rand(200, 400) / 4),
-                'Africa'  => $d = (int) (\mt_rand(200, 400) / 4),
-                'CIS'     => $e = (int) (\mt_rand(200, 400) / 4),
-                'Other'   => $f = (int) (\mt_rand(200, 400) / 4),
-                'Total'   => $a + $b + $c + $d + $e + $f,
-            ];
-        }
-
-        $view->data['annualCustomerRegion'] = $annualCustomerRegion;
-
-         /////
-        $currentCustomersRep = [];
-        for ($i = 1; $i < 13; ++$i) {
-            $currentCustomersRep['Rep ' . $i] = [
-                'customers' => (int) (\mt_rand(200, 400) / 12),
-            ];
-        }
-
-        \uasort($currentCustomersRep, function($a, $b) {
-            return $b['customers'] <=> $a['customers'];
-        });
-
-        $view->data['currentCustomersRep'] = $currentCustomersRep;
-
-        $annualCustomersRep = [];
-        for ($i = 1; $i < 13; ++$i) {
-            $annualCustomersRep['Rep ' . $i] = [];
-
-            for ($j = 1; $j < 11; ++$j) {
-                $annualCustomersRep['Rep ' . $i][] = [
-                    'customers' => (int) (\mt_rand(200, 400) / 12),
-                    'year'      => 2020 - 10 + $j,
-                ];
-            }
-        }
-
-        $view->data['annualCustomersRep'] = $annualCustomersRep;
-
-        return $view;
-    }
-
     /**
      * Routing end-point for application behaviour.
      *
diff --git a/Models/BillElement.php b/Models/BillElement.php
index ed5a910..059ecf2 100755
--- a/Models/BillElement.php
+++ b/Models/BillElement.php
@@ -257,7 +257,7 @@ class BillElement implements \JsonSerializable
         $element->totalPurchasePriceNet->setInt($element->quantity * $item->purchasePrice->getInt());
 
         $element->singleProfitNet->setInt($element->singleSalesPriceNet->getInt() - $element->singlePurchasePriceNet->getInt());
-        $element->totalProfitNet->setInt($element->quantity * ($element->totalSalesPriceNet->getInt() - $element->totalPurchasePriceNet->getInt()));
+        $element->totalProfitNet->setInt($element->totalSalesPriceNet->getInt() - $element->totalPurchasePriceNet->getInt());
 
         $element->taxP    = new FloatInt((int) (($code->percentageInvoice * $element->totalSalesPriceNet->getInt()) / 10000));
         $element->taxR    = new FloatInt($code->percentageInvoice);
diff --git a/Theme/Backend/Lang/ar.lang.php b/Theme/Backend/Lang/ar.lang.php
index 939edb0..dfae789 100755
--- a/Theme/Backend/Lang/ar.lang.php
+++ b/Theme/Backend/Lang/ar.lang.php
@@ -15,25 +15,25 @@ declare(strict_types=1);
 return ['Billing' => [
     'Address'         => 'تبوك',
     'Addresses'       => 'عناوين',
-    'Africa'          => '#VALUE!',
+    'Africa'          => '',
     'AlreadyPaid'     => 'مدفوع بالفعل',
-    'America'         => '#VALUE!',
+    'America'         => '',
     'Amount'          => '',
-    'Analyse'         => '#VALUE!',
+    'Analyse'         => '',
     'Archive'         => '',
-    'Articles'        => '#VALUE!',
-    'Asia'            => '#VALUE!',
-    'Attribute'       => '#VALUE!',
-    'BaseTime'        => '#VALUE!',
+    'Articles'        => '',
+    'Asia'            => '',
+    'Attribute'       => '',
+    'BaseTime'        => '',
     'Billing'         => '',
     'Bills'           => 'فواتير',
     'Bonus'           => 'علاوة',
-    'CIS'             => '#VALUE!',
+    'CIS'             => '',
     'Cashback'        => 'استرداد النقدي',
     'City'            => 'مدينة',
     'Client'          => 'عميل',
     'ClientID'        => 'معرف العميل',
-    'ComparisonTime'  => '#VALUE!',
+    'ComparisonTime'  => '',
     'Confirmation'    => 'تأكيد',
     'Country'         => 'دولة',
     'CreateBill'      => '',
@@ -41,7 +41,7 @@ return ['Billing' => [
     'CreditCard'      => 'بطاقة إئتمان',
     'CreditNote'      => 'اشعار دائن',
     'Currency'        => '',
-    'Customers'       => '#VALUE!',
+    'Customers'       => '',
     'Date'            => 'تاريخ',
     'Delivery'        => 'توصيل',
     'DeliveryNote'    => 'مذكرة تسليم',
@@ -50,10 +50,10 @@ return ['Billing' => [
     'DiscountP'       => 'خصم ٪',
     'Due'             => 'بسبب',
     'Email'           => '',
-    'Europe'          => '#VALUE!',
-    'Filter'          => '#VALUE!',
+    'Europe'          => '',
+    'Filter'          => '',
     'Freightage'      => 'شحن',
-    'General'         => '#VALUE!',
+    'General'         => '',
     'Gross'           => 'أزداد',
     'Invoice'         => 'فاتورة',
     'Invoices'        => 'الفواتير',
@@ -68,7 +68,7 @@ return ['Billing' => [
     'Net'             => 'شبكة',
     'Offer'           => 'عرض',
     'Original'        => '',
-    'Other'           => '#VALUE!',
+    'Other'           => '',
     'Payment'         => 'دفع',
     'PaymentPlan'     => '',
     'PazmentPlan'     => '',
@@ -79,9 +79,9 @@ return ['Billing' => [
     'Profit'          => 'ربح',
     'Quantity'        => 'كمية',
     'Recipient'       => 'متلقي',
-    'Region'          => '#VALUE!',
-    'Rep'             => '#VALUE!',
-    'Sales'           => '#VALUE!',
+    'Region'          => '',
+    'Rep'             => '',
+    'Sales'           => '',
     'Select'          => 'يختار',
     'Shipment'        => 'شحنة',
     'Source'          => 'مصدر',
@@ -93,7 +93,7 @@ return ['Billing' => [
     'Type'            => 'نوع',
     'Types'           => '',
     'Upload'          => 'تحميل',
-    'Value'           => '#VALUE!',
+    'Value'           => '',
     'Variation'       => 'تفاوت',
     'Zip'             => 'أزيز',
 ]];
diff --git a/Theme/Backend/Lang/cs.lang.php b/Theme/Backend/Lang/cs.lang.php
index ea145db..f52fbb5 100755
--- a/Theme/Backend/Lang/cs.lang.php
+++ b/Theme/Backend/Lang/cs.lang.php
@@ -15,25 +15,25 @@ declare(strict_types=1);
 return ['Billing' => [
     'Address'         => 'Adresa',
     'Addresses'       => 'Adresy',
-    'Africa'          => '#VALUE!',
+    'Africa'          => '',
     'AlreadyPaid'     => 'Již zaplatil',
-    'America'         => '#VALUE!',
+    'America'         => '',
     'Amount'          => '',
-    'Analyse'         => '#VALUE!',
+    'Analyse'         => '',
     'Archive'         => '',
-    'Articles'        => '#VALUE!',
-    'Asia'            => '#VALUE!',
-    'Attribute'       => '#VALUE!',
-    'BaseTime'        => '#VALUE!',
+    'Articles'        => '',
+    'Asia'            => '',
+    'Attribute'       => '',
+    'BaseTime'        => '',
     'Billing'         => '',
     'Bills'           => 'Účtenka',
     'Bonus'           => 'Bonus',
-    'CIS'             => '#VALUE!',
+    'CIS'             => '',
     'Cashback'        => 'Hotovost',
     'City'            => 'Město',
     'Client'          => 'Klienta',
     'ClientID'        => 'ID klienta',
-    'ComparisonTime'  => '#VALUE!',
+    'ComparisonTime'  => '',
     'Confirmation'    => 'potvrzení',
     'Country'         => 'Země',
     'CreateBill'      => '',
@@ -41,7 +41,7 @@ return ['Billing' => [
     'CreditCard'      => 'Kreditní karta',
     'CreditNote'      => 'Dobropis',
     'Currency'        => '',
-    'Customers'       => '#VALUE!',
+    'Customers'       => '',
     'Date'            => 'datum',
     'Delivery'        => 'dodávka',
     'DeliveryNote'    => 'Dodací list',
@@ -50,10 +50,10 @@ return ['Billing' => [
     'DiscountP'       => 'Sleva%',
     'Due'             => 'Způsoben',
     'Email'           => '',
-    'Europe'          => '#VALUE!',
-    'Filter'          => '#VALUE!',
+    'Europe'          => '',
+    'Filter'          => '',
     'Freightage'      => 'Dopravné',
-    'General'         => '#VALUE!',
+    'General'         => '',
     'Gross'           => 'Hrubý',
     'Invoice'         => 'Faktura',
     'Invoices'        => 'Faktury',
@@ -68,7 +68,7 @@ return ['Billing' => [
     'Net'             => 'Síť',
     'Offer'           => 'Nabídka',
     'Original'        => '',
-    'Other'           => '#VALUE!',
+    'Other'           => '',
     'Payment'         => 'Způsob platby',
     'PaymentPlan'     => '',
     'PazmentPlan'     => '',
@@ -79,9 +79,9 @@ return ['Billing' => [
     'Profit'          => 'Zisk',
     'Quantity'        => 'Množství',
     'Recipient'       => 'Příjemce',
-    'Region'          => '#VALUE!',
-    'Rep'             => '#VALUE!',
-    'Sales'           => '#VALUE!',
+    'Region'          => '',
+    'Rep'             => '',
+    'Sales'           => '',
     'Select'          => 'Vybrat',
     'Shipment'        => 'náklad',
     'Source'          => 'Zdroj',
@@ -93,7 +93,7 @@ return ['Billing' => [
     'Type'            => 'Typ',
     'Types'           => '',
     'Upload'          => 'nahrát',
-    'Value'           => '#VALUE!',
+    'Value'           => '',
     'Variation'       => 'Variace',
     'Zip'             => 'Zip',
 ]];
diff --git a/Theme/Backend/Lang/da.lang.php b/Theme/Backend/Lang/da.lang.php
index 170903f..4f70016 100755
--- a/Theme/Backend/Lang/da.lang.php
+++ b/Theme/Backend/Lang/da.lang.php
@@ -15,25 +15,25 @@ declare(strict_types=1);
 return ['Billing' => [
     'Address'         => 'Adresse',
     'Addresses'       => 'Adresser',
-    'Africa'          => '#VALUE!',
+    'Africa'          => '',
     'AlreadyPaid'     => 'Allerede betalt',
-    'America'         => '#VALUE!',
+    'America'         => '',
     'Amount'          => '',
-    'Analyse'         => '#VALUE!',
+    'Analyse'         => '',
     'Archive'         => '',
-    'Articles'        => '#VALUE!',
-    'Asia'            => '#VALUE!',
-    'Attribute'       => '#VALUE!',
-    'BaseTime'        => '#VALUE!',
+    'Articles'        => '',
+    'Asia'            => '',
+    'Attribute'       => '',
+    'BaseTime'        => '',
     'Billing'         => '',
     'Bills'           => 'Regninger.',
     'Bonus'           => 'Bonus',
-    'CIS'             => '#VALUE!',
+    'CIS'             => '',
     'Cashback'        => 'Penge tilbage',
     'City'            => 'City.',
     'Client'          => 'Klient',
     'ClientID'        => 'Klient ID.',
-    'ComparisonTime'  => '#VALUE!',
+    'ComparisonTime'  => '',
     'Confirmation'    => 'Bekræftelse',
     'Country'         => 'Land',
     'CreateBill'      => '',
@@ -41,7 +41,7 @@ return ['Billing' => [
     'CreditCard'      => 'Kreditkort',
     'CreditNote'      => 'Kreditnota',
     'Currency'        => '',
-    'Customers'       => '#VALUE!',
+    'Customers'       => '',
     'Date'            => 'Dato',
     'Delivery'        => 'Levering',
     'DeliveryNote'    => 'Levering note',
@@ -50,10 +50,10 @@ return ['Billing' => [
     'DiscountP'       => 'Rabat%',
     'Due'             => 'På grund',
     'Email'           => '',
-    'Europe'          => '#VALUE!',
-    'Filter'          => '#VALUE!',
+    'Europe'          => '',
+    'Filter'          => '',
     'Freightage'      => 'Gods',
-    'General'         => '#VALUE!',
+    'General'         => '',
     'Gross'           => 'Brutto',
     'Invoice'         => 'Faktura',
     'Invoices'        => 'Fakturaer.',
@@ -68,7 +68,7 @@ return ['Billing' => [
     'Net'             => 'Net',
     'Offer'           => 'Tilbud',
     'Original'        => '',
-    'Other'           => '#VALUE!',
+    'Other'           => '',
     'Payment'         => 'Betaling',
     'PaymentPlan'     => '',
     'PazmentPlan'     => '',
@@ -79,9 +79,9 @@ return ['Billing' => [
     'Profit'          => 'Profit',
     'Quantity'        => 'Antal',
     'Recipient'       => 'Modtager',
-    'Region'          => '#VALUE!',
-    'Rep'             => '#VALUE!',
-    'Sales'           => '#VALUE!',
+    'Region'          => '',
+    'Rep'             => '',
+    'Sales'           => '',
     'Select'          => 'Vælg',
     'Shipment'        => 'Forsendelse',
     'Source'          => 'Kilde',
@@ -93,7 +93,7 @@ return ['Billing' => [
     'Type'            => 'Type',
     'Types'           => '',
     'Upload'          => 'Upload',
-    'Value'           => '#VALUE!',
+    'Value'           => '',
     'Variation'       => 'Variation',
     'Zip'             => 'Zip.',
 ]];
diff --git a/Theme/Backend/Lang/el.lang.php b/Theme/Backend/Lang/el.lang.php
index ae406bb0..6cc4abe 100755
--- a/Theme/Backend/Lang/el.lang.php
+++ b/Theme/Backend/Lang/el.lang.php
@@ -15,25 +15,25 @@ declare(strict_types=1);
 return ['Billing' => [
     'Address'         => 'Διεύθυνση',
     'Addresses'       => 'Διευθύνσεις',
-    'Africa'          => '#VALUE!',
+    'Africa'          => '',
     'AlreadyPaid'     => 'Ήδη πληρωθεί',
-    'America'         => '#VALUE!',
+    'America'         => '',
     'Amount'          => '',
-    'Analyse'         => '#VALUE!',
+    'Analyse'         => '',
     'Archive'         => '',
-    'Articles'        => '#VALUE!',
-    'Asia'            => '#VALUE!',
-    'Attribute'       => '#VALUE!',
-    'BaseTime'        => '#VALUE!',
+    'Articles'        => '',
+    'Asia'            => '',
+    'Attribute'       => '',
+    'BaseTime'        => '',
     'Billing'         => '',
     'Bills'           => 'Λογαριασμοί',
     'Bonus'           => 'Δώρο',
-    'CIS'             => '#VALUE!',
+    'CIS'             => '',
     'Cashback'        => 'Επιστροφή μετρητών',
     'City'            => 'Πόλη',
     'Client'          => 'Πελάτης',
     'ClientID'        => 'ταυτότητα πελάτη',
-    'ComparisonTime'  => '#VALUE!',
+    'ComparisonTime'  => '',
     'Confirmation'    => 'Επιβεβαίωση',
     'Country'         => 'Χώρα',
     'CreateBill'      => '',
@@ -41,7 +41,7 @@ return ['Billing' => [
     'CreditCard'      => 'Πιστωτική κάρτα',
     'CreditNote'      => 'Πιστωτικό σημείωμα',
     'Currency'        => '',
-    'Customers'       => '#VALUE!',
+    'Customers'       => '',
     'Date'            => 'Ημερομηνία',
     'Delivery'        => 'Διανομή',
     'DeliveryNote'    => 'Δελτίο παράδοσης',
@@ -50,10 +50,10 @@ return ['Billing' => [
     'DiscountP'       => 'Έκπτωση%',
     'Due'             => 'Λόγω',
     'Email'           => '',
-    'Europe'          => '#VALUE!',
-    'Filter'          => '#VALUE!',
+    'Europe'          => '',
+    'Filter'          => '',
     'Freightage'      => 'Ναύλος',
-    'General'         => '#VALUE!',
+    'General'         => '',
     'Gross'           => 'Ακαθάριστο',
     'Invoice'         => 'Τιμολόγιο',
     'Invoices'        => 'Τιμολόγια',
@@ -68,7 +68,7 @@ return ['Billing' => [
     'Net'             => 'Καθαρά',
     'Offer'           => 'Προσφορά',
     'Original'        => '',
-    'Other'           => '#VALUE!',
+    'Other'           => '',
     'Payment'         => 'Πληρωμή',
     'PaymentPlan'     => '',
     'PazmentPlan'     => '',
@@ -79,9 +79,9 @@ return ['Billing' => [
     'Profit'          => 'Κέρδος',
     'Quantity'        => 'Ποσότητα',
     'Recipient'       => 'Παραλήπτης',
-    'Region'          => '#VALUE!',
-    'Rep'             => '#VALUE!',
-    'Sales'           => '#VALUE!',
+    'Region'          => '',
+    'Rep'             => '',
+    'Sales'           => '',
     'Select'          => 'Επιλέγω',
     'Shipment'        => 'Αποστολή',
     'Source'          => 'Πηγή',
@@ -93,7 +93,7 @@ return ['Billing' => [
     'Type'            => 'Τύπος',
     'Types'           => '',
     'Upload'          => 'Μεταφόρτω',
-    'Value'           => '#VALUE!',
+    'Value'           => '',
     'Variation'       => 'Παραλλαγή',
     'Zip'             => 'Φερμουάρ',
 ]];
diff --git a/Theme/Backend/Lang/es.lang.php b/Theme/Backend/Lang/es.lang.php
index 0f81877..1c0c8c3 100755
--- a/Theme/Backend/Lang/es.lang.php
+++ b/Theme/Backend/Lang/es.lang.php
@@ -15,25 +15,25 @@ declare(strict_types=1);
 return ['Billing' => [
     'Address'         => 'Habla a',
     'Addresses'       => 'Direcciones',
-    'Africa'          => '#VALUE!',
+    'Africa'          => '',
     'AlreadyPaid'     => 'Ya pagado',
-    'America'         => '#VALUE!',
+    'America'         => '',
     'Amount'          => '',
-    'Analyse'         => '#VALUE!',
+    'Analyse'         => '',
     'Archive'         => '',
-    'Articles'        => '#VALUE!',
-    'Asia'            => '#VALUE!',
-    'Attribute'       => '#VALUE!',
-    'BaseTime'        => '#VALUE!',
+    'Articles'        => '',
+    'Asia'            => '',
+    'Attribute'       => '',
+    'BaseTime'        => '',
     'Billing'         => '',
     'Bills'           => 'Facturas',
     'Bonus'           => 'Prima',
-    'CIS'             => '#VALUE!',
+    'CIS'             => '',
     'Cashback'        => 'Devolución de dinero',
     'City'            => 'Ciudad',
     'Client'          => 'Cliente',
     'ClientID'        => 'Identificación del cliente',
-    'ComparisonTime'  => '#VALUE!',
+    'ComparisonTime'  => '',
     'Confirmation'    => 'Confirmación',
     'Country'         => 'País',
     'CreateBill'      => '',
@@ -41,7 +41,7 @@ return ['Billing' => [
     'CreditCard'      => 'Tarjeta de crédito',
     'CreditNote'      => 'Nota de crédito',
     'Currency'        => '',
-    'Customers'       => '#VALUE!',
+    'Customers'       => '',
     'Date'            => 'Fecha',
     'Delivery'        => 'Entrega',
     'DeliveryNote'    => 'Nota de entrega',
@@ -50,10 +50,10 @@ return ['Billing' => [
     'DiscountP'       => 'Descuento%',
     'Due'             => 'Vencer',
     'Email'           => '',
-    'Europe'          => '#VALUE!',
-    'Filter'          => '#VALUE!',
+    'Europe'          => '',
+    'Filter'          => '',
     'Freightage'      => 'Flete',
-    'General'         => '#VALUE!',
+    'General'         => '',
     'Gross'           => 'Bruto',
     'Invoice'         => 'Factura',
     'Invoices'        => 'Facturas',
@@ -68,7 +68,7 @@ return ['Billing' => [
     'Net'             => 'Red',
     'Offer'           => 'Oferta',
     'Original'        => '',
-    'Other'           => '#VALUE!',
+    'Other'           => '',
     'Payment'         => 'Pago',
     'PaymentPlan'     => '',
     'PazmentPlan'     => '',
@@ -79,9 +79,9 @@ return ['Billing' => [
     'Profit'          => 'Lucro',
     'Quantity'        => 'Cantidad',
     'Recipient'       => 'Recipiente',
-    'Region'          => '#VALUE!',
-    'Rep'             => '#VALUE!',
-    'Sales'           => '#VALUE!',
+    'Region'          => '',
+    'Rep'             => '',
+    'Sales'           => '',
     'Select'          => 'Seleccione',
     'Shipment'        => 'Envío',
     'Source'          => 'Fuente',
@@ -93,7 +93,7 @@ return ['Billing' => [
     'Type'            => 'Escribe',
     'Types'           => '',
     'Upload'          => 'Subir',
-    'Value'           => '#VALUE!',
+    'Value'           => '',
     'Variation'       => 'Variación',
     'Zip'             => 'Cremallera',
 ]];
diff --git a/Theme/Backend/Lang/fi.lang.php b/Theme/Backend/Lang/fi.lang.php
index 8c28bab..ee681cb 100755
--- a/Theme/Backend/Lang/fi.lang.php
+++ b/Theme/Backend/Lang/fi.lang.php
@@ -15,25 +15,25 @@ declare(strict_types=1);
 return ['Billing' => [
     'Address'         => 'Osoite',
     'Addresses'       => 'Osoitteet',
-    'Africa'          => '#VALUE!',
+    'Africa'          => '',
     'AlreadyPaid'     => 'Jo maksettu',
-    'America'         => '#VALUE!',
+    'America'         => '',
     'Amount'          => '',
-    'Analyse'         => '#VALUE!',
+    'Analyse'         => '',
     'Archive'         => '',
-    'Articles'        => '#VALUE!',
-    'Asia'            => '#VALUE!',
-    'Attribute'       => '#VALUE!',
-    'BaseTime'        => '#VALUE!',
+    'Articles'        => '',
+    'Asia'            => '',
+    'Attribute'       => '',
+    'BaseTime'        => '',
     'Billing'         => '',
     'Bills'           => 'Laskut',
     'Bonus'           => 'Bonus',
-    'CIS'             => '#VALUE!',
+    'CIS'             => '',
     'Cashback'        => 'Vaihtorahat',
     'City'            => 'Kaupunki',
     'Client'          => 'Asiakas',
     'ClientID'        => 'Asiakastunnus',
-    'ComparisonTime'  => '#VALUE!',
+    'ComparisonTime'  => '',
     'Confirmation'    => 'Vahvistus',
     'Country'         => 'Maa',
     'CreateBill'      => '',
@@ -41,7 +41,7 @@ return ['Billing' => [
     'CreditCard'      => 'Luottokortti',
     'CreditNote'      => 'Luottoluotto',
     'Currency'        => '',
-    'Customers'       => '#VALUE!',
+    'Customers'       => '',
     'Date'            => 'Päivämäärä',
     'Delivery'        => 'Toimitus',
     'DeliveryNote'    => 'Saapumisilmoitus',
@@ -50,10 +50,10 @@ return ['Billing' => [
     'DiscountP'       => 'Alennus %',
     'Due'             => 'Takia',
     'Email'           => '',
-    'Europe'          => '#VALUE!',
-    'Filter'          => '#VALUE!',
+    'Europe'          => '',
+    'Filter'          => '',
     'Freightage'      => 'Rahti',
-    'General'         => '#VALUE!',
+    'General'         => '',
     'Gross'           => 'Ällöttävä',
     'Invoice'         => 'Lasku',
     'Invoices'        => 'Laskut',
@@ -68,7 +68,7 @@ return ['Billing' => [
     'Net'             => 'Netto',
     'Offer'           => 'Tarjous',
     'Original'        => '',
-    'Other'           => '#VALUE!',
+    'Other'           => '',
     'Payment'         => 'Maksu',
     'PaymentPlan'     => '',
     'PazmentPlan'     => '',
@@ -79,9 +79,9 @@ return ['Billing' => [
     'Profit'          => 'Voitto',
     'Quantity'        => 'Määrä',
     'Recipient'       => 'Vastaanottaja',
-    'Region'          => '#VALUE!',
-    'Rep'             => '#VALUE!',
-    'Sales'           => '#VALUE!',
+    'Region'          => '',
+    'Rep'             => '',
+    'Sales'           => '',
     'Select'          => 'Valitse',
     'Shipment'        => 'Lähetys',
     'Source'          => 'Lähde',
@@ -93,7 +93,7 @@ return ['Billing' => [
     'Type'            => 'Tyyppi',
     'Types'           => '',
     'Upload'          => 'Ladata',
-    'Value'           => '#VALUE!',
+    'Value'           => '',
     'Variation'       => 'Vaihtelu',
     'Zip'             => 'Postinumero',
 ]];
diff --git a/Theme/Backend/Lang/fr.lang.php b/Theme/Backend/Lang/fr.lang.php
index 5734b55..c082907 100755
--- a/Theme/Backend/Lang/fr.lang.php
+++ b/Theme/Backend/Lang/fr.lang.php
@@ -15,25 +15,25 @@ declare(strict_types=1);
 return ['Billing' => [
     'Address'         => 'Adresse',
     'Addresses'       => 'Adresses',
-    'Africa'          => '#VALUE!',
+    'Africa'          => '',
     'AlreadyPaid'     => 'Déjà payé',
-    'America'         => '#VALUE!',
+    'America'         => '',
     'Amount'          => '',
-    'Analyse'         => '#VALUE!',
+    'Analyse'         => '',
     'Archive'         => '',
-    'Articles'        => '#VALUE!',
-    'Asia'            => '#VALUE!',
-    'Attribute'       => '#VALUE!',
-    'BaseTime'        => '#VALUE!',
+    'Articles'        => '',
+    'Asia'            => '',
+    'Attribute'       => '',
+    'BaseTime'        => '',
     'Billing'         => '',
     'Bills'           => 'Factures',
     'Bonus'           => 'Prime',
-    'CIS'             => '#VALUE!',
+    'CIS'             => '',
     'Cashback'        => 'Remise en argent',
     'City'            => 'Ville',
     'Client'          => 'Client',
     'ClientID'        => 'identité du client',
-    'ComparisonTime'  => '#VALUE!',
+    'ComparisonTime'  => '',
     'Confirmation'    => 'Confirmation',
     'Country'         => 'Pays',
     'CreateBill'      => '',
@@ -41,7 +41,7 @@ return ['Billing' => [
     'CreditCard'      => 'Carte de crédit',
     'CreditNote'      => 'Note de crédit',
     'Currency'        => '',
-    'Customers'       => '#VALUE!',
+    'Customers'       => '',
     'Date'            => 'Date',
     'Delivery'        => 'Livraison',
     'DeliveryNote'    => 'Bon de livraison',
@@ -50,10 +50,10 @@ return ['Billing' => [
     'DiscountP'       => 'Remise %',
     'Due'             => 'Dû',
     'Email'           => '',
-    'Europe'          => '#VALUE!',
-    'Filter'          => '#VALUE!',
+    'Europe'          => '',
+    'Filter'          => '',
     'Freightage'      => 'Fret',
-    'General'         => '#VALUE!',
+    'General'         => '',
     'Gross'           => 'Brut',
     'Invoice'         => 'Facture d\'achat',
     'Invoices'        => 'Factures',
@@ -68,7 +68,7 @@ return ['Billing' => [
     'Net'             => 'Rapporter',
     'Offer'           => 'Offrir',
     'Original'        => '',
-    'Other'           => '#VALUE!',
+    'Other'           => '',
     'Payment'         => 'Paiement',
     'PaymentPlan'     => '',
     'PazmentPlan'     => '',
@@ -79,9 +79,9 @@ return ['Billing' => [
     'Profit'          => 'Profit',
     'Quantity'        => 'Quantité',
     'Recipient'       => 'Destinataire',
-    'Region'          => '#VALUE!',
-    'Rep'             => '#VALUE!',
-    'Sales'           => '#VALUE!',
+    'Region'          => '',
+    'Rep'             => '',
+    'Sales'           => '',
     'Select'          => 'Sélectionner',
     'Shipment'        => 'Expédition',
     'Source'          => 'La source',
@@ -93,7 +93,7 @@ return ['Billing' => [
     'Type'            => 'Taper',
     'Types'           => '',
     'Upload'          => 'Télécharger',
-    'Value'           => '#VALUE!',
+    'Value'           => '',
     'Variation'       => 'Variation',
     'Zip'             => 'Zipper',
 ]];
diff --git a/Theme/Backend/Lang/hu.lang.php b/Theme/Backend/Lang/hu.lang.php
index 0bf4fa7..c2fdcfa 100755
--- a/Theme/Backend/Lang/hu.lang.php
+++ b/Theme/Backend/Lang/hu.lang.php
@@ -15,25 +15,25 @@ declare(strict_types=1);
 return ['Billing' => [
     'Address'         => 'Cím',
     'Addresses'       => 'Címek',
-    'Africa'          => '#VALUE!',
+    'Africa'          => '',
     'AlreadyPaid'     => 'Fizetve',
-    'America'         => '#VALUE!',
+    'America'         => '',
     'Amount'          => '',
-    'Analyse'         => '#VALUE!',
+    'Analyse'         => '',
     'Archive'         => '',
-    'Articles'        => '#VALUE!',
-    'Asia'            => '#VALUE!',
-    'Attribute'       => '#VALUE!',
-    'BaseTime'        => '#VALUE!',
+    'Articles'        => '',
+    'Asia'            => '',
+    'Attribute'       => '',
+    'BaseTime'        => '',
     'Billing'         => '',
     'Bills'           => 'Számlák',
     'Bonus'           => 'Bónusz',
-    'CIS'             => '#VALUE!',
+    'CIS'             => '',
     'Cashback'        => 'Pénzvisszafizetés',
     'City'            => 'Város',
     'Client'          => 'Ügyfél',
     'ClientID'        => 'Ügyfélazonosító',
-    'ComparisonTime'  => '#VALUE!',
+    'ComparisonTime'  => '',
     'Confirmation'    => 'Megerősítés',
     'Country'         => 'Ország',
     'CreateBill'      => '',
@@ -41,7 +41,7 @@ return ['Billing' => [
     'CreditCard'      => 'Hitelkártya',
     'CreditNote'      => 'Jóváírás',
     'Currency'        => '',
-    'Customers'       => '#VALUE!',
+    'Customers'       => '',
     'Date'            => 'Dátum',
     'Delivery'        => 'Szállítás',
     'DeliveryNote'    => 'Fuvarlevél',
@@ -50,10 +50,10 @@ return ['Billing' => [
     'DiscountP'       => 'Árengedmény%',
     'Due'             => 'Esedékes',
     'Email'           => '',
-    'Europe'          => '#VALUE!',
-    'Filter'          => '#VALUE!',
+    'Europe'          => '',
+    'Filter'          => '',
     'Freightage'      => 'Fuvardíj',
-    'General'         => '#VALUE!',
+    'General'         => '',
     'Gross'           => 'Bruttó',
     'Invoice'         => 'Számla',
     'Invoices'        => 'Számlák',
@@ -68,7 +68,7 @@ return ['Billing' => [
     'Net'             => 'Háló',
     'Offer'           => 'Ajánlat',
     'Original'        => '',
-    'Other'           => '#VALUE!',
+    'Other'           => '',
     'Payment'         => 'Fizetés',
     'PaymentPlan'     => '',
     'PazmentPlan'     => '',
@@ -79,9 +79,9 @@ return ['Billing' => [
     'Profit'          => 'Nyereség',
     'Quantity'        => 'Mennyiség',
     'Recipient'       => 'Befogadó',
-    'Region'          => '#VALUE!',
-    'Rep'             => '#VALUE!',
-    'Sales'           => '#VALUE!',
+    'Region'          => '',
+    'Rep'             => '',
+    'Sales'           => '',
     'Select'          => 'Kiválaszt',
     'Shipment'        => 'Szállítmány',
     'Source'          => 'Forrás',
@@ -93,7 +93,7 @@ return ['Billing' => [
     'Type'            => 'típus',
     'Types'           => '',
     'Upload'          => 'Feltöltés',
-    'Value'           => '#VALUE!',
+    'Value'           => '',
     'Variation'       => 'Variáció',
     'Zip'             => 'Postai irányítószám',
 ]];
diff --git a/Theme/Backend/Lang/it.lang.php b/Theme/Backend/Lang/it.lang.php
index d778cf7..a7643a8 100755
--- a/Theme/Backend/Lang/it.lang.php
+++ b/Theme/Backend/Lang/it.lang.php
@@ -15,25 +15,25 @@ declare(strict_types=1);
 return ['Billing' => [
     'Address'         => 'Indirizzo',
     'Addresses'       => 'Indirizzi',
-    'Africa'          => '#VALUE!',
+    'Africa'          => '',
     'AlreadyPaid'     => 'Già pagato',
-    'America'         => '#VALUE!',
+    'America'         => '',
     'Amount'          => '',
-    'Analyse'         => '#VALUE!',
+    'Analyse'         => '',
     'Archive'         => '',
-    'Articles'        => '#VALUE!',
-    'Asia'            => '#VALUE!',
-    'Attribute'       => '#VALUE!',
-    'BaseTime'        => '#VALUE!',
+    'Articles'        => '',
+    'Asia'            => '',
+    'Attribute'       => '',
+    'BaseTime'        => '',
     'Billing'         => '',
     'Bills'           => 'Fatture',
     'Bonus'           => 'Bonus.',
-    'CIS'             => '#VALUE!',
+    'CIS'             => '',
     'Cashback'        => 'Rimborso',
     'City'            => 'Città',
     'Client'          => 'Cliente',
     'ClientID'        => 'Identificativo cliente',
-    'ComparisonTime'  => '#VALUE!',
+    'ComparisonTime'  => '',
     'Confirmation'    => 'Conferma',
     'Country'         => 'Nazione',
     'CreateBill'      => '',
@@ -41,7 +41,7 @@ return ['Billing' => [
     'CreditCard'      => 'Carta di credito',
     'CreditNote'      => 'Nota di credito',
     'Currency'        => '',
-    'Customers'       => '#VALUE!',
+    'Customers'       => '',
     'Date'            => 'Data',
     'Delivery'        => 'Consegna',
     'DeliveryNote'    => 'Bolla d\'accompagnamento',
@@ -50,10 +50,10 @@ return ['Billing' => [
     'DiscountP'       => 'Sconto%',
     'Due'             => 'Dovuto',
     'Email'           => '',
-    'Europe'          => '#VALUE!',
-    'Filter'          => '#VALUE!',
+    'Europe'          => '',
+    'Filter'          => '',
     'Freightage'      => 'Liberare',
-    'General'         => '#VALUE!',
+    'General'         => '',
     'Gross'           => 'Schifoso',
     'Invoice'         => 'Fattura',
     'Invoices'        => 'Fatture',
@@ -68,7 +68,7 @@ return ['Billing' => [
     'Net'             => 'Rete',
     'Offer'           => 'Offerta',
     'Original'        => '',
-    'Other'           => '#VALUE!',
+    'Other'           => '',
     'Payment'         => 'Pagamento',
     'PaymentPlan'     => '',
     'PazmentPlan'     => '',
@@ -79,9 +79,9 @@ return ['Billing' => [
     'Profit'          => 'Profitto',
     'Quantity'        => 'Quantità',
     'Recipient'       => 'Destinatario',
-    'Region'          => '#VALUE!',
-    'Rep'             => '#VALUE!',
-    'Sales'           => '#VALUE!',
+    'Region'          => '',
+    'Rep'             => '',
+    'Sales'           => '',
     'Select'          => 'Selezionare',
     'Shipment'        => 'Spedizione',
     'Source'          => 'Fonte',
@@ -93,7 +93,7 @@ return ['Billing' => [
     'Type'            => 'Tipo',
     'Types'           => '',
     'Upload'          => 'Caricamento',
-    'Value'           => '#VALUE!',
+    'Value'           => '',
     'Variation'       => 'Variazione',
     'Zip'             => 'Cerniera lampo',
 ]];
diff --git a/Theme/Backend/Lang/ja.lang.php b/Theme/Backend/Lang/ja.lang.php
index 3f35552..686dac3 100755
--- a/Theme/Backend/Lang/ja.lang.php
+++ b/Theme/Backend/Lang/ja.lang.php
@@ -15,25 +15,25 @@ declare(strict_types=1);
 return ['Billing' => [
     'Address'         => '住所',
     'Addresses'       => 'アドレス',
-    'Africa'          => '#VALUE!',
+    'Africa'          => '',
     'AlreadyPaid'     => '既に支払いました',
-    'America'         => '#VALUE!',
+    'America'         => '',
     'Amount'          => '',
-    'Analyse'         => '#VALUE!',
+    'Analyse'         => '',
     'Archive'         => '',
-    'Articles'        => '#VALUE!',
-    'Asia'            => '#VALUE!',
-    'Attribute'       => '#VALUE!',
-    'BaseTime'        => '#VALUE!',
+    'Articles'        => '',
+    'Asia'            => '',
+    'Attribute'       => '',
+    'BaseTime'        => '',
     'Billing'         => '',
     'Bills'           => 'bill',
     'Bonus'           => 'ボーナス',
-    'CIS'             => '#VALUE!',
+    'CIS'             => '',
     'Cashback'        => 'キャッシュバック',
     'City'            => '市',
     'Client'          => 'クライアント',
     'ClientID'        => 'クライアントID',
-    'ComparisonTime'  => '#VALUE!',
+    'ComparisonTime'  => '',
     'Confirmation'    => '確認',
     'Country'         => '国',
     'CreateBill'      => '',
@@ -41,7 +41,7 @@ return ['Billing' => [
     'CreditCard'      => 'クレジットカード',
     'CreditNote'      => 'クレジットノート',
     'Currency'        => '',
-    'Customers'       => '#VALUE!',
+    'Customers'       => '',
     'Date'            => '日にち',
     'Delivery'        => '配達',
     'DeliveryNote'    => '配達メモ',
@@ -50,10 +50,10 @@ return ['Billing' => [
     'DiscountP'       => '割引 ％',
     'Due'             => '期限',
     'Email'           => '',
-    'Europe'          => '#VALUE!',
-    'Filter'          => '#VALUE!',
+    'Europe'          => '',
+    'Filter'          => '',
     'Freightage'      => 'fre fre',
-    'General'         => '#VALUE!',
+    'General'         => '',
     'Gross'           => 'きもい',
     'Invoice'         => '請求書',
     'Invoices'        => '請求書',
@@ -68,7 +68,7 @@ return ['Billing' => [
     'Net'             => 'ネット',
     'Offer'           => 'オファー',
     'Original'        => '',
-    'Other'           => '#VALUE!',
+    'Other'           => '',
     'Payment'         => '支払い',
     'PaymentPlan'     => '',
     'PazmentPlan'     => '',
@@ -79,9 +79,9 @@ return ['Billing' => [
     'Profit'          => '利益',
     'Quantity'        => '量',
     'Recipient'       => '受信者',
-    'Region'          => '#VALUE!',
-    'Rep'             => '#VALUE!',
-    'Sales'           => '#VALUE!',
+    'Region'          => '',
+    'Rep'             => '',
+    'Sales'           => '',
     'Select'          => '選択する',
     'Shipment'        => '出荷',
     'Source'          => 'ソース',
@@ -93,7 +93,7 @@ return ['Billing' => [
     'Type'            => 'タイプ',
     'Types'           => '',
     'Upload'          => 'アップロード',
-    'Value'           => '#VALUE!',
+    'Value'           => '',
     'Variation'       => '変化',
     'Zip'             => 'ジップ',
 ]];
diff --git a/Theme/Backend/Lang/ko.lang.php b/Theme/Backend/Lang/ko.lang.php
index a2dca1e..06c37e6 100755
--- a/Theme/Backend/Lang/ko.lang.php
+++ b/Theme/Backend/Lang/ko.lang.php
@@ -15,25 +15,25 @@ declare(strict_types=1);
 return ['Billing' => [
     'Address'         => '주소',
     'Addresses'       => '구애',
-    'Africa'          => '#VALUE!',
+    'Africa'          => '',
     'AlreadyPaid'     => '이미 지불',
-    'America'         => '#VALUE!',
+    'America'         => '',
     'Amount'          => '',
-    'Analyse'         => '#VALUE!',
+    'Analyse'         => '',
     'Archive'         => '',
-    'Articles'        => '#VALUE!',
-    'Asia'            => '#VALUE!',
-    'Attribute'       => '#VALUE!',
-    'BaseTime'        => '#VALUE!',
+    'Articles'        => '',
+    'Asia'            => '',
+    'Attribute'       => '',
+    'BaseTime'        => '',
     'Billing'         => '',
     'Bills'           => '청구서',
     'Bonus'           => '보너스',
-    'CIS'             => '#VALUE!',
+    'CIS'             => '',
     'Cashback'        => '현금',
     'City'            => '도시',
     'Client'          => '고객',
     'ClientID'        => '클라이언트 ID.',
-    'ComparisonTime'  => '#VALUE!',
+    'ComparisonTime'  => '',
     'Confirmation'    => '확인',
     'Country'         => '국가',
     'CreateBill'      => '',
@@ -41,7 +41,7 @@ return ['Billing' => [
     'CreditCard'      => '신용 카드',
     'CreditNote'      => '신용 노트',
     'Currency'        => '',
-    'Customers'       => '#VALUE!',
+    'Customers'       => '',
     'Date'            => '날짜',
     'Delivery'        => '배달',
     'DeliveryNote'    => '배달 메모',
@@ -50,10 +50,10 @@ return ['Billing' => [
     'DiscountP'       => '할인 %',
     'Due'             => '로 인한',
     'Email'           => '',
-    'Europe'          => '#VALUE!',
-    'Filter'          => '#VALUE!',
+    'Europe'          => '',
+    'Filter'          => '',
     'Freightage'      => '화물',
-    'General'         => '#VALUE!',
+    'General'         => '',
     'Gross'           => '역겨운',
     'Invoice'         => '송장',
     'Invoices'        => '송장',
@@ -68,7 +68,7 @@ return ['Billing' => [
     'Net'             => '그물',
     'Offer'           => '권하다',
     'Original'        => '',
-    'Other'           => '#VALUE!',
+    'Other'           => '',
     'Payment'         => '지불',
     'PaymentPlan'     => '',
     'PazmentPlan'     => '',
@@ -79,9 +79,9 @@ return ['Billing' => [
     'Profit'          => '이익',
     'Quantity'        => '수량',
     'Recipient'       => '받는 사람',
-    'Region'          => '#VALUE!',
-    'Rep'             => '#VALUE!',
-    'Sales'           => '#VALUE!',
+    'Region'          => '',
+    'Rep'             => '',
+    'Sales'           => '',
     'Select'          => '선택하다',
     'Shipment'        => '선적',
     'Source'          => '원천',
@@ -93,7 +93,7 @@ return ['Billing' => [
     'Type'            => '유형',
     'Types'           => '',
     'Upload'          => '업로드',
-    'Value'           => '#VALUE!',
+    'Value'           => '',
     'Variation'       => '변화',
     'Zip'             => '지퍼',
 ]];
diff --git a/Theme/Backend/Lang/no.lang.php b/Theme/Backend/Lang/no.lang.php
index 3ff3d0c..4850a16 100755
--- a/Theme/Backend/Lang/no.lang.php
+++ b/Theme/Backend/Lang/no.lang.php
@@ -15,25 +15,25 @@ declare(strict_types=1);
 return ['Billing' => [
     'Address'         => 'Adresse',
     'Addresses'       => 'Adresser',
-    'Africa'          => '#VALUE!',
+    'Africa'          => '',
     'AlreadyPaid'     => 'Allerede betalt',
-    'America'         => '#VALUE!',
+    'America'         => '',
     'Amount'          => '',
-    'Analyse'         => '#VALUE!',
+    'Analyse'         => '',
     'Archive'         => '',
-    'Articles'        => '#VALUE!',
-    'Asia'            => '#VALUE!',
-    'Attribute'       => '#VALUE!',
-    'BaseTime'        => '#VALUE!',
+    'Articles'        => '',
+    'Asia'            => '',
+    'Attribute'       => '',
+    'BaseTime'        => '',
     'Billing'         => '',
     'Bills'           => 'Regninger',
     'Bonus'           => 'Bonus',
-    'CIS'             => '#VALUE!',
+    'CIS'             => '',
     'Cashback'        => 'Penger tilbake',
     'City'            => 'By',
     'Client'          => 'Klient',
     'ClientID'        => 'klient-ID',
-    'ComparisonTime'  => '#VALUE!',
+    'ComparisonTime'  => '',
     'Confirmation'    => 'Bekreftelse',
     'Country'         => 'Land',
     'CreateBill'      => '',
@@ -41,7 +41,7 @@ return ['Billing' => [
     'CreditCard'      => 'Kredittkort',
     'CreditNote'      => 'Kredittnota',
     'Currency'        => '',
-    'Customers'       => '#VALUE!',
+    'Customers'       => '',
     'Date'            => 'Dato',
     'Delivery'        => 'Leveranse',
     'DeliveryNote'    => 'Leveringsnotat',
@@ -50,10 +50,10 @@ return ['Billing' => [
     'DiscountP'       => 'Rabatt%',
     'Due'             => 'På grunn av det',
     'Email'           => '',
-    'Europe'          => '#VALUE!',
-    'Filter'          => '#VALUE!',
+    'Europe'          => '',
+    'Filter'          => '',
     'Freightage'      => 'Frakt',
-    'General'         => '#VALUE!',
+    'General'         => '',
     'Gross'           => 'Ekkelt',
     'Invoice'         => 'Faktura',
     'Invoices'        => 'Fakturaer',
@@ -68,7 +68,7 @@ return ['Billing' => [
     'Net'             => 'Nett',
     'Offer'           => 'By på',
     'Original'        => '',
-    'Other'           => '#VALUE!',
+    'Other'           => '',
     'Payment'         => 'innbetaling',
     'PaymentPlan'     => '',
     'PazmentPlan'     => '',
@@ -79,9 +79,9 @@ return ['Billing' => [
     'Profit'          => 'Profitt',
     'Quantity'        => 'Mengde',
     'Recipient'       => 'Mottaker',
-    'Region'          => '#VALUE!',
-    'Rep'             => '#VALUE!',
-    'Sales'           => '#VALUE!',
+    'Region'          => '',
+    'Rep'             => '',
+    'Sales'           => '',
     'Select'          => 'Plukke ut',
     'Shipment'        => 'Forsendelse',
     'Source'          => 'Kilde',
@@ -93,7 +93,7 @@ return ['Billing' => [
     'Type'            => 'Type',
     'Types'           => '',
     'Upload'          => 'Laste opp',
-    'Value'           => '#VALUE!',
+    'Value'           => '',
     'Variation'       => 'Variasjon',
     'Zip'             => 'Glidelås',
 ]];
diff --git a/Theme/Backend/Lang/pl.lang.php b/Theme/Backend/Lang/pl.lang.php
index 9ee287c..25bb5bc 100755
--- a/Theme/Backend/Lang/pl.lang.php
+++ b/Theme/Backend/Lang/pl.lang.php
@@ -15,25 +15,25 @@ declare(strict_types=1);
 return ['Billing' => [
     'Address'         => 'Adres',
     'Addresses'       => 'Adresy',
-    'Africa'          => '#VALUE!',
+    'Africa'          => '',
     'AlreadyPaid'     => 'Już zapłacone',
-    'America'         => '#VALUE!',
+    'America'         => '',
     'Amount'          => '',
-    'Analyse'         => '#VALUE!',
+    'Analyse'         => '',
     'Archive'         => '',
-    'Articles'        => '#VALUE!',
-    'Asia'            => '#VALUE!',
-    'Attribute'       => '#VALUE!',
-    'BaseTime'        => '#VALUE!',
+    'Articles'        => '',
+    'Asia'            => '',
+    'Attribute'       => '',
+    'BaseTime'        => '',
     'Billing'         => '',
     'Bills'           => 'Rachunki',
     'Bonus'           => 'Premia',
-    'CIS'             => '#VALUE!',
+    'CIS'             => '',
     'Cashback'        => 'Zwrot gotówki',
     'City'            => 'Miasto',
     'Client'          => 'Klient',
     'ClientID'        => 'Identyfikator klienta',
-    'ComparisonTime'  => '#VALUE!',
+    'ComparisonTime'  => '',
     'Confirmation'    => 'Potwierdzenie',
     'Country'         => 'Kraj',
     'CreateBill'      => '',
@@ -41,7 +41,7 @@ return ['Billing' => [
     'CreditCard'      => 'Karta kredytowa',
     'CreditNote'      => 'Uwaga kredytowa',
     'Currency'        => '',
-    'Customers'       => '#VALUE!',
+    'Customers'       => '',
     'Date'            => 'Data',
     'Delivery'        => 'Dostawa',
     'DeliveryNote'    => 'Dowód dostawy',
@@ -50,10 +50,10 @@ return ['Billing' => [
     'DiscountP'       => 'Zniżka %',
     'Due'             => 'Z powodu',
     'Email'           => '',
-    'Europe'          => '#VALUE!',
-    'Filter'          => '#VALUE!',
+    'Europe'          => '',
+    'Filter'          => '',
     'Freightage'      => 'Frachtowanie',
-    'General'         => '#VALUE!',
+    'General'         => '',
     'Gross'           => 'Brutto',
     'Invoice'         => 'Faktura',
     'Invoices'        => 'Faktury',
@@ -68,7 +68,7 @@ return ['Billing' => [
     'Net'             => 'Internet',
     'Offer'           => 'Oferta',
     'Original'        => '',
-    'Other'           => '#VALUE!',
+    'Other'           => '',
     'Payment'         => 'Zapłata',
     'PaymentPlan'     => '',
     'PazmentPlan'     => '',
@@ -79,9 +79,9 @@ return ['Billing' => [
     'Profit'          => 'Zysk',
     'Quantity'        => 'Ilość',
     'Recipient'       => 'Odbiorca',
-    'Region'          => '#VALUE!',
-    'Rep'             => '#VALUE!',
-    'Sales'           => '#VALUE!',
+    'Region'          => '',
+    'Rep'             => '',
+    'Sales'           => '',
     'Select'          => 'Wybierać',
     'Shipment'        => 'Wysyłka',
     'Source'          => 'Źródło',
@@ -93,7 +93,7 @@ return ['Billing' => [
     'Type'            => 'Rodzaj',
     'Types'           => '',
     'Upload'          => 'Wgrywać',
-    'Value'           => '#VALUE!',
+    'Value'           => '',
     'Variation'       => 'Zmiana',
     'Zip'             => 'Zamek błyskawiczny',
 ]];
diff --git a/Theme/Backend/Lang/pt.lang.php b/Theme/Backend/Lang/pt.lang.php
index 3d53b1f..869d9ac 100755
--- a/Theme/Backend/Lang/pt.lang.php
+++ b/Theme/Backend/Lang/pt.lang.php
@@ -15,25 +15,25 @@ declare(strict_types=1);
 return ['Billing' => [
     'Address'         => 'Endereço',
     'Addresses'       => 'Endereços',
-    'Africa'          => '#VALUE!',
+    'Africa'          => '',
     'AlreadyPaid'     => 'Já pago',
-    'America'         => '#VALUE!',
+    'America'         => '',
     'Amount'          => '',
-    'Analyse'         => '#VALUE!',
+    'Analyse'         => '',
     'Archive'         => '',
-    'Articles'        => '#VALUE!',
-    'Asia'            => '#VALUE!',
-    'Attribute'       => '#VALUE!',
-    'BaseTime'        => '#VALUE!',
+    'Articles'        => '',
+    'Asia'            => '',
+    'Attribute'       => '',
+    'BaseTime'        => '',
     'Billing'         => '',
     'Bills'           => 'Notas',
     'Bonus'           => 'Bônus',
-    'CIS'             => '#VALUE!',
+    'CIS'             => '',
     'Cashback'        => 'Dinheiro de volta',
     'City'            => 'Cidade',
     'Client'          => 'Cliente',
     'ClientID'        => 'ID do Cliente',
-    'ComparisonTime'  => '#VALUE!',
+    'ComparisonTime'  => '',
     'Confirmation'    => 'Confirmação',
     'Country'         => 'País',
     'CreateBill'      => '',
@@ -41,7 +41,7 @@ return ['Billing' => [
     'CreditCard'      => 'Cartão de crédito',
     'CreditNote'      => 'Nota de crédito',
     'Currency'        => '',
-    'Customers'       => '#VALUE!',
+    'Customers'       => '',
     'Date'            => 'Encontro',
     'Delivery'        => 'Entrega',
     'DeliveryNote'    => 'Nota de entrega',
@@ -50,10 +50,10 @@ return ['Billing' => [
     'DiscountP'       => 'Desconto%',
     'Due'             => 'Vencimento',
     'Email'           => '',
-    'Europe'          => '#VALUE!',
-    'Filter'          => '#VALUE!',
+    'Europe'          => '',
+    'Filter'          => '',
     'Freightage'      => 'Freightage',
-    'General'         => '#VALUE!',
+    'General'         => '',
     'Gross'           => 'Bruto',
     'Invoice'         => 'Fatura',
     'Invoices'        => 'Faturas',
@@ -68,7 +68,7 @@ return ['Billing' => [
     'Net'             => 'Internet',
     'Offer'           => 'Oferta',
     'Original'        => '',
-    'Other'           => '#VALUE!',
+    'Other'           => '',
     'Payment'         => 'Pagamento',
     'PaymentPlan'     => '',
     'PazmentPlan'     => '',
@@ -79,9 +79,9 @@ return ['Billing' => [
     'Profit'          => 'Lucro',
     'Quantity'        => 'Quantidade',
     'Recipient'       => 'Destinatário',
-    'Region'          => '#VALUE!',
-    'Rep'             => '#VALUE!',
-    'Sales'           => '#VALUE!',
+    'Region'          => '',
+    'Rep'             => '',
+    'Sales'           => '',
     'Select'          => 'Selecione.',
     'Shipment'        => 'envio',
     'Source'          => 'Fonte',
@@ -93,7 +93,7 @@ return ['Billing' => [
     'Type'            => 'Modelo',
     'Types'           => '',
     'Upload'          => 'Envio',
-    'Value'           => '#VALUE!',
+    'Value'           => '',
     'Variation'       => 'Variação',
     'Zip'             => 'Fecho eclair',
 ]];
diff --git a/Theme/Backend/Lang/ru.lang.php b/Theme/Backend/Lang/ru.lang.php
index 6dde069..f533428 100755
--- a/Theme/Backend/Lang/ru.lang.php
+++ b/Theme/Backend/Lang/ru.lang.php
@@ -15,25 +15,25 @@ declare(strict_types=1);
 return ['Billing' => [
     'Address'         => 'Адрес',
     'Addresses'       => 'Адреса',
-    'Africa'          => '#VALUE!',
+    'Africa'          => '',
     'AlreadyPaid'     => 'Уже оплачено',
-    'America'         => '#VALUE!',
+    'America'         => '',
     'Amount'          => '',
-    'Analyse'         => '#VALUE!',
+    'Analyse'         => '',
     'Archive'         => '',
-    'Articles'        => '#VALUE!',
-    'Asia'            => '#VALUE!',
-    'Attribute'       => '#VALUE!',
-    'BaseTime'        => '#VALUE!',
+    'Articles'        => '',
+    'Asia'            => '',
+    'Attribute'       => '',
+    'BaseTime'        => '',
     'Billing'         => '',
     'Bills'           => 'Счета',
     'Bonus'           => 'Бонус',
-    'CIS'             => '#VALUE!',
+    'CIS'             => '',
     'Cashback'        => 'Возврат наличных',
     'City'            => 'Город',
     'Client'          => 'Клиент',
     'ClientID'        => 'ID клиента',
-    'ComparisonTime'  => '#VALUE!',
+    'ComparisonTime'  => '',
     'Confirmation'    => 'Подтверждение',
     'Country'         => 'Страна',
     'CreateBill'      => '',
@@ -41,7 +41,7 @@ return ['Billing' => [
     'CreditCard'      => 'Кредитная карта',
     'CreditNote'      => 'Кредитная нота',
     'Currency'        => '',
-    'Customers'       => '#VALUE!',
+    'Customers'       => '',
     'Date'            => 'Дата',
     'Delivery'        => 'Доставка',
     'DeliveryNote'    => 'Накладная',
@@ -50,10 +50,10 @@ return ['Billing' => [
     'DiscountP'       => 'Скидка %',
     'Due'             => 'Должное',
     'Email'           => '',
-    'Europe'          => '#VALUE!',
-    'Filter'          => '#VALUE!',
+    'Europe'          => '',
+    'Filter'          => '',
     'Freightage'      => 'Фрахты',
-    'General'         => '#VALUE!',
+    'General'         => '',
     'Gross'           => 'Валовой',
     'Invoice'         => 'Счет',
     'Invoices'        => 'Счета',
@@ -68,7 +68,7 @@ return ['Billing' => [
     'Net'             => 'Сеть',
     'Offer'           => 'Предложение',
     'Original'        => '',
-    'Other'           => '#VALUE!',
+    'Other'           => '',
     'Payment'         => 'Оплата',
     'PaymentPlan'     => '',
     'PazmentPlan'     => '',
@@ -79,9 +79,9 @@ return ['Billing' => [
     'Profit'          => 'Выгода',
     'Quantity'        => 'Количество',
     'Recipient'       => 'Получатель',
-    'Region'          => '#VALUE!',
-    'Rep'             => '#VALUE!',
-    'Sales'           => '#VALUE!',
+    'Region'          => '',
+    'Rep'             => '',
+    'Sales'           => '',
     'Select'          => 'Выбирать',
     'Shipment'        => 'Отгрузка',
     'Source'          => 'Источник',
@@ -93,7 +93,7 @@ return ['Billing' => [
     'Type'            => 'Тип',
     'Types'           => '',
     'Upload'          => 'Загрузить',
-    'Value'           => '#VALUE!',
+    'Value'           => '',
     'Variation'       => 'Вариация',
     'Zip'             => 'Zip.',
 ]];
diff --git a/Theme/Backend/Lang/sv.lang.php b/Theme/Backend/Lang/sv.lang.php
index a7c395f..002f9f1 100755
--- a/Theme/Backend/Lang/sv.lang.php
+++ b/Theme/Backend/Lang/sv.lang.php
@@ -15,25 +15,25 @@ declare(strict_types=1);
 return ['Billing' => [
     'Address'         => 'Adress',
     'Addresses'       => 'Adresser',
-    'Africa'          => '#VALUE!',
+    'Africa'          => '',
     'AlreadyPaid'     => 'Redan betalat',
-    'America'         => '#VALUE!',
+    'America'         => '',
     'Amount'          => '',
-    'Analyse'         => '#VALUE!',
+    'Analyse'         => '',
     'Archive'         => '',
-    'Articles'        => '#VALUE!',
-    'Asia'            => '#VALUE!',
-    'Attribute'       => '#VALUE!',
-    'BaseTime'        => '#VALUE!',
+    'Articles'        => '',
+    'Asia'            => '',
+    'Attribute'       => '',
+    'BaseTime'        => '',
     'Billing'         => '',
     'Bills'           => 'Räkningar',
     'Bonus'           => 'Bonus',
-    'CIS'             => '#VALUE!',
+    'CIS'             => '',
     'Cashback'        => 'Pengar tillbaka',
     'City'            => 'Stad',
     'Client'          => 'Klient',
     'ClientID'        => 'Klient ID',
-    'ComparisonTime'  => '#VALUE!',
+    'ComparisonTime'  => '',
     'Confirmation'    => 'Bekräftelse',
     'Country'         => 'Land',
     'CreateBill'      => '',
@@ -41,7 +41,7 @@ return ['Billing' => [
     'CreditCard'      => 'Kreditkort',
     'CreditNote'      => 'Kreditanteckning',
     'Currency'        => '',
-    'Customers'       => '#VALUE!',
+    'Customers'       => '',
     'Date'            => 'Datum',
     'Delivery'        => 'Leverans',
     'DeliveryNote'    => 'Leveransanteckning',
@@ -50,10 +50,10 @@ return ['Billing' => [
     'DiscountP'       => 'Rabatt%',
     'Due'             => 'På grund av',
     'Email'           => '',
-    'Europe'          => '#VALUE!',
-    'Filter'          => '#VALUE!',
+    'Europe'          => '',
+    'Filter'          => '',
     'Freightage'      => 'Frakt',
-    'General'         => '#VALUE!',
+    'General'         => '',
     'Gross'           => 'Äckligt',
     'Invoice'         => 'Faktura',
     'Invoices'        => 'Fakturor',
@@ -68,7 +68,7 @@ return ['Billing' => [
     'Net'             => 'Netto',
     'Offer'           => 'Erbjudande',
     'Original'        => '',
-    'Other'           => '#VALUE!',
+    'Other'           => '',
     'Payment'         => 'Betalning',
     'PaymentPlan'     => '',
     'PazmentPlan'     => '',
@@ -79,9 +79,9 @@ return ['Billing' => [
     'Profit'          => 'Vinst',
     'Quantity'        => 'Kvantitet',
     'Recipient'       => 'Mottagare',
-    'Region'          => '#VALUE!',
-    'Rep'             => '#VALUE!',
-    'Sales'           => '#VALUE!',
+    'Region'          => '',
+    'Rep'             => '',
+    'Sales'           => '',
     'Select'          => 'Välj',
     'Shipment'        => 'Sändning',
     'Source'          => 'Källa',
@@ -93,7 +93,7 @@ return ['Billing' => [
     'Type'            => 'Typ',
     'Types'           => '',
     'Upload'          => 'Ladda upp',
-    'Value'           => '#VALUE!',
+    'Value'           => '',
     'Variation'       => 'Variation',
     'Zip'             => 'Blixtlås',
 ]];
diff --git a/Theme/Backend/Lang/th.lang.php b/Theme/Backend/Lang/th.lang.php
index 16a28c5..313dd1a 100755
--- a/Theme/Backend/Lang/th.lang.php
+++ b/Theme/Backend/Lang/th.lang.php
@@ -15,25 +15,25 @@ declare(strict_types=1);
 return ['Billing' => [
     'Address'         => 'ที่อยู่',
     'Addresses'       => 'ที่อยู่',
-    'Africa'          => '#VALUE!',
+    'Africa'          => '',
     'AlreadyPaid'     => 'จ่ายแล้ว',
-    'America'         => '#VALUE!',
+    'America'         => '',
     'Amount'          => '',
-    'Analyse'         => '#VALUE!',
+    'Analyse'         => '',
     'Archive'         => '',
-    'Articles'        => '#VALUE!',
-    'Asia'            => '#VALUE!',
-    'Attribute'       => '#VALUE!',
-    'BaseTime'        => '#VALUE!',
+    'Articles'        => '',
+    'Asia'            => '',
+    'Attribute'       => '',
+    'BaseTime'        => '',
     'Billing'         => '',
     'Bills'           => 'การเรียกเก็บเงิน',
     'Bonus'           => 'โบนัส',
-    'CIS'             => '#VALUE!',
+    'CIS'             => '',
     'Cashback'        => 'เงินคืน',
     'City'            => 'เมือง',
     'Client'          => 'ลูกค้า',
     'ClientID'        => 'รหัสลูกค้า',
-    'ComparisonTime'  => '#VALUE!',
+    'ComparisonTime'  => '',
     'Confirmation'    => 'การยืนยัน',
     'Country'         => 'ประเทศ',
     'CreateBill'      => '',
@@ -41,7 +41,7 @@ return ['Billing' => [
     'CreditCard'      => 'บัตรเครดิต',
     'CreditNote'      => 'ใบลดหนี้',
     'Currency'        => '',
-    'Customers'       => '#VALUE!',
+    'Customers'       => '',
     'Date'            => 'วันที่',
     'Delivery'        => 'จัดส่ง',
     'DeliveryNote'    => 'บันทึกการส่งมอบ',
@@ -50,10 +50,10 @@ return ['Billing' => [
     'DiscountP'       => 'การลดราคา %',
     'Due'             => 'เนื่องจาก',
     'Email'           => '',
-    'Europe'          => '#VALUE!',
-    'Filter'          => '#VALUE!',
+    'Europe'          => '',
+    'Filter'          => '',
     'Freightage'      => 'การขนส่งสินค้า',
-    'General'         => '#VALUE!',
+    'General'         => '',
     'Gross'           => 'ทั้งหมด',
     'Invoice'         => 'ใบแจ้งหนี้',
     'Invoices'        => 'ใบแจ้งหนี้',
@@ -68,7 +68,7 @@ return ['Billing' => [
     'Net'             => 'สุทธิ',
     'Offer'           => 'เสนอ',
     'Original'        => '',
-    'Other'           => '#VALUE!',
+    'Other'           => '',
     'Payment'         => 'การชำระเงิน',
     'PaymentPlan'     => '',
     'PazmentPlan'     => '',
@@ -79,9 +79,9 @@ return ['Billing' => [
     'Profit'          => 'กำไร',
     'Quantity'        => 'ปริมาณ',
     'Recipient'       => 'ผู้รับ',
-    'Region'          => '#VALUE!',
-    'Rep'             => '#VALUE!',
-    'Sales'           => '#VALUE!',
+    'Region'          => '',
+    'Rep'             => '',
+    'Sales'           => '',
     'Select'          => 'เลือก',
     'Shipment'        => 'การจัดส่ง',
     'Source'          => 'แหล่งที่มา',
@@ -93,7 +93,7 @@ return ['Billing' => [
     'Type'            => 'พิมพ์',
     'Types'           => '',
     'Upload'          => 'ที่อัพโหลด',
-    'Value'           => '#VALUE!',
+    'Value'           => '',
     'Variation'       => 'การเปลี่ยนแปลง',
     'Zip'             => 'ซิป',
 ]];
diff --git a/Theme/Backend/Lang/tr.lang.php b/Theme/Backend/Lang/tr.lang.php
index 0c91ec3..9036539 100755
--- a/Theme/Backend/Lang/tr.lang.php
+++ b/Theme/Backend/Lang/tr.lang.php
@@ -15,25 +15,25 @@ declare(strict_types=1);
 return ['Billing' => [
     'Address'         => 'Adres',
     'Addresses'       => 'Adresler',
-    'Africa'          => '#VALUE!',
+    'Africa'          => '',
     'AlreadyPaid'     => 'Zaten ödendi',
-    'America'         => '#VALUE!',
+    'America'         => '',
     'Amount'          => '',
-    'Analyse'         => '#VALUE!',
+    'Analyse'         => '',
     'Archive'         => '',
-    'Articles'        => '#VALUE!',
-    'Asia'            => '#VALUE!',
-    'Attribute'       => '#VALUE!',
-    'BaseTime'        => '#VALUE!',
+    'Articles'        => '',
+    'Asia'            => '',
+    'Attribute'       => '',
+    'BaseTime'        => '',
     'Billing'         => '',
     'Bills'           => 'Faturalar',
     'Bonus'           => 'Bonus',
-    'CIS'             => '#VALUE!',
+    'CIS'             => '',
     'Cashback'        => 'Nakit para',
     'City'            => 'Şehir',
     'Client'          => 'Müşteri',
     'ClientID'        => 'Müşteri Kimliği',
-    'ComparisonTime'  => '#VALUE!',
+    'ComparisonTime'  => '',
     'Confirmation'    => 'Onayla',
     'Country'         => 'Ülke',
     'CreateBill'      => '',
@@ -41,7 +41,7 @@ return ['Billing' => [
     'CreditCard'      => 'Kredi kartı',
     'CreditNote'      => 'Kredi notu',
     'Currency'        => '',
-    'Customers'       => '#VALUE!',
+    'Customers'       => '',
     'Date'            => 'Tarih',
     'Delivery'        => 'Teslimat',
     'DeliveryNote'    => 'Teslimat notu',
@@ -50,10 +50,10 @@ return ['Billing' => [
     'DiscountP'       => 'İndirim %',
     'Due'             => 'Vadesi dolmuş',
     'Email'           => '',
-    'Europe'          => '#VALUE!',
-    'Filter'          => '#VALUE!',
+    'Europe'          => '',
+    'Filter'          => '',
     'Freightage'      => 'Yük',
-    'General'         => '#VALUE!',
+    'General'         => '',
     'Gross'           => 'Brüt',
     'Invoice'         => 'Fatura',
     'Invoices'        => 'Faturalar',
@@ -68,7 +68,7 @@ return ['Billing' => [
     'Net'             => 'Ağ',
     'Offer'           => 'Teklif',
     'Original'        => '',
-    'Other'           => '#VALUE!',
+    'Other'           => '',
     'Payment'         => 'Ödeme',
     'PaymentPlan'     => '',
     'PazmentPlan'     => '',
@@ -79,9 +79,9 @@ return ['Billing' => [
     'Profit'          => 'Kâr',
     'Quantity'        => 'Miktar',
     'Recipient'       => 'Alıcı',
-    'Region'          => '#VALUE!',
-    'Rep'             => '#VALUE!',
-    'Sales'           => '#VALUE!',
+    'Region'          => '',
+    'Rep'             => '',
+    'Sales'           => '',
     'Select'          => 'Seçme',
     'Shipment'        => 'gönderi',
     'Source'          => 'Kaynak',
@@ -93,7 +93,7 @@ return ['Billing' => [
     'Type'            => 'Tip',
     'Types'           => '',
     'Upload'          => 'Yüklemek',
-    'Value'           => '#VALUE!',
+    'Value'           => '',
     'Variation'       => 'varyasyon',
     'Zip'             => 'Zip',
 ]];
diff --git a/Theme/Backend/Lang/uk.lang.php b/Theme/Backend/Lang/uk.lang.php
index c1046fe..198a054 100755
--- a/Theme/Backend/Lang/uk.lang.php
+++ b/Theme/Backend/Lang/uk.lang.php
@@ -15,25 +15,25 @@ declare(strict_types=1);
 return ['Billing' => [
     'Address'         => 'Адреса',
     'Addresses'       => 'Адреси',
-    'Africa'          => '#VALUE!',
+    'Africa'          => '',
     'AlreadyPaid'     => 'Вже оплачено',
-    'America'         => '#VALUE!',
+    'America'         => '',
     'Amount'          => '',
-    'Analyse'         => '#VALUE!',
+    'Analyse'         => '',
     'Archive'         => '',
-    'Articles'        => '#VALUE!',
-    'Asia'            => '#VALUE!',
-    'Attribute'       => '#VALUE!',
-    'BaseTime'        => '#VALUE!',
+    'Articles'        => '',
+    'Asia'            => '',
+    'Attribute'       => '',
+    'BaseTime'        => '',
     'Billing'         => '',
     'Bills'           => 'Векселі',
     'Bonus'           => 'Бонус',
-    'CIS'             => '#VALUE!',
+    'CIS'             => '',
     'Cashback'        => 'Готівка',
     'City'            => 'Місто',
     'Client'          => 'Клієнт',
     'ClientID'        => 'Ідентифікатор клієнта',
-    'ComparisonTime'  => '#VALUE!',
+    'ComparisonTime'  => '',
     'Confirmation'    => 'Підтвердження',
     'Country'         => 'Країна',
     'CreateBill'      => '',
@@ -41,7 +41,7 @@ return ['Billing' => [
     'CreditCard'      => 'Кредитна карта',
     'CreditNote'      => 'Кредитове авізо',
     'Currency'        => '',
-    'Customers'       => '#VALUE!',
+    'Customers'       => '',
     'Date'            => 'Дата',
     'Delivery'        => 'Доставка',
     'DeliveryNote'    => 'Накладна',
@@ -50,10 +50,10 @@ return ['Billing' => [
     'DiscountP'       => 'Знижка%',
     'Due'             => 'Заборгованість',
     'Email'           => '',
-    'Europe'          => '#VALUE!',
-    'Filter'          => '#VALUE!',
+    'Europe'          => '',
+    'Filter'          => '',
     'Freightage'      => 'Фрахт',
-    'General'         => '#VALUE!',
+    'General'         => '',
     'Gross'           => 'Валовий',
     'Invoice'         => 'Рахунок-фактура',
     'Invoices'        => 'Рахунки-фактури',
@@ -68,7 +68,7 @@ return ['Billing' => [
     'Net'             => 'Сітка',
     'Offer'           => 'Пропозиція',
     'Original'        => '',
-    'Other'           => '#VALUE!',
+    'Other'           => '',
     'Payment'         => 'Платіж',
     'PaymentPlan'     => '',
     'PazmentPlan'     => '',
@@ -79,9 +79,9 @@ return ['Billing' => [
     'Profit'          => 'Прибуток',
     'Quantity'        => 'Кількість',
     'Recipient'       => 'Одержувач',
-    'Region'          => '#VALUE!',
-    'Rep'             => '#VALUE!',
-    'Sales'           => '#VALUE!',
+    'Region'          => '',
+    'Rep'             => '',
+    'Sales'           => '',
     'Select'          => 'Вибирати',
     'Shipment'        => 'Відвантаження',
     'Source'          => 'Джерело',
@@ -93,7 +93,7 @@ return ['Billing' => [
     'Type'            => 'Тип',
     'Types'           => '',
     'Upload'          => 'Завантажувати',
-    'Value'           => '#VALUE!',
+    'Value'           => '',
     'Variation'       => 'Зміна',
     'Zip'             => 'Блиск',
 ]];
diff --git a/Theme/Backend/Lang/zh.lang.php b/Theme/Backend/Lang/zh.lang.php
index 8fb9a47..5381aaa 100755
--- a/Theme/Backend/Lang/zh.lang.php
+++ b/Theme/Backend/Lang/zh.lang.php
@@ -15,25 +15,25 @@ declare(strict_types=1);
 return ['Billing' => [
     'Address'         => '地址',
     'Addresses'       => '地址',
-    'Africa'          => '#VALUE!',
+    'Africa'          => '',
     'AlreadyPaid'     => '已付款',
-    'America'         => '#VALUE!',
+    'America'         => '',
     'Amount'          => '',
-    'Analyse'         => '#VALUE!',
+    'Analyse'         => '',
     'Archive'         => '',
-    'Articles'        => '#VALUE!',
-    'Asia'            => '#VALUE!',
-    'Attribute'       => '#VALUE!',
-    'BaseTime'        => '#VALUE!',
+    'Articles'        => '',
+    'Asia'            => '',
+    'Attribute'       => '',
+    'BaseTime'        => '',
     'Billing'         => '',
     'Bills'           => '账单',
     'Bonus'           => '奖金',
-    'CIS'             => '#VALUE!',
+    'CIS'             => '',
     'Cashback'        => '返现金',
     'City'            => '城市',
     'Client'          => '客户',
     'ClientID'        => '客户ID',
-    'ComparisonTime'  => '#VALUE!',
+    'ComparisonTime'  => '',
     'Confirmation'    => '确认',
     'Country'         => '国家',
     'CreateBill'      => '',
@@ -41,7 +41,7 @@ return ['Billing' => [
     'CreditCard'      => '信用卡',
     'CreditNote'      => '信用票据',
     'Currency'        => '',
-    'Customers'       => '#VALUE!',
+    'Customers'       => '',
     'Date'            => '日期',
     'Delivery'        => '交货',
     'DeliveryNote'    => '送货单',
@@ -50,10 +50,10 @@ return ['Billing' => [
     'DiscountP'       => '折扣 ％',
     'Due'             => '到期的',
     'Email'           => '',
-    'Europe'          => '#VALUE!',
-    'Filter'          => '#VALUE!',
+    'Europe'          => '',
+    'Filter'          => '',
     'Freightage'      => 'FRIGUTAGE.',
-    'General'         => '#VALUE!',
+    'General'         => '',
     'Gross'           => '总的',
     'Invoice'         => '发票',
     'Invoices'        => '发票',
@@ -68,7 +68,7 @@ return ['Billing' => [
     'Net'             => '网',
     'Offer'           => '提供',
     'Original'        => '',
-    'Other'           => '#VALUE!',
+    'Other'           => '',
     'Payment'         => '支付',
     'PaymentPlan'     => '',
     'PazmentPlan'     => '',
@@ -79,9 +79,9 @@ return ['Billing' => [
     'Profit'          => '利润',
     'Quantity'        => '数量',
     'Recipient'       => '接受者',
-    'Region'          => '#VALUE!',
-    'Rep'             => '#VALUE!',
-    'Sales'           => '#VALUE!',
+    'Region'          => '',
+    'Rep'             => '',
+    'Sales'           => '',
     'Select'          => '选择',
     'Shipment'        => '运输',
     'Source'          => '来源',
@@ -93,7 +93,7 @@ return ['Billing' => [
     'Type'            => '类型',
     'Types'           => '',
     'Upload'          => '上传',
-    'Value'           => '#VALUE!',
+    'Value'           => '',
     'Variation'       => '变化',
     'Zip'             => '压缩',
 ]];
diff --git a/Theme/Backend/bill-analysis.tpl.php b/Theme/Backend/bill-analysis.tpl.php
deleted file mode 100755
index 73eea63..0000000
--- a/Theme/Backend/bill-analysis.tpl.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Jingga
- *
- * PHP Version 8.1
- *
- * @package   Modules\ClientManagement
- * @copyright Dennis Eichhorn
- * @license   OMS License 2.0
- * @version   1.0.0
- * @link      https://jingga.app
- */
-declare(strict_types=1);
-
-/* @todo: single month/quarter/fiscal year/calendar year */
-/* @todo: time range (<= 12 month = monthly view; else annual view/comparison) */
-
-/**
- * @var \phpOMS\Views\View $this
- */
-echo $this->data['nav']->render();
diff --git a/Theme/Backend/purchase-bill.tpl.php b/Theme/Backend/purchase-bill.tpl.php
index b696646..f84badb 100755
--- a/Theme/Backend/purchase-bill.tpl.php
+++ b/Theme/Backend/purchase-bill.tpl.php
@@ -22,6 +22,7 @@ include __DIR__ . '/../../../Media/Theme/Backend/template-functions.php';
  * @var \phpOMS\Views\View $this
  */
 
+/** @var \Modules\Billing\Models\Bill $bill */
 $bill     = $this->data['bill'];
 $elements = $bill->getElements();
 
@@ -29,7 +30,7 @@ $previewType  = $this->data['previewType'];
 $originalType = $this->data['originalType'];
 $billPdf      = $bill->getFileByType($previewType);
 $original     = $bill->getFileByType($originalType);
-$media        = $bill->getMedia();
+$media        = $bill->files;
 
 echo $this->data['nav']->render(); ?>
 
@@ -219,7 +220,7 @@ echo $this->data['nav']->render(); ?>
                     <section id="mediaFile" class="portlet col-simple">
                         <div class="portlet-body col-simple">
                             <?php if ($original->id > 0) : ?>
-                            <iframe class="col-simple" data-form="iUiSettings" data-name="iframeHelper" id="iHelperFrame" src="<?= UriFactory::build('Resources/mozilla/Pdf/web/viewer.html{?}&file=' . \urlencode(($original->isAbsolute ? '' : '/../../../../') . $original->getPath())); ?>" allowfullscreen></iframe>
+                                <iframe class="col-simple" id="iOriginal" src="<?= UriFactory::build('Resources/mozilla/Pdf/web/viewer.html?file=' . \urlencode(UriFactory::build('{/api}media/export?id=' . $original->id))); ?>" allowfullscreen></iframe>
                             <?php endif; ?>
                         </div>
                     </section>
diff --git a/Theme/Backend/region-analysis.tpl.php b/Theme/Backend/region-analysis.tpl.php
deleted file mode 100755
index de64e04..0000000
--- a/Theme/Backend/region-analysis.tpl.php
+++ /dev/null
@@ -1,1756 +0,0 @@
-<?php
-/**
- * Jingga
- *
- * PHP Version 8.1
- *
- * @package   Modules\ClientManagement
- * @copyright Dennis Eichhorn
- * @license   OMS License 2.0
- * @version   1.0.0
- * @link      https://jingga.app
- */
-declare(strict_types=1);
-
-use phpOMS\Localization\Money;
-
-/* @todo: single month/quarter/fiscal year/calendar year */
-/* @todo: time range (<= 12 month = monthly view; else annual view/comparison) */
-
-/**
- * @var \phpOMS\Views\View $this
- */
-echo $this->data['nav']->render();
-?>
-
-<div class="tabview tab-2">
-    <div class="box">
-        <ul class="tab-links">
-            <li><label for="c-tab-2"><?= $this->getHtml('General'); ?></label></li>
-            <li><label for="c-tab-3"><?= $this->getHtml('Region'); ?></label></li>
-            <li><label for="c-tab-1"><?= $this->getHtml('Filter'); ?></label></li>
-        </ul>
-    </div>
-    <div class="tab-content">
-        <input type="radio" id="c-tab-1" name="tabular-2"<?= $this->request->uri->fragment === 'c-tab-1' ? ' checked' : ''; ?>>
-        <div class="tab">
-            <div class="row">
-                <div class="col-xs-12 col-lg-6">
-                    <section class="portlet">
-                        <form>
-                           <div class="portlet-head"><?= $this->getHtml('Filter'); ?></div>
-                            <div class="portlet-body">
-                                <div class="form-group">
-                                    <label for="iId"><?= $this->getHtml('Client'); ?></label>
-                                    <input type="text" id="iName1" name="name1">
-                                </div>
-
-                                <div class="form-group">
-                                    <div class="input-control">
-                                        <label for="iDecimalPoint"><?= $this->getHtml('BaseTime'); ?></label>
-                                        <input id="iDecimalPoint" name="settings_decimal" type="text" value="" placeholder=".">
-                                    </div>
-
-                                    <div class="input-control">
-                                        <label for="iThousandSep"><?= $this->getHtml('ComparisonTime'); ?></label>
-                                        <input id="iThousandSep" name="settings_thousands" type="text" value="" placeholder=",">
-                                    </div>
-                                </div>
-
-                                <div class="form-group">
-                                    <div class="input-control">
-                                        <label for="iDecimalPoint"><?= $this->getHtml('Attribute'); ?></label>
-                                        <input id="iDecimalPoint" name="settings_decimal" type="text" value="" placeholder=".">
-                                    </div>
-
-                                    <div class="input-control">
-                                        <label for="iThousandSep"><?= $this->getHtml('Value'); ?></label>
-                                        <input id="iThousandSep" name="settings_thousands" type="text" value="" placeholder=",">
-                                    </div>
-                                </div>
-
-                                <div class="form-group">
-                                    <label for="iId"><?= $this->getHtml('Region'); ?></label>
-                                    <input type="text" id="iName1" name="name1">
-                                </div>
-
-                                <div class="form-group">
-                                    <label for="iId"><?= $this->getHtml('Country'); ?></label>
-                                    <input type="text" id="iName1" name="name1">
-                                </div>
-
-                                <div class="form-group">
-                                    <label for="iId"><?= $this->getHtml('Rep'); ?></label>
-                                    <input type="text" id="iName1" name="name1">
-                                </div>
-                            </div>
-                            <div class="portlet-foot"><input id="iSubmitGeneral" name="submitGeneral" type="submit" value="<?= $this->getHtml('Save', '0', '0'); ?>"></div>
-                        </form>
-                    </section>
-                </div>
-            </div>
-        </div>
-
-        <input type="radio" id="c-tab-2" name="tabular-2"<?= $this->request->uri->fragment === 'c-tab-1' ? ' checked' : ''; ?>>
-        <div class="tab">
-            <div class="row">
-                <div class="col-xs-12 col-lg-6">
-                    <section class="portlet">
-                        <div class="portlet-head">
-                            Sales per Region - Current
-                            <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
-                        </div>
-                        <?php $customerRegion = $this->data['currentCustomerRegion']; ?>
-                        <div class="portlet-body">
-                            <canvas id="sales-region" data-chart='{
-                                        "type": "pie",
-                                        "data": {
-                                            "labels": [
-                                                    "Europe", "America", "Asia", "Africa", "CIS", "Other"
-                                                ],
-                                            "datasets": [{
-                                                "data": [
-                                                    <?= (int) ($customerRegion['Europe'] ?? 0); ?>,
-                                                    <?= (int) ($customerRegion['America'] ?? 0); ?>,
-                                                    <?= (int) ($customerRegion['Asia'] ?? 0); ?>,
-                                                    <?= (int) ($customerRegion['Africa'] ?? 0); ?>,
-                                                    <?= (int) ($customerRegion['CIS'] ?? 0); ?>,
-                                                    <?= (int) ($customerRegion['Other'] ?? 0); ?>
-                                                ],
-                                                "backgroundColor": [
-                                                    "rgb(255, 99, 132)",
-                                                    "rgb(255, 159, 64)",
-                                                    "rgb(255, 205, 86)",
-                                                    "rgb(75, 192, 192)",
-                                                    "rgb(54, 162, 235)",
-                                                    "rgb(153, 102, 255)"
-                                                ]
-                                            }]
-                                        },
-                                        "options": {
-                                            "title": {
-                                                "display": false,
-                                                "text": "Customers per Region - Currently"
-                                            }
-                                        }
-                                }'></canvas>
-
-                            <div class="more-container">
-                                <input id="more-customer-region" type="checkbox" name="more-container">
-                                <label for="more-customer-region">
-                                    <span>Data</span>
-                                    <i class="fa fa-chevron-right expand"></i>
-                                </label>
-                                <div>
-                                <table class="default">
-                                    <thead>
-                                        <tr>
-                                            <td>Region
-                                            <td>Customer count
-                                    <tbody>
-                                        <?php
-                                            $sum = 0;
-                                        foreach ($customerRegion as $region => $values) : $sum += $values; ?>
-                                            <tr>
-                                                <td><?= $region; ?>
-                                                <td><?= $values; ?>
-                                        <?php endforeach; ?>
-                                            <tr>
-                                                <td>Total
-                                                <td><?= $sum; ?>
-                                </table>
-                                </div>
-                            </div>
-                        </div>
-                    </section>
-                </div>
-
-                <div class="col-xs-12 col-lg-6">
-                    <section class="portlet">
-                        <div class="portlet-head">
-                            Sales per Region - Annual
-                            <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
-                        </div>
-                        <?php $customerRegion = $this->data['annualCustomerRegion']; ?>
-                        <div class="portlet-body">
-                            <canvas id="sales-region" data-chart='{
-                                            "type": "line",
-                                            "data": {
-                                                "labels": [
-                                                    <?php
-                                                        $temp = [];
-                                                        foreach ($customerRegion as $annual) {
-                                                            $temp[] = (string) $annual['year'];
-                                                        }
-                                                    ?>
-                                                    <?= '"' . \implode('", "', $temp) . '"'; ?>
-                                                ],
-                                                "datasets": [
-                                                    {
-                                                        "label": "<?= $this->getHtml('Total'); ?>",
-                                                        "type": "line",
-                                                        "data": [
-                                                            <?php
-                                                                $temp = [];
-                                                                foreach ($customerRegion as $annual) {
-                                                                    $temp[] = ((int) ($annual['Total'] ?? 0));
-                                                                }
-                                                            ?>
-                                                            <?= \implode(',', $temp); ?>
-                                                        ],
-                                                        "fill": false,
-                                                        "borderColor": "rgb(139, 139, 139)",
-                                                        "backgroundColor": "rgb(139, 139, 139)",
-                                                        "tension": 0.0
-                                                    },
-                                                    {
-                                                        "label": "<?= $this->getHtml('Europe'); ?>",
-                                                        "type": "line",
-                                                        "data": [
-                                                            <?php
-                                                                $temp = [];
-                                                                foreach ($customerRegion as $annual) {
-                                                                    $temp[] = ((int) ($annual['Europe'] ?? 0));
-                                                                }
-                                                            ?>
-                                                            <?= \implode(',', $temp); ?>
-                                                        ],
-                                                        "fill": false,
-                                                        "borderColor": "rgb(255, 99, 132)",
-                                                        "backgroundColor": "rgb(255, 99, 132)",
-                                                        "tension": 0.0
-                                                    },
-                                                    {
-                                                        "label": "<?= $this->getHtml('America'); ?>",
-                                                        "type": "line",
-                                                        "data": [
-                                                            <?php
-                                                                $temp = [];
-                                                                foreach ($customerRegion as $annual) {
-                                                                    $temp[] = ((int) ($annual['America'] ?? 0));
-                                                                }
-                                                            ?>
-                                                            <?= \implode(',', $temp); ?>
-                                                        ],
-                                                        "fill": false,
-                                                        "borderColor": "rgb(255, 159, 64)",
-                                                        "backgroundColor": "rgb(255, 159, 64)",
-                                                        "tension": 0.0
-                                                    },
-                                                    {
-                                                        "label": "<?= $this->getHtml('Asia'); ?>",
-                                                        "type": "line",
-                                                        "data": [
-                                                            <?php
-                                                                $temp = [];
-                                                                foreach ($customerRegion as $annual) {
-                                                                    $temp[] = ((int) ($annual['Asia'] ?? 0));
-                                                                }
-                                                            ?>
-                                                            <?= \implode(',', $temp); ?>
-                                                        ],
-                                                        "fill": false,
-                                                        "borderColor": "rgb(255, 205, 86)",
-                                                        "backgroundColor": "rgb(255, 205, 86)",
-                                                        "tension": 0.0
-                                                    },
-                                                    {
-                                                        "label": "<?= $this->getHtml('Africa'); ?>",
-                                                        "type": "line",
-                                                        "data": [
-                                                            <?php
-                                                                $temp = [];
-                                                                foreach ($customerRegion as $annual) {
-                                                                    $temp[] = ((int) ($annual['Africa'] ?? 0));
-                                                                }
-                                                            ?>
-                                                            <?= \implode(',', $temp); ?>
-                                                        ],
-                                                        "fill": false,
-                                                        "borderColor": "rgb(75, 192, 192)",
-                                                        "backgroundColor": "rgb(75, 192, 192)",
-                                                        "tension": 0.0
-                                                    },
-                                                    {
-                                                        "label": "<?= $this->getHtml('CIS'); ?>",
-                                                        "type": "line",
-                                                        "data": [
-                                                            <?php
-                                                                $temp = [];
-                                                                foreach ($customerRegion as $annual) {
-                                                                    $temp[] = ((int) ($annual['CIS'] ?? 0));
-                                                                }
-                                                            ?>
-                                                            <?= \implode(',', $temp); ?>
-                                                        ],
-                                                        "fill": false,
-                                                        "borderColor": "rgb(54, 162, 235)",
-                                                        "backgroundColor": "rgb(54, 162, 235)",
-                                                        "tension": 0.0
-                                                    },
-                                                    {
-                                                        "label": "<?= $this->getHtml('Other'); ?>",
-                                                        "type": "line",
-                                                        "data": [
-                                                            <?php
-                                                                $temp = [];
-                                                                foreach ($customerRegion as $annual) {
-                                                                    $temp[] = ((int) ($annual['Other'] ?? 0));
-                                                                }
-                                                            ?>
-                                                            <?= \implode(',', $temp); ?>
-                                                        ],
-                                                        "fill": false,
-                                                        "borderColor": "rgb(153, 102, 255)",
-                                                        "backgroundColor": "rgb(153, 102, 255)",
-                                                        "tension": 0.0
-                                                    }
-                                                ]
-                                            },
-                                            "options": {
-                                                "title": {
-                                                    "display": false,
-                                                    "text": "Sales per Region - Annual"
-                                                },
-                                                "scales": {
-                                                    "yAxes": [
-                                                        {
-                                                            "id": "axis-1",
-                                                            "display": true,
-                                                            "position": "left"
-                                                        }
-                                                    ]
-                                                }
-                                            }
-                                    }'></canvas>
-
-                            <div class="more-container">
-                                <input id="more-customer-region-annual" type="checkbox" name="more-container">
-                                <label for="more-customer-region-annual">
-                                    <span>Data</span>
-                                    <i class="fa fa-chevron-right expand"></i>
-                                </label>
-                                <div>
-                                <table class="default">
-                                    <thead>
-                                        <tr>
-                                            <td>Region
-                                            <?php foreach ([2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020] as $year => $values) : ?>
-                                                <td><?= $values; ?>
-                                            <?php endforeach; ?>
-                                    <tbody>
-                                        <?php
-                                        $regions = [
-                                            'Europe',
-                                            'America',
-                                            'Asia',
-                                            'Africa',
-                                            'CIS',
-                                            'Other',
-                                            'Total',
-                                        ];
-                                        foreach ($regions as $region) : ?>
-                                                <tr>
-                                                    <td><?= $region; ?>
-                                                <?php foreach ($customerRegion as $year => $annual) : ?>
-                                                    <td><?= $annual[$region] ?? 0; ?>
-                                        <?php endforeach; endforeach; ?>
-                                </table>
-                                </div>
-                            </div>
-                        </div>
-                    </section>
-                </div>
-            </div>
-
-            <div class="row">
-                <div class="col-xs-12 col-lg-6">
-                    <section class="portlet">
-                        <div class="portlet-head">
-                            Profit per Region - Current
-                            <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
-                        </div>
-                        <?php $customerRegion = $this->data['currentCustomerRegion']; ?>
-                        <div class="portlet-body">
-                            <canvas id="sales-region" data-chart='{
-                                        "type": "pie",
-                                        "data": {
-                                            "labels": [
-                                                    "Europe", "America", "Asia", "Africa", "CIS", "Other"
-                                                ],
-                                            "datasets": [{
-                                                "data": [
-                                                    <?= (int) ($customerRegion['Europe'] ?? 0); ?>,
-                                                    <?= (int) ($customerRegion['America'] ?? 0); ?>,
-                                                    <?= (int) ($customerRegion['Asia'] ?? 0); ?>,
-                                                    <?= (int) ($customerRegion['Africa'] ?? 0); ?>,
-                                                    <?= (int) ($customerRegion['CIS'] ?? 0); ?>,
-                                                    <?= (int) ($customerRegion['Other'] ?? 0); ?>
-                                                ],
-                                                "backgroundColor": [
-                                                    "rgb(255, 99, 132)",
-                                                    "rgb(255, 159, 64)",
-                                                    "rgb(255, 205, 86)",
-                                                    "rgb(75, 192, 192)",
-                                                    "rgb(54, 162, 235)",
-                                                    "rgb(153, 102, 255)"
-                                                ]
-                                            }]
-                                        },
-                                        "options": {
-                                            "title": {
-                                                "display": false,
-                                                "text": "Customers per Region - Currently"
-                                            }
-                                        }
-                                }'></canvas>
-
-                            <div class="more-container">
-                                <input id="more-customer-region" type="checkbox" name="more-container">
-                                <label for="more-customer-region">
-                                    <span>Data</span>
-                                    <i class="fa fa-chevron-right expand"></i>
-                                </label>
-                                <div>
-                                <table class="default">
-                                    <thead>
-                                        <tr>
-                                            <td>Region
-                                            <td>Customer count
-                                    <tbody>
-                                        <?php
-                                            $sum = 0;
-                                        foreach ($customerRegion as $region => $values) : $sum += $values; ?>
-                                            <tr>
-                                                <td><?= $region; ?>
-                                                <td><?= $values; ?>
-                                        <?php endforeach; ?>
-                                            <tr>
-                                                <td>Total
-                                                <td><?= $sum; ?>
-                                </table>
-                                </div>
-                            </div>
-                        </div>
-                    </section>
-                </div>
-
-                <div class="col-xs-12 col-lg-6">
-                    <section class="portlet">
-                        <div class="portlet-head">
-                            Profit per Region - Annual
-                            <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
-                        </div>
-                        <?php $customerRegion = $this->data['annualCustomerRegion']; ?>
-                        <div class="portlet-body">
-                            <canvas id="sales-region" data-chart='{
-                                            "type": "line",
-                                            "data": {
-                                                "labels": [
-                                                    <?php
-                                                        $temp = [];
-                                                        foreach ($customerRegion as $annual) {
-                                                            $temp[] = (string) $annual['year'];
-                                                        }
-                                                    ?>
-                                                    <?= '"' . \implode('", "', $temp) . '"'; ?>
-                                                ],
-                                                "datasets": [
-                                                    {
-                                                        "label": "<?= $this->getHtml('Total'); ?>",
-                                                        "type": "line",
-                                                        "data": [
-                                                            <?php
-                                                                $temp = [];
-                                                                foreach ($customerRegion as $annual) {
-                                                                    $temp[] = ((int) ($annual['Total'] ?? 0));
-                                                                }
-                                                            ?>
-                                                            <?= \implode(',', $temp); ?>
-                                                        ],
-                                                        "fill": false,
-                                                        "borderColor": "rgb(139, 139, 139)",
-                                                        "backgroundColor": "rgb(139, 139, 139)",
-                                                        "tension": 0.0
-                                                    },
-                                                    {
-                                                        "label": "<?= $this->getHtml('Europe'); ?>",
-                                                        "type": "line",
-                                                        "data": [
-                                                            <?php
-                                                                $temp = [];
-                                                                foreach ($customerRegion as $annual) {
-                                                                    $temp[] = ((int) ($annual['Europe'] ?? 0));
-                                                                }
-                                                            ?>
-                                                            <?= \implode(',', $temp); ?>
-                                                        ],
-                                                        "fill": false,
-                                                        "borderColor": "rgb(255, 99, 132)",
-                                                        "backgroundColor": "rgb(255, 99, 132)",
-                                                        "tension": 0.0
-                                                    },
-                                                    {
-                                                        "label": "<?= $this->getHtml('America'); ?>",
-                                                        "type": "line",
-                                                        "data": [
-                                                            <?php
-                                                                $temp = [];
-                                                                foreach ($customerRegion as $annual) {
-                                                                    $temp[] = ((int) ($annual['America'] ?? 0));
-                                                                }
-                                                            ?>
-                                                            <?= \implode(',', $temp); ?>
-                                                        ],
-                                                        "fill": false,
-                                                        "borderColor": "rgb(255, 159, 64)",
-                                                        "backgroundColor": "rgb(255, 159, 64)",
-                                                        "tension": 0.0
-                                                    },
-                                                    {
-                                                        "label": "<?= $this->getHtml('Asia'); ?>",
-                                                        "type": "line",
-                                                        "data": [
-                                                            <?php
-                                                                $temp = [];
-                                                                foreach ($customerRegion as $annual) {
-                                                                    $temp[] = ((int) ($annual['Asia'] ?? 0));
-                                                                }
-                                                            ?>
-                                                            <?= \implode(',', $temp); ?>
-                                                        ],
-                                                        "fill": false,
-                                                        "borderColor": "rgb(255, 205, 86)",
-                                                        "backgroundColor": "rgb(255, 205, 86)",
-                                                        "tension": 0.0
-                                                    },
-                                                    {
-                                                        "label": "<?= $this->getHtml('Africa'); ?>",
-                                                        "type": "line",
-                                                        "data": [
-                                                            <?php
-                                                                $temp = [];
-                                                                foreach ($customerRegion as $annual) {
-                                                                    $temp[] = ((int) ($annual['Africa'] ?? 0));
-                                                                }
-                                                            ?>
-                                                            <?= \implode(',', $temp); ?>
-                                                        ],
-                                                        "fill": false,
-                                                        "borderColor": "rgb(75, 192, 192)",
-                                                        "backgroundColor": "rgb(75, 192, 192)",
-                                                        "tension": 0.0
-                                                    },
-                                                    {
-                                                        "label": "<?= $this->getHtml('CIS'); ?>",
-                                                        "type": "line",
-                                                        "data": [
-                                                            <?php
-                                                                $temp = [];
-                                                                foreach ($customerRegion as $annual) {
-                                                                    $temp[] = ((int) ($annual['CIS'] ?? 0));
-                                                                }
-                                                            ?>
-                                                            <?= \implode(',', $temp); ?>
-                                                        ],
-                                                        "fill": false,
-                                                        "borderColor": "rgb(54, 162, 235)",
-                                                        "backgroundColor": "rgb(54, 162, 235)",
-                                                        "tension": 0.0
-                                                    },
-                                                    {
-                                                        "label": "<?= $this->getHtml('Other'); ?>",
-                                                        "type": "line",
-                                                        "data": [
-                                                            <?php
-                                                                $temp = [];
-                                                                foreach ($customerRegion as $annual) {
-                                                                    $temp[] = ((int) ($annual['Other'] ?? 0));
-                                                                }
-                                                            ?>
-                                                            <?= \implode(',', $temp); ?>
-                                                        ],
-                                                        "fill": false,
-                                                        "borderColor": "rgb(153, 102, 255)",
-                                                        "backgroundColor": "rgb(153, 102, 255)",
-                                                        "tension": 0.0
-                                                    }
-                                                ]
-                                            },
-                                            "options": {
-                                                "title": {
-                                                    "display": false,
-                                                    "text": "Sales per Region - Annual"
-                                                },
-                                                "scales": {
-                                                    "yAxes": [
-                                                        {
-                                                            "id": "axis-1",
-                                                            "display": true,
-                                                            "position": "left"
-                                                        }
-                                                    ]
-                                                }
-                                            }
-                                    }'></canvas>
-
-                            <div class="more-container">
-                                <input id="more-customer-region-annual" type="checkbox" name="more-container">
-                                <label for="more-customer-region-annual">
-                                    <span>Data</span>
-                                    <i class="fa fa-chevron-right expand"></i>
-                                </label>
-                                <div>
-                                <table class="default">
-                                    <thead>
-                                        <tr>
-                                            <td>Region
-                                            <?php foreach ([2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020] as $year => $values) : ?>
-                                                <td><?= $values; ?>
-                                            <?php endforeach; ?>
-                                    <tbody>
-                                        <?php
-                                        $regions = [
-                                            'Europe',
-                                            'America',
-                                            'Asia',
-                                            'Africa',
-                                            'CIS',
-                                            'Other',
-                                            'Total',
-                                        ];
-                                        foreach ($regions as $region) : ?>
-                                                <tr>
-                                                    <td><?= $region; ?>
-                                                <?php foreach ($customerRegion as $year => $annual) : ?>
-                                                    <td><?= $annual[$region] ?? 0; ?>
-                                        <?php endforeach; endforeach; ?>
-                                </table>
-                                </div>
-                            </div>
-                        </div>
-                    </section>
-                </div>
-            </div>
-
-            <div class="row">
-                <div class="col-xs-12">
-                    <section class="portlet">
-                        <div class="portlet-head">
-                            Sales / Region
-                            <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
-                        </div>
-                        <table class="default">
-                            <thead>
-                                <tr>
-                                    <td>Country
-                                    <td>Sales PY
-                                    <td>Sales B
-                                    <td>Sales A
-                                    <td>Diff PY
-                                    <td>Diff B
-                            <tbody>
-                        </table>
-                   </section>
-                </div>
-            </div>
-        </div>
-
-        <input type="radio" id="c-tab-3" name="tabular-2"<?= $this->request->uri->fragment === 'c-tab-3' ? ' checked' : ''; ?>>
-        <div class="tab">
-            <div class="row">
-                <div class="col-xs-12 col-lg-6">
-                    <section class="portlet">
-                        <form>
-                           <div class="portlet-head"><?= $this->getHtml('Filter'); ?></div>
-                            <div class="portlet-body">
-                                <div class="form-group">
-                                    <label for="iId"><?= $this->getHtml('Region'); ?></label>
-                                    <input type="text" id="iName1" name="name1">
-                                </div>
-                            </div>
-                            <div class="portlet-foot"><input id="iSubmitGeneral" name="submitGeneral" type="submit" value="<?= $this->getHtml('Analyse'); ?>"></div>
-                        </form>
-                    </section>
-                </div>
-            </div>
-
-            <div class="row">
-                <div class="col-xs-12 col-lg-6">
-                    <section class="portlet">
-                        <div class="portlet-head">
-                            Sales / Profit - Monthly
-                            <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
-                        </div>
-                        <?php $saleCustomer = $this->data['monthlySaleCustomer']; ?>
-                        <div class="portlet-body">
-                            <canvas id="sales-region" data-chart='{
-                                            "type": "bar",
-                                            "data": {
-                                                "labels": [
-                                                    <?php
-                                                        $temp = [];
-                                                        foreach ($saleCustomer as $monthly) {
-                                                            $temp[] = $monthly['month'] . '/' . \substr((string) $monthly['year'], -2);
-                                                        }
-                                                    ?>
-                                                    <?= '"' . \implode('", "', $temp) . '"'; ?>
-                                                ],
-                                                "datasets": [
-                                                    {
-                                                        "label": "<?= $this->getHtml('Profit'); ?>",
-                                                        "type": "line",
-                                                        "data": [
-                                                            <?php
-                                                                $temp = [];
-                                                                foreach ($saleCustomer as $monthly) {
-                                                                    $temp[] = ((int) $monthly['customers']);
-                                                                }
-                                                            ?>
-                                                            <?= \implode(',', $temp); ?>
-                                                        ],
-                                                        "yAxisID": "axis-2",
-                                                        "fill": false,
-                                                        "borderColor": "rgb(255, 99, 132)",
-                                                        "backgroundColor": "rgb(255, 99, 132)",
-                                                        "tension": 0.0
-                                                    },
-                                                    {
-                                                        "label": "<?= $this->getHtml('Sales'); ?>",
-                                                        "type": "bar",
-                                                        "data": [
-                                                            <?php
-                                                                $temp = [];
-                                                                foreach ($saleCustomer as $monthly) {
-                                                                    $temp[] = ((int) $monthly['net_sales']) / 1000;
-                                                                }
-                                                            ?>
-                                                            <?= \implode(',', $temp); ?>
-                                                        ],
-                                                        "yAxisID": "axis-1",
-                                                        "fill": false,
-                                                        "borderColor": "rgb(54, 162, 235)",
-                                                        "backgroundColor": "rgb(54, 162, 235)",
-                                                        "tension": 0.0
-                                                    }
-                                                ]
-                                            },
-                                            "options": {
-                                                "title": {
-                                                    "display": false,
-                                                    "text": "Sales / Profit"
-                                                },
-                                                "scales": {
-                                                    "yAxes": [
-                                                        {
-                                                            "id": "axis-1",
-                                                            "display": true,
-                                                            "position": "left"
-                                                        },
-                                                        {
-                                                            "id": "axis-2",
-                                                            "display": true,
-                                                            "position": "right",
-                                                            "scaleLabel": {
-                                                                "display": true,
-                                                                "labelString": "<?= $this->getHtml('Profit'); ?>"
-                                                            },
-                                                            "gridLines": {
-                                                                "display": false
-                                                            }
-                                                        }
-                                                    ]
-                                                }
-                                            }
-                                    }'></canvas>
-                            <div class="more-container">
-                                <input id="more-customer-sales" type="checkbox" name="more-container">
-                                <label for="more-customer-sales">
-                                    <span>Data</span>
-                                    <i class="fa fa-chevron-right expand"></i>
-                                </label>
-                                <div>
-                                <table class="default">
-                                    <thead>
-                                        <tr>
-                                            <td>Month
-                                            <td>Sales
-                                            <td>Profit
-                                            <td>Profit %
-                                    <tbody>
-                                        <?php
-                                            $sum1 = 0;
-                                            $sum2 = 0;
-                                        foreach ($saleCustomer as $values) :
-                                            $sum1 += ((int) $values['net_sales']) / 1000;
-                                            $sum2 += ((int) $values['customers']);
-                                        ?>
-                                            <tr>
-                                                <td><?= $values['month'] . '/' . \substr((string) $values['year'], -2); ?>
-                                                <td><?= (new Money(((int) $values['net_sales']) / 10000))->getCurrency(); ?>
-                                                <td><?= ((int) $values['customers']); ?>
-                                                <td><?= ((int) $values['customers']); ?>
-                                        <?php endforeach; ?>
-                                            <tr>
-                                                <td>Total
-                                                <td><?= (new Money($sum1))->getCurrency(); ?>
-                                                <td><?= (int) ($sum2 / 12); ?>
-                                                <td><?= (int) ($sum2 / 12); ?>
-                                </table>
-                                </div>
-                            </div>
-                        </div>
-                    </section>
-                </div>
-
-                <div class="col-xs-12 col-lg-6">
-                    <section class="portlet">
-                        <div class="portlet-head">
-                            Sales / Profit - Annual
-                            <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
-                        </div>
-                        <?php $saleCustomer = $this->data['annualSaleCustomer']; ?>
-                        <div class="portlet-body">
-                            <canvas id="sales-customer-annual" data-chart='{
-                                            "type": "bar",
-                                            "data": {
-                                                "labels": [
-                                                    <?php
-                                                        $temp = [];
-                                                        foreach ($saleCustomer as $annual) {
-                                                            $temp[] = $annual['year'];
-                                                        }
-                                                    ?>
-                                                    <?= '"' . \implode('", "', $temp) . '"'; ?>
-                                                ],
-                                                "datasets": [
-                                                    {
-                                                        "label": "<?= $this->getHtml('Profit'); ?>",
-                                                        "type": "line",
-                                                        "data": [
-                                                            <?php
-                                                                $temp = [];
-                                                                foreach ($saleCustomer as $annual) {
-                                                                    $temp[] = ((int) $annual['customers']);
-                                                                }
-                                                            ?>
-                                                            <?= \implode(',', $temp); ?>
-                                                        ],
-                                                        "yAxisID": "axis-2",
-                                                        "fill": false,
-                                                        "borderColor": "rgb(255, 99, 132)",
-                                                        "backgroundColor": "rgb(255, 99, 132)",
-                                                        "tension": 0.0
-                                                    },
-                                                    {
-                                                        "label": "<?= $this->getHtml('Sales'); ?>",
-                                                        "type": "bar",
-                                                        "data": [
-                                                            <?php
-                                                                $temp = [];
-                                                                foreach ($saleCustomer as $annual) {
-                                                                    $temp[] = ((int) $annual['net_sales']) / 1000;
-                                                                }
-                                                            ?>
-                                                            <?= \implode(',', $temp); ?>
-                                                        ],
-                                                        "yAxisID": "axis-1",
-                                                        "fill": false,
-                                                        "borderColor": "rgb(54, 162, 235)",
-                                                        "backgroundColor": "rgb(54, 162, 235)",
-                                                        "tension": 0.0
-                                                    }
-                                                ]
-                                            },
-                                            "options": {
-                                                "title": {
-                                                    "display": false,
-                                                    "text": "Sales / Profit"
-                                                },
-                                                "scales": {
-                                                    "yAxes": [
-                                                        {
-                                                            "id": "axis-1",
-                                                            "display": true,
-                                                            "position": "left"
-                                                        },
-                                                        {
-                                                            "id": "axis-2",
-                                                            "display": true,
-                                                            "position": "right",
-                                                            "scaleLabel": {
-                                                                "display": true,
-                                                                "labelString": "<?= $this->getHtml('Profit'); ?>"
-                                                            },
-                                                            "gridLines": {
-                                                                "display": false
-                                                            }
-                                                        }
-                                                    ]
-                                                }
-                                            }
-                                    }'></canvas>
-                            <div class="more-container">
-                                <input id="more-customer-sales-annual" type="checkbox" name="more-container">
-                                <label for="more-customer-sales-annual">
-                                    <span>Data</span>
-                                    <i class="fa fa-chevron-right expand"></i>
-                                </label>
-                                <div>
-                                <table class="default">
-                                    <thead>
-                                        <tr>
-                                            <td>Year
-                                            <td>Sales
-                                            <td>Profit
-                                            <td>Profit %
-                                    <tbody>
-                                        <?php
-                                        foreach ($saleCustomer as $values) :
-                                        ?>
-                                            <tr>
-                                                <td><?= (string) $values['year']; ?>
-                                                <td><?= (new Money(((int) $values['net_sales']) / 10000))->getCurrency(); ?>
-                                                <td><?= ((int) $values['customers']); ?>
-                                                <td><?= ((int) $values['customers']); ?>
-                                        <?php endforeach; ?>
-                                </table>
-                                </div>
-                            </div>
-                        </div>
-                    </section>
-                </div>
-
-                <div class="col-xs-12 col-lg-6">
-                    <section class="portlet">
-                        <div class="portlet-head">
-                            Sales per Attribute - Current
-                            <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
-                        </div>
-                        <?php $customerGroups = $this->data['customerGroups']; ?>
-                        <div class="portlet-body">
-                            <div class="form-group">
-                                <label for="iOname"><?= $this->getHtml('Attribute'); ?></label>
-                                <select id="iOname" name="settings_1000000009">
-                                    <option>Attribute to Analyse
-                                </select>
-                            </div>
-
-                            <div>
-                            <canvas id="sales-region" data-chart='{
-                                        "type": "pie",
-                                        "data": {
-                                            "labels": [
-                                                    <?php
-                                                        $temp = [];
-                                                        foreach ($customerGroups as $name => $groups) {
-                                                            $temp[] = $name;
-                                                        }
-                                                    ?>
-                                                    <?= '"' . \implode('", "', $temp) . '"'; ?>
-                                                ],
-                                            "datasets": [{
-                                                "data": [
-                                                    <?php
-                                                        $temp = [];
-                                                        foreach ($customerGroups as $values) {
-                                                            $temp[] = ((int) $values['customers']);
-                                                        }
-                                                    ?>
-                                                    <?= \implode(',', $temp); ?>
-                                                ],
-                                                "backgroundColor": [
-                                                    "rgb(255, 99, 132)",
-                                                    "rgb(255, 159, 64)",
-                                                    "rgb(255, 205, 86)",
-                                                    "rgb(75, 192, 192)",
-                                                    "rgb(54, 162, 235)",
-                                                    "rgb(153, 102, 255)"
-                                                ]
-                                            }]
-                                        },
-                                        "options": {
-                                            "title": {
-                                                "display": false,
-                                                "text": "Customers per group"
-                                            }
-                                        }
-                                }'></canvas>
-                            </div>
-
-                            <div class="more-container">
-                                <input id="more-customer-attribute-current" type="checkbox" name="more-container">
-                                <label for="more-customer-attribute-current">
-                                    <span>Data</span>
-                                    <i class="fa fa-chevron-right expand"></i>
-                                </label>
-                                <div>
-                                <table class="default">
-                                    <thead>
-                                        <tr>
-                                            <td>Groups
-                                            <td>Customer count
-                                    <tbody>
-                                        <?php
-                                            $sum = 0;
-                                        foreach ($customerGroups as $groups => $values) : $sum += $values['customers']; ?>
-                                            <tr>
-                                                <td><?= $groups; ?>
-                                                <td><?= $values['customers']; ?>
-                                        <?php endforeach; ?>
-                                            <tr>
-                                                <td>Total
-                                                <td><?= $sum; ?>
-                                </table>
-                                </div>
-                            </div>
-                        </div>
-                    </section>
-                </div>
-
-                <div class="col-xs-12 col-lg-6">
-                    <section class="portlet">
-                        <div class="portlet-head">
-                            Sales per Attribute - Annual
-                            <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
-                        </div>
-                        <?php $customerRegion = $this->data['annualCustomerRegion']; ?>
-                        <div class="portlet-body">
-                            <div class="form-group">
-                                <label for="iOname"><?= $this->getHtml('Attribute'); ?></label>
-                                <select id="iOname" name="settings_1000000009">
-                                    <option>Attribute to Analyse
-                                </select>
-                            </div>
-
-                            <div>
-                            <canvas id="sales-region" data-chart='{
-                                            "type": "line",
-                                            "data": {
-                                                "labels": [
-                                                    <?php
-                                                        $temp = [];
-                                                        foreach ($customerRegion as $annual) {
-                                                            $temp[] = (string) $annual['year'];
-                                                        }
-                                                    ?>
-                                                    <?= '"' . \implode('", "', $temp) . '"'; ?>
-                                                ],
-                                                "datasets": [
-                                                    {
-                                                        "label": "<?= $this->getHtml('Total'); ?>",
-                                                        "type": "line",
-                                                        "data": [
-                                                            <?php
-                                                                $temp = [];
-                                                                foreach ($customerRegion as $annual) {
-                                                                    $temp[] = ((int) ($annual['Total'] ?? 0));
-                                                                }
-                                                            ?>
-                                                            <?= \implode(',', $temp); ?>
-                                                        ],
-                                                        "fill": false,
-                                                        "borderColor": "rgb(139, 139, 139)",
-                                                        "backgroundColor": "rgb(139, 139, 139)",
-                                                        "tension": 0.0
-                                                    },
-                                                    {
-                                                        "label": "<?= $this->getHtml('Europe'); ?>",
-                                                        "type": "line",
-                                                        "data": [
-                                                            <?php
-                                                                $temp = [];
-                                                                foreach ($customerRegion as $annual) {
-                                                                    $temp[] = ((int) ($annual['Europe'] ?? 0));
-                                                                }
-                                                            ?>
-                                                            <?= \implode(',', $temp); ?>
-                                                        ],
-                                                        "fill": false,
-                                                        "borderColor": "rgb(255, 99, 132)",
-                                                        "backgroundColor": "rgb(255, 99, 132)",
-                                                        "tension": 0.0
-                                                    },
-                                                    {
-                                                        "label": "<?= $this->getHtml('America'); ?>",
-                                                        "type": "line",
-                                                        "data": [
-                                                            <?php
-                                                                $temp = [];
-                                                                foreach ($customerRegion as $annual) {
-                                                                    $temp[] = ((int) ($annual['America'] ?? 0));
-                                                                }
-                                                            ?>
-                                                            <?= \implode(',', $temp); ?>
-                                                        ],
-                                                        "fill": false,
-                                                        "borderColor": "rgb(255, 159, 64)",
-                                                        "backgroundColor": "rgb(255, 159, 64)",
-                                                        "tension": 0.0
-                                                    },
-                                                    {
-                                                        "label": "<?= $this->getHtml('Asia'); ?>",
-                                                        "type": "line",
-                                                        "data": [
-                                                            <?php
-                                                                $temp = [];
-                                                                foreach ($customerRegion as $annual) {
-                                                                    $temp[] = ((int) ($annual['Asia'] ?? 0));
-                                                                }
-                                                            ?>
-                                                            <?= \implode(',', $temp); ?>
-                                                        ],
-                                                        "fill": false,
-                                                        "borderColor": "rgb(255, 205, 86)",
-                                                        "backgroundColor": "rgb(255, 205, 86)",
-                                                        "tension": 0.0
-                                                    },
-                                                    {
-                                                        "label": "<?= $this->getHtml('Africa'); ?>",
-                                                        "type": "line",
-                                                        "data": [
-                                                            <?php
-                                                                $temp = [];
-                                                                foreach ($customerRegion as $annual) {
-                                                                    $temp[] = ((int) ($annual['Africa'] ?? 0));
-                                                                }
-                                                            ?>
-                                                            <?= \implode(',', $temp); ?>
-                                                        ],
-                                                        "fill": false,
-                                                        "borderColor": "rgb(75, 192, 192)",
-                                                        "backgroundColor": "rgb(75, 192, 192)",
-                                                        "tension": 0.0
-                                                    },
-                                                    {
-                                                        "label": "<?= $this->getHtml('CIS'); ?>",
-                                                        "type": "line",
-                                                        "data": [
-                                                            <?php
-                                                                $temp = [];
-                                                                foreach ($customerRegion as $annual) {
-                                                                    $temp[] = ((int) ($annual['CIS'] ?? 0));
-                                                                }
-                                                            ?>
-                                                            <?= \implode(',', $temp); ?>
-                                                        ],
-                                                        "fill": false,
-                                                        "borderColor": "rgb(54, 162, 235)",
-                                                        "backgroundColor": "rgb(54, 162, 235)",
-                                                        "tension": 0.0
-                                                    },
-                                                    {
-                                                        "label": "<?= $this->getHtml('Other'); ?>",
-                                                        "type": "line",
-                                                        "data": [
-                                                            <?php
-                                                                $temp = [];
-                                                                foreach ($customerRegion as $annual) {
-                                                                    $temp[] = ((int) ($annual['Other'] ?? 0));
-                                                                }
-                                                            ?>
-                                                            <?= \implode(',', $temp); ?>
-                                                        ],
-                                                        "fill": false,
-                                                        "borderColor": "rgb(153, 102, 255)",
-                                                        "backgroundColor": "rgb(153, 102, 255)",
-                                                        "tension": 0.0
-                                                    }
-                                                ]
-                                            },
-                                            "options": {
-                                                "title": {
-                                                    "display": false,
-                                                    "text": "Customers per Region - Annual"
-                                                },
-                                                "scales": {
-                                                    "yAxes": [
-                                                        {
-                                                            "id": "axis-1",
-                                                            "display": true,
-                                                            "position": "left"
-                                                        }
-                                                    ]
-                                                }
-                                            }
-                                    }'></canvas>
-                                </div>
-
-                            <div class="more-container">
-                                <input id="more-customer-attribute-annual" type="checkbox" name="more-container">
-                                <label for="more-customer-attribute-annual">
-                                    <span>Data</span>
-                                    <i class="fa fa-chevron-right expand"></i>
-                                </label>
-                                <div>
-                                <table class="default">
-                                    <thead>
-                                        <tr>
-                                            <td>Region
-                                            <?php foreach ([2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020] as $year => $values) : ?>
-                                                <td><?= $values; ?>
-                                            <?php endforeach; ?>
-                                    <tbody>
-                                        <?php
-                                        $regions = [
-                                            'Europe',
-                                            'America',
-                                            'Asia',
-                                            'Africa',
-                                            'CIS',
-                                            'Other',
-                                            'Total',
-                                        ];
-                                        foreach ($regions as $region) : ?>
-                                                <tr>
-                                                    <td><?= $region; ?>
-                                                <?php foreach ($customerRegion as $year => $annual) : ?>
-                                                    <td><?= $annual[$region] ?? 0; ?>
-                                        <?php endforeach; endforeach; ?>
-                                </table>
-                                </div>
-                            </div>
-                        </div>
-                    </section>
-                </div>
-
-                <div class="col-xs-12 col-lg-6">
-                    <section class="portlet">
-                        <div class="portlet-head">
-                            Profit per Attribute - Current
-                            <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
-                        </div>
-                        <?php $customerGroups = $this->data['customerGroups']; ?>
-                        <div class="portlet-body">
-                            <div class="form-group">
-                                <label for="iOname"><?= $this->getHtml('Attribute'); ?></label>
-                                <select id="iOname" name="settings_1000000009">
-                                    <option>Attribute to Analyse
-                                </select>
-                            </div>
-
-                            <div>
-                            <canvas id="sales-region" data-chart='{
-                                        "type": "pie",
-                                        "data": {
-                                            "labels": [
-                                                    <?php
-                                                        $temp = [];
-                                                        foreach ($customerGroups as $name => $groups) {
-                                                            $temp[] = $name;
-                                                        }
-                                                    ?>
-                                                    <?= '"' . \implode('", "', $temp) . '"'; ?>
-                                                ],
-                                            "datasets": [{
-                                                "data": [
-                                                    <?php
-                                                        $temp = [];
-                                                        foreach ($customerGroups as $values) {
-                                                            $temp[] = ((int) $values['customers']);
-                                                        }
-                                                    ?>
-                                                    <?= \implode(',', $temp); ?>
-                                                ],
-                                                "backgroundColor": [
-                                                    "rgb(255, 99, 132)",
-                                                    "rgb(255, 159, 64)",
-                                                    "rgb(255, 205, 86)",
-                                                    "rgb(75, 192, 192)",
-                                                    "rgb(54, 162, 235)",
-                                                    "rgb(153, 102, 255)"
-                                                ]
-                                            }]
-                                        },
-                                        "options": {
-                                            "title": {
-                                                "display": false,
-                                                "text": "Customers per group"
-                                            }
-                                        }
-                                }'></canvas>
-                            </div>
-
-                            <div class="more-container">
-                                <input id="more-customer-attribute-current" type="checkbox" name="more-container">
-                                <label for="more-customer-attribute-current">
-                                    <span>Data</span>
-                                    <i class="fa fa-chevron-right expand"></i>
-                                </label>
-                                <div>
-                                <table class="default">
-                                    <thead>
-                                        <tr>
-                                            <td>Groups
-                                            <td>Customer count
-                                    <tbody>
-                                        <?php
-                                            $sum = 0;
-                                        foreach ($customerGroups as $groups => $values) : $sum += $values['customers']; ?>
-                                            <tr>
-                                                <td><?= $groups; ?>
-                                                <td><?= $values['customers']; ?>
-                                        <?php endforeach; ?>
-                                            <tr>
-                                                <td>Total
-                                                <td><?= $sum; ?>
-                                </table>
-                                </div>
-                            </div>
-                        </div>
-                    </section>
-                </div>
-
-                <div class="col-xs-12 col-lg-6">
-                    <section class="portlet">
-                        <div class="portlet-head">
-                            Profit per Attribute - Annual
-                            <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
-                        </div>
-                        <?php $customerRegion = $this->data['annualCustomerRegion']; ?>
-                        <div class="portlet-body">
-                            <div class="form-group">
-                                <label for="iOname"><?= $this->getHtml('Attribute'); ?></label>
-                                <select id="iOname" name="settings_1000000009">
-                                    <option>Attribute to Analyse
-                                </select>
-                            </div>
-
-                            <div>
-                            <canvas id="sales-region" data-chart='{
-                                            "type": "line",
-                                            "data": {
-                                                "labels": [
-                                                    <?php
-                                                        $temp = [];
-                                                        foreach ($customerRegion as $annual) {
-                                                            $temp[] = (string) $annual['year'];
-                                                        }
-                                                    ?>
-                                                    <?= '"' . \implode('", "', $temp) . '"'; ?>
-                                                ],
-                                                "datasets": [
-                                                    {
-                                                        "label": "<?= $this->getHtml('Total'); ?>",
-                                                        "type": "line",
-                                                        "data": [
-                                                            <?php
-                                                                $temp = [];
-                                                                foreach ($customerRegion as $annual) {
-                                                                    $temp[] = ((int) ($annual['Total'] ?? 0));
-                                                                }
-                                                            ?>
-                                                            <?= \implode(',', $temp); ?>
-                                                        ],
-                                                        "fill": false,
-                                                        "borderColor": "rgb(139, 139, 139)",
-                                                        "backgroundColor": "rgb(139, 139, 139)",
-                                                        "tension": 0.0
-                                                    },
-                                                    {
-                                                        "label": "<?= $this->getHtml('Europe'); ?>",
-                                                        "type": "line",
-                                                        "data": [
-                                                            <?php
-                                                                $temp = [];
-                                                                foreach ($customerRegion as $annual) {
-                                                                    $temp[] = ((int) ($annual['Europe'] ?? 0));
-                                                                }
-                                                            ?>
-                                                            <?= \implode(',', $temp); ?>
-                                                        ],
-                                                        "fill": false,
-                                                        "borderColor": "rgb(255, 99, 132)",
-                                                        "backgroundColor": "rgb(255, 99, 132)",
-                                                        "tension": 0.0
-                                                    },
-                                                    {
-                                                        "label": "<?= $this->getHtml('America'); ?>",
-                                                        "type": "line",
-                                                        "data": [
-                                                            <?php
-                                                                $temp = [];
-                                                                foreach ($customerRegion as $annual) {
-                                                                    $temp[] = ((int) ($annual['America'] ?? 0));
-                                                                }
-                                                            ?>
-                                                            <?= \implode(',', $temp); ?>
-                                                        ],
-                                                        "fill": false,
-                                                        "borderColor": "rgb(255, 159, 64)",
-                                                        "backgroundColor": "rgb(255, 159, 64)",
-                                                        "tension": 0.0
-                                                    },
-                                                    {
-                                                        "label": "<?= $this->getHtml('Asia'); ?>",
-                                                        "type": "line",
-                                                        "data": [
-                                                            <?php
-                                                                $temp = [];
-                                                                foreach ($customerRegion as $annual) {
-                                                                    $temp[] = ((int) ($annual['Asia'] ?? 0));
-                                                                }
-                                                            ?>
-                                                            <?= \implode(',', $temp); ?>
-                                                        ],
-                                                        "fill": false,
-                                                        "borderColor": "rgb(255, 205, 86)",
-                                                        "backgroundColor": "rgb(255, 205, 86)",
-                                                        "tension": 0.0
-                                                    },
-                                                    {
-                                                        "label": "<?= $this->getHtml('Africa'); ?>",
-                                                        "type": "line",
-                                                        "data": [
-                                                            <?php
-                                                                $temp = [];
-                                                                foreach ($customerRegion as $annual) {
-                                                                    $temp[] = ((int) ($annual['Africa'] ?? 0));
-                                                                }
-                                                            ?>
-                                                            <?= \implode(',', $temp); ?>
-                                                        ],
-                                                        "fill": false,
-                                                        "borderColor": "rgb(75, 192, 192)",
-                                                        "backgroundColor": "rgb(75, 192, 192)",
-                                                        "tension": 0.0
-                                                    },
-                                                    {
-                                                        "label": "<?= $this->getHtml('CIS'); ?>",
-                                                        "type": "line",
-                                                        "data": [
-                                                            <?php
-                                                                $temp = [];
-                                                                foreach ($customerRegion as $annual) {
-                                                                    $temp[] = ((int) ($annual['CIS'] ?? 0));
-                                                                }
-                                                            ?>
-                                                            <?= \implode(',', $temp); ?>
-                                                        ],
-                                                        "fill": false,
-                                                        "borderColor": "rgb(54, 162, 235)",
-                                                        "backgroundColor": "rgb(54, 162, 235)",
-                                                        "tension": 0.0
-                                                    },
-                                                    {
-                                                        "label": "<?= $this->getHtml('Other'); ?>",
-                                                        "type": "line",
-                                                        "data": [
-                                                            <?php
-                                                                $temp = [];
-                                                                foreach ($customerRegion as $annual) {
-                                                                    $temp[] = ((int) ($annual['Other'] ?? 0));
-                                                                }
-                                                            ?>
-                                                            <?= \implode(',', $temp); ?>
-                                                        ],
-                                                        "fill": false,
-                                                        "borderColor": "rgb(153, 102, 255)",
-                                                        "backgroundColor": "rgb(153, 102, 255)",
-                                                        "tension": 0.0
-                                                    }
-                                                ]
-                                            },
-                                            "options": {
-                                                "title": {
-                                                    "display": false,
-                                                    "text": "Customers per Region - Annual"
-                                                },
-                                                "scales": {
-                                                    "yAxes": [
-                                                        {
-                                                            "id": "axis-1",
-                                                            "display": true,
-                                                            "position": "left"
-                                                        }
-                                                    ]
-                                                }
-                                            }
-                                    }'></canvas>
-                                </div>
-
-                            <div class="more-container">
-                                <input id="more-customer-attribute-annual" type="checkbox" name="more-container">
-                                <label for="more-customer-attribute-annual">
-                                    <span>Data</span>
-                                    <i class="fa fa-chevron-right expand"></i>
-                                </label>
-                                <div>
-                                <table class="default">
-                                    <thead>
-                                        <tr>
-                                            <td>Region
-                                            <?php foreach ([2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020] as $year => $values) : ?>
-                                                <td><?= $values; ?>
-                                            <?php endforeach; ?>
-                                    <tbody>
-                                        <?php
-                                        $regions = [
-                                            'Europe',
-                                            'America',
-                                            'Asia',
-                                            'Africa',
-                                            'CIS',
-                                            'Other',
-                                            'Total',
-                                        ];
-                                        foreach ($regions as $region) : ?>
-                                                <tr>
-                                                    <td><?= $region; ?>
-                                                <?php foreach ($customerRegion as $year => $annual) : ?>
-                                                    <td><?= $annual[$region] ?? 0; ?>
-                                        <?php endforeach; endforeach; ?>
-                                </table>
-                                </div>
-                            </div>
-                        </div>
-                    </section>
-                </div>
-
-                <div class="col-xs-12 col-lg-6">
-                    <section class="portlet">
-                        <div class="portlet-head">
-                            Invoices / Articles - Monthly
-                            <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
-                        </div>
-                        <?php $saleCustomer = $this->data['monthlySaleCustomer']; ?>
-                        <div class="portlet-body">
-                            <canvas id="sales-region" data-chart='{
-                                            "type": "bar",
-                                            "data": {
-                                                "labels": [
-                                                    <?php
-                                                        $temp = [];
-                                                        foreach ($saleCustomer as $monthly) {
-                                                            $temp[] = $monthly['month'] . '/' . \substr((string) $monthly['year'], -2);
-                                                        }
-                                                    ?>
-                                                    <?= '"' . \implode('", "', $temp) . '"'; ?>
-                                                ],
-                                                "datasets": [
-                                                    {
-                                                        "label": "<?= $this->getHtml('Articles'); ?>",
-                                                        "type": "line",
-                                                        "data": [
-                                                            <?php
-                                                                $temp = [];
-                                                                foreach ($saleCustomer as $monthly) {
-                                                                    $temp[] = ((int) $monthly['customers']);
-                                                                }
-                                                            ?>
-                                                            <?= \implode(',', $temp); ?>
-                                                        ],
-                                                        "yAxisID": "axis-2",
-                                                        "fill": false,
-                                                        "borderColor": "rgb(255, 99, 132)",
-                                                        "backgroundColor": "rgb(255, 99, 132)",
-                                                        "tension": 0.0
-                                                    },
-                                                    {
-                                                        "label": "<?= $this->getHtml('Sales'); ?>",
-                                                        "type": "bar",
-                                                        "data": [
-                                                            <?php
-                                                                $temp = [];
-                                                                foreach ($saleCustomer as $monthly) {
-                                                                    $temp[] = ((int) $monthly['net_sales']) / 1000;
-                                                                }
-                                                            ?>
-                                                            <?= \implode(',', $temp); ?>
-                                                        ],
-                                                        "yAxisID": "axis-1",
-                                                        "fill": false,
-                                                        "borderColor": "rgb(54, 162, 235)",
-                                                        "backgroundColor": "rgb(54, 162, 235)",
-                                                        "tension": 0.0
-                                                    }
-                                                ]
-                                            },
-                                            "options": {
-                                                "title": {
-                                                    "display": false,
-                                                    "text": "Sales / Articles"
-                                                },
-                                                "scales": {
-                                                    "yAxes": [
-                                                        {
-                                                            "id": "axis-1",
-                                                            "display": true,
-                                                            "position": "left"
-                                                        },
-                                                        {
-                                                            "id": "axis-2",
-                                                            "display": true,
-                                                            "position": "right",
-                                                            "scaleLabel": {
-                                                                "display": true,
-                                                                "labelString": "<?= $this->getHtml('Articles'); ?>"
-                                                            },
-                                                            "gridLines": {
-                                                                "display": false
-                                                            }
-                                                        }
-                                                    ]
-                                                }
-                                            }
-                                    }'></canvas>
-                            <div class="more-container">
-                                <input id="more-customer-sales" type="checkbox" name="more-container">
-                                <label for="more-customer-sales">
-                                    <span>Data</span>
-                                    <i class="fa fa-chevron-right expand"></i>
-                                </label>
-                                <div>
-                                <table class="default">
-                                    <thead>
-                                        <tr>
-                                            <td>Month
-                                            <td>Sales
-                                            <td>Articles
-                                    <tbody>
-                                        <?php
-                                            $sum1 = 0;
-                                            $sum2 = 0;
-                                        foreach ($saleCustomer as $values) :
-                                            $sum1 += ((int) $values['net_sales']) / 1000;
-                                            $sum2 += ((int) $values['customers']);
-                                        ?>
-                                            <tr>
-                                                <td><?= $values['month'] . '/' . \substr((string) $values['year'], -2); ?>
-                                                <td><?= (new Money(((int) $values['net_sales']) / 10000))->getCurrency(); ?>
-                                                <td><?= ((int) $values['customers']); ?>
-                                                <td><?= ((int) $values['customers']); ?>
-                                        <?php endforeach; ?>
-                                            <tr>
-                                                <td>Total
-                                                <td><?= (new Money($sum1))->getCurrency(); ?>
-                                                <td><?= (int) ($sum2 / 12); ?>
-                                                <td><?= (int) ($sum2 / 12); ?>
-                                </table>
-                                </div>
-                            </div>
-                        </div>
-                    </section>
-                </div>
-
-                <div class="col-xs-12 col-lg-6">
-                    <section class="portlet">
-                        <div class="portlet-head">
-                            Invoices / Articles - Annual
-                            <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
-                        </div>
-                        <?php $saleCustomer = $this->data['annualSaleCustomer']; ?>
-                        <div class="portlet-body">
-                            <canvas id="sales-customer-annual" data-chart='{
-                                            "type": "bar",
-                                            "data": {
-                                                "labels": [
-                                                    <?php
-                                                        $temp = [];
-                                                        foreach ($saleCustomer as $annual) {
-                                                            $temp[] = $annual['year'];
-                                                        }
-                                                    ?>
-                                                    <?= '"' . \implode('", "', $temp) . '"'; ?>
-                                                ],
-                                                "datasets": [
-                                                    {
-                                                        "label": "<?= $this->getHtml('Articles'); ?>",
-                                                        "type": "line",
-                                                        "data": [
-                                                            <?php
-                                                                $temp = [];
-                                                                foreach ($saleCustomer as $annual) {
-                                                                    $temp[] = ((int) $annual['customers']);
-                                                                }
-                                                            ?>
-                                                            <?= \implode(',', $temp); ?>
-                                                        ],
-                                                        "yAxisID": "axis-2",
-                                                        "fill": false,
-                                                        "borderColor": "rgb(255, 99, 132)",
-                                                        "backgroundColor": "rgb(255, 99, 132)",
-                                                        "tension": 0.0
-                                                    },
-                                                    {
-                                                        "label": "<?= $this->getHtml('Sales'); ?>",
-                                                        "type": "bar",
-                                                        "data": [
-                                                            <?php
-                                                                $temp = [];
-                                                                foreach ($saleCustomer as $annual) {
-                                                                    $temp[] = ((int) $annual['net_sales']) / 1000;
-                                                                }
-                                                            ?>
-                                                            <?= \implode(',', $temp); ?>
-                                                        ],
-                                                        "yAxisID": "axis-1",
-                                                        "fill": false,
-                                                        "borderColor": "rgb(54, 162, 235)",
-                                                        "backgroundColor": "rgb(54, 162, 235)",
-                                                        "tension": 0.0
-                                                    }
-                                                ]
-                                            },
-                                            "options": {
-                                                "title": {
-                                                    "display": false,
-                                                    "text": "Sales / Articles"
-                                                },
-                                                "scales": {
-                                                    "yAxes": [
-                                                        {
-                                                            "id": "axis-1",
-                                                            "display": true,
-                                                            "position": "left"
-                                                        },
-                                                        {
-                                                            "id": "axis-2",
-                                                            "display": true,
-                                                            "position": "right",
-                                                            "scaleLabel": {
-                                                                "display": true,
-                                                                "labelString": "<?= $this->getHtml('Articles'); ?>"
-                                                            },
-                                                            "gridLines": {
-                                                                "display": false
-                                                            }
-                                                        }
-                                                    ]
-                                                }
-                                            }
-                                    }'></canvas>
-                            <div class="more-container">
-                                <input id="more-customer-sales-annual" type="checkbox" name="more-container">
-                                <label for="more-customer-sales-annual">
-                                    <span>Data</span>
-                                    <i class="fa fa-chevron-right expand"></i>
-                                </label>
-                                <div>
-                                <table class="default">
-                                    <thead>
-                                        <tr>
-                                            <td>Year
-                                            <td>Sales
-                                            <td>Articles
-                                    <tbody>
-                                        <?php
-                                        foreach ($saleCustomer as $values) :
-                                        ?>
-                                            <tr>
-                                                <td><?= (string) $values['year']; ?>
-                                                <td><?= (new Money(((int) $values['net_sales']) / 10000))->getCurrency(); ?>
-                                                <td><?= ((int) $values['customers']); ?>
-                                                <td><?= ((int) $values['customers']); ?>
-                                        <?php endforeach; ?>
-                                </table>
-                                </div>
-                            </div>
-                        </div>
-                    </section>
-                </div>
-            </div>
-        </div>
-
-    </div>
-</div>
\ No newline at end of file
diff --git a/Theme/Backend/rep-analysis.tpl.php b/Theme/Backend/rep-analysis.tpl.php
deleted file mode 100755
index af2af5c..0000000
--- a/Theme/Backend/rep-analysis.tpl.php
+++ /dev/null
@@ -1,344 +0,0 @@
-<?php
-/**
- * Jingga
- *
- * PHP Version 8.1
- *
- * @package   Modules\ClientManagement
- * @copyright Dennis Eichhorn
- * @license   OMS License 2.0
- * @version   1.0.0
- * @link      https://jingga.app
- */
-declare(strict_types=1);
-
-/* @todo: single month/quarter/fiscal year/calendar year */
-/* @todo: time range (<= 12 month = monthly view; else annual view/comparison) */
-
-/**
- * @var \phpOMS\Views\View $this
- */
-echo $this->data['nav']->render();
-?>
-
-<div class="tabview tab-2">
-    <div class="box">
-        <ul class="tab-links">
-            <li><label for="c-tab-2"><?= $this->getHtml('General'); ?></label></li>
-            <li><label for="c-tab-1"><?= $this->getHtml('Filter'); ?></label></li>
-        </ul>
-    </div>
-    <div class="tab-content">
-        <input type="radio" id="c-tab-1" name="tabular-2"<?= $this->request->uri->fragment === 'c-tab-1' ? ' checked' : ''; ?>>
-        <div class="tab">
-            <div class="row">
-                <div class="col-xs-12 col-lg-6">
-                    <section class="portlet">
-                        <form>
-                           <div class="portlet-head"><?= $this->getHtml('Filter'); ?></div>
-                            <div class="portlet-body">
-                                <div class="form-group">
-                                    <label for="iId"><?= $this->getHtml('Client'); ?></label>
-                                    <input type="text" id="iName1" name="name1">
-                                </div>
-
-                                <div class="form-group">
-                                    <div class="input-control">
-                                        <label for="iDecimalPoint"><?= $this->getHtml('BaseTime'); ?></label>
-                                        <input id="iDecimalPoint" name="settings_decimal" type="text" value="" placeholder=".">
-                                    </div>
-
-                                    <div class="input-control">
-                                        <label for="iThousandSep"><?= $this->getHtml('ComparisonTime'); ?></label>
-                                        <input id="iThousandSep" name="settings_thousands" type="text" value="" placeholder=",">
-                                    </div>
-                                </div>
-
-                                <div class="form-group">
-                                    <div class="input-control">
-                                        <label for="iDecimalPoint"><?= $this->getHtml('Attribute'); ?></label>
-                                        <input id="iDecimalPoint" name="settings_decimal" type="text" value="" placeholder=".">
-                                    </div>
-
-                                    <div class="input-control">
-                                        <label for="iThousandSep"><?= $this->getHtml('Value'); ?></label>
-                                        <input id="iThousandSep" name="settings_thousands" type="text" value="" placeholder=",">
-                                    </div>
-                                </div>
-
-                                <div class="form-group">
-                                    <label for="iId"><?= $this->getHtml('Region'); ?></label>
-                                    <input type="text" id="iName1" name="name1">
-                                </div>
-
-                                <div class="form-group">
-                                    <label for="iId"><?= $this->getHtml('Country'); ?></label>
-                                    <input type="text" id="iName1" name="name1">
-                                </div>
-
-                                <div class="form-group">
-                                    <label for="iId"><?= $this->getHtml('Rep'); ?></label>
-                                    <input type="text" id="iName1" name="name1">
-                                </div>
-                            </div>
-                            <div class="portlet-foot"><input id="iSubmitGeneral" name="submitGeneral" type="submit" value="<?= $this->getHtml('Save', '0', '0'); ?>"></div>
-                        </form>
-                    </section>
-                </div>
-            </div>
-        </div>
-
-        <input type="radio" id="c-tab-2" name="tabular-2"<?= $this->request->uri->fragment === 'c-tab-1' ? ' checked' : ''; ?>>
-        <div class="tab">
-            <div class="row">
-                <div class="col-xs-12 col-lg-6">
-                    <section class="portlet">
-                        <div class="portlet-head">
-                            Sales per Rep - Current
-                            <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
-                        </div>
-                        <?php $customersRep = $this->data['currentCustomersRep']; ?>
-                        <div class="portlet-body">
-                            <canvas id="sales-region" data-chart='{
-                                            "type": "horizontalBar",
-                                            "data": {
-                                                "labels": [
-                                                    <?php
-                                                        $temp = [];
-                                                        foreach ($customersRep as $name => $rep) {
-                                                            $temp[] = $name;
-                                                        }
-                                                    ?>
-                                                    <?= '"' . \implode('", "', $temp) . '"'; ?>
-                                                ],
-                                                "datasets": [
-                                                    {
-                                                        "label": "<?= $this->getHtml('Customers'); ?>",
-                                                        "type": "horizontalBar",
-                                                        "data": [
-                                                            <?php
-                                                                $temp = [];
-                                                                foreach ($customersRep as $values) {
-                                                                    $temp[] = ((int) $values['customers']);
-                                                                }
-                                                            ?>
-                                                            <?= \implode(',', $temp); ?>
-                                                        ],
-                                                        "fill": false,
-                                                        "borderColor": "rgb(54, 162, 235)",
-                                                        "backgroundColor": "rgb(54, 162, 235)",
-                                                        "tension": 0.0
-                                                    }
-                                                ]
-                                            },
-                                            "options": {
-                                                "title": {
-                                                    "display": false,
-                                                    "text": "Customers per rep"
-                                                }
-                                            }
-                                    }'></canvas>
-
-                            <div class="more-container">
-                                <input id="more-customer-rep-current" type="checkbox" name="more-container">
-                                <label for="more-customer-rep-current">
-                                    <span>Data</span>
-                                    <i class="fa fa-chevron-right expand"></i>
-                                </label>
-                                <div>
-                                <table class="default">
-                                    <thead>
-                                        <tr>
-                                            <td>Rep
-                                            <td>Customer count
-                                    <tbody>
-                                        <?php
-                                            $sum = 0;
-                                        foreach ($customersRep as $rep => $values) : $sum += $values['customers']; ?>
-                                            <tr>
-                                                <td><?= $rep; ?>
-                                                <td><?= $values['customers']; ?>
-                                        <?php endforeach; ?>
-                                            <tr>
-                                                <td>Total
-                                                <td><?= $sum; ?>
-                                </table>
-                                </div>
-                            </div>
-                        </div>
-                    </section>
-                </div>
-
-                <div class="col-xs-12 col-lg-6">
-                    <section class="portlet">
-                        <div class="portlet-head">
-                            Sales per Rep - Annual
-                            <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
-                        </div>
-                        <?php $customersRep = $this->data['annualCustomersRep']; ?>
-                                <table class="default">
-                                    <thead>
-                                        <tr>
-                                            <td>Rep
-                                            <?php foreach ([2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020] as $year) : ?>
-                                                <td><?= $year; ?>
-                                            <?php endforeach; ?>
-                                    <tbody>
-                                        <?php
-                                            $sum = [];
-                                        foreach ($customersRep as $rep => $annual) : ?>
-                                            <tr>
-                                                <td><?= $rep; ?>
-                                                <?php foreach ($annual as $year => $values) :
-                                                    $sum[$values['year']] = ($sum[$values['year']] ?? 0) + $values['customers']; ?>
-                                                <td><?= $values['customers']; ?>
-                                            <?php endforeach; ?>
-                                        <?php endforeach; ?>
-                                        <tr>
-                                            <td>Total
-                                            <?php foreach ([2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020] as $year) : ?>
-                                                <td><?= $sum[$year]; ?>
-                                            <?php endforeach; ?>
-                                </table>
-                    </section>
-                </div>
-            </div>
-
-            <div class="row">
-                <div class="col-xs-12 col-lg-6">
-                    <section class="portlet">
-                        <div class="portlet-head">
-                            Profit per Rep - Current
-                            <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
-                        </div>
-                        <?php $customersRep = $this->data['currentCustomersRep']; ?>
-                        <div class="portlet-body">
-                            <canvas id="sales-region" data-chart='{
-                                            "type": "horizontalBar",
-                                            "data": {
-                                                "labels": [
-                                                    <?php
-                                                        $temp = [];
-                                                        foreach ($customersRep as $name => $rep) {
-                                                            $temp[] = $name;
-                                                        }
-                                                    ?>
-                                                    <?= '"' . \implode('", "', $temp) . '"'; ?>
-                                                ],
-                                                "datasets": [
-                                                    {
-                                                        "label": "<?= $this->getHtml('Customers'); ?>",
-                                                        "type": "horizontalBar",
-                                                        "data": [
-                                                            <?php
-                                                                $temp = [];
-                                                                foreach ($customersRep as $values) {
-                                                                    $temp[] = ((int) $values['customers']);
-                                                                }
-                                                            ?>
-                                                            <?= \implode(',', $temp); ?>
-                                                        ],
-                                                        "fill": false,
-                                                        "borderColor": "rgb(54, 162, 235)",
-                                                        "backgroundColor": "rgb(54, 162, 235)",
-                                                        "tension": 0.0
-                                                    }
-                                                ]
-                                            },
-                                            "options": {
-                                                "title": {
-                                                    "display": false,
-                                                    "text": "Customers per rep"
-                                                }
-                                            }
-                                    }'></canvas>
-
-                            <div class="more-container">
-                                <input id="more-customer-rep-current" type="checkbox" name="more-container">
-                                <label for="more-customer-rep-current">
-                                    <span>Data</span>
-                                    <i class="fa fa-chevron-right expand"></i>
-                                </label>
-                                <div>
-                                <table class="default">
-                                    <thead>
-                                        <tr>
-                                            <td>Rep
-                                            <td>Customer count
-                                    <tbody>
-                                        <?php
-                                            $sum = 0;
-                                        foreach ($customersRep as $rep => $values) : $sum += $values['customers']; ?>
-                                            <tr>
-                                                <td><?= $rep; ?>
-                                                <td><?= $values['customers']; ?>
-                                        <?php endforeach; ?>
-                                            <tr>
-                                                <td>Total
-                                                <td><?= $sum; ?>
-                                </table>
-                                </div>
-                            </div>
-                        </div>
-                    </section>
-                </div>
-
-                <div class="col-xs-12 col-lg-6">
-                    <section class="portlet">
-                        <div class="portlet-head">
-                            Profit per Rep - Annual
-                            <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
-                        </div>
-                        <?php $customersRep = $this->data['annualCustomersRep']; ?>
-                                <table class="default">
-                                    <thead>
-                                        <tr>
-                                            <td>Rep
-                                            <?php foreach ([2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020] as $year) : ?>
-                                                <td><?= $year; ?>
-                                            <?php endforeach; ?>
-                                    <tbody>
-                                        <?php
-                                            $sum = [];
-                                        foreach ($customersRep as $rep => $annual) : ?>
-                                            <tr>
-                                                <td><?= $rep; ?>
-                                                <?php foreach ($annual as $year => $values) :
-                                                    $sum[$values['year']] = ($sum[$values['year']] ?? 0) + $values['customers']; ?>
-                                                <td><?= $values['customers']; ?>
-                                            <?php endforeach; ?>
-                                        <?php endforeach; ?>
-                                        <tr>
-                                            <td>Total
-                                            <?php foreach ([2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020] as $year) : ?>
-                                                <td><?= $sum[$year]; ?>
-                                            <?php endforeach; ?>
-                                </table>
-                    </section>
-                </div>
-            </div>
-
-            <div class="row">
-                <div class="col-xs-12">
-                    <section class="portlet">
-                        <div class="portlet-head">
-                            Sales / Rep
-                            <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
-                        </div>
-                        <table class="default">
-                            <thead>
-                                <tr>
-                                    <td>Rep
-                                    <td>Sales PY
-                                    <td>Sales B
-                                    <td>Sales A
-                                    <td>Diff PY
-                                    <td>Diff B
-                            <tbody>
-                        </table>
-                   </section>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php
index f7040bd..341509c 100755
--- a/tests/Controller/ApiControllerTest.php
+++ b/tests/Controller/ApiControllerTest.php
@@ -123,7 +123,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
 
         $this->module->apiBillCreate($request, $response);
 
-        $bId = $response->get('')['response']->id;
+        $bId = $response->getDataArray('')['response']->id;
         self::assertGreaterThan(0, $bId);
 
         for ($k = 0; $k < 10; ++$k) {
@@ -151,7 +151,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
             }
 
             $this->module->apiBillElementCreate($request, $response);
-            self::assertGreaterThan(0, $response->get('')['response']->id);
+            self::assertGreaterThan(0, $response->getDataArray('')['response']->id);
         }
 
         $response = new HttpResponse();
@@ -162,7 +162,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
 
         $this->module->apiBillPdfArchiveCreate($request, $response);
 
-        $result = $response->get('');
+        $result = $response->getData('');
         self::assertGreaterThan(0, $result === null ? -1 : $result['response']?->id);
     }
     */
@@ -199,7 +199,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
 
         $this->module->apiBillCreate($request, $response);
 
-        $bId = $response->get('')['response']->id;
+        $bId = $response->getDataArray('')['response']->id;
         self::assertGreaterThan(0, $bId);
 
         for ($k = 0; $k < 10; ++$k) {
@@ -227,7 +227,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
             }
 
             $this->module->apiBillElementCreate($request, $response);
-            self::assertGreaterThan(0, $response->get('')['response']->id);
+            self::assertGreaterThan(0, $response->getDataArray('')['response']->id);
         }
 
         $response = new HttpResponse();
@@ -238,7 +238,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
 
         $this->module->apiBillPdfArchiveCreate($request, $response);
 
-        $result = $response->get('');
+        $result = $response->getData('');
         self::assertGreaterThan(0, $result === null ? -1 : $result['response']?->id);
     }
     */