taxtank-core 0.28.104 → 0.28.107

package/bundles/taxtank-core.umd.js

@@ -92,9 +92,9 @@
         };
         return CorelogicService;
     }());
-    CorelogicService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: CorelogicService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    CorelogicService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: CorelogicService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: CorelogicService, decorators: [{
+    CorelogicService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: CorelogicService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    CorelogicService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: CorelogicService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: CorelogicService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -138,9 +138,9 @@
         };
         return CorelogicInterceptor;
     }());
-    CorelogicInterceptor.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: CorelogicInterceptor, deps: [{ token: CorelogicService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    CorelogicInterceptor.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: CorelogicInterceptor });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: CorelogicInterceptor, decorators: [{
+    CorelogicInterceptor.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: CorelogicInterceptor, deps: [{ token: CorelogicService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    CorelogicInterceptor.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: CorelogicInterceptor });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: CorelogicInterceptor, decorators: [{
                 type: i0.Injectable
             }], ctorParameters: function () {
             return [{ type: CorelogicService }, { type: undefined, decorators: [{
@@ -180,9 +180,9 @@
         };
         return FinancialYearInterceptor;
     }());
-    FinancialYearInterceptor.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: FinancialYearInterceptor, deps: [{ token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    FinancialYearInterceptor.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: FinancialYearInterceptor });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: FinancialYearInterceptor, decorators: [{
+    FinancialYearInterceptor.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: FinancialYearInterceptor, deps: [{ token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    FinancialYearInterceptor.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: FinancialYearInterceptor });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: FinancialYearInterceptor, decorators: [{
                 type: i0.Injectable
             }], ctorParameters: function () {
             return [{ type: undefined, decorators: [{
@@ -191,7 +191,7 @@
                         }] }];
         } });
 
-    /*! *****************************************************************************
+    /******************************************************************************
     Copyright (c) Microsoft Corporation.
 
     Permission to use, copy, modify, and/or distribute this software for any
@@ -353,7 +353,11 @@
     var __createBinding = Object.create ? (function (o, m, k, k2) {
         if (k2 === undefined)
             k2 = k;
-        Object.defineProperty(o, k2, { enumerable: true, get: function () { return m[k]; } });
+        var desc = Object.getOwnPropertyDescriptor(m, k);
+        if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+            desc = { enumerable: true, get: function () { return m[k]; } };
+        }
+        Object.defineProperty(o, k2, desc);
     }) : (function (o, m, k, k2) {
         if (k2 === undefined)
             k2 = k;
@@ -508,6 +512,11 @@
             throw new TypeError("Cannot write private member to an object whose class did not declare it");
         return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
     }
+    function __classPrivateFieldIn(state, receiver) {
+        if (receiver === null || (typeof receiver !== "object" && typeof receiver !== "function"))
+            throw new TypeError("Cannot use 'in' operator on non-object");
+        return typeof state === "function" ? receiver === state : state.has(receiver);
+    }
 
     var NAME_TOKEN = 'token';
     var NAME_REFRESH_TOKEN = 'refreshToken';
@@ -538,9 +547,9 @@
         };
         return JwtService;
     }(angularJwt.JwtHelperService));
-    JwtService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: JwtService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    JwtService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: JwtService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: JwtService, decorators: [{
+    JwtService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: JwtService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    JwtService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: JwtService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: JwtService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -651,9 +660,9 @@
         };
         return EventDispatcherService;
     }());
-    EventDispatcherService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: EventDispatcherService, deps: [], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    EventDispatcherService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: EventDispatcherService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: EventDispatcherService, decorators: [{
+    EventDispatcherService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: EventDispatcherService, deps: [], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    EventDispatcherService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: EventDispatcherService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: EventDispatcherService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -707,9 +716,9 @@
         };
         return AuthService;
     }());
-    AuthService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: AuthService, deps: [{ token: i1__namespace.HttpClient }, { token: JwtService }, { token: EventDispatcherService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    AuthService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: AuthService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: AuthService, decorators: [{
+    AuthService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: AuthService, deps: [{ token: i1__namespace.HttpClient }, { token: JwtService }, { token: EventDispatcherService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    AuthService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: AuthService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: AuthService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -850,9 +859,9 @@
         };
         return JwtInterceptor;
     }());
-    JwtInterceptor.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: JwtInterceptor, deps: [{ token: JwtService }, { token: AuthService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    JwtInterceptor.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: JwtInterceptor });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: JwtInterceptor, decorators: [{
+    JwtInterceptor.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: JwtInterceptor, deps: [{ token: JwtService }, { token: AuthService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    JwtInterceptor.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: JwtInterceptor });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: JwtInterceptor, decorators: [{
                 type: i0.Injectable
             }], ctorParameters: function () {
             return [{ type: JwtService }, { type: AuthService }, { type: undefined, decorators: [{
@@ -890,9 +899,9 @@
         };
         return UserSwitcherService;
     }());
-    UserSwitcherService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: UserSwitcherService, deps: [], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    UserSwitcherService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: UserSwitcherService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: UserSwitcherService, decorators: [{
+    UserSwitcherService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: UserSwitcherService, deps: [], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    UserSwitcherService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: UserSwitcherService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: UserSwitcherService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -915,7 +924,17 @@
             if (!req.url.includes(this.environment.api_uri) || !username) {
                 return req;
             }
-            var params = new i1.HttpParams({ fromString: req.params.toString() }).set('_switch_user', username);
+            var params = new i1.HttpParams({
+                fromString: req.params.toString(),
+                // custom encoder to encode '+' symbol and other (Problem: TT-2359)
+                // https://stackoverflow.com/questions/49438737/how-to-escape-angular-httpparams
+                encoder: {
+                    encodeKey: function (key) { return encodeURIComponent(key); },
+                    encodeValue: function (value) { return encodeURIComponent(value); },
+                    decodeKey: function (key) { return decodeURIComponent(key); },
+                    decodeValue: function (value) { return decodeURIComponent(value); }
+                }
+            }).set('_switch_user', username);
             return req.clone({ params: params });
             // @TODO move to header solution when backend can support it
             // return req.clone({
@@ -929,9 +948,9 @@
         };
         return UserSwitcherInterceptor;
     }());
-    UserSwitcherInterceptor.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: UserSwitcherInterceptor, deps: [{ token: UserSwitcherService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    UserSwitcherInterceptor.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: UserSwitcherInterceptor });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: UserSwitcherInterceptor, decorators: [{
+    UserSwitcherInterceptor.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: UserSwitcherInterceptor, deps: [{ token: UserSwitcherService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    UserSwitcherInterceptor.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: UserSwitcherInterceptor });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: UserSwitcherInterceptor, decorators: [{
                 type: i0.Injectable
             }], ctorParameters: function () {
             return [{ type: UserSwitcherService }, { type: undefined, decorators: [{
@@ -1178,9 +1197,9 @@
         };
         return PreloaderService;
     }());
-    PreloaderService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PreloaderService, deps: [], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    PreloaderService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PreloaderService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PreloaderService, decorators: [{
+    PreloaderService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PreloaderService, deps: [], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    PreloaderService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PreloaderService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PreloaderService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -1210,9 +1229,9 @@
         };
         return PreloaderInterceptor;
     }());
-    PreloaderInterceptor.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PreloaderInterceptor, deps: [{ token: PreloaderService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    PreloaderInterceptor.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PreloaderInterceptor });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PreloaderInterceptor, decorators: [{
+    PreloaderInterceptor.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PreloaderInterceptor, deps: [{ token: PreloaderService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    PreloaderInterceptor.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PreloaderInterceptor });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PreloaderInterceptor, decorators: [{
                 type: i0.Injectable
             }], ctorParameters: function () { return [{ type: PreloaderService }]; } });
 
@@ -1331,9 +1350,9 @@
         };
         return ToastService;
     }());
-    ToastService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ToastService, deps: [], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    ToastService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ToastService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ToastService, decorators: [{
+    ToastService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ToastService, deps: [], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    ToastService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ToastService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ToastService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -1559,9 +1578,9 @@
         RestService.prototype.listenEvents = function () { };
         return RestService;
     }());
-    RestService$1.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: RestService$1, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    RestService$1.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: RestService$1, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: RestService$1, decorators: [{
+    RestService$1.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: RestService$1, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    RestService$1.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: RestService$1, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: RestService$1, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -3465,6 +3484,92 @@
         ]
     };
 
+    exports.ChartAccountsTaxLabelsEnum = void 0;
+    (function (ChartAccountsTaxLabelsEnum) {
+        ChartAccountsTaxLabelsEnum["TAX_WITHHELD"] = "Tax withheld";
+        ChartAccountsTaxLabelsEnum["TAX_PAID"] = "Tax Paid";
+        ChartAccountsTaxLabelsEnum["TAX_DEDUCTED"] = "Tax Deducted";
+    })(exports.ChartAccountsTaxLabelsEnum || (exports.ChartAccountsTaxLabelsEnum = {}));
+
+    function enumToList(data) {
+        var list = [];
+        for (var key in data) {
+            if (Number(key) >= 0) {
+                list.push({
+                    label: data[key],
+                    value: Number(key)
+                });
+            }
+        }
+        return list;
+    }
+
+    exports.ChartAccountsHeadingTaxableEnum = void 0;
+    (function (ChartAccountsHeadingTaxableEnum) {
+        ChartAccountsHeadingTaxableEnum[ChartAccountsHeadingTaxableEnum["GROSS_INTEREST"] = 7] = "GROSS_INTEREST";
+        ChartAccountsHeadingTaxableEnum[ChartAccountsHeadingTaxableEnum["DIVIDENDS"] = 38] = "DIVIDENDS";
+        ChartAccountsHeadingTaxableEnum[ChartAccountsHeadingTaxableEnum["EMPLOYEE_SHARE_SCHEMES"] = 42] = "EMPLOYEE_SHARE_SCHEMES";
+        ChartAccountsHeadingTaxableEnum[ChartAccountsHeadingTaxableEnum["PARTNERSHIPS_AND_TRUSTS_INCOME"] = 43] = "PARTNERSHIPS_AND_TRUSTS_INCOME";
+    })(exports.ChartAccountsHeadingTaxableEnum || (exports.ChartAccountsHeadingTaxableEnum = {}));
+
+    exports.ChartAccountsHeadingTaxDeductibleEnum = void 0;
+    (function (ChartAccountsHeadingTaxDeductibleEnum) {
+        ChartAccountsHeadingTaxDeductibleEnum[ChartAccountsHeadingTaxDeductibleEnum["ALLOWANCES_AND_PAYMENTS"] = 4] = "ALLOWANCES_AND_PAYMENTS";
+        ChartAccountsHeadingTaxDeductibleEnum[ChartAccountsHeadingTaxDeductibleEnum["PENSIONS_AND_ALLOWANCES"] = 5] = "PENSIONS_AND_ALLOWANCES";
+        ChartAccountsHeadingTaxDeductibleEnum[ChartAccountsHeadingTaxDeductibleEnum["ANNUITIES_AND_SUPERANNUATION_INCOME_STREAMS"] = 40] = "ANNUITIES_AND_SUPERANNUATION_INCOME_STREAMS";
+        ChartAccountsHeadingTaxDeductibleEnum[ChartAccountsHeadingTaxDeductibleEnum["SUPERANNUATION_LUMP_SUM"] = 41] = "SUPERANNUATION_LUMP_SUM";
+    })(exports.ChartAccountsHeadingTaxDeductibleEnum || (exports.ChartAccountsHeadingTaxDeductibleEnum = {}));
+
+    exports.ChartAccountsHeadingListEnum = void 0;
+    (function (ChartAccountsHeadingListEnum) {
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["ALLOWANCES_EARNINGS_TIPS_DIRECTOR_FEES"] = 2] = "ALLOWANCES_EARNINGS_TIPS_DIRECTOR_FEES";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["AUSTRALIAN_GOVERNMENT_ALLOWANCES_PAYMENTS"] = 4] = "AUSTRALIAN_GOVERNMENT_ALLOWANCES_PAYMENTS";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["AUSTRALIAN_GOVERNMENT_PENSIONS_ALLOWANCES"] = 5] = "AUSTRALIAN_GOVERNMENT_PENSIONS_ALLOWANCES";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["WORK_RELATED_CAR_EXPENSES"] = 8] = "WORK_RELATED_CAR_EXPENSES";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["DEPRECIATION_VEHICLES"] = 9] = "DEPRECIATION_VEHICLES";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["WORK_RELATED_TRAVEL_EXPENSES"] = 10] = "WORK_RELATED_TRAVEL_EXPENSES";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["COMPULSORY_WORK_UNIFORM"] = 11] = "COMPULSORY_WORK_UNIFORM";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["PROTECTION_CLOTHING"] = 12] = "PROTECTION_CLOTHING";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["OCCUPATIONAL_SPECIFIC_CLOTHING"] = 13] = "OCCUPATIONAL_SPECIFIC_CLOTHING";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["SELF_EDUCATIONAL_EXPENSES"] = 14] = "SELF_EDUCATIONAL_EXPENSES";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["OTHER_WORK_RELATED_EXPENSES"] = 15] = "OTHER_WORK_RELATED_EXPENSES";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["SUBSCRIPTIONS"] = 16] = "SUBSCRIPTIONS";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["HOME_OFFICE_RUNNING"] = 17] = "HOME_OFFICE_RUNNING";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["TOOLS_EQUIPMENT"] = 18] = "TOOLS_EQUIPMENT";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["HOME_OFFICE_OCCUPANCY"] = 19] = "HOME_OFFICE_OCCUPANCY";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["AWARD_OVERTIME_MEAL_ALLOWANCE_EXPENSE"] = 20] = "AWARD_OVERTIME_MEAL_ALLOWANCE_EXPENSE";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["NEWSPAPER"] = 21] = "NEWSPAPER";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["PRINTING_POSTAGE_STATIONERY"] = 22] = "PRINTING_POSTAGE_STATIONERY";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["SEMINARS_ETC"] = 23] = "SEMINARS_ETC";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["TELEPHONE"] = 24] = "TELEPHONE";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["UNION_FEES"] = 25] = "UNION_FEES";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["OTHER"] = 26] = "OTHER";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["DONATIONS"] = 27] = "DONATIONS";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["PSI"] = 30] = "PSI";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["BONUSES"] = 34] = "BONUSES";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["OTHER_DEDUCTIONS"] = 37] = "OTHER_DEDUCTIONS";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["ETP"] = 39] = "ETP";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["INTEREST_DEDUCTIONS"] = 47] = "INTEREST_DEDUCTIONS";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["DIVIDEND_DEDUCTIONS"] = 48] = "DIVIDEND_DEDUCTIONS";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["PURCHASES_STOCK_INVENTORY"] = 52] = "PURCHASES_STOCK_INVENTORY";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["CONTRACTORS_COMMISSION"] = 53] = "CONTRACTORS_COMMISSION";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["SUPERANNUATION"] = 54] = "SUPERANNUATION";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["BAD_DEBT"] = 55] = "BAD_DEBT";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["LEASE_EXPENSES"] = 56] = "LEASE_EXPENSES";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["RENT_EXPENSES"] = 57] = "RENT_EXPENSES";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["INTEREST_EXPENSES_AUSTRALIA"] = 58] = "INTEREST_EXPENSES_AUSTRALIA";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["INTEREST_EXPENSES_OVERSEAS"] = 59] = "INTEREST_EXPENSES_OVERSEAS";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["KLMS"] = 60] = "KLMS";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["FUEL_OIL"] = 61] = "FUEL_OIL";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["SERVICES_MAINTENANCE"] = 62] = "SERVICES_MAINTENANCE";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["REGISTRATION"] = 63] = "REGISTRATION";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["LEASE_INTEREST_PAYMENTS"] = 64] = "LEASE_INTEREST_PAYMENTS";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["INSURANCE"] = 65] = "INSURANCE";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["TYRES_BATTERIES"] = 66] = "TYRES_BATTERIES";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["OTHER_EXPENSES"] = 67] = "OTHER_EXPENSES";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["DEPRECIATION_EXPENSES"] = 68] = "DEPRECIATION_EXPENSES";
+    })(exports.ChartAccountsHeadingListEnum || (exports.ChartAccountsHeadingListEnum = {}));
+
     var ChartAccounts = /** @class */ (function (_super) {
         __extends(ChartAccounts, _super);
         function ChartAccounts() {
@@ -3619,6 +3724,37 @@
         ChartAccounts.prototype.isClaimPercentEditable = function () {
             return (this.isWorkExpense() || this.isSoleExpense()) && (!this.isVehicleExpense() && !this.isPersonalExpense());
         };
+        /**
+         * get label for transaction tax field depended on selected chart account.
+         * tax type depends on chart account heading or category.
+         */
+        ChartAccounts.prototype.getTaxLabel = function () {
+            var _a, _b;
+            // get simple array of ids from enum with taxable chart accounts headings
+            var taxableCAHeadingsIds = enumToList(exports.ChartAccountsHeadingTaxableEnum)
+                .map(function (item) { return item.value; });
+            // get simple array of ids from enum with tax-deductible chart accounts headings
+            var deductibleCAHeadingsIds = enumToList(exports.ChartAccountsHeadingTaxDeductibleEnum)
+                .map(function (item) { return item.value; });
+            // check if one of ids arrays includes current chart accounts heading id and set tax label
+            // otherwise label is empty for this class
+            switch (true) {
+                case taxableCAHeadingsIds.includes((_a = this.heading) === null || _a === void 0 ? void 0 : _a.id):
+                    return exports.ChartAccountsTaxLabelsEnum.TAX_PAID;
+                case deductibleCAHeadingsIds.includes((_b = this.heading) === null || _b === void 0 ? void 0 : _b.id):
+                    return exports.ChartAccountsTaxLabelsEnum.TAX_DEDUCTED;
+                case CHART_ACCOUNTS_CATEGORIES.workIncome.includes(this.category):
+                    return exports.ChartAccountsTaxLabelsEnum.TAX_WITHHELD;
+                default:
+                    return null;
+            }
+        };
+        ChartAccounts.prototype.isETP = function () {
+            return this.heading.id === exports.ChartAccountsHeadingListEnum.ETP;
+        };
+        ChartAccounts.prototype.isSalary = function () {
+            return this.id === exports.ChartAccountsListEnum.SALARY_OR_WAGES;
+        };
         return ChartAccounts;
     }(ChartAccounts$1));
     /**
@@ -3844,6 +3980,103 @@
         return TransactionReceipt;
     }(TransactionReceipt$1));
 
+    /**
+     * @TODO Alex/Vik: think and create some new collection type
+     * @TODO Alex: research all constants and make the same structure
+     */
+    var ChartAccountsCategoryECollection = /** @class */ (function () {
+        function ChartAccountsCategoryECollection(items) {
+            this.items = items || [
+                exports.ChartAccountsCategoryEnum.PROPERTY_INCOME,
+                exports.ChartAccountsCategoryEnum.PROPERTY_EXPENSE,
+                exports.ChartAccountsCategoryEnum.PROPERTY_DEPRECIATION,
+                exports.ChartAccountsCategoryEnum.PROPERTY_CAPITAL_WORKS,
+                exports.ChartAccountsCategoryEnum.WORK_DEPRECIATION,
+                exports.ChartAccountsCategoryEnum.WORK_INCOME,
+                exports.ChartAccountsCategoryEnum.WORK_EXPENSE,
+                exports.ChartAccountsCategoryEnum.OTHER_INCOME,
+                exports.ChartAccountsCategoryEnum.OTHER_EXPENSE,
+                exports.ChartAccountsCategoryEnum.PERSONAL_INCOME,
+                exports.ChartAccountsCategoryEnum.PERSONAL_EXPENSE,
+                exports.ChartAccountsCategoryEnum.SOLE_INCOME,
+                exports.ChartAccountsCategoryEnum.SOLE_EXPENSE,
+                exports.ChartAccountsCategoryEnum.SOLE_DEPRECIATION
+            ];
+        }
+        ChartAccountsCategoryECollection.prototype.getByType = function (types) {
+            var _this = this;
+            if (!Array.isArray(types)) {
+                types = [types];
+            }
+            var items = [];
+            types.forEach(function (type) {
+                var filtered = _this.items.filter(function (item) { return exports.ChartAccountsCategoryEnum[item].includes(type.toUpperCase()); });
+                items.push.apply(items, __spreadArray([], __read(filtered)));
+            });
+            return new ChartAccountsCategoryECollection(items);
+        };
+        ChartAccountsCategoryECollection.prototype.getByTankType = function (tankTypes) {
+            var _this = this;
+            if (!Array.isArray(tankTypes)) {
+                tankTypes = [tankTypes];
+            }
+            var items = [];
+            tankTypes.forEach(function (tankType) {
+                var filtered = _this.items.filter(function (item) { return exports.ChartAccountsCategoryEnum[item].includes(tankType.toUpperCase()); });
+                items.push.apply(items, __spreadArray([], __read(filtered)));
+            });
+            return new ChartAccountsCategoryECollection(items);
+        };
+        return ChartAccountsCategoryECollection;
+    }());
+
+    var ChartAccountsDepreciation$1 = /** @class */ (function (_super) {
+        __extends(ChartAccountsDepreciation, _super);
+        function ChartAccountsDepreciation() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        return ChartAccountsDepreciation;
+    }(AbstractModel));
+
+    var ChartAccountsDepreciation = /** @class */ (function (_super) {
+        __extends(ChartAccountsDepreciation, _super);
+        function ChartAccountsDepreciation() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        return ChartAccountsDepreciation;
+    }(ChartAccountsDepreciation$1));
+    __decorate([
+        classTransformer.Type(function () { return ChartAccounts; })
+    ], ChartAccountsDepreciation.prototype, "chartAccounts", void 0);
+    __decorate([
+        classTransformer.Transform(function (_a) {
+            var value = _a.value;
+            return +value;
+        })
+    ], ChartAccountsDepreciation.prototype, "limit", void 0);
+    __decorate([
+        classTransformer.Transform(function (_a) {
+            var value = _a.value;
+            return +value;
+        })
+    ], ChartAccountsDepreciation.prototype, "effectiveLife", void 0);
+
+    var ChartAccountsValue$1 = /** @class */ (function (_super) {
+        __extends(ChartAccountsValue, _super);
+        function ChartAccountsValue() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        return ChartAccountsValue;
+    }(AbstractModel));
+
+    var ChartAccountsValue = /** @class */ (function (_super) {
+        __extends(ChartAccountsValue, _super);
+        function ChartAccountsValue() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        return ChartAccountsValue;
+    }(ChartAccountsValue$1));
+
     var IncomeSource$1 = /** @class */ (function (_super) {
         __extends(IncomeSource, _super);
         function IncomeSource() {
@@ -3872,6 +4105,13 @@
         function SalaryForecast() {
             return _super !== null && _super.apply(this, arguments) || this;
         }
+        Object.defineProperty(SalaryForecast.prototype, "taxWithheld", {
+            get: function () {
+                return this.grossAmount - this.netPay;
+            },
+            enumerable: false,
+            configurable: true
+        });
         return SalaryForecast;
     }(SalaryForecast$1));
     __decorate([
@@ -5132,6 +5372,7 @@
         return VehicleLogbook;
     }(AbstractModel));
 
+    // problem with DateRange and typescript. See more https://github.com/rotaready/moment-range/issues/263
     var moment = momentRange.extendMoment(moment__namespace);
     var VehicleLogbook = /** @class */ (function (_super) {
         __extends(VehicleLogbook, _super);
@@ -7535,6 +7776,29 @@
         return Document;
     }(Document$1));
 
+    var DOCUMENT_FILE_TYPES = {
+        image: [
+            'image/png',
+            'image/jpg',
+            'image/jpeg',
+            'image/tiff',
+            'image/bmp'
+        ],
+        all: [
+            'image/png',
+            'image/jpg',
+            'image/jpeg',
+            'image/tiff',
+            'image/bmp',
+            'application/msword',
+            'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+            'application/pdf',
+            'application/vnd.ms-excel',
+            'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+            'text/csv'
+        ]
+    };
+
     var DocumentFolder$1 = /** @class */ (function (_super) {
         __extends(DocumentFolder, _super);
         function DocumentFolder() {
@@ -7554,6 +7818,23 @@
         classTransformer.Type(function () { return Document; })
     ], DocumentFolder.prototype, "documents", void 0);
 
+    /**
+     * Enum with income amount types (Net or Gross)
+     */
+    exports.IncomeAmountTypeEnum = void 0;
+    (function (IncomeAmountTypeEnum) {
+        IncomeAmountTypeEnum[IncomeAmountTypeEnum["NET"] = 0] = "NET";
+        IncomeAmountTypeEnum[IncomeAmountTypeEnum["GROSS"] = 1] = "GROSS";
+    })(exports.IncomeAmountTypeEnum || (exports.IncomeAmountTypeEnum = {}));
+
+    exports.TransactionCategoryEnum = void 0;
+    (function (TransactionCategoryEnum) {
+        TransactionCategoryEnum[TransactionCategoryEnum["PROPERTY"] = 0] = "PROPERTY";
+        TransactionCategoryEnum[TransactionCategoryEnum["WORK"] = 1] = "WORK";
+        TransactionCategoryEnum[TransactionCategoryEnum["SOLE"] = 2] = "SOLE";
+        TransactionCategoryEnum[TransactionCategoryEnum["PERSONAL"] = 3] = "PERSONAL";
+    })(exports.TransactionCategoryEnum || (exports.TransactionCategoryEnum = {}));
+
     /**
      * BankConnection means user account at specific bank (usually each user has only one at the same bank)
      * service handles BankConnection management
@@ -7647,9 +7928,9 @@
         UserEventTypeTypeEnum.BASIQ_NEW_ACCOUNTS,
         UserEventTypeTypeEnum.BASIQ_AUTHORIZATION_FAIL
     ];
-    BankConnectionService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BankConnectionService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    BankConnectionService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BankConnectionService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BankConnectionService, decorators: [{
+    BankConnectionService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BankConnectionService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    BankConnectionService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BankConnectionService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BankConnectionService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -7772,9 +8053,9 @@
      * Basiq does not provide a hook, so we have to check job status manually every x seconds
      */
     BasiqService.bankCredintialsCheckInterval = 3000;
-    BasiqService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BasiqService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }, { token: BankConnectionService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    BasiqService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BasiqService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BasiqService, decorators: [{
+    BasiqService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BasiqService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }, { token: BankConnectionService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    BasiqService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BasiqService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BasiqService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -7812,9 +8093,9 @@
         };
         return BasiqTokenService;
     }());
-    BasiqTokenService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BasiqTokenService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    BasiqTokenService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BasiqTokenService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BasiqTokenService, decorators: [{
+    BasiqTokenService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BasiqTokenService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    BasiqTokenService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BasiqTokenService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BasiqTokenService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -7852,9 +8133,9 @@
         };
         return BasiqTokenInterceptor;
     }());
-    BasiqTokenInterceptor.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BasiqTokenInterceptor, deps: [{ token: BasiqTokenService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    BasiqTokenInterceptor.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BasiqTokenInterceptor });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BasiqTokenInterceptor, decorators: [{
+    BasiqTokenInterceptor.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BasiqTokenInterceptor, deps: [{ token: BasiqTokenService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    BasiqTokenInterceptor.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BasiqTokenInterceptor });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BasiqTokenInterceptor, decorators: [{
                 type: i0.Injectable
             }], ctorParameters: function () { return [{ type: BasiqTokenService }]; } });
 
@@ -7892,9 +8173,9 @@
         };
         return SseService;
     }());
-    SseService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SseService, deps: [{ token: i0__namespace.NgZone }, { token: JwtService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    SseService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SseService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SseService, decorators: [{
+    SseService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: SseService, deps: [{ token: i0__namespace.NgZone }, { token: JwtService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    SseService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: SseService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: SseService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -8071,9 +8352,9 @@
         };
         return UserService;
     }());
-    UserService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: UserService, deps: [{ token: i1__namespace.HttpClient }, { token: JwtService }, { token: EventDispatcherService }, { token: SseService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    UserService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: UserService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: UserService, decorators: [{
+    UserService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: UserService, deps: [{ token: i1__namespace.HttpClient }, { token: JwtService }, { token: EventDispatcherService }, { token: SseService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    UserService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: UserService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: UserService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -8107,9 +8388,9 @@
         };
         return BasiqClientIdInterceptor;
     }());
-    BasiqClientIdInterceptor.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BasiqClientIdInterceptor, deps: [{ token: UserService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    BasiqClientIdInterceptor.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BasiqClientIdInterceptor });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BasiqClientIdInterceptor, decorators: [{
+    BasiqClientIdInterceptor.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BasiqClientIdInterceptor, deps: [{ token: UserService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    BasiqClientIdInterceptor.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BasiqClientIdInterceptor });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BasiqClientIdInterceptor, decorators: [{
                 type: i0.Injectable
             }], ctorParameters: function () { return [{ type: UserService }]; } });
 
@@ -8118,9 +8399,9 @@
         }
         return InterceptorsModule;
     }());
-    InterceptorsModule.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: InterceptorsModule, deps: [], target: i0__namespace.ɵɵFactoryTarget.NgModule });
-    InterceptorsModule.ɵmod = i0__namespace.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: InterceptorsModule });
-    InterceptorsModule.ɵinj = i0__namespace.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: InterceptorsModule, providers: [
+    InterceptorsModule.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: InterceptorsModule, deps: [], target: i0__namespace.ɵɵFactoryTarget.NgModule });
+    InterceptorsModule.ɵmod = i0__namespace.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: InterceptorsModule });
+    InterceptorsModule.ɵinj = i0__namespace.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: InterceptorsModule, providers: [
             {
                 provide: i1.HTTP_INTERCEPTORS,
                 useClass: CorelogicInterceptor,
@@ -8158,7 +8439,7 @@
                 multi: true
             }
         ] });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: InterceptorsModule, decorators: [{
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: InterceptorsModule, decorators: [{
                 type: i0.NgModule,
                 args: [{
                         providers: [
@@ -8219,14 +8500,14 @@
         };
         return TtCoreModule;
     }());
-    TtCoreModule.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TtCoreModule, deps: [], target: i0__namespace.ɵɵFactoryTarget.NgModule });
-    TtCoreModule.ɵmod = i0__namespace.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TtCoreModule, imports: [i1$1.CommonModule,
+    TtCoreModule.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TtCoreModule, deps: [], target: i0__namespace.ɵɵFactoryTarget.NgModule });
+    TtCoreModule.ɵmod = i0__namespace.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TtCoreModule, imports: [i1$1.CommonModule,
             InterceptorsModule] });
-    TtCoreModule.ɵinj = i0__namespace.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TtCoreModule, imports: [[
+    TtCoreModule.ɵinj = i0__namespace.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TtCoreModule, imports: [[
                 i1$1.CommonModule,
                 InterceptorsModule
             ]] });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TtCoreModule, decorators: [{
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TtCoreModule, decorators: [{
                 type: i0.NgModule,
                 args: [{
                         declarations: [],
@@ -9571,56 +9852,6 @@
         return ClientInviteCollection;
     }(Collection));
 
-    /**
-     * @TODO Alex/Vik: think and create some new collection type
-     * @TODO Alex: research all constants and make the same structure
-     */
-    var ChartAccountsCategoryECollection = /** @class */ (function () {
-        function ChartAccountsCategoryECollection(items) {
-            this.items = items || [
-                exports.ChartAccountsCategoryEnum.PROPERTY_INCOME,
-                exports.ChartAccountsCategoryEnum.PROPERTY_EXPENSE,
-                exports.ChartAccountsCategoryEnum.PROPERTY_DEPRECIATION,
-                exports.ChartAccountsCategoryEnum.PROPERTY_CAPITAL_WORKS,
-                exports.ChartAccountsCategoryEnum.WORK_DEPRECIATION,
-                exports.ChartAccountsCategoryEnum.WORK_INCOME,
-                exports.ChartAccountsCategoryEnum.WORK_EXPENSE,
-                exports.ChartAccountsCategoryEnum.OTHER_INCOME,
-                exports.ChartAccountsCategoryEnum.OTHER_EXPENSE,
-                exports.ChartAccountsCategoryEnum.PERSONAL_INCOME,
-                exports.ChartAccountsCategoryEnum.PERSONAL_EXPENSE,
-                exports.ChartAccountsCategoryEnum.SOLE_INCOME,
-                exports.ChartAccountsCategoryEnum.SOLE_EXPENSE,
-                exports.ChartAccountsCategoryEnum.SOLE_DEPRECIATION
-            ];
-        }
-        ChartAccountsCategoryECollection.prototype.getByType = function (types) {
-            var _this = this;
-            if (!Array.isArray(types)) {
-                types = [types];
-            }
-            var items = [];
-            types.forEach(function (type) {
-                var filtered = _this.items.filter(function (item) { return exports.ChartAccountsCategoryEnum[item].includes(type.toUpperCase()); });
-                items.push.apply(items, __spreadArray([], __read(filtered)));
-            });
-            return new ChartAccountsCategoryECollection(items);
-        };
-        ChartAccountsCategoryECollection.prototype.getByTankType = function (tankTypes) {
-            var _this = this;
-            if (!Array.isArray(tankTypes)) {
-                tankTypes = [tankTypes];
-            }
-            var items = [];
-            tankTypes.forEach(function (tankType) {
-                var filtered = _this.items.filter(function (item) { return exports.ChartAccountsCategoryEnum[item].includes(tankType.toUpperCase()); });
-                items.push.apply(items, __spreadArray([], __read(filtered)));
-            });
-            return new ChartAccountsCategoryECollection(items);
-        };
-        return ChartAccountsCategoryECollection;
-    }());
-
     exports.DocumentTypeEnum = void 0;
     (function (DocumentTypeEnum) {
         DocumentTypeEnum[DocumentTypeEnum["INVOICE"] = 1] = "INVOICE";
@@ -9635,6 +9866,23 @@
         AnnualFrequencyEnum[AnnualFrequencyEnum["WEEKLY"] = 52] = "WEEKLY";
     })(exports.AnnualFrequencyEnum || (exports.AnnualFrequencyEnum = {}));
 
+    exports.ChartAccountsSalaryAdjustmentsListEnum = void 0;
+    (function (ChartAccountsSalaryAdjustmentsListEnum) {
+        ChartAccountsSalaryAdjustmentsListEnum[ChartAccountsSalaryAdjustmentsListEnum["ALLOWANCE"] = 4] = "ALLOWANCE";
+        ChartAccountsSalaryAdjustmentsListEnum[ChartAccountsSalaryAdjustmentsListEnum["TIPS"] = 5] = "TIPS";
+        ChartAccountsSalaryAdjustmentsListEnum[ChartAccountsSalaryAdjustmentsListEnum["REIMBURSEMENTS"] = 555] = "REIMBURSEMENTS";
+        ChartAccountsSalaryAdjustmentsListEnum[ChartAccountsSalaryAdjustmentsListEnum["ADVANCE"] = 556] = "ADVANCE";
+        ChartAccountsSalaryAdjustmentsListEnum[ChartAccountsSalaryAdjustmentsListEnum["POST_TAX_DEDUCTIONS_OTHER"] = 644] = "POST_TAX_DEDUCTIONS_OTHER";
+        ChartAccountsSalaryAdjustmentsListEnum[ChartAccountsSalaryAdjustmentsListEnum["PRE_TAX_DEDUCTIONS_OTHER"] = 645] = "PRE_TAX_DEDUCTIONS_OTHER";
+        ChartAccountsSalaryAdjustmentsListEnum[ChartAccountsSalaryAdjustmentsListEnum["PHONE_ALLOWANCE"] = 646] = "PHONE_ALLOWANCE";
+        ChartAccountsSalaryAdjustmentsListEnum[ChartAccountsSalaryAdjustmentsListEnum["UNIFORM_ALLOWANCE"] = 647] = "UNIFORM_ALLOWANCE";
+        ChartAccountsSalaryAdjustmentsListEnum[ChartAccountsSalaryAdjustmentsListEnum["META_ALLOWANCE"] = 648] = "META_ALLOWANCE";
+        ChartAccountsSalaryAdjustmentsListEnum[ChartAccountsSalaryAdjustmentsListEnum["TRAVEL_ALLOWANCE"] = 649] = "TRAVEL_ALLOWANCE";
+        ChartAccountsSalaryAdjustmentsListEnum[ChartAccountsSalaryAdjustmentsListEnum["OTHER_ALLOWANCE"] = 650] = "OTHER_ALLOWANCE";
+        ChartAccountsSalaryAdjustmentsListEnum[ChartAccountsSalaryAdjustmentsListEnum["LAFH"] = 651] = "LAFH";
+        ChartAccountsSalaryAdjustmentsListEnum[ChartAccountsSalaryAdjustmentsListEnum["WORK_PLACE_GIVING"] = 653] = "WORK_PLACE_GIVING";
+    })(exports.ChartAccountsSalaryAdjustmentsListEnum || (exports.ChartAccountsSalaryAdjustmentsListEnum = {}));
+
     // @TODO Artem TT-2308 move everything
 
     exports.ChartAccountsEtpEnum = void 0;
@@ -9646,72 +9894,6 @@
         ChartAccountsEtpEnum[ChartAccountsEtpEnum["ETP_B"] = 553] = "ETP_B";
     })(exports.ChartAccountsEtpEnum || (exports.ChartAccountsEtpEnum = {}));
 
-    exports.ChartAccountsHeadingListEnum = void 0;
-    (function (ChartAccountsHeadingListEnum) {
-        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["ALLOWANCES_EARNINGS_TIPS_DIRECTOR_FEES"] = 2] = "ALLOWANCES_EARNINGS_TIPS_DIRECTOR_FEES";
-        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["AUSTRALIAN_GOVERNMENT_ALLOWANCES_PAYMENTS"] = 4] = "AUSTRALIAN_GOVERNMENT_ALLOWANCES_PAYMENTS";
-        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["AUSTRALIAN_GOVERNMENT_PENSIONS_ALLOWANCES"] = 5] = "AUSTRALIAN_GOVERNMENT_PENSIONS_ALLOWANCES";
-        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["WORK_RELATED_CAR_EXPENSES"] = 8] = "WORK_RELATED_CAR_EXPENSES";
-        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["DEPRECIATION_VEHICLES"] = 9] = "DEPRECIATION_VEHICLES";
-        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["WORK_RELATED_TRAVEL_EXPENSES"] = 10] = "WORK_RELATED_TRAVEL_EXPENSES";
-        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["COMPULSORY_WORK_UNIFORM"] = 11] = "COMPULSORY_WORK_UNIFORM";
-        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["PROTECTION_CLOTHING"] = 12] = "PROTECTION_CLOTHING";
-        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["OCCUPATIONAL_SPECIFIC_CLOTHING"] = 13] = "OCCUPATIONAL_SPECIFIC_CLOTHING";
-        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["SELF_EDUCATIONAL_EXPENSES"] = 14] = "SELF_EDUCATIONAL_EXPENSES";
-        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["OTHER_WORK_RELATED_EXPENSES"] = 15] = "OTHER_WORK_RELATED_EXPENSES";
-        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["SUBSCRIPTIONS"] = 16] = "SUBSCRIPTIONS";
-        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["HOME_OFFICE_RUNNING"] = 17] = "HOME_OFFICE_RUNNING";
-        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["TOOLS_EQUIPMENT"] = 18] = "TOOLS_EQUIPMENT";
-        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["HOME_OFFICE_OCCUPANCY"] = 19] = "HOME_OFFICE_OCCUPANCY";
-        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["AWARD_OVERTIME_MEAL_ALLOWANCE_EXPENSE"] = 20] = "AWARD_OVERTIME_MEAL_ALLOWANCE_EXPENSE";
-        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["NEWSPAPER"] = 21] = "NEWSPAPER";
-        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["PRINTING_POSTAGE_STATIONERY"] = 22] = "PRINTING_POSTAGE_STATIONERY";
-        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["SEMINARS_ETC"] = 23] = "SEMINARS_ETC";
-        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["TELEPHONE"] = 24] = "TELEPHONE";
-        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["UNION_FEES"] = 25] = "UNION_FEES";
-        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["OTHER"] = 26] = "OTHER";
-        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["DONATIONS"] = 27] = "DONATIONS";
-        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["PSI"] = 30] = "PSI";
-        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["BONUSES"] = 34] = "BONUSES";
-        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["OTHER_DEDUCTIONS"] = 37] = "OTHER_DEDUCTIONS";
-        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["ETP"] = 39] = "ETP";
-        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["INTEREST_DEDUCTIONS"] = 47] = "INTEREST_DEDUCTIONS";
-        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["DIVIDEND_DEDUCTIONS"] = 48] = "DIVIDEND_DEDUCTIONS";
-        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["PURCHASES_STOCK_INVENTORY"] = 52] = "PURCHASES_STOCK_INVENTORY";
-        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["CONTRACTORS_COMMISSION"] = 53] = "CONTRACTORS_COMMISSION";
-        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["SUPERANNUATION"] = 54] = "SUPERANNUATION";
-        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["BAD_DEBT"] = 55] = "BAD_DEBT";
-        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["LEASE_EXPENSES"] = 56] = "LEASE_EXPENSES";
-        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["RENT_EXPENSES"] = 57] = "RENT_EXPENSES";
-        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["INTEREST_EXPENSES_AUSTRALIA"] = 58] = "INTEREST_EXPENSES_AUSTRALIA";
-        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["INTEREST_EXPENSES_OVERSEAS"] = 59] = "INTEREST_EXPENSES_OVERSEAS";
-        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["KLMS"] = 60] = "KLMS";
-        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["FUEL_OIL"] = 61] = "FUEL_OIL";
-        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["SERVICES_MAINTENANCE"] = 62] = "SERVICES_MAINTENANCE";
-        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["REGISTRATION"] = 63] = "REGISTRATION";
-        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["LEASE_INTEREST_PAYMENTS"] = 64] = "LEASE_INTEREST_PAYMENTS";
-        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["INSURANCE"] = 65] = "INSURANCE";
-        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["TYRES_BATTERIES"] = 66] = "TYRES_BATTERIES";
-        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["OTHER_EXPENSES"] = 67] = "OTHER_EXPENSES";
-        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["DEPRECIATION_EXPENSES"] = 68] = "DEPRECIATION_EXPENSES";
-    })(exports.ChartAccountsHeadingListEnum || (exports.ChartAccountsHeadingListEnum = {}));
-
-    exports.ChartAccountsHeadingTaxableEnum = void 0;
-    (function (ChartAccountsHeadingTaxableEnum) {
-        ChartAccountsHeadingTaxableEnum[ChartAccountsHeadingTaxableEnum["GROSS_INTEREST"] = 7] = "GROSS_INTEREST";
-        ChartAccountsHeadingTaxableEnum[ChartAccountsHeadingTaxableEnum["DIVIDENDS"] = 38] = "DIVIDENDS";
-        ChartAccountsHeadingTaxableEnum[ChartAccountsHeadingTaxableEnum["EMPLOYEE_SHARE_SCHEMES"] = 42] = "EMPLOYEE_SHARE_SCHEMES";
-        ChartAccountsHeadingTaxableEnum[ChartAccountsHeadingTaxableEnum["PARTNERSHIPS_AND_TRUSTS_INCOME"] = 43] = "PARTNERSHIPS_AND_TRUSTS_INCOME";
-    })(exports.ChartAccountsHeadingTaxableEnum || (exports.ChartAccountsHeadingTaxableEnum = {}));
-
-    exports.ChartAccountsHeadingTaxDeductibleEnum = void 0;
-    (function (ChartAccountsHeadingTaxDeductibleEnum) {
-        ChartAccountsHeadingTaxDeductibleEnum[ChartAccountsHeadingTaxDeductibleEnum["ALLOWANCES_AND_PAYMENTS"] = 4] = "ALLOWANCES_AND_PAYMENTS";
-        ChartAccountsHeadingTaxDeductibleEnum[ChartAccountsHeadingTaxDeductibleEnum["PENSIONS_AND_ALLOWANCES"] = 5] = "PENSIONS_AND_ALLOWANCES";
-        ChartAccountsHeadingTaxDeductibleEnum[ChartAccountsHeadingTaxDeductibleEnum["ANNUITIES_AND_SUPERANNUATION_INCOME_STREAMS"] = 40] = "ANNUITIES_AND_SUPERANNUATION_INCOME_STREAMS";
-        ChartAccountsHeadingTaxDeductibleEnum[ChartAccountsHeadingTaxDeductibleEnum["SUPERANNUATION_LUMP_SUM"] = 41] = "SUPERANNUATION_LUMP_SUM";
-    })(exports.ChartAccountsHeadingTaxDeductibleEnum || (exports.ChartAccountsHeadingTaxDeductibleEnum = {}));
-
     exports.ChartAccountsMetadataTypeEnum = void 0;
     (function (ChartAccountsMetadataTypeEnum) {
         ChartAccountsMetadataTypeEnum[ChartAccountsMetadataTypeEnum["NUMBER"] = 3] = "NUMBER";
@@ -10184,60 +10366,6 @@
         return BorrowingExpenseLoan;
     }(BorrowingExpenseLoan$1));
 
-    var ChartAccountsDepreciation$1 = /** @class */ (function (_super) {
-        __extends(ChartAccountsDepreciation, _super);
-        function ChartAccountsDepreciation() {
-            return _super !== null && _super.apply(this, arguments) || this;
-        }
-        return ChartAccountsDepreciation;
-    }(AbstractModel));
-
-    var ChartAccountsDepreciation = /** @class */ (function (_super) {
-        __extends(ChartAccountsDepreciation, _super);
-        function ChartAccountsDepreciation() {
-            return _super !== null && _super.apply(this, arguments) || this;
-        }
-        return ChartAccountsDepreciation;
-    }(ChartAccountsDepreciation$1));
-    __decorate([
-        classTransformer.Type(function () { return ChartAccounts; })
-    ], ChartAccountsDepreciation.prototype, "chartAccounts", void 0);
-    __decorate([
-        classTransformer.Transform(function (_a) {
-            var value = _a.value;
-            return +value;
-        })
-    ], ChartAccountsDepreciation.prototype, "limit", void 0);
-    __decorate([
-        classTransformer.Transform(function (_a) {
-            var value = _a.value;
-            return +value;
-        })
-    ], ChartAccountsDepreciation.prototype, "effectiveLife", void 0);
-
-    exports.ChartAccountsTaxLabelsEnum = void 0;
-    (function (ChartAccountsTaxLabelsEnum) {
-        ChartAccountsTaxLabelsEnum["TAX_WITHHELD"] = "Tax withheld";
-        ChartAccountsTaxLabelsEnum["TAX_PAID"] = "Tax Paid";
-        ChartAccountsTaxLabelsEnum["TAX_DEDUCTED"] = "Tax Deducted";
-    })(exports.ChartAccountsTaxLabelsEnum || (exports.ChartAccountsTaxLabelsEnum = {}));
-
-    var ChartAccountsValue$1 = /** @class */ (function (_super) {
-        __extends(ChartAccountsValue, _super);
-        function ChartAccountsValue() {
-            return _super !== null && _super.apply(this, arguments) || this;
-        }
-        return ChartAccountsValue;
-    }(AbstractModel));
-
-    var ChartAccountsValue = /** @class */ (function (_super) {
-        __extends(ChartAccountsValue, _super);
-        function ChartAccountsValue() {
-            return _super !== null && _super.apply(this, arguments) || this;
-        }
-        return ChartAccountsValue;
-    }(ChartAccountsValue$1));
-
     var Chat$1 = /** @class */ (function (_super) {
         __extends(Chat, _super);
         function Chat() {
@@ -10713,29 +10841,6 @@
         return DepreciationReceipt;
     }(DepreciationReceipt$1));
 
-    var DOCUMENT_FILE_TYPES = {
-        image: [
-            'image/png',
-            'image/jpg',
-            'image/jpeg',
-            'image/tiff',
-            'image/bmp'
-        ],
-        all: [
-            'image/png',
-            'image/jpg',
-            'image/jpeg',
-            'image/tiff',
-            'image/bmp',
-            'application/msword',
-            'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-            'application/pdf',
-            'application/vnd.ms-excel',
-            'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-            'text/csv'
-        ]
-    };
-
     var EmployeeInvite$1 = /** @class */ (function (_super) {
         __extends(EmployeeInvite, _super);
         function EmployeeInvite() {
@@ -12017,23 +12122,22 @@
         function MyTaxPartnershipsAndTrusts(transactions, incomeSources) {
             this.transactions = transactions;
             this.incomeSources = incomeSources;
-            this.partnershipIncomes = this.transactions.filterBy('chartAccounts.id', exports.ChartAccountsListEnum.PARTNERSHIP_INCOME);
-            this.partnershipExpenses = this.transactions.filterBy('chartAccounts.id', exports.ChartAccountsListEnum.PARTNERSHIP_EXPENSES);
+            this.partnershipsIncomes = this.transactions.filterBy('chartAccounts.id', exports.ChartAccountsListEnum.PARTNERSHIP_INCOME);
+            this.partnershipsExpenses = this.transactions.filterBy('chartAccounts.id', exports.ChartAccountsListEnum.PARTNERSHIP_EXPENSES);
             this.trustsIncomes = this.transactions.filterBy('chartAccounts.id', exports.ChartAccountsListEnum.TRUST_INCOME);
             this.trustsExpenses = this.transactions.filterBy('chartAccounts.id', exports.ChartAccountsListEnum.TRUST_EXPENSES);
-            this.trustType = this.getTrustType();
-            this.netNonPrimaryProductionAmount = (this.partnershipIncomes.sumBy('amount') - this.partnershipExpenses.sumBy('amount')) +
-                (this.trustsIncomes.sumBy('amount') - this.trustsExpenses.sumBy('amount'));
-            this.partnershipsNetIncome = this.partnershipIncomes.sumBy('amount') -
-                this.partnershipExpenses.sumBy('amount');
-            this.trustsNetIncome = this.trustsIncomes.sumBy('amount') - this.trustsExpenses.sumBy('amount');
-            this.partnershipsSmallBusinessNetIncome = this.partnershipIncomes.sumBy('amount') -
-                this.partnershipExpenses.sumBy('amount');
-            this.trustsSmallBusinessNetIncome = this.trustsIncomes.sumBy('amount') -
-                this.trustsExpenses.sumBy('amount');
-            this.taxPaidTotal = this.transactions
+            this.partnershipsIncomeTotalAmount = this.partnershipsIncomes.sumBy('amount');
+            this.partnershipsExpenseTotalAmount = this.partnershipsExpenses.sumBy('amount');
+            this.trustsIncomeTotalAmount = this.trustsIncomes.sumBy('amount');
+            this.trustsExpenseTotalAmount = this.trustsExpenses.sumBy('amount');
+            this.partnershipsNetNonPrimaryProductionAmount = this.partnershipsIncomeTotalAmount - this.partnershipsExpenseTotalAmount;
+            this.trustsNetNonPrimaryProductionAmount = this.trustsIncomeTotalAmount - this.trustsExpenseTotalAmount;
+            this.frankingCreditsTotal = this.transactions
                 .filterBy('chartAccounts.heading.id', exports.ChartAccountsHeadingTaxableEnum.PARTNERSHIPS_AND_TRUSTS_INCOME)
-                .sumBy('tax');
+                .getTransactionsMetadata()
+                .filterBy('chartAccountsMetadata.id', exports.ChartAccountsMetadataListEnum.FRANKING_CREDIT)
+                .sumBy('value');
+            this.trustsIncomeTotalTax = this.trustsIncomes.sumBy('tax');
             this.frankingCreditsTotal = this.transactions
                 .filterBy('chartAccounts.heading.id', exports.ChartAccountsHeadingTaxableEnum.PARTNERSHIPS_AND_TRUSTS_INCOME)
                 .getTransactionsMetadata()
@@ -12041,22 +12145,6 @@
                 .sumBy('value');
             this.taxOffsetNRASTotalAmount = this.transactions.filterBy('chartAccounts.id', exports.ChartAccountsListEnum.TAX_OFFSETS_N_R_A_S).sumBy('amount');
         }
-        /**
-         * Get Income source forecast trust type, related to trust income with max amount
-         */
-        MyTaxPartnershipsAndTrusts.prototype.getTrustType = function () {
-            var filteredTrustIncomes = this.trustsIncomes
-                .filterBy('incomeSource.id', this.incomeSources
-                .removeBy('actualForecast.trustType', null)
-                .getIds());
-            if (!filteredTrustIncomes.length) {
-                return null;
-            }
-            return this.incomeSources
-                .findBy('id', filteredTrustIncomes.maxBy('amount').incomeSource.id)
-                .actualForecast
-                .trustType;
-        };
         return MyTaxPartnershipsAndTrusts;
     }());
 
@@ -12522,23 +12610,6 @@
         TaxSummaryTypeEnum["FORECASTS"] = "forecasts";
     })(exports.TaxSummaryTypeEnum || (exports.TaxSummaryTypeEnum = {}));
 
-    /**
-     * Enum with income amount types (Net or Gross)
-     */
-    exports.IncomeAmountTypeEnum = void 0;
-    (function (IncomeAmountTypeEnum) {
-        IncomeAmountTypeEnum[IncomeAmountTypeEnum["NET"] = 0] = "NET";
-        IncomeAmountTypeEnum[IncomeAmountTypeEnum["GROSS"] = 1] = "GROSS";
-    })(exports.IncomeAmountTypeEnum || (exports.IncomeAmountTypeEnum = {}));
-
-    exports.TransactionCategoryEnum = void 0;
-    (function (TransactionCategoryEnum) {
-        TransactionCategoryEnum[TransactionCategoryEnum["PROPERTY"] = 0] = "PROPERTY";
-        TransactionCategoryEnum[TransactionCategoryEnum["WORK"] = 1] = "WORK";
-        TransactionCategoryEnum[TransactionCategoryEnum["SOLE"] = 2] = "SOLE";
-        TransactionCategoryEnum[TransactionCategoryEnum["PERSONAL"] = 3] = "PERSONAL";
-    })(exports.TransactionCategoryEnum || (exports.TransactionCategoryEnum = {}));
-
     var MyAccountHistory = /** @class */ (function () {
         function MyAccountHistory() {
         }
@@ -12689,9 +12760,9 @@
         };
         return AddressService;
     }());
-    AddressService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: AddressService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    AddressService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: AddressService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: AddressService, decorators: [{
+    AddressService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: AddressService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    AddressService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: AddressService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: AddressService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -12806,9 +12877,9 @@
         };
         return BankAccountService;
     }(RestService$1));
-    BankAccountService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BankAccountService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    BankAccountService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BankAccountService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BankAccountService, decorators: [{
+    BankAccountService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BankAccountService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    BankAccountService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BankAccountService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BankAccountService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -12894,9 +12965,9 @@
         };
         return BankTransactionService;
     }(RestService$1));
-    BankTransactionService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BankTransactionService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    BankTransactionService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BankTransactionService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BankTransactionService, decorators: [{
+    BankTransactionService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BankTransactionService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    BankTransactionService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BankTransactionService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BankTransactionService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -12904,34 +12975,269 @@
             }] });
 
     /**
-     * Service that handling banks logic
+     * Abstract base service that implements common services functionality
+     * and describe abstract methods/properties that have to be implemented in child services
+     * Model - entity service is working with
+     * BaseModel - base entity model that extends by Model
+     * CollectionModel - entity collection class
      */
-    var BankService = /** @class */ (function (_super) {
-        __extends(BankService, _super);
-        function BankService() {
-            var _this = _super.apply(this, __spreadArray([], __read(arguments))) || this;
-            _this.modelClass = Bank;
-            _this.url = 'banks';
-            _this.isHydra = true;
-            return _this;
+    var RestService = /** @class */ (function () {
+        function RestService(http, eventDispatcherService, environment) {
+            this.http = http;
+            this.eventDispatcherService = eventDispatcherService;
+            this.environment = environment;
+            /**
+             * Subject for service cache
+             */
+            this.cacheSubject = new rxjs.ReplaySubject(1);
+            /**
+             * List of methods unavailable for current API
+             */
+            this.disabledMethods = [];
+            this.listenEvents();
         }
-        BankService.prototype.get = function () {
-            return _super.prototype.get.call(this).pipe(operators.map(function (banks) {
-                // exclude basiq banks without login fields (basiq may return broken banks without loginFields)
-                return banks.filter(function (bank) { return bank.isManual || (bank.externalId && bank.loginFields); });
-            }));
-        };
-        return BankService;
-    }(RestService$1));
-    BankService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BankService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    BankService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BankService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BankService, decorators: [{
-                type: i0.Injectable,
-                args: [{
-                        providedIn: 'root'
-                    }]
-            }] });
-
+        Object.defineProperty(RestService.prototype, "apiUrl", {
+            get: function () {
+                return this.environment.apiV2 + "/" + this.entityUrl;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        RestService.prototype.get = function () {
+            this.handleAccessError('get');
+            // Set cache as empty collection to avoid multiple requests before cache filled
+            if (!this.cache) {
+                this.cache = this.createCollectionInstance(this.collectionClass, []);
+                this.resetCache();
+            }
+            return this.cacheSubject.asObservable();
+        };
+        ;
+        RestService.prototype.getSingle = function () {
+            this.handleAccessError('get');
+            return this.get().pipe(operators.map(function (collection) { return collection.first; }));
+        };
+        /**
+         * Create a new Model instance in database
+         */
+        RestService.prototype.post = function (model) {
+            var _this = this;
+            this.handleAccessError('post');
+            return this.http.post(this.apiUrl, model)
+                .pipe(operators.map(function (response) {
+                var result = _this.createModelInstance(_this.modelClass, response);
+                _this.handleResponse([result], 'post');
+                return result;
+            }));
+        };
+        /**
+         * Create multiple new Model instances in database
+         */
+        RestService.prototype.postBatch = function (models) {
+            var _this = this;
+            this.handleAccessError('postBatch');
+            return this.http.post(this.apiUrl, models)
+                .pipe(operators.map(function (response) {
+                var result = response.map(function (item) { return _this.createModelInstance(_this.modelClass, item); });
+                _this.handleResponse(result, 'post');
+                return result;
+            }));
+        };
+        /**
+         * Change an existing Model instance in database
+         */
+        RestService.prototype.put = function (model) {
+            var _this = this;
+            this.handleAccessError('put');
+            return this.http.put(this.apiUrl + "/" + model.id, model)
+                .pipe(operators.map(function (response) {
+                var result = _this.createModelInstance(_this.modelClass, response);
+                _this.handleResponse([result], 'put');
+                return result;
+            }));
+        };
+        /**
+         * Change multiple existing Model instances in database
+         */
+        RestService.prototype.putBatch = function (models) {
+            var _this = this;
+            this.handleAccessError('putBatch');
+            return this.http.put(this.apiUrl, models)
+                .pipe(operators.map(function (response) {
+                var result = response.map(function (item) { return _this.createModelInstance(_this.modelClass, item); });
+                _this.handleResponse(result, 'put');
+                return result;
+            }));
+        };
+        /**
+         * Remove a Model instance from database
+         */
+        RestService.prototype.delete = function (model) {
+            var _this = this;
+            this.handleAccessError('delete');
+            return this.http.delete(this.apiUrl + "/" + model.id)
+                .pipe(operators.map(function () {
+                _this.handleResponse([model], 'delete');
+            }));
+        };
+        /**
+         * Remove multiple Model instances from database
+         */
+        RestService.prototype.deleteBatch = function (models) {
+            var _this = this;
+            this.handleAccessError('deleteBatch');
+            return this.http.post(this.apiUrl + "/delete", models)
+                .pipe(operators.map(function () {
+                _this.handleResponse(models, 'delete');
+            }));
+        };
+        /**
+         * Refresh cache with actual backend data
+         */
+        RestService.prototype.resetCache = function () {
+            this.fetch()
+                .pipe(operators.first())
+                .subscribe();
+        };
+        /**
+         * Get data from backend and fill the cache
+         */
+        RestService.prototype.fetch = function () {
+            var _this = this;
+            return this.http.get(this.apiUrl)
+                .pipe(operators.map(function (response) { return _this.isApiPlatform ? response['hydra:member'] : toArray(response); }), operators.map(function (response) {
+                var items = response.map(function (item) { return _this.createModelInstance(_this.modelClass, item); });
+                _this.cache = _this.createCollectionInstance(_this.collectionClass, items);
+                _this.cacheSubject.next(_this.cache);
+                return _this.cache;
+            }));
+        };
+        ;
+        /**
+         * Handle response data - update cache and dispatch event if it is needed
+         */
+        RestService.prototype.handleResponse = function (response, method) {
+            this.updateCache(response, method);
+            // dispatch event for interested services
+            if (response[0] instanceof ObservableModel) {
+                this.dispatchEvent(method, response);
+            }
+        };
+        /**
+         * Update cache with passed items. Add/Update detects automatically, Delete via optional flag
+         */
+        RestService.prototype.updateCache = function (items, method) {
+            var _a;
+            var _this = this;
+            switch (method) {
+                case 'post':
+                    this.cache = (_a = this.cache).push.apply(_a, __spreadArray([], __read(items)));
+                    break;
+                case 'put':
+                    items.forEach(function (item) {
+                        _this.cache = _this.cache.replaceBy('id', item.id, item);
+                    });
+                    break;
+                case 'delete':
+                    this.cache = this.cache.removeBy('id', items.map(function (item) { return item.id; }));
+            }
+            this.cacheSubject.next(this.cache);
+        };
+        /**
+         * Generate and dispatch rest event
+         */
+        RestService.prototype.dispatchEvent = function (method, items) {
+            var eventName = this.modelClass.getEventName(method);
+            this.eventDispatcherService.dispatch2(new AppEvent2(eventName, items));
+        };
+        /**
+         * Create new instance of class
+         * @param model The class whose instance to be created
+         * @param plain Single object or array from which will be created model instance(s)
+         */
+        RestService.prototype.createModelInstance = function (model, plain) {
+            // excludePrefixes - class-transformer option is using to ignore hydra fields
+            return classTransformer.plainToClass(model, plain, { excludePrefixes: ['@'] });
+        };
+        RestService.prototype.createCollectionInstance = function (collectionClass, items) {
+            return new collectionClass(items);
+        };
+        /**
+         * Check if method is not disabled. Throw exception otherwise.
+         * Some entities does not have endpoints for all methods.
+         */
+        RestService.prototype.handleAccessError = function (method) {
+            if (!this.disabledMethods.includes(method)) {
+                return;
+            }
+            throw new Error("Method " + method + "() is not allowed for " + this.constructor.name);
+        };
+        /**
+         * Subscribe to http events and run callback
+         * @param type The class whose changes should be listened for
+         * @param methods The list of http methods should be listened for
+         * @param callback The function to be called when event triggered
+         */
+        RestService.prototype.listenCSE = function (modelClass, methods, callback) {
+            var _this = this;
+            methods.forEach(function (method) {
+                _this.eventDispatcherService.on2(modelClass.getEventName(method)).subscribe(function (data) {
+                    callback(data);
+                });
+            });
+        };
+        /**
+         * Method that call all listeners. Empty by default. Should be redefined by child services if required
+         */
+        RestService.prototype.listenEvents = function () { };
+        return RestService;
+    }());
+    RestService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: RestService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    RestService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: RestService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: RestService, decorators: [{
+                type: i0.Injectable,
+                args: [{
+                        providedIn: 'root'
+                    }]
+            }], ctorParameters: function () {
+            return [{ type: i1__namespace.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
+                            type: i0.Inject,
+                            args: ['environment']
+                        }] }];
+        } });
+
+    /**
+     * Service that handling banks logic
+     */
+    var BankService = /** @class */ (function (_super) {
+        __extends(BankService, _super);
+        function BankService() {
+            var _this = _super.apply(this, __spreadArray([], __read(arguments))) || this;
+            _this.modelClass = Bank;
+            _this.collectionClass = Collection;
+            _this.entityUrl = 'banks';
+            _this.isApiPlatform = true;
+            _this.disabledMethods = ['post', 'postBatch', 'put', 'putBatch', 'delete', 'deleteBatch'];
+            return _this;
+        }
+        BankService.prototype.get = function () {
+            return _super.prototype.get.call(this)
+                .pipe(operators.map(function (banks) {
+                // exclude basiq banks without login fields (basiq may return broken banks without loginFields)
+                return banks.filter(function (bank) { return bank.isManual || (!!bank.externalId && !!bank.loginFields); });
+            }));
+        };
+        return BankService;
+    }(RestService));
+    BankService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BankService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    BankService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BankService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BankService, decorators: [{
+                type: i0.Injectable,
+                args: [{
+                        providedIn: 'root'
+                    }]
+            }] });
+
     /**
      * Service to work with depreciation chart accounts
      */
@@ -12958,9 +13264,9 @@
         };
         return ChartAccountsDepreciationService;
     }(RestService$1));
-    ChartAccountsDepreciationService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ChartAccountsDepreciationService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    ChartAccountsDepreciationService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ChartAccountsDepreciationService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ChartAccountsDepreciationService, decorators: [{
+    ChartAccountsDepreciationService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ChartAccountsDepreciationService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    ChartAccountsDepreciationService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ChartAccountsDepreciationService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ChartAccountsDepreciationService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -13003,13 +13309,12 @@
         };
         /**
          * Get list of chart accounts heading
-         * @param categories
          */
-        ChartAccountsService.prototype.getChartAccountsHeadings = function (categories) {
+        ChartAccountsService.prototype.getChartAccountsHeadings = function (categories, chartAccountsIds) {
             if (categories === void 0) { categories = CHART_ACCOUNTS_CATEGORIES.all; }
             return this.getChartAccounts()
                 .pipe(operators.map(function (chartAccounts) {
-                var filteredChartAccounts = chartAccounts.filter(function (ca) { return categories.includes(ca.category); });
+                var filteredChartAccounts = chartAccounts.filter(function (ca) { return categories.includes(ca.category) && (!chartAccountsIds || chartAccountsIds.includes(ca.id)); });
                 var headings = [];
                 filteredChartAccounts.forEach(function (ca) {
                     var heading = headings.find(function (h) { var _a; return h.id === ((_a = ca.heading) === null || _a === void 0 ? void 0 : _a.id); });
@@ -13045,9 +13350,9 @@
         };
         return ChartAccountsService;
     }());
-    ChartAccountsService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ChartAccountsService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    ChartAccountsService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ChartAccountsService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ChartAccountsService, decorators: [{
+    ChartAccountsService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ChartAccountsService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    ChartAccountsService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ChartAccountsService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ChartAccountsService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -13099,9 +13404,9 @@
         };
         return MessageService;
     }(RestService$1));
-    MessageService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: MessageService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }, { token: SseService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    MessageService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: MessageService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: MessageService, decorators: [{
+    MessageService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: MessageService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }, { token: SseService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    MessageService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: MessageService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: MessageService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -13215,9 +13520,9 @@
         };
         return MessageDocumentService;
     }());
-    MessageDocumentService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: MessageDocumentService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    MessageDocumentService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: MessageDocumentService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: MessageDocumentService, decorators: [{
+    MessageDocumentService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: MessageDocumentService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    MessageDocumentService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: MessageDocumentService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: MessageDocumentService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -13298,9 +13603,9 @@
         };
         return ChatService;
     }(RestService$1));
-    ChatService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ChatService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }, { token: SseService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    ChatService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ChatService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ChatService, decorators: [{
+    ChatService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ChatService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }, { token: SseService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    ChatService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ChatService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ChatService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -13373,9 +13678,9 @@
         };
         return ReceiptService;
     }());
-    ReceiptService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ReceiptService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    ReceiptService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ReceiptService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ReceiptService, decorators: [{
+    ReceiptService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ReceiptService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    ReceiptService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ReceiptService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ReceiptService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -13409,9 +13714,9 @@
         }
         return DepreciationReceiptService;
     }(ReceiptService));
-    DepreciationReceiptService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: DepreciationReceiptService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    DepreciationReceiptService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: DepreciationReceiptService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: DepreciationReceiptService, decorators: [{
+    DepreciationReceiptService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: DepreciationReceiptService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    DepreciationReceiptService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: DepreciationReceiptService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: DepreciationReceiptService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -13577,9 +13882,9 @@
         };
         return DepreciationService;
     }(RestService$1));
-    DepreciationService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: DepreciationService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }, { token: DepreciationReceiptService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    DepreciationService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: DepreciationService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: DepreciationService, decorators: [{
+    DepreciationService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: DepreciationService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }, { token: DepreciationReceiptService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    DepreciationService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: DepreciationService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: DepreciationService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -13638,9 +13943,9 @@
         };
         return DepreciationCapitalProjectService;
     }());
-    DepreciationCapitalProjectService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: DepreciationCapitalProjectService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    DepreciationCapitalProjectService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: DepreciationCapitalProjectService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: DepreciationCapitalProjectService, decorators: [{
+    DepreciationCapitalProjectService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: DepreciationCapitalProjectService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    DepreciationCapitalProjectService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: DepreciationCapitalProjectService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: DepreciationCapitalProjectService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -13662,9 +13967,9 @@
         }
         return DocumentService;
     }(RestService$1));
-    DocumentService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: DocumentService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    DocumentService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: DocumentService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: DocumentService, decorators: [{
+    DocumentService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: DocumentService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    DocumentService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: DocumentService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: DocumentService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -13736,9 +14041,9 @@
         };
         return DocumentFolderService;
     }(RestService$1));
-    DocumentFolderService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: DocumentFolderService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    DocumentFolderService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: DocumentFolderService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: DocumentFolderService, decorators: [{
+    DocumentFolderService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: DocumentFolderService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    DocumentFolderService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: DocumentFolderService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: DocumentFolderService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -13827,9 +14132,9 @@
         auth_type: 'rerequest',
         return_scopes: true
     };
-    FacebookService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: FacebookService, deps: [{ token: i1__namespace.HttpClient }, { token: ToastService }, { token: JwtService }, { token: i1__namespace$1.Router }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    FacebookService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: FacebookService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: FacebookService, decorators: [{
+    FacebookService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: FacebookService, deps: [{ token: i1__namespace.HttpClient }, { token: ToastService }, { token: JwtService }, { token: i1__namespace$1.Router }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    FacebookService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: FacebookService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: FacebookService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -13877,9 +14182,9 @@
         };
         return ClientIncomeTypesService;
     }());
-    ClientIncomeTypesService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ClientIncomeTypesService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    ClientIncomeTypesService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ClientIncomeTypesService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ClientIncomeTypesService, decorators: [{
+    ClientIncomeTypesService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ClientIncomeTypesService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    ClientIncomeTypesService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ClientIncomeTypesService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ClientIncomeTypesService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -14008,9 +14313,9 @@
         };
         return ClientInviteService;
     }(RestService$1));
-    ClientInviteService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ClientInviteService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    ClientInviteService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ClientInviteService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ClientInviteService, decorators: [{
+    ClientInviteService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ClientInviteService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    ClientInviteService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ClientInviteService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ClientInviteService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -14097,9 +14402,9 @@
         };
         return ClientMovementService;
     }(RestService$1));
-    ClientMovementService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ClientMovementService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    ClientMovementService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ClientMovementService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ClientMovementService, decorators: [{
+    ClientMovementService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ClientMovementService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    ClientMovementService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ClientMovementService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ClientMovementService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -14132,9 +14437,9 @@
         };
         return EmployeeService;
     }(RestService$1));
-    EmployeeService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: EmployeeService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    EmployeeService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: EmployeeService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: EmployeeService, decorators: [{
+    EmployeeService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: EmployeeService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    EmployeeService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: EmployeeService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: EmployeeService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -14181,9 +14486,9 @@
         };
         return EmployeeInviteService;
     }(RestService$1));
-    EmployeeInviteService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: EmployeeInviteService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    EmployeeInviteService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: EmployeeInviteService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: EmployeeInviteService, decorators: [{
+    EmployeeInviteService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: EmployeeInviteService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    EmployeeInviteService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: EmployeeInviteService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: EmployeeInviteService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -14209,9 +14514,9 @@
         };
         return ClientPortfolioReportService;
     }());
-    ClientPortfolioReportService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ClientPortfolioReportService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    ClientPortfolioReportService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ClientPortfolioReportService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ClientPortfolioReportService, decorators: [{
+    ClientPortfolioReportService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ClientPortfolioReportService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    ClientPortfolioReportService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ClientPortfolioReportService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ClientPortfolioReportService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -14287,9 +14592,9 @@
         };
         return FirmService;
     }());
-    FirmService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: FirmService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    FirmService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: FirmService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: FirmService, decorators: [{
+    FirmService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: FirmService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    FirmService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: FirmService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: FirmService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -14369,9 +14674,9 @@
         };
         return IncomeSourceForecastService;
     }(RestService$1));
-    IncomeSourceForecastService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: IncomeSourceForecastService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    IncomeSourceForecastService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: IncomeSourceForecastService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: IncomeSourceForecastService, decorators: [{
+    IncomeSourceForecastService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: IncomeSourceForecastService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    IncomeSourceForecastService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: IncomeSourceForecastService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: IncomeSourceForecastService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -14446,9 +14751,9 @@
         };
         return SalaryForecastService;
     }(RestService$1));
-    SalaryForecastService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SalaryForecastService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    SalaryForecastService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SalaryForecastService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SalaryForecastService, decorators: [{
+    SalaryForecastService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: SalaryForecastService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    SalaryForecastService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: SalaryForecastService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: SalaryForecastService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -14530,9 +14835,9 @@
         };
         return SoleForecastService;
     }(RestService$1));
-    SoleForecastService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SoleForecastService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    SoleForecastService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SoleForecastService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SoleForecastService, decorators: [{
+    SoleForecastService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: SoleForecastService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    SoleForecastService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: SoleForecastService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: SoleForecastService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -14640,9 +14945,9 @@
         };
         return IncomeSourceService;
     }(RestService$1));
-    IncomeSourceService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: IncomeSourceService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    IncomeSourceService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: IncomeSourceService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: IncomeSourceService, decorators: [{
+    IncomeSourceService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: IncomeSourceService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    IncomeSourceService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: IncomeSourceService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: IncomeSourceService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -14704,9 +15009,9 @@
         };
         return BorrowingExpenseService;
     }());
-    BorrowingExpenseService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BorrowingExpenseService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    BorrowingExpenseService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BorrowingExpenseService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BorrowingExpenseService, decorators: [{
+    BorrowingExpenseService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BorrowingExpenseService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    BorrowingExpenseService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BorrowingExpenseService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BorrowingExpenseService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -14844,9 +15149,9 @@
         };
         return LoanService;
     }(RestService$1));
-    LoanService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: LoanService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    LoanService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: LoanService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: LoanService, decorators: [{
+    LoanService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: LoanService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    LoanService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: LoanService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: LoanService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -14866,9 +15171,9 @@
         }
         return PropertyCategoryService;
     }(RestService$1));
-    PropertyCategoryService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyCategoryService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    PropertyCategoryService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyCategoryService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyCategoryService, decorators: [{
+    PropertyCategoryService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PropertyCategoryService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    PropertyCategoryService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PropertyCategoryService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PropertyCategoryService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -14912,9 +15217,9 @@
         };
         return PropertyCategoryMovementService;
     }(RestService$1));
-    PropertyCategoryMovementService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyCategoryMovementService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    PropertyCategoryMovementService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyCategoryMovementService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyCategoryMovementService, decorators: [{
+    PropertyCategoryMovementService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PropertyCategoryMovementService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    PropertyCategoryMovementService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PropertyCategoryMovementService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PropertyCategoryMovementService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -14971,9 +15276,9 @@
         };
         return PropertyDocumentService;
     }(RestService$1));
-    PropertyDocumentService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyDocumentService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    PropertyDocumentService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyDocumentService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyDocumentService, decorators: [{
+    PropertyDocumentService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PropertyDocumentService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    PropertyDocumentService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PropertyDocumentService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PropertyDocumentService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -14991,9 +15296,9 @@
         }
         return TaxExemptionService;
     }(RestService$1));
-    TaxExemptionService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TaxExemptionService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    TaxExemptionService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TaxExemptionService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TaxExemptionService, decorators: [{
+    TaxExemptionService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TaxExemptionService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    TaxExemptionService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TaxExemptionService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TaxExemptionService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -15029,9 +15334,9 @@
         };
         return PropertySaleService;
     }(RestService$1));
-    PropertySaleService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertySaleService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    PropertySaleService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertySaleService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertySaleService, decorators: [{
+    PropertySaleService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PropertySaleService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    PropertySaleService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PropertySaleService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PropertySaleService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -15086,315 +15391,83 @@
                     var _a;
                     if (((_a = propertyShare.user) === null || _a === void 0 ? void 0 : _a.isLoggedIn()) && propertyShare.isPending() && propertyShare.property.user.id !== +localStorage.getItem('userId')) {
                         propertySharesIncoming.push(propertyShare);
-                    }
-                });
-                return propertySharesIncoming;
-            }));
-        };
-        /**
-         * Get outcoming property shares list
-         */
-        PropertyShareService.prototype.getOutcoming = function () {
-            var _this = this;
-            return this.get().pipe(operators.map(function (propertyShares) {
-                return _this.filterOutcoming(propertyShares);
-            }));
-        };
-        /**
-         * Filter outcoming property shares
-         */
-        PropertyShareService.prototype.filterOutcoming = function (propertyShares) {
-            var propertySharesOutcoming = [];
-            propertyShares.forEach(function (propertyShare) {
-                var _a;
-                if (!((_a = propertyShare.user) === null || _a === void 0 ? void 0 : _a.isLoggedIn())) {
-                    propertySharesOutcoming.push(propertyShare);
-                }
-            });
-            return propertySharesOutcoming;
-        };
-        PropertyShareService.prototype.getByPropertyId = function (propertyId) {
-            return this.get()
-                .pipe(operators.map(function (propertyShares) {
-                return propertyShares.filter(function (propertyShare) { return propertyShare.property.id === propertyId; });
-            }));
-        };
-        /**
-         * Listen to User updated event
-         */
-        PropertyShareService.prototype.listenUserUpdated = function () {
-            var _this = this;
-            this.eventDispatcherService.on(exports.AppEventTypeEnum.USER_UPDATED)
-                .subscribe(function () {
-                _this.fetch().subscribe(function (propertyShares) {
-                    _this.cache = propertyShares;
-                    _this.updateCache();
-                });
-            });
-        };
-        /**
-         * @Todo Alex refactor after PropertyShare functionality in PropertyService will be cleared up
-         */
-        PropertyShareService.prototype.listenSalesAdded = function () {
-            var _this = this;
-            this.eventDispatcherService.on(exports.AppEventTypeEnum.PROPERTY_SALE_ADDED).subscribe(function (propertySale) {
-                var shareToReplace = _this.find(propertySale.share.id);
-                shareToReplace.sale = classTransformer.plainToClass(PropertySale, { id: propertySale.id });
-                replace(_this.cache, shareToReplace);
-                _this.updateCache();
-            });
-        };
-        PropertyShareService.prototype.listenSalesDeleted = function () {
-            var _this = this;
-            this.eventDispatcherService.on(exports.AppEventTypeEnum.PROPERTY_SALE_DELETED).subscribe(function (propertySale) {
-                var shareToReplace = _this.find(propertySale.share.id);
-                shareToReplace.sale = null;
-                replace(_this.cache, shareToReplace);
-                _this.updateCache();
-            });
-        };
-        return PropertyShareService;
-    }(RestService$1));
-    PropertyShareService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyShareService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    PropertyShareService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyShareService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyShareService, decorators: [{
-                type: i0.Injectable,
-                args: [{
-                        providedIn: 'root'
-                    }]
-            }] });
-
-    /**
-     * Abstract base service that implements common services functionality
-     * and describe abstract methods/properties that have to be implemented in child services
-     * Model - entity service is working with
-     * BaseModel - base entity model that extends by Model
-     * CollectionModel - entity collection class
-     */
-    var RestService = /** @class */ (function () {
-        function RestService(http, eventDispatcherService, environment) {
-            this.http = http;
-            this.eventDispatcherService = eventDispatcherService;
-            this.environment = environment;
-            /**
-             * Subject for service cache
-             */
-            this.cacheSubject = new rxjs.ReplaySubject(1);
-            /**
-             * List of methods unavailable for current API
-             */
-            this.disabledMethods = [];
-            this.listenEvents();
-        }
-        Object.defineProperty(RestService.prototype, "apiUrl", {
-            get: function () {
-                return this.environment.apiV2 + "/" + this.entityUrl;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        RestService.prototype.get = function () {
-            this.handleAccessError('get');
-            // Set cache as empty collection to avoid multiple requests before cache filled
-            if (!this.cache) {
-                this.cache = this.createCollectionInstance(this.collectionClass, []);
-                this.resetCache();
-            }
-            return this.cacheSubject.asObservable();
-        };
-        ;
-        RestService.prototype.getSingle = function () {
-            this.handleAccessError('get');
-            return this.get().pipe(operators.map(function (collection) { return collection.first; }));
-        };
-        /**
-         * Create a new Model instance in database
-         */
-        RestService.prototype.post = function (model) {
-            var _this = this;
-            this.handleAccessError('post');
-            return this.http.post(this.apiUrl, model)
-                .pipe(operators.map(function (response) {
-                var result = _this.createModelInstance(_this.modelClass, response);
-                _this.handleResponse([result], 'post');
-                return result;
-            }));
-        };
-        /**
-         * Create multiple new Model instances in database
-         */
-        RestService.prototype.postBatch = function (models) {
-            var _this = this;
-            this.handleAccessError('postBatch');
-            return this.http.post(this.apiUrl, models)
-                .pipe(operators.map(function (response) {
-                var result = response.map(function (item) { return _this.createModelInstance(_this.modelClass, item); });
-                _this.handleResponse(result, 'post');
-                return result;
-            }));
-        };
-        /**
-         * Change an existing Model instance in database
-         */
-        RestService.prototype.put = function (model) {
-            var _this = this;
-            this.handleAccessError('put');
-            return this.http.put(this.apiUrl + "/" + model.id, model)
-                .pipe(operators.map(function (response) {
-                var result = _this.createModelInstance(_this.modelClass, response);
-                _this.handleResponse([result], 'put');
-                return result;
-            }));
-        };
-        /**
-         * Change multiple existing Model instances in database
-         */
-        RestService.prototype.putBatch = function (models) {
-            var _this = this;
-            this.handleAccessError('putBatch');
-            return this.http.put(this.apiUrl, models)
-                .pipe(operators.map(function (response) {
-                var result = response.map(function (item) { return _this.createModelInstance(_this.modelClass, item); });
-                _this.handleResponse(result, 'put');
-                return result;
-            }));
-        };
-        /**
-         * Remove a Model instance from database
-         */
-        RestService.prototype.delete = function (model) {
-            var _this = this;
-            this.handleAccessError('delete');
-            return this.http.delete(this.apiUrl + "/" + model.id)
-                .pipe(operators.map(function () {
-                _this.handleResponse([model], 'delete');
-            }));
-        };
-        /**
-         * Remove multiple Model instances from database
-         */
-        RestService.prototype.deleteBatch = function (models) {
-            var _this = this;
-            this.handleAccessError('deleteBatch');
-            return this.http.post(this.apiUrl + "/delete", models)
-                .pipe(operators.map(function () {
-                _this.handleResponse(models, 'delete');
-            }));
-        };
-        /**
-         * Refresh cache with actual backend data
-         */
-        RestService.prototype.resetCache = function () {
-            this.fetch()
-                .pipe(operators.first())
-                .subscribe();
-        };
-        /**
-         * Get data from backend and fill the cache
-         */
-        RestService.prototype.fetch = function () {
-            var _this = this;
-            return this.http.get(this.apiUrl)
-                .pipe(operators.map(function (response) { return _this.isApiPlatform ? response['hydra:member'] : toArray(response); }), operators.map(function (response) {
-                var items = response.map(function (item) { return _this.createModelInstance(_this.modelClass, item); });
-                _this.cache = _this.createCollectionInstance(_this.collectionClass, items);
-                _this.cacheSubject.next(_this.cache);
-                return _this.cache;
-            }));
-        };
-        ;
-        /**
-         * Handle response data - update cache and dispatch event if it is needed
-         */
-        RestService.prototype.handleResponse = function (response, method) {
-            this.updateCache(response, method);
-            // dispatch event for interested services
-            if (response[0] instanceof ObservableModel) {
-                this.dispatchEvent(method, response);
-            }
-        };
-        /**
-         * Update cache with passed items. Add/Update detects automatically, Delete via optional flag
-         */
-        RestService.prototype.updateCache = function (items, method) {
-            var _a;
-            var _this = this;
-            switch (method) {
-                case 'post':
-                    this.cache = (_a = this.cache).push.apply(_a, __spreadArray([], __read(items)));
-                    break;
-                case 'put':
-                    items.forEach(function (item) {
-                        _this.cache = _this.cache.replaceBy('id', item.id, item);
-                    });
-                    break;
-                case 'delete':
-                    this.cache = this.cache.removeBy('id', items.map(function (item) { return item.id; }));
-            }
-            this.cacheSubject.next(this.cache);
-        };
-        /**
-         * Generate and dispatch rest event
-         */
-        RestService.prototype.dispatchEvent = function (method, items) {
-            var eventName = this.modelClass.getEventName(method);
-            this.eventDispatcherService.dispatch2(new AppEvent2(eventName, items));
-        };
-        /**
-         * Create new instance of class
-         * @param model The class whose instance to be created
-         * @param plain Single object or array from which will be created model instance(s)
-         */
-        RestService.prototype.createModelInstance = function (model, plain) {
-            // excludePrefixes - class-transformer option is using to ignore hydra fields
-            return classTransformer.plainToClass(model, plain, { excludePrefixes: ['@'] });
+                    }
+                });
+                return propertySharesIncoming;
+            }));
         };
-        RestService.prototype.createCollectionInstance = function (collectionClass, items) {
-            return new collectionClass(items);
+        /**
+         * Get outcoming property shares list
+         */
+        PropertyShareService.prototype.getOutcoming = function () {
+            var _this = this;
+            return this.get().pipe(operators.map(function (propertyShares) {
+                return _this.filterOutcoming(propertyShares);
+            }));
         };
         /**
-         * Check if method is not disabled. Throw exception otherwise.
-         * Some entities does not have endpoints for all methods.
+         * Filter outcoming property shares
          */
-        RestService.prototype.handleAccessError = function (method) {
-            if (!this.disabledMethods.includes(method)) {
-                return;
-            }
-            throw new Error("Method " + method + "() is not allowed for " + this.constructor.name);
+        PropertyShareService.prototype.filterOutcoming = function (propertyShares) {
+            var propertySharesOutcoming = [];
+            propertyShares.forEach(function (propertyShare) {
+                var _a;
+                if (!((_a = propertyShare.user) === null || _a === void 0 ? void 0 : _a.isLoggedIn())) {
+                    propertySharesOutcoming.push(propertyShare);
+                }
+            });
+            return propertySharesOutcoming;
+        };
+        PropertyShareService.prototype.getByPropertyId = function (propertyId) {
+            return this.get()
+                .pipe(operators.map(function (propertyShares) {
+                return propertyShares.filter(function (propertyShare) { return propertyShare.property.id === propertyId; });
+            }));
         };
         /**
-         * Subscribe to http events and run callback
-         * @param type The class whose changes should be listened for
-         * @param methods The list of http methods should be listened for
-         * @param callback The function to be called when event triggered
+         * Listen to User updated event
          */
-        RestService.prototype.listenCSE = function (modelClass, methods, callback) {
+        PropertyShareService.prototype.listenUserUpdated = function () {
             var _this = this;
-            methods.forEach(function (method) {
-                _this.eventDispatcherService.on2(modelClass.getEventName(method)).subscribe(function (data) {
-                    callback(data);
+            this.eventDispatcherService.on(exports.AppEventTypeEnum.USER_UPDATED)
+                .subscribe(function () {
+                _this.fetch().subscribe(function (propertyShares) {
+                    _this.cache = propertyShares;
+                    _this.updateCache();
                 });
             });
         };
         /**
-         * Method that call all listeners. Empty by default. Should be redefined by child services if required
+         * @Todo Alex refactor after PropertyShare functionality in PropertyService will be cleared up
          */
-        RestService.prototype.listenEvents = function () { };
-        return RestService;
-    }());
-    RestService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: RestService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    RestService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: RestService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: RestService, decorators: [{
+        PropertyShareService.prototype.listenSalesAdded = function () {
+            var _this = this;
+            this.eventDispatcherService.on(exports.AppEventTypeEnum.PROPERTY_SALE_ADDED).subscribe(function (propertySale) {
+                var shareToReplace = _this.find(propertySale.share.id);
+                shareToReplace.sale = classTransformer.plainToClass(PropertySale, { id: propertySale.id });
+                replace(_this.cache, shareToReplace);
+                _this.updateCache();
+            });
+        };
+        PropertyShareService.prototype.listenSalesDeleted = function () {
+            var _this = this;
+            this.eventDispatcherService.on(exports.AppEventTypeEnum.PROPERTY_SALE_DELETED).subscribe(function (propertySale) {
+                var shareToReplace = _this.find(propertySale.share.id);
+                shareToReplace.sale = null;
+                replace(_this.cache, shareToReplace);
+                _this.updateCache();
+            });
+        };
+        return PropertyShareService;
+    }(RestService$1));
+    PropertyShareService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PropertyShareService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    PropertyShareService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PropertyShareService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PropertyShareService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
                     }]
-            }], ctorParameters: function () {
-            return [{ type: i1__namespace.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
-                            type: i0.Inject,
-                            args: ['environment']
-                        }] }];
-        } });
+            }] });
 
     /**
      * @Todo Alex remove functionality related to PropertyShare
@@ -15513,9 +15586,9 @@
         };
         return PropertyService;
     }(RestService));
-    PropertyService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    PropertyService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyService, decorators: [{
+    PropertyService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PropertyService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    PropertyService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PropertyService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PropertyService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -15563,9 +15636,9 @@
         };
         return ServiceNotificationService;
     }(RestService$1));
-    ServiceNotificationService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ServiceNotificationService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }, { token: SseService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    ServiceNotificationService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ServiceNotificationService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ServiceNotificationService, decorators: [{
+    ServiceNotificationService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ServiceNotificationService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }, { token: SseService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    ServiceNotificationService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ServiceNotificationService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ServiceNotificationService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -15577,12 +15650,12 @@
                         }] }, { type: ToastService }, { type: SseService }];
         } });
 
-    var MessagesEnum$1;
+    var MessagesEnum$2;
     (function (MessagesEnum) {
         MessagesEnum["LOGO_UPDATED"] = "Logo updated successfully";
         MessagesEnum["LOGO_ERROR_FORMAT"] = "Wrong file format. Allowed extensions: jpg, img, png";
         MessagesEnum["LOGO_ERROR_SIZE"] = "The file is too big. Maximum size is 2mb";
-    })(MessagesEnum$1 || (MessagesEnum$1 = {}));
+    })(MessagesEnum$2 || (MessagesEnum$2 = {}));
 
     var SoleBusinessService = /** @class */ (function (_super) {
         __extends(SoleBusinessService, _super);
@@ -15610,7 +15683,7 @@
                 replace(tempCache, classTransformer.plainToClass(SoleBusiness, updatedBusiness));
                 _this.cache = tempCache;
                 _this.cacheSubject.next(_this.cache);
-                _this.toastService.success(MessagesEnum$1.LOGO_UPDATED);
+                _this.toastService.success(MessagesEnum$2.LOGO_UPDATED);
             }), operators.catchError(function (error) {
                 // Show error when user provided wrong image (format or size)
                 if (error.status === 422) {
@@ -15621,9 +15694,9 @@
         };
         return SoleBusinessService;
     }(RestService$1));
-    SoleBusinessService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SoleBusinessService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    SoleBusinessService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SoleBusinessService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SoleBusinessService, decorators: [{
+    SoleBusinessService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: SoleBusinessService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    SoleBusinessService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: SoleBusinessService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: SoleBusinessService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -15641,9 +15714,9 @@
         }
         return SoleBusinessActivityService;
     }(RestService$1));
-    SoleBusinessActivityService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SoleBusinessActivityService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    SoleBusinessActivityService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SoleBusinessActivityService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SoleBusinessActivityService, decorators: [{
+    SoleBusinessActivityService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: SoleBusinessActivityService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    SoleBusinessActivityService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: SoleBusinessActivityService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: SoleBusinessActivityService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -15673,9 +15746,9 @@
         };
         return SoleBusinessLossService;
     }(RestService$1));
-    SoleBusinessLossService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SoleBusinessLossService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    SoleBusinessLossService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SoleBusinessLossService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SoleBusinessLossService, decorators: [{
+    SoleBusinessLossService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: SoleBusinessLossService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    SoleBusinessLossService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: SoleBusinessLossService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: SoleBusinessLossService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -15696,9 +15769,9 @@
         }
         return SoleBusinessLossOffsetRuleService;
     }(RestService$1));
-    SoleBusinessLossOffsetRuleService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SoleBusinessLossOffsetRuleService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    SoleBusinessLossOffsetRuleService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SoleBusinessLossOffsetRuleService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SoleBusinessLossOffsetRuleService, decorators: [{
+    SoleBusinessLossOffsetRuleService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: SoleBusinessLossOffsetRuleService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    SoleBusinessLossOffsetRuleService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: SoleBusinessLossOffsetRuleService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: SoleBusinessLossOffsetRuleService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -15716,9 +15789,9 @@
         }
         return SoleContactService;
     }(RestService$1));
-    SoleContactService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SoleContactService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    SoleContactService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SoleContactService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SoleContactService, decorators: [{
+    SoleContactService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: SoleContactService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    SoleContactService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: SoleContactService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: SoleContactService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -15778,9 +15851,9 @@
         };
         return SoleDepreciationMethodService;
     }());
-    SoleDepreciationMethodService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SoleDepreciationMethodService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }, { token: EventDispatcherService }, { token: ToastService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    SoleDepreciationMethodService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SoleDepreciationMethodService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SoleDepreciationMethodService, decorators: [{
+    SoleDepreciationMethodService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: SoleDepreciationMethodService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }, { token: EventDispatcherService }, { token: ToastService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    SoleDepreciationMethodService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: SoleDepreciationMethodService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: SoleDepreciationMethodService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -15839,9 +15912,9 @@
         };
         return SoleDetailsService;
     }());
-    SoleDetailsService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SoleDetailsService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }, { token: EventDispatcherService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    SoleDetailsService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SoleDetailsService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SoleDetailsService, decorators: [{
+    SoleDetailsService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: SoleDetailsService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }, { token: EventDispatcherService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    SoleDetailsService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: SoleDetailsService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: SoleDetailsService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -15924,9 +15997,9 @@
         };
         return SoleInvoiceService;
     }(RestService$1));
-    SoleInvoiceService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SoleInvoiceService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    SoleInvoiceService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SoleInvoiceService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SoleInvoiceService, decorators: [{
+    SoleInvoiceService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: SoleInvoiceService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    SoleInvoiceService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: SoleInvoiceService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: SoleInvoiceService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -15944,9 +16017,9 @@
         }
         return SoleInvoiceTemplateService;
     }(RestService$1));
-    SoleInvoiceTemplateService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SoleInvoiceTemplateService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    SoleInvoiceTemplateService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SoleInvoiceTemplateService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SoleInvoiceTemplateService, decorators: [{
+    SoleInvoiceTemplateService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: SoleInvoiceTemplateService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    SoleInvoiceTemplateService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: SoleInvoiceTemplateService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: SoleInvoiceTemplateService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -15964,9 +16037,9 @@
         }
         return BasReportService;
     }(RestService$1));
-    BasReportService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BasReportService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    BasReportService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BasReportService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BasReportService, decorators: [{
+    BasReportService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BasReportService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    BasReportService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BasReportService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BasReportService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -15987,9 +16060,9 @@
         }
         return ServicePriceService;
     }(RestService$1));
-    ServicePriceService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ServicePriceService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    ServicePriceService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ServicePriceService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ServicePriceService, decorators: [{
+    ServicePriceService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ServicePriceService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    ServicePriceService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ServicePriceService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ServicePriceService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -16116,9 +16189,9 @@
         };
         return SubscriptionService;
     }());
-    SubscriptionService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SubscriptionService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: SseService }, { token: ToastService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    SubscriptionService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SubscriptionService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SubscriptionService, decorators: [{
+    SubscriptionService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: SubscriptionService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: SseService }, { token: ToastService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    SubscriptionService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: SubscriptionService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: SubscriptionService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -16159,9 +16232,9 @@
         };
         return TaxReviewHistoryService;
     }(RestService$1));
-    TaxReviewHistoryService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TaxReviewHistoryService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    TaxReviewHistoryService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TaxReviewHistoryService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TaxReviewHistoryService, decorators: [{
+    TaxReviewHistoryService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TaxReviewHistoryService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    TaxReviewHistoryService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TaxReviewHistoryService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TaxReviewHistoryService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -16258,9 +16331,9 @@
         };
         return TaxReviewService;
     }(RestService$1));
-    TaxReviewService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TaxReviewService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    TaxReviewService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TaxReviewService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TaxReviewService, decorators: [{
+    TaxReviewService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TaxReviewService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    TaxReviewService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TaxReviewService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TaxReviewService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -16321,9 +16394,9 @@
         };
         return TaxSummaryService;
     }());
-    TaxSummaryService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TaxSummaryService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    TaxSummaryService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TaxSummaryService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TaxSummaryService, decorators: [{
+    TaxSummaryService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TaxSummaryService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    TaxSummaryService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TaxSummaryService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TaxSummaryService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -16430,9 +16503,9 @@
         };
         return TransactionAllocationService;
     }(RestService$1));
-    TransactionAllocationService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TransactionAllocationService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    TransactionAllocationService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TransactionAllocationService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TransactionAllocationService, decorators: [{
+    TransactionAllocationService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TransactionAllocationService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    TransactionAllocationService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TransactionAllocationService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TransactionAllocationService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -16461,9 +16534,9 @@
         }
         return TransactionReceiptService;
     }(ReceiptService));
-    TransactionReceiptService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TransactionReceiptService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    TransactionReceiptService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TransactionReceiptService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TransactionReceiptService, decorators: [{
+    TransactionReceiptService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TransactionReceiptService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    TransactionReceiptService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TransactionReceiptService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TransactionReceiptService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -16475,19 +16548,6 @@
                         }] }, { type: ToastService }];
         } });
 
-    function enumToList(data) {
-        var list = [];
-        for (var key in data) {
-            if (Number(key) >= 0) {
-                list.push({
-                    label: data[key],
-                    value: Number(key)
-                });
-            }
-        }
-        return list;
-    }
-
     /**
      * Service for transactions business logic
      */
@@ -16609,7 +16669,7 @@
             transactions = ___default["default"].cloneDeep(transactions);
             return this.http.post(this.environment.apiV2 + "/" + this.url, transactions)
                 .pipe(operators.map(function (response) {
-                var _c;
+                var _b;
                 var addedTransactions = response.map(function (item) { return classTransformer.plainToClass(Transaction, item); });
                 transactions.forEach(function (transaction, index) {
                     // @TODO backend: need to upload file in the same backend endpoint with transaction add/update
@@ -16633,7 +16693,7 @@
                     }
                 });
                 if (_this.cache) {
-                    (_c = _this.cache).push.apply(_c, __spreadArray([], __read(addedTransactions)));
+                    (_b = _this.cache).push.apply(_b, __spreadArray([], __read(addedTransactions)));
                     _this.updateCache();
                 }
                 _this.eventDispatcherService.dispatch(new AppEvent(exports.AppEventTypeEnum.TRANSACTIONS_CREATED, addedTransactions));
@@ -16744,31 +16804,6 @@
             }
             return amount;
         };
-        /**
-         * get label for transaction tax field depended of selected chart account.
-         * tax type depends of chart account heading or category.
-         */
-        TransactionService.prototype.getTaxLabel = function (chartAccounts) {
-            var _a, _b;
-            // get simple array of ids from enum with taxable chart accounts headings
-            var taxableCAHeadingsIds = enumToList(exports.ChartAccountsHeadingTaxableEnum)
-                .map(function (item) { return item.value; });
-            // get simple array of ids from enum with tax deductible chart accounts headings
-            var deductibleCAHeadingsIds = enumToList(exports.ChartAccountsHeadingTaxDeductibleEnum)
-                .map(function (item) { return item.value; });
-            // check if one of ids arrays includes current chart accounts heading id and set tax label
-            // otherwise label is empty for this class
-            switch (true) {
-                case taxableCAHeadingsIds.includes((_a = chartAccounts.heading) === null || _a === void 0 ? void 0 : _a.id):
-                    return exports.ChartAccountsTaxLabelsEnum.TAX_PAID;
-                case deductibleCAHeadingsIds.includes((_b = chartAccounts.heading) === null || _b === void 0 ? void 0 : _b.id):
-                    return exports.ChartAccountsTaxLabelsEnum.TAX_DEDUCTED;
-                case CHART_ACCOUNTS_CATEGORIES.workIncome.includes(chartAccounts.category):
-                    return exports.ChartAccountsTaxLabelsEnum.TAX_WITHHELD;
-                default:
-                    return null;
-            }
-        };
         /**
          * Listen to EventDispatcherService event related to Depreciation changing
          */
@@ -16840,9 +16875,9 @@
         };
         return TransactionService;
     }(RestService$1));
-    TransactionService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TransactionService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }, { token: TransactionReceiptService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    TransactionService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TransactionService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TransactionService, decorators: [{
+    TransactionService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TransactionService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }, { token: TransactionReceiptService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    TransactionService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TransactionService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TransactionService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -16874,9 +16909,9 @@
     }());
     TutorialVideoService.googleUrl = "https://www.googleapis.com/drive/v3/files?fields=*&mimeType='video/mp4'&orderBy=name";
     TutorialVideoService.parents = '1uLMLzi8WUy2go9xhfzJEwgFwOM43dukM';
-    TutorialVideoService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TutorialVideoService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    TutorialVideoService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TutorialVideoService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TutorialVideoService, decorators: [{
+    TutorialVideoService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TutorialVideoService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    TutorialVideoService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TutorialVideoService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TutorialVideoService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -16901,9 +16936,9 @@
         }
         return VehicleService;
     }(RestService$1));
-    VehicleService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: VehicleService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    VehicleService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: VehicleService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: VehicleService, decorators: [{
+    VehicleService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: VehicleService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    VehicleService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: VehicleService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: VehicleService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -16984,9 +17019,9 @@
         };
         return VehicleClaimService;
     }(RestService$1));
-    VehicleClaimService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: VehicleClaimService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    VehicleClaimService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: VehicleClaimService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: VehicleClaimService, decorators: [{
+    VehicleClaimService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: VehicleClaimService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    VehicleClaimService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: VehicleClaimService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: VehicleClaimService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -17068,9 +17103,9 @@
         };
         return VehicleClaimDetailsService;
     }());
-    VehicleClaimDetailsService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: VehicleClaimDetailsService, deps: [{ token: 'environment' }, { token: i1__namespace.HttpClient }, { token: EventDispatcherService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    VehicleClaimDetailsService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: VehicleClaimDetailsService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: VehicleClaimDetailsService, decorators: [{
+    VehicleClaimDetailsService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: VehicleClaimDetailsService, deps: [{ token: 'environment' }, { token: i1__namespace.HttpClient }, { token: EventDispatcherService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    VehicleClaimDetailsService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: VehicleClaimDetailsService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: VehicleClaimDetailsService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -17095,9 +17130,9 @@
         }
         return VehicleLogbookService;
     }(RestService$1));
-    VehicleLogbookService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: VehicleLogbookService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    VehicleLogbookService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: VehicleLogbookService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: VehicleLogbookService, decorators: [{
+    VehicleLogbookService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: VehicleLogbookService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    VehicleLogbookService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: VehicleLogbookService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: VehicleLogbookService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -17132,9 +17167,9 @@
         };
         return OccupationService;
     }());
-    OccupationService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: OccupationService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    OccupationService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: OccupationService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: OccupationService, decorators: [{
+    OccupationService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: OccupationService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    OccupationService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: OccupationService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: OccupationService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -17184,9 +17219,9 @@
         };
         return UserEventSettingService;
     }(RestService$1));
-    UserEventSettingService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: UserEventSettingService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    UserEventSettingService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: UserEventSettingService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: UserEventSettingService, decorators: [{
+    UserEventSettingService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: UserEventSettingService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    UserEventSettingService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: UserEventSettingService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: UserEventSettingService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -17204,9 +17239,9 @@
         }
         return UserEventTypeService;
     }(RestService$1));
-    UserEventTypeService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: UserEventTypeService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    UserEventTypeService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: UserEventTypeService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: UserEventTypeService, decorators: [{
+    UserEventTypeService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: UserEventTypeService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    UserEventTypeService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: UserEventTypeService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: UserEventTypeService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -17226,9 +17261,9 @@
         }
         return UsersInviteService;
     }(RestService$1));
-    UsersInviteService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: UsersInviteService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    UsersInviteService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: UsersInviteService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: UsersInviteService, decorators: [{
+    UsersInviteService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: UsersInviteService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    UsersInviteService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: UsersInviteService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: UsersInviteService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -17427,9 +17462,9 @@
         };
         return AccountSetupService;
     }());
-    AccountSetupService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: AccountSetupService, deps: [{ token: ClientIncomeTypesService }, { token: PropertyService }, { token: IncomeSourceService }, { token: BankAccountService }, { token: TransactionAllocationService }, { token: VehicleClaimService }, { token: TransactionService }, { token: SoleBusinessService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    AccountSetupService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: AccountSetupService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: AccountSetupService, decorators: [{
+    AccountSetupService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: AccountSetupService, deps: [{ token: ClientIncomeTypesService }, { token: PropertyService }, { token: IncomeSourceService }, { token: BankAccountService }, { token: TransactionAllocationService }, { token: VehicleClaimService }, { token: TransactionService }, { token: SoleBusinessService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    AccountSetupService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: AccountSetupService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: AccountSetupService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -17457,9 +17492,9 @@
         };
         return RewardfulService;
     }());
-    RewardfulService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: RewardfulService, deps: [{ token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    RewardfulService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: RewardfulService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: RewardfulService, decorators: [{
+    RewardfulService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: RewardfulService, deps: [{ token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    RewardfulService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: RewardfulService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: RewardfulService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -17507,9 +17542,9 @@
         };
         return AssetsService;
     }());
-    AssetsService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: AssetsService, deps: [{ token: i1__namespace.HttpClient }, { token: UserSwitcherService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    AssetsService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: AssetsService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: AssetsService, decorators: [{
+    AssetsService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: AssetsService, deps: [{ token: i1__namespace.HttpClient }, { token: UserSwitcherService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    AssetsService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: AssetsService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: AssetsService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -17579,9 +17614,9 @@
         };
         return BankTransactionCalculationService;
     }());
-    BankTransactionCalculationService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BankTransactionCalculationService, deps: [], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    BankTransactionCalculationService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BankTransactionCalculationService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BankTransactionCalculationService, decorators: [{
+    BankTransactionCalculationService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BankTransactionCalculationService, deps: [], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    BankTransactionCalculationService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BankTransactionCalculationService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BankTransactionCalculationService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -17611,9 +17646,9 @@
         };
         return BankAccountCalculationService;
     }());
-    BankAccountCalculationService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BankAccountCalculationService, deps: [{ token: BankTransactionCalculationService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    BankAccountCalculationService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BankAccountCalculationService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BankAccountCalculationService, decorators: [{
+    BankAccountCalculationService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BankAccountCalculationService, deps: [{ token: BankTransactionCalculationService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    BankAccountCalculationService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BankAccountCalculationService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BankAccountCalculationService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -17640,9 +17675,9 @@
         };
         return ExportFormatterService;
     }());
-    ExportFormatterService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ExportFormatterService, deps: [{ token: i1__namespace$2.CurrencyPipe }, { token: i1__namespace$2.DatePipe }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    ExportFormatterService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ExportFormatterService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ExportFormatterService, decorators: [{
+    ExportFormatterService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ExportFormatterService, deps: [{ token: i1__namespace$2.CurrencyPipe }, { token: i1__namespace$2.DatePipe }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    ExportFormatterService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ExportFormatterService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ExportFormatterService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -17665,9 +17700,9 @@
         };
         return HeaderTitleService;
     }());
-    HeaderTitleService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: HeaderTitleService, deps: [{ token: i1__namespace$1.Router }, { token: i1__namespace$1.ActivatedRoute }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    HeaderTitleService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: HeaderTitleService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: HeaderTitleService, decorators: [{
+    HeaderTitleService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: HeaderTitleService, deps: [{ token: i1__namespace$1.Router }, { token: i1__namespace$1.ActivatedRoute }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    HeaderTitleService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: HeaderTitleService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: HeaderTitleService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -17702,9 +17737,9 @@
         };
         return IntercomService;
     }());
-    IntercomService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: IntercomService, deps: [{ token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    IntercomService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: IntercomService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: IntercomService, decorators: [{
+    IntercomService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: IntercomService, deps: [{ token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    IntercomService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: IntercomService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: IntercomService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -17771,9 +17806,9 @@
         };
         return PdfFromDomElementService;
     }());
-    PdfFromDomElementService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PdfFromDomElementService, deps: [], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    PdfFromDomElementService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PdfFromDomElementService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PdfFromDomElementService, decorators: [{
+    PdfFromDomElementService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PdfFromDomElementService, deps: [], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    PdfFromDomElementService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PdfFromDomElementService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PdfFromDomElementService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -17856,9 +17891,9 @@
         };
         return PdfFromTableService;
     }());
-    PdfFromTableService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PdfFromTableService, deps: [], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    PdfFromTableService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PdfFromTableService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PdfFromTableService, decorators: [{
+    PdfFromTableService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PdfFromTableService, deps: [], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    PdfFromTableService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PdfFromTableService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PdfFromTableService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -17894,9 +17929,9 @@
         };
         return PdfFromDataTableService;
     }(PdfFromTableService));
-    PdfFromDataTableService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PdfFromDataTableService, deps: [{ token: ExportFormatterService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    PdfFromDataTableService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PdfFromDataTableService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PdfFromDataTableService, decorators: [{
+    PdfFromDataTableService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PdfFromDataTableService, deps: [{ token: ExportFormatterService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    PdfFromDataTableService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PdfFromDataTableService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PdfFromDataTableService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -17935,9 +17970,9 @@
         };
         return PdfFromHtmlTableService;
     }(PdfFromTableService));
-    PdfFromHtmlTableService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PdfFromHtmlTableService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    PdfFromHtmlTableService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PdfFromHtmlTableService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PdfFromHtmlTableService, decorators: [{
+    PdfFromHtmlTableService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PdfFromHtmlTableService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    PdfFromHtmlTableService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PdfFromHtmlTableService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PdfFromHtmlTableService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -17971,9 +18006,9 @@
         };
         return EquityPositionChartService;
     }());
-    EquityPositionChartService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: EquityPositionChartService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    EquityPositionChartService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: EquityPositionChartService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: EquityPositionChartService, decorators: [{
+    EquityPositionChartService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: EquityPositionChartService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    EquityPositionChartService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: EquityPositionChartService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: EquityPositionChartService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -18161,9 +18196,9 @@
         };
         return PropertyCalculationService;
     }());
-    PropertyCalculationService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyCalculationService, deps: [], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    PropertyCalculationService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyCalculationService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyCalculationService, decorators: [{
+    PropertyCalculationService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PropertyCalculationService, deps: [], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    PropertyCalculationService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PropertyCalculationService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PropertyCalculationService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -18220,9 +18255,9 @@
         };
         return PropertyTransactionReportService;
     }());
-    PropertyTransactionReportService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyTransactionReportService, deps: [{ token: PropertyService }, { token: TransactionService }, { token: DepreciationService }, { token: ChartAccountsService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    PropertyTransactionReportService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyTransactionReportService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyTransactionReportService, decorators: [{
+    PropertyTransactionReportService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PropertyTransactionReportService, deps: [{ token: PropertyService }, { token: TransactionService }, { token: DepreciationService }, { token: ChartAccountsService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    PropertyTransactionReportService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PropertyTransactionReportService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PropertyTransactionReportService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -18304,9 +18339,9 @@
         };
         return TransactionCalculationService;
     }());
-    TransactionCalculationService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TransactionCalculationService, deps: [], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    TransactionCalculationService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TransactionCalculationService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TransactionCalculationService, decorators: [{
+    TransactionCalculationService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TransactionCalculationService, deps: [], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    TransactionCalculationService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TransactionCalculationService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TransactionCalculationService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -18370,9 +18405,9 @@
         };
         return LogbookBestPeriodService;
     }());
-    LogbookBestPeriodService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: LogbookBestPeriodService, deps: [{ token: VehicleClaimDetailsService }, { token: VehicleClaimService }, { token: VehicleLogbookService }, { token: EventDispatcherService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    LogbookBestPeriodService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: LogbookBestPeriodService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: LogbookBestPeriodService, decorators: [{
+    LogbookBestPeriodService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: LogbookBestPeriodService, deps: [{ token: VehicleClaimDetailsService }, { token: VehicleClaimService }, { token: VehicleLogbookService }, { token: EventDispatcherService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    LogbookBestPeriodService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: LogbookBestPeriodService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: LogbookBestPeriodService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -18416,9 +18451,9 @@
         };
         return XlsxService;
     }());
-    XlsxService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: XlsxService, deps: [], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    XlsxService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: XlsxService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: XlsxService, decorators: [{
+    XlsxService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: XlsxService, deps: [], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    XlsxService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: XlsxService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: XlsxService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -18663,16 +18698,16 @@
         };
     }
 
-    var MessagesEnum;
+    var MessagesEnum$1;
     (function (MessagesEnum) {
         MessagesEnum["INVALID_DATE"] = "The date should not be before $1";
-    })(MessagesEnum || (MessagesEnum = {}));
+    })(MessagesEnum$1 || (MessagesEnum$1 = {}));
 
     /**
      * Validation function, that checks If date form value is more than provided date
      */
     function minDateValidator(date, message) {
-        if (message === void 0) { message = MessagesEnum.INVALID_DATE.replace('$1', new i1$1.DatePipe('en-US').transform(date)); }
+        if (message === void 0) { message = MessagesEnum$1.INVALID_DATE.replace('$1', new i1$1.DatePipe('en-US').transform(date)); }
         return function (control) {
             if (!control.value) {
                 return null;
@@ -18712,6 +18747,50 @@
         };
     }
 
+    /**
+     * Validation function, that checks If provided date is within a current financial year
+     */
+    function currentFinYearValidator() {
+        var currentFinYear = new FinancialYear();
+        return function (control) {
+            if (!control.value || control.value >= currentFinYear.startDate && control.value <= currentFinYear.endDate) {
+                return null;
+            }
+            return { notCurrentFinYear: true };
+        };
+    }
+
+    var MAX_SIZE = 4194304;
+    var FileValidator = /** @class */ (function () {
+        function FileValidator() {
+        }
+        // File max size check
+        FileValidator.fileMaxSize = function (maxSize) {
+            if (maxSize === void 0) { maxSize = MAX_SIZE; }
+            var validatorFn = function (file) {
+                return file.size > maxSize ? { fileMaxSize: { maxSize: maxSize } } : null;
+            };
+            return FileValidator.fileValidation(validatorFn);
+        };
+        // File extension check
+        FileValidator.fileExtensions = function (allowedExtensions) {
+            if (allowedExtensions === void 0) { allowedExtensions = DOCUMENT_FILE_TYPES.all; }
+            var validatorFn = function (file) {
+                return allowedExtensions.includes(file.type) ? null : { fileExtension: { allowedExtensions: allowedExtensions.join() } };
+            };
+            return FileValidator.fileValidation(validatorFn);
+        };
+        FileValidator.fileValidation = function (validatorFn) {
+            return function (formControl) {
+                if (!formControl.value) {
+                    return null;
+                }
+                return validatorFn(formControl.value);
+            };
+        };
+        return FileValidator;
+    }());
+
     /**
      * Validator for address, check if corelogic suggestion selected correctly
      */
@@ -20632,21 +20711,24 @@
         __extends(MyTaxPartnershipsAndTrustsForm, _super);
         function MyTaxPartnershipsAndTrustsForm(partnershipsAndTrusts) {
             return _super.call(this, {
-                partnershipsNetIncome: new forms.FormControl({
-                    value: partnershipsAndTrusts.partnershipsNetIncome,
+                partnershipsIncomeTotalAmount: new forms.FormControl({
+                    value: partnershipsAndTrusts.partnershipsIncomeTotalAmount,
+                    disabled: true
+                }),
+                partnershipsExpenseTotalAmount: new forms.FormControl({
+                    value: partnershipsAndTrusts.partnershipsExpenseTotalAmount,
+                    disabled: true
+                }),
+                trustsIncomeTotalAmount: new forms.FormControl({
+                    value: partnershipsAndTrusts.trustsIncomeTotalAmount,
                     disabled: true
                 }),
-                trustsNetIncome: new forms.FormControl({
-                    value: partnershipsAndTrusts.trustsNetIncome,
+                trustsExpenseTotalAmount: new forms.FormControl({
+                    value: partnershipsAndTrusts.trustsExpenseTotalAmount,
                     disabled: true
                 }),
-                trustType: new forms.FormControl(partnershipsAndTrusts.trustType, conditionalValidator(function (control) {
-                    return !!partnershipsAndTrusts.trustsIncomes.length;
-                }, forms.Validators.required)),
-                partnershipsSmallBusinessNetIncome: new forms.FormControl(partnershipsAndTrusts.partnershipsSmallBusinessNetIncome, forms.Validators.required),
-                trustsSmallBusinessNetIncome: new forms.FormControl(partnershipsAndTrusts.trustsSmallBusinessNetIncome, forms.Validators.required),
-                taxPaidTotal: new forms.FormControl({
-                    value: partnershipsAndTrusts.taxPaidTotal,
+                trustsIncomeTotalTax: new forms.FormControl({
+                    value: partnershipsAndTrusts.trustsIncomeTotalTax,
                     disabled: true
                 }),
                 frankingCreditsTotal: new forms.FormControl({
@@ -20801,6 +20883,313 @@
     }(AbstractForm));
     VehicleLogbookForm.maxDescriptionLength = 60;
 
+    /**
+     * general validation rules
+     */
+    exports.FormValidationsEnum = void 0;
+    (function (FormValidationsEnum) {
+        FormValidationsEnum[FormValidationsEnum["INPUT_MAX_LENGTH"] = 60] = "INPUT_MAX_LENGTH";
+        FormValidationsEnum[FormValidationsEnum["TEXT_MAX_LENGTH"] = 300] = "TEXT_MAX_LENGTH";
+        FormValidationsEnum[FormValidationsEnum["FILE_MAX_SIZE"] = 4194304] = "FILE_MAX_SIZE";
+        // @TODO move to file uploader component
+        FormValidationsEnum["FILE_ACCEPTED_TYPES"] = "Accepted file type: .doc .jpg .png .pdf .tiff .bmp .excel .csv";
+    })(exports.FormValidationsEnum || (exports.FormValidationsEnum = {}));
+
+    /**
+     * @TODO refactor, move specific fields like property in separated forms
+     * @TODO remove useless getters
+     */
+    var TransactionBaseForm = /** @class */ (function (_super) {
+        __extends(TransactionBaseForm, _super);
+        function TransactionBaseForm(transaction, registeredForGst, controls) {
+            if (controls === void 0) { controls = {}; }
+            var _this = this;
+            var _a;
+            _this = _super.call(this, Object.assign({
+                chartAccounts: new forms.FormControl(transaction.chartAccounts, [forms.Validators.required, autocompleteValidator()]),
+                claimPercent: new forms.FormControl({ value: transaction.claimPercent, disabled: true }, [forms.Validators.required, forms.Validators.min(0), forms.Validators.max(100)]),
+                amount: new forms.FormControl(transaction.amount, forms.Validators.required),
+                amountWithGST: new forms.FormControl(transaction.amountWithGst, forms.Validators.required),
+                isGST: new forms.FormControl({ value: transaction.isGST, disabled: !((_a = transaction.chartAccounts) === null || _a === void 0 ? void 0 : _a.isGST) || !registeredForGst }),
+                gstAmount: new forms.FormControl({ value: transaction.gstAmount, disabled: true }, forms.Validators.required),
+                date: new forms.FormControl(transaction.date, [forms.Validators.required, currentFinYearValidator()]),
+                description: new forms.FormControl(transaction.description, forms.Validators.maxLength(exports.FormValidationsEnum.TEXT_MAX_LENGTH)),
+                // @TODO Alex: refactor (TT-1996)
+                file: new forms.FormControl(transaction['receipt'], [
+                    FileValidator.fileExtensions(DOCUMENT_FILE_TYPES.all), FileValidator.fileMaxSize(+exports.FormValidationsEnum.FILE_MAX_SIZE)
+                ]),
+                property: new forms.FormControl({ value: transaction.property, disabled: transaction.chartAccounts }),
+            }, controls), transaction) || this;
+            _this.registeredForGst = registeredForGst;
+            _this.watchChartAccounts();
+            if (_this.isGstApplicable()) {
+                _this.watchAmountWithGST();
+                _this.watchIsGst();
+            }
+            return _this;
+        }
+        TransactionBaseForm.prototype.watchIsGst = function () {
+            var _this = this;
+            this.get('isGST').valueChanges.subscribe(function (isGST) {
+                _this.updateAmount();
+                _this.updateGstAmount();
+            });
+        };
+        TransactionBaseForm.prototype.watchAmountWithGST = function () {
+            var _this = this;
+            this.get('amountWithGST').valueChanges.subscribe(function () {
+                _this.updateAmount();
+                _this.updateGstAmount();
+            });
+        };
+        TransactionBaseForm.prototype.watchChartAccounts = function () {
+            var _this = this;
+            this.get('chartAccounts').valueChanges.subscribe(function (value) {
+                if (!(value instanceof ChartAccounts)) {
+                    return;
+                }
+                // recalculate claim percent for selected chart accounts
+                _this.updateClaimPercent(value);
+                if (!_this.isGstApplicable()) {
+                    return;
+                }
+                // update gst if applicable
+                if (value.isGST) {
+                    _this.get('isGST').enable();
+                    _this.get('isGST').patchValue(true);
+                }
+                else {
+                    _this.get('isGST').patchValue(false);
+                    _this.get('isGST').disable();
+                }
+            });
+        };
+        TransactionBaseForm.prototype.updateGstAmount = function () {
+            this.get('gstAmount').patchValue((this.amountWithGST - this.amount).toFixed(2));
+        };
+        TransactionBaseForm.prototype.updateAmount = function () {
+            this.get('amount').patchValue(this.isGST ? (this.amountWithGST / ChartAccounts.GSTCoefficient).toFixed(2) : this.amountWithGST);
+        };
+        TransactionBaseForm.prototype.isGstApplicable = function () {
+            return !!this.registeredForGst && !!this.model.business;
+        };
+        Object.defineProperty(TransactionBaseForm.prototype, "amount", {
+            get: function () {
+                return this.get('amount').value;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(TransactionBaseForm.prototype, "amountWithGST", {
+            get: function () {
+                return this.get('amountWithGST').value;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(TransactionBaseForm.prototype, "isGST", {
+            get: function () {
+                return this.get('isGST').value;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        /**
+         * propertyClaimPercent for propertyExpense (except platform fees, which already include claimPercent),
+         * taxablePercent for others
+         * can be adjusted only for property/sole expenses
+         */
+        TransactionBaseForm.prototype.updateClaimPercent = function (chartAccounts) {
+            var _a;
+            if (chartAccounts.isClaimPercentEditable()) {
+                this.get('claimPercent').enable();
+            }
+            // property claim (ownership% x shared%) for property expenses, taxable percent for others
+            var claimPercent = chartAccounts.taxablePercent;
+            if (chartAccounts.isPropertyExpense() && chartAccounts.id !== exports.ChartAccountsListEnum.PLATFORM_FEES) {
+                claimPercent *= (_a = this.value.property) === null || _a === void 0 ? void 0 : _a.claimCoefficient;
+            }
+            this.get('claimPercent').setValue(claimPercent);
+        };
+        return TransactionBaseForm;
+    }(AbstractForm));
+
+    var MessagesEnum;
+    (function (MessagesEnum) {
+        MessagesEnum["DATE_VALIDATION_ERROR"] = "The transaction date is before the ownership date, please update the date to confirm";
+    })(MessagesEnum || (MessagesEnum = {}));
+
+    var TransactionForm = /** @class */ (function (_super) {
+        __extends(TransactionForm, _super);
+        function TransactionForm(transaction, registeredForGst, controls) {
+            if (controls === void 0) { controls = {}; }
+            var _this = _super.call(this, transaction, registeredForGst, controls) || this;
+            if (transaction.property) {
+                _this.get('date').addValidators(minDateValidator(transaction.property.myShare.fromDate, MessagesEnum.DATE_VALIDATION_ERROR));
+            }
+            return _this;
+        }
+        return TransactionForm;
+    }(TransactionBaseForm));
+
+    var WorkIncomeForm = /** @class */ (function (_super) {
+        __extends(WorkIncomeForm, _super);
+        function WorkIncomeForm(transaction, registeredForGst, allocations) {
+            var _this = this;
+            var _a;
+            _this = _super.call(this, transaction, registeredForGst, {
+                // @TODO move to TransactionForm, since other transactions could have it too
+                transactions: new forms.FormArray([]),
+                metadata: new forms.FormArray((transaction.metadata || []).map(function (transactionMetadata) {
+                    return new forms.FormGroup({
+                        value: new forms.FormControl(transactionMetadata.value),
+                        chartAccountsMetadata: new forms.FormControl(transactionMetadata.chartAccountsMetadata)
+                    });
+                })),
+                tax: new forms.FormControl({
+                    value: transaction.tax,
+                    disabled: !transaction.chartAccounts || transaction.chartAccounts.isNRAS(),
+                }, forms.Validators.required),
+                incomeSource: new forms.FormControl(transaction.incomeSource, [forms.Validators.required, autocompleteValidator()]),
+            }) || this;
+            // @TODO vik move to TransactionForm
+            if (allocations.length) {
+                _this.get('amount').disable();
+                _this.get('date').disable();
+            }
+            // salary adjustments (like tips)
+            transaction.transactions.map(function (transaction) {
+                _this.addTransactionControl(transaction);
+            });
+            if (!((_a = transaction.chartAccounts) === null || _a === void 0 ? void 0 : _a.isSalary())) {
+                _this.get('transactions').disable();
+            }
+            _this.listenEvents();
+            return _this;
+        }
+        WorkIncomeForm.prototype.listenEvents = function () {
+            this.watchIncomeSource();
+            this.watchChartAccounts();
+        };
+        WorkIncomeForm.prototype.watchIncomeSource = function () {
+            var _this = this;
+            this.get('incomeSource').valueChanges.subscribe(function (incomeSource) {
+                // prefill salary tax with its income source forecast
+                if (incomeSource instanceof IncomeSource && incomeSource.isSalaryIncome() && !_this.get('tax').value) {
+                    _this.get('tax').setValue(incomeSource.salaryForecasts[0].taxWithheld);
+                }
+            });
+        };
+        WorkIncomeForm.prototype.watchChartAccounts = function () {
+            var _this = this;
+            _super.prototype.watchChartAccounts.call(this);
+            this.get('chartAccounts').valueChanges.subscribe(function (value) {
+                // some fields depend on ChartAccounts and can't be filled until it's selected
+                if (!(value instanceof ChartAccounts)) {
+                    _this.get('tax').disable();
+                    _this.get('transactions').disable();
+                    return;
+                }
+                _this.buildMetadataForm();
+                if (value.isNRAS()) {
+                    _this.get('tax').disable();
+                }
+                else {
+                    _this.get('tax').enable();
+                }
+                if (value.isSalary()) {
+                    _this.get('transactions').enable();
+                }
+                else {
+                    _this.get('transactions').disable();
+                }
+            });
+        };
+        /**
+         * depends on chartAccounts the form could include different extra fields
+         */
+        WorkIncomeForm.prototype.buildMetadataForm = function () {
+            var _this = this;
+            // Remove all controls in the FormArray before pushing
+            this.get('metadata').clear();
+            // create form controls for each metadata object from selected chart accounts
+            (this.get('chartAccounts').value.metadata).forEach(function (chartAccountsMetadata) {
+                _this.get('metadata').push(new forms.FormGroup({
+                    value: new forms.FormControl(chartAccountsMetadata.isSharePercentage() ? 100 : 0),
+                    chartAccountsMetadata: new forms.FormControl(chartAccountsMetadata),
+                }));
+            });
+        };
+        WorkIncomeForm.prototype.addTransactionControl = function (transaction) {
+            if (transaction === void 0) { transaction = classTransformer.plainToClass(Transaction, {}); }
+            var formGroup = new forms.FormGroup({
+                id: new forms.FormControl(transaction.id),
+                chartAccounts: new forms.FormControl(transaction.chartAccounts, [forms.Validators.required, autocompleteValidator()]),
+                amount: new forms.FormControl(Math.abs(transaction.amount), [forms.Validators.required]),
+            });
+            this.get('transactions').push(formGroup);
+        };
+        WorkIncomeForm.prototype.removeTransactionControl = function (index) {
+            this.get('transactions').removeAt(index);
+        };
+        /**
+         * salary transactions might include adjustments (child transactions), like tips or donation.
+         * Adjustments inherit most of the fields from parent transaction
+         */
+        WorkIncomeForm.prototype.buildTransactions = function () {
+            var _this = this;
+            var transaction = classTransformer.plainToClass(Transaction, this.value);
+            return this.get('transactions').value.map(function (childTransaction) { return Object.assign({
+                description: transaction.chartAccounts.name,
+                date: transaction.date,
+                claimPercent: transaction.claimPercent,
+                source: transaction.source,
+                tax: transaction.tax,
+                type: transaction.type
+            }, _this.model.transactions.find(function (transaction) { return transaction.id === childTransaction['id']; }) || {}, childTransaction); });
+        };
+        WorkIncomeForm.prototype.submit = function (data) {
+            if (data === void 0) { data = {}; }
+            return _super.prototype.submit.call(this, Object.assign(data, { transactions: this.buildTransactions() }));
+        };
+        return WorkIncomeForm;
+    }(TransactionForm));
+
+    var DepreciationForm = /** @class */ (function (_super) {
+        __extends(DepreciationForm, _super);
+        function DepreciationForm(depreciation, registeredForGst) {
+            var _this = _super.call(this, depreciation, registeredForGst) || this;
+            _this.get('claimPercent').setValue(depreciation.currentYearForecast.claimPercent);
+            _this.addControl('isCloseBalanceCorrect', new forms.FormControl(true));
+            _this.addControl('closeBalance', new forms.FormControl({ value: depreciation.closeBalance || 0, disabled: true }, forms.Validators.required));
+            _this.addControl('financialYear', new forms.FormControl(depreciation.financialYear || new FinancialYear().year));
+            // forbid to change chartAccounts/claimPercent for existing depreciations
+            if (depreciation.id) {
+                _this.get('chartAccounts').disable({ emitEvent: false });
+                _this.get('claimPercent').disable({ emitEvent: false });
+            }
+            // @TODO should be watched?
+            // if depreciation has 'depreciationCapitalProject' value - set value and disable 'date' form control
+            if (depreciation.depreciationCapitalProject) {
+                _this.get('date').setValue(depreciation.depreciationCapitalProject.effectiveDate);
+                _this.get('date').disable();
+            }
+            else {
+                _this.get('date').setValue(depreciation.date);
+            }
+            _this.get('isCloseBalanceCorrect').valueChanges.subscribe(function (isSelected) {
+                if (isSelected) {
+                    _this.get('closeBalance').disable();
+                }
+                else {
+                    _this.get('closeBalance').enable();
+                }
+            });
+            return _this;
+        }
+        return DepreciationForm;
+    }(TransactionBaseForm));
+
     // @TODO Alex: Create indexes everywhere and break this file to imports from indexes
 
     /**
@@ -20903,6 +21292,7 @@
     exports.DepreciationCollection = DepreciationCollection;
     exports.DepreciationForecast = DepreciationForecast;
     exports.DepreciationForecastCollection = DepreciationForecastCollection;
+    exports.DepreciationForm = DepreciationForm;
     exports.DepreciationGroup = DepreciationGroup;
     exports.DepreciationGroupItem = DepreciationGroupItem;
     exports.DepreciationLvpReportItem = DepreciationLvpReportItem;
@@ -20930,6 +21320,7 @@
     exports.ExportFormatterService = ExportFormatterService;
     exports.ExportableCollection = ExportableCollection;
     exports.FacebookService = FacebookService;
+    exports.FileValidator = FileValidator;
     exports.FinancialYear = FinancialYear;
     exports.Firm = Firm;
     exports.FirmService = FirmService;
@@ -21118,8 +21509,10 @@
     exports.TransactionAllocationService = TransactionAllocationService;
     exports.TransactionBase = TransactionBase;
     exports.TransactionBaseCollection = TransactionBaseCollection;
+    exports.TransactionBaseForm = TransactionBaseForm;
     exports.TransactionCalculationService = TransactionCalculationService;
     exports.TransactionCollection = TransactionCollection;
+    exports.TransactionForm = TransactionForm;
     exports.TransactionMetadata = TransactionMetadata;
     exports.TransactionReceipt = TransactionReceipt;
     exports.TransactionReceiptService = TransactionReceiptService;
@@ -21156,6 +21549,7 @@
     exports.VehicleLogbookForm = VehicleLogbookForm;
     exports.VehicleLogbookService = VehicleLogbookService;
     exports.VehicleService = VehicleService;
+    exports.WorkIncomeForm = WorkIncomeForm;
     exports.XlsxService = XlsxService;
     exports.atLeastOneCheckedValidator = atLeastOneCheckedValidator;
     exports.atoLinks = atoLinks;
@@ -21165,6 +21559,7 @@
     exports.compareMatOptions = compareMatOptions;
     exports.conditionalValidator = conditionalValidator;
     exports.createDate = createDate;
+    exports.currentFinYearValidator = currentFinYearValidator;
     exports.displayMatOptions = displayMatOptions;
     exports.enumToList = enumToList;
     exports.fieldsSumValidator = fieldsSumValidator;