taxtank-core 0.28.107 → 0.28.109

package/bundles/taxtank-core.umd.js

@@ -92,9 +92,9 @@
         };
         return CorelogicService;
     }());
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -138,9 +138,9 @@
         };
         return CorelogicInterceptor;
     }());
-    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: [{
+    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: [{
                 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.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: [{
+    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: [{
                 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,11 +353,7 @@
     var __createBinding = Object.create ? (function (o, m, k, k2) {
         if (k2 === undefined)
             k2 = 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);
+        Object.defineProperty(o, k2, { enumerable: true, get: function () { return m[k]; } });
     }) : (function (o, m, k, k2) {
         if (k2 === undefined)
             k2 = k;
@@ -512,11 +508,6 @@
             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';
@@ -547,9 +538,9 @@
         };
         return JwtService;
     }(angularJwt.JwtHelperService));
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -660,9 +651,9 @@
         };
         return EventDispatcherService;
     }());
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -716,9 +707,9 @@
         };
         return AuthService;
     }());
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -859,9 +850,9 @@
         };
         return JwtInterceptor;
     }());
-    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: [{
+    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: [{
                 type: i0.Injectable
             }], ctorParameters: function () {
             return [{ type: JwtService }, { type: AuthService }, { type: undefined, decorators: [{
@@ -899,9 +890,9 @@
         };
         return UserSwitcherService;
     }());
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -948,9 +939,9 @@
         };
         return UserSwitcherInterceptor;
     }());
-    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: [{
+    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: [{
                 type: i0.Injectable
             }], ctorParameters: function () {
             return [{ type: UserSwitcherService }, { type: undefined, decorators: [{
@@ -1197,9 +1188,9 @@
         };
         return PreloaderService;
     }());
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -1229,9 +1220,9 @@
         };
         return PreloaderInterceptor;
     }());
-    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: [{
+    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: [{
                 type: i0.Injectable
             }], ctorParameters: function () { return [{ type: PreloaderService }]; } });
 
@@ -1350,9 +1341,9 @@
         };
         return ToastService;
     }());
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -1578,9 +1569,9 @@
         RestService.prototype.listenEvents = function () { };
         return RestService;
     }());
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -3228,41 +3219,120 @@
         return ChartAccountsMetadata;
     }(AbstractModel));
 
-    exports.ChartAccountsMetadataListEnum = void 0;
-    (function (ChartAccountsMetadataListEnum) {
-        ChartAccountsMetadataListEnum[ChartAccountsMetadataListEnum["TAX_INSTALMENTS"] = 4] = "TAX_INSTALMENTS";
-        ChartAccountsMetadataListEnum[ChartAccountsMetadataListEnum["FRANKING_CREDIT"] = 5] = "FRANKING_CREDIT";
-        ChartAccountsMetadataListEnum[ChartAccountsMetadataListEnum["ELIGIBLE_FOR_REDUCTION"] = 6] = "ELIGIBLE_FOR_REDUCTION";
-        ChartAccountsMetadataListEnum[ChartAccountsMetadataListEnum["SHARE_PERCENTAGE"] = 7] = "SHARE_PERCENTAGE";
-        ChartAccountsMetadataListEnum[ChartAccountsMetadataListEnum["TAX_OFFSETS"] = 8] = "TAX_OFFSETS";
-        ChartAccountsMetadataListEnum[ChartAccountsMetadataListEnum["HOURS"] = 11] = "HOURS";
-        ChartAccountsMetadataListEnum[ChartAccountsMetadataListEnum["TAX_PAID"] = 13] = "TAX_PAID";
-        ChartAccountsMetadataListEnum[ChartAccountsMetadataListEnum["TAX_FREE_COMPONENT"] = 18] = "TAX_FREE_COMPONENT";
-        ChartAccountsMetadataListEnum[ChartAccountsMetadataListEnum["YEARS_OF_SERVICE"] = 19] = "YEARS_OF_SERVICE";
-        ChartAccountsMetadataListEnum[ChartAccountsMetadataListEnum["UNTAXED_ELEMENT"] = 24] = "UNTAXED_ELEMENT";
-        ChartAccountsMetadataListEnum[ChartAccountsMetadataListEnum["NOT_ELIGIBLE_FOR_DEDUCTION"] = 25] = "NOT_ELIGIBLE_FOR_DEDUCTION";
-        ChartAccountsMetadataListEnum[ChartAccountsMetadataListEnum["FRANKED"] = 26] = "FRANKED";
-        ChartAccountsMetadataListEnum[ChartAccountsMetadataListEnum["UNFRANKED"] = 27] = "UNFRANKED";
-        ChartAccountsMetadataListEnum[ChartAccountsMetadataListEnum["TAX_OFFSETS_N_R_A_S"] = 29] = "TAX_OFFSETS_N_R_A_S";
-        ChartAccountsMetadataListEnum[ChartAccountsMetadataListEnum["DISCOUNT_FROM_DEFERRED_SCHEMES"] = 32] = "DISCOUNT_FROM_DEFERRED_SCHEMES";
-    })(exports.ChartAccountsMetadataListEnum || (exports.ChartAccountsMetadataListEnum = {}));
+    exports.DocumentTypeEnum = void 0;
+    (function (DocumentTypeEnum) {
+        DocumentTypeEnum[DocumentTypeEnum["INVOICE"] = 1] = "INVOICE";
+    })(exports.DocumentTypeEnum || (exports.DocumentTypeEnum = {}));
 
-    var ChartAccountsMetadata = /** @class */ (function (_super) {
-        __extends(ChartAccountsMetadata, _super);
-        function ChartAccountsMetadata() {
-            return _super !== null && _super.apply(this, arguments) || this;
-        }
-        /**
-         * Check if metadata id is related to SHARE_PERCENTAGE value
-         */
-        ChartAccountsMetadata.prototype.isSharePercentage = function () {
-            return this.id === exports.ChartAccountsMetadataListEnum.SHARE_PERCENTAGE;
-        };
-        ChartAccountsMetadata.prototype.isHours = function () {
-            return this.id === exports.ChartAccountsMetadataListEnum.HOURS;
-        };
-        return ChartAccountsMetadata;
-    }(ChartAccountsMetadata$1));
+    exports.AnnualFrequencyEnum = void 0;
+    (function (AnnualFrequencyEnum) {
+        AnnualFrequencyEnum[AnnualFrequencyEnum["ANNUAL"] = 1] = "ANNUAL";
+        AnnualFrequencyEnum[AnnualFrequencyEnum["QUARTERLY"] = 3] = "QUARTERLY";
+        AnnualFrequencyEnum[AnnualFrequencyEnum["MONTHLY"] = 12] = "MONTHLY";
+        AnnualFrequencyEnum[AnnualFrequencyEnum["FORTNIGHTLY"] = 26] = "FORTNIGHTLY";
+        AnnualFrequencyEnum[AnnualFrequencyEnum["WEEKLY"] = 52] = "WEEKLY";
+    })(exports.AnnualFrequencyEnum || (exports.AnnualFrequencyEnum = {}));
+
+    exports.ChartAccountsCategoryEnum = void 0;
+    (function (ChartAccountsCategoryEnum) {
+        ChartAccountsCategoryEnum[ChartAccountsCategoryEnum["PROPERTY_INCOME"] = 1] = "PROPERTY_INCOME";
+        ChartAccountsCategoryEnum[ChartAccountsCategoryEnum["PROPERTY_EXPENSE"] = 2] = "PROPERTY_EXPENSE";
+        ChartAccountsCategoryEnum[ChartAccountsCategoryEnum["PROPERTY_DEPRECIATION"] = 3] = "PROPERTY_DEPRECIATION";
+        ChartAccountsCategoryEnum[ChartAccountsCategoryEnum["PROPERTY_CAPITAL_WORKS"] = 4] = "PROPERTY_CAPITAL_WORKS";
+        ChartAccountsCategoryEnum[ChartAccountsCategoryEnum["WORK_DEPRECIATION"] = 5] = "WORK_DEPRECIATION";
+        ChartAccountsCategoryEnum[ChartAccountsCategoryEnum["WORK_INCOME"] = 6] = "WORK_INCOME";
+        ChartAccountsCategoryEnum[ChartAccountsCategoryEnum["WORK_EXPENSE"] = 7] = "WORK_EXPENSE";
+        ChartAccountsCategoryEnum[ChartAccountsCategoryEnum["OTHER_INCOME"] = 8] = "OTHER_INCOME";
+        ChartAccountsCategoryEnum[ChartAccountsCategoryEnum["OTHER_EXPENSE"] = 9] = "OTHER_EXPENSE";
+        ChartAccountsCategoryEnum[ChartAccountsCategoryEnum["PERSONAL_INCOME"] = 10] = "PERSONAL_INCOME";
+        ChartAccountsCategoryEnum[ChartAccountsCategoryEnum["PERSONAL_EXPENSE"] = 11] = "PERSONAL_EXPENSE";
+        ChartAccountsCategoryEnum[ChartAccountsCategoryEnum["SOLE_INCOME"] = 12] = "SOLE_INCOME";
+        ChartAccountsCategoryEnum[ChartAccountsCategoryEnum["SOLE_EXPENSE"] = 13] = "SOLE_EXPENSE";
+        ChartAccountsCategoryEnum[ChartAccountsCategoryEnum["SOLE_DEPRECIATION"] = 14] = "SOLE_DEPRECIATION";
+    })(exports.ChartAccountsCategoryEnum || (exports.ChartAccountsCategoryEnum = {}));
+
+    exports.ChartAccountsEtpEnum = void 0;
+    (function (ChartAccountsEtpEnum) {
+        ChartAccountsEtpEnum[ChartAccountsEtpEnum["ETP_R"] = 549] = "ETP_R";
+        ChartAccountsEtpEnum[ChartAccountsEtpEnum["ETP_S"] = 550] = "ETP_S";
+        ChartAccountsEtpEnum[ChartAccountsEtpEnum["ETP_O"] = 551] = "ETP_O";
+        ChartAccountsEtpEnum[ChartAccountsEtpEnum["ETP_D"] = 552] = "ETP_D";
+        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.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.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.ChartAccountsHeadingVehicleListEnum = void 0;
+    (function (ChartAccountsHeadingVehicleListEnum) {
+        ChartAccountsHeadingVehicleListEnum[ChartAccountsHeadingVehicleListEnum["WORK_RELATED_CAR_EXPENSES"] = 8] = "WORK_RELATED_CAR_EXPENSES";
+        ChartAccountsHeadingVehicleListEnum[ChartAccountsHeadingVehicleListEnum["DEPRECIATION_VEHICLES"] = 9] = "DEPRECIATION_VEHICLES";
+        ChartAccountsHeadingVehicleListEnum[ChartAccountsHeadingVehicleListEnum["KLMS"] = 60] = "KLMS";
+        ChartAccountsHeadingVehicleListEnum[ChartAccountsHeadingVehicleListEnum["FUEL_OIL"] = 61] = "FUEL_OIL";
+    })(exports.ChartAccountsHeadingVehicleListEnum || (exports.ChartAccountsHeadingVehicleListEnum = {}));
 
     exports.ChartAccountsListEnum = void 0;
     (function (ChartAccountsListEnum) {
@@ -3357,31 +3427,86 @@
         ChartAccountsListEnum[ChartAccountsListEnum["PSI_DEDUCTION_OTHER"] = 860] = "PSI_DEDUCTION_OTHER";
     })(exports.ChartAccountsListEnum || (exports.ChartAccountsListEnum = {}));
 
-    exports.ChartAccountsCategoryEnum = void 0;
-    (function (ChartAccountsCategoryEnum) {
-        ChartAccountsCategoryEnum[ChartAccountsCategoryEnum["PROPERTY_INCOME"] = 1] = "PROPERTY_INCOME";
-        ChartAccountsCategoryEnum[ChartAccountsCategoryEnum["PROPERTY_EXPENSE"] = 2] = "PROPERTY_EXPENSE";
-        ChartAccountsCategoryEnum[ChartAccountsCategoryEnum["PROPERTY_DEPRECIATION"] = 3] = "PROPERTY_DEPRECIATION";
-        ChartAccountsCategoryEnum[ChartAccountsCategoryEnum["PROPERTY_CAPITAL_WORKS"] = 4] = "PROPERTY_CAPITAL_WORKS";
-        ChartAccountsCategoryEnum[ChartAccountsCategoryEnum["WORK_DEPRECIATION"] = 5] = "WORK_DEPRECIATION";
-        ChartAccountsCategoryEnum[ChartAccountsCategoryEnum["WORK_INCOME"] = 6] = "WORK_INCOME";
-        ChartAccountsCategoryEnum[ChartAccountsCategoryEnum["WORK_EXPENSE"] = 7] = "WORK_EXPENSE";
-        ChartAccountsCategoryEnum[ChartAccountsCategoryEnum["OTHER_INCOME"] = 8] = "OTHER_INCOME";
-        ChartAccountsCategoryEnum[ChartAccountsCategoryEnum["OTHER_EXPENSE"] = 9] = "OTHER_EXPENSE";
-        ChartAccountsCategoryEnum[ChartAccountsCategoryEnum["PERSONAL_INCOME"] = 10] = "PERSONAL_INCOME";
-        ChartAccountsCategoryEnum[ChartAccountsCategoryEnum["PERSONAL_EXPENSE"] = 11] = "PERSONAL_EXPENSE";
-        ChartAccountsCategoryEnum[ChartAccountsCategoryEnum["SOLE_INCOME"] = 12] = "SOLE_INCOME";
-        ChartAccountsCategoryEnum[ChartAccountsCategoryEnum["SOLE_EXPENSE"] = 13] = "SOLE_EXPENSE";
-        ChartAccountsCategoryEnum[ChartAccountsCategoryEnum["SOLE_DEPRECIATION"] = 14] = "SOLE_DEPRECIATION";
-    })(exports.ChartAccountsCategoryEnum || (exports.ChartAccountsCategoryEnum = {}));
+    exports.ChartAccountsMetadataListEnum = void 0;
+    (function (ChartAccountsMetadataListEnum) {
+        ChartAccountsMetadataListEnum[ChartAccountsMetadataListEnum["TAX_INSTALMENTS"] = 4] = "TAX_INSTALMENTS";
+        ChartAccountsMetadataListEnum[ChartAccountsMetadataListEnum["FRANKING_CREDIT"] = 5] = "FRANKING_CREDIT";
+        ChartAccountsMetadataListEnum[ChartAccountsMetadataListEnum["ELIGIBLE_FOR_REDUCTION"] = 6] = "ELIGIBLE_FOR_REDUCTION";
+        ChartAccountsMetadataListEnum[ChartAccountsMetadataListEnum["SHARE_PERCENTAGE"] = 7] = "SHARE_PERCENTAGE";
+        ChartAccountsMetadataListEnum[ChartAccountsMetadataListEnum["TAX_OFFSETS"] = 8] = "TAX_OFFSETS";
+        ChartAccountsMetadataListEnum[ChartAccountsMetadataListEnum["HOURS"] = 11] = "HOURS";
+        ChartAccountsMetadataListEnum[ChartAccountsMetadataListEnum["TAX_PAID"] = 13] = "TAX_PAID";
+        ChartAccountsMetadataListEnum[ChartAccountsMetadataListEnum["TAX_FREE_COMPONENT"] = 18] = "TAX_FREE_COMPONENT";
+        ChartAccountsMetadataListEnum[ChartAccountsMetadataListEnum["YEARS_OF_SERVICE"] = 19] = "YEARS_OF_SERVICE";
+        ChartAccountsMetadataListEnum[ChartAccountsMetadataListEnum["UNTAXED_ELEMENT"] = 24] = "UNTAXED_ELEMENT";
+        ChartAccountsMetadataListEnum[ChartAccountsMetadataListEnum["NOT_ELIGIBLE_FOR_DEDUCTION"] = 25] = "NOT_ELIGIBLE_FOR_DEDUCTION";
+        ChartAccountsMetadataListEnum[ChartAccountsMetadataListEnum["FRANKED"] = 26] = "FRANKED";
+        ChartAccountsMetadataListEnum[ChartAccountsMetadataListEnum["UNFRANKED"] = 27] = "UNFRANKED";
+        ChartAccountsMetadataListEnum[ChartAccountsMetadataListEnum["TAX_OFFSETS_N_R_A_S"] = 29] = "TAX_OFFSETS_N_R_A_S";
+        ChartAccountsMetadataListEnum[ChartAccountsMetadataListEnum["DISCOUNT_FROM_DEFERRED_SCHEMES"] = 32] = "DISCOUNT_FROM_DEFERRED_SCHEMES";
+    })(exports.ChartAccountsMetadataListEnum || (exports.ChartAccountsMetadataListEnum = {}));
 
-    exports.ChartAccountsHeadingVehicleListEnum = void 0;
-    (function (ChartAccountsHeadingVehicleListEnum) {
-        ChartAccountsHeadingVehicleListEnum[ChartAccountsHeadingVehicleListEnum["WORK_RELATED_CAR_EXPENSES"] = 8] = "WORK_RELATED_CAR_EXPENSES";
-        ChartAccountsHeadingVehicleListEnum[ChartAccountsHeadingVehicleListEnum["DEPRECIATION_VEHICLES"] = 9] = "DEPRECIATION_VEHICLES";
-        ChartAccountsHeadingVehicleListEnum[ChartAccountsHeadingVehicleListEnum["KLMS"] = 60] = "KLMS";
-        ChartAccountsHeadingVehicleListEnum[ChartAccountsHeadingVehicleListEnum["FUEL_OIL"] = 61] = "FUEL_OIL";
-    })(exports.ChartAccountsHeadingVehicleListEnum || (exports.ChartAccountsHeadingVehicleListEnum = {}));
+    exports.ChartAccountsMetadataTypeEnum = void 0;
+    (function (ChartAccountsMetadataTypeEnum) {
+        ChartAccountsMetadataTypeEnum[ChartAccountsMetadataTypeEnum["NUMBER"] = 3] = "NUMBER";
+        ChartAccountsMetadataTypeEnum[ChartAccountsMetadataTypeEnum["BOOLEAN"] = 4] = "BOOLEAN";
+    })(exports.ChartAccountsMetadataTypeEnum || (exports.ChartAccountsMetadataTypeEnum = {}));
+
+    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 = {}));
+
+    exports.ChartAccountsSalaryIncludedListEnum = void 0;
+    (function (ChartAccountsSalaryIncludedListEnum) {
+        ChartAccountsSalaryIncludedListEnum[ChartAccountsSalaryIncludedListEnum["ALLOWANCE"] = 4] = "ALLOWANCE";
+        ChartAccountsSalaryIncludedListEnum[ChartAccountsSalaryIncludedListEnum["TIPS"] = 5] = "TIPS";
+        ChartAccountsSalaryIncludedListEnum[ChartAccountsSalaryIncludedListEnum["REIMBURSEMENTS"] = 555] = "REIMBURSEMENTS";
+        ChartAccountsSalaryIncludedListEnum[ChartAccountsSalaryIncludedListEnum["ADVANCE"] = 556] = "ADVANCE";
+        ChartAccountsSalaryIncludedListEnum[ChartAccountsSalaryIncludedListEnum["PHONE_ALLOWANCE"] = 646] = "PHONE_ALLOWANCE";
+        ChartAccountsSalaryIncludedListEnum[ChartAccountsSalaryIncludedListEnum["UNIFORM_ALLOWANCE"] = 647] = "UNIFORM_ALLOWANCE";
+        ChartAccountsSalaryIncludedListEnum[ChartAccountsSalaryIncludedListEnum["META_ALLOWANCE"] = 648] = "META_ALLOWANCE";
+        ChartAccountsSalaryIncludedListEnum[ChartAccountsSalaryIncludedListEnum["TRAVEL_ALLOWANCE"] = 649] = "TRAVEL_ALLOWANCE";
+        ChartAccountsSalaryIncludedListEnum[ChartAccountsSalaryIncludedListEnum["OTHER_ALLOWANCE"] = 650] = "OTHER_ALLOWANCE";
+        ChartAccountsSalaryIncludedListEnum[ChartAccountsSalaryIncludedListEnum["LAFH"] = 651] = "LAFH";
+    })(exports.ChartAccountsSalaryIncludedListEnum || (exports.ChartAccountsSalaryIncludedListEnum = {}));
+
+    exports.ChartAccountsTypeEnum = void 0;
+    (function (ChartAccountsTypeEnum) {
+        ChartAccountsTypeEnum[ChartAccountsTypeEnum["INCOME"] = 1] = "INCOME";
+        ChartAccountsTypeEnum[ChartAccountsTypeEnum["EXPENSE"] = 2] = "EXPENSE";
+    })(exports.ChartAccountsTypeEnum || (exports.ChartAccountsTypeEnum = {}));
+
+    // @TODO Artem TT-2308 move everything
+
+    var ChartAccountsMetadata = /** @class */ (function (_super) {
+        __extends(ChartAccountsMetadata, _super);
+        function ChartAccountsMetadata() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        /**
+         * Check if metadata id is related to SHARE_PERCENTAGE value
+         */
+        ChartAccountsMetadata.prototype.isSharePercentage = function () {
+            return this.id === exports.ChartAccountsMetadataListEnum.SHARE_PERCENTAGE;
+        };
+        ChartAccountsMetadata.prototype.isHours = function () {
+            return this.id === exports.ChartAccountsMetadataListEnum.HOURS;
+        };
+        return ChartAccountsMetadata;
+    }(ChartAccountsMetadata$1));
 
     /**
      * Grouped chart accounts categories for fast work
@@ -3504,72 +3629,6 @@
         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() {
@@ -3607,7 +3666,7 @@
             }
         };
         /**
-         * Check if chart accounts id is related for 'NRAS Tax Offset' category
+         * special type used for just pre-paying tax to the ATO, uses on tax summary
          */
         ChartAccounts.prototype.isNRAS = function () {
             return this.id === exports.ChartAccountsListEnum.TAX_OFFSETS_N_R_A_S;
@@ -3755,6 +3814,12 @@
         ChartAccounts.prototype.isSalary = function () {
             return this.id === exports.ChartAccountsListEnum.SALARY_OR_WAGES;
         };
+        /**
+         * chart accounts included in salary, like tips or allowance
+         */
+        ChartAccounts.prototype.isSalaryIncluded = function () {
+            return this.id in exports.ChartAccountsSalaryIncludedListEnum;
+        };
         return ChartAccounts;
     }(ChartAccounts$1));
     /**
@@ -4561,6 +4626,23 @@
         return DepreciationForecast;
     }(DepreciationForecast$1));
 
+    /**
+     * 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 = {}));
+
     /**
      * @TODO Alex: clarify grouping rules and refactor
      */
@@ -4972,7 +5054,7 @@
                 if (this.isExpense()) {
                     return grossAmount;
                 }
-                grossAmount += this.transactions.reduce(function (sum, transaction) { return sum + Math.abs(transaction.amount); }, 0);
+                grossAmount += this.transactions.filter(function (t) { var _a; return !((_a = t.chartAccounts) === null || _a === void 0 ? void 0 : _a.isSalaryIncluded()); }).reduce(function (sum, transaction) { return sum + Math.abs(transaction.amount); }, 0);
                 if (this.isWorkTank()) {
                     grossAmount += this.frankingCredit - this.taxFreeComponent - this.eligibleForReduction;
                 }
@@ -7818,23 +7900,6 @@
         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
@@ -7928,9 +7993,9 @@
         UserEventTypeTypeEnum.BASIQ_NEW_ACCOUNTS,
         UserEventTypeTypeEnum.BASIQ_AUTHORIZATION_FAIL
     ];
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -8053,9 +8118,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.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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -8093,9 +8158,9 @@
         };
         return BasiqTokenService;
     }());
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -8133,9 +8198,9 @@
         };
         return BasiqTokenInterceptor;
     }());
-    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: [{
+    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: [{
                 type: i0.Injectable
             }], ctorParameters: function () { return [{ type: BasiqTokenService }]; } });
 
@@ -8173,9 +8238,9 @@
         };
         return SseService;
     }());
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -8352,9 +8417,9 @@
         };
         return UserService;
     }());
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -8388,9 +8453,9 @@
         };
         return BasiqClientIdInterceptor;
     }());
-    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: [{
+    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: [{
                 type: i0.Injectable
             }], ctorParameters: function () { return [{ type: UserService }]; } });
 
@@ -8399,9 +8464,9 @@
         }
         return InterceptorsModule;
     }());
-    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: [
+    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: [
             {
                 provide: i1.HTTP_INTERCEPTORS,
                 useClass: CorelogicInterceptor,
@@ -8439,7 +8504,7 @@
                 multi: true
             }
         ] });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: InterceptorsModule, decorators: [{
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: InterceptorsModule, decorators: [{
                 type: i0.NgModule,
                 args: [{
                         providers: [
@@ -8500,14 +8565,14 @@
         };
         return TtCoreModule;
     }());
-    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,
+    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,
             InterceptorsModule] });
-    TtCoreModule.ɵinj = i0__namespace.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TtCoreModule, imports: [[
+    TtCoreModule.ɵinj = i0__namespace.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TtCoreModule, imports: [[
                 i1$1.CommonModule,
                 InterceptorsModule
             ]] });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TtCoreModule, decorators: [{
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TtCoreModule, decorators: [{
                 type: i0.NgModule,
                 args: [{
                         declarations: [],
@@ -9852,60 +9917,6 @@
         return ClientInviteCollection;
     }(Collection));
 
-    exports.DocumentTypeEnum = void 0;
-    (function (DocumentTypeEnum) {
-        DocumentTypeEnum[DocumentTypeEnum["INVOICE"] = 1] = "INVOICE";
-    })(exports.DocumentTypeEnum || (exports.DocumentTypeEnum = {}));
-
-    exports.AnnualFrequencyEnum = void 0;
-    (function (AnnualFrequencyEnum) {
-        AnnualFrequencyEnum[AnnualFrequencyEnum["ANNUAL"] = 1] = "ANNUAL";
-        AnnualFrequencyEnum[AnnualFrequencyEnum["QUARTERLY"] = 3] = "QUARTERLY";
-        AnnualFrequencyEnum[AnnualFrequencyEnum["MONTHLY"] = 12] = "MONTHLY";
-        AnnualFrequencyEnum[AnnualFrequencyEnum["FORTNIGHTLY"] = 26] = "FORTNIGHTLY";
-        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;
-    (function (ChartAccountsEtpEnum) {
-        ChartAccountsEtpEnum[ChartAccountsEtpEnum["ETP_R"] = 549] = "ETP_R";
-        ChartAccountsEtpEnum[ChartAccountsEtpEnum["ETP_S"] = 550] = "ETP_S";
-        ChartAccountsEtpEnum[ChartAccountsEtpEnum["ETP_O"] = 551] = "ETP_O";
-        ChartAccountsEtpEnum[ChartAccountsEtpEnum["ETP_D"] = 552] = "ETP_D";
-        ChartAccountsEtpEnum[ChartAccountsEtpEnum["ETP_B"] = 553] = "ETP_B";
-    })(exports.ChartAccountsEtpEnum || (exports.ChartAccountsEtpEnum = {}));
-
-    exports.ChartAccountsMetadataTypeEnum = void 0;
-    (function (ChartAccountsMetadataTypeEnum) {
-        ChartAccountsMetadataTypeEnum[ChartAccountsMetadataTypeEnum["NUMBER"] = 3] = "NUMBER";
-        ChartAccountsMetadataTypeEnum[ChartAccountsMetadataTypeEnum["BOOLEAN"] = 4] = "BOOLEAN";
-    })(exports.ChartAccountsMetadataTypeEnum || (exports.ChartAccountsMetadataTypeEnum = {}));
-
-    exports.ChartAccountsTypeEnum = void 0;
-    (function (ChartAccountsTypeEnum) {
-        ChartAccountsTypeEnum[ChartAccountsTypeEnum["INCOME"] = 1] = "INCOME";
-        ChartAccountsTypeEnum[ChartAccountsTypeEnum["EXPENSE"] = 2] = "EXPENSE";
-    })(exports.ChartAccountsTypeEnum || (exports.ChartAccountsTypeEnum = {}));
-
     exports.ClientDetailsMedicareExemptionEnum = void 0;
     (function (ClientDetailsMedicareExemptionEnum) {
         ClientDetailsMedicareExemptionEnum[ClientDetailsMedicareExemptionEnum["NO"] = 0] = "NO";
@@ -12760,9 +12771,9 @@
         };
         return AddressService;
     }());
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -12877,9 +12888,9 @@
         };
         return BankAccountService;
     }(RestService$1));
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -12965,9 +12976,9 @@
         };
         return BankTransactionService;
     }(RestService$1));
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -12975,317 +12986,82 @@
             }] });
 
     /**
-     * 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
+     * Service that handling banks logic
      */
-    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();
+    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;
         }
-        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; }));
+        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'
+                    }]
+            }] });
+
+    /**
+     * Service to work with depreciation chart accounts
+     */
+    var ChartAccountsDepreciationService = /** @class */ (function (_super) {
+        __extends(ChartAccountsDepreciationService, _super);
+        function ChartAccountsDepreciationService() {
+            var _this = _super.apply(this, __spreadArray([], __read(arguments))) || this;
+            _this.url = 'chart-accounts-depreciations';
+            _this.modelClass = ChartAccountsDepreciation;
+            _this.isHydra = true;
+            return _this;
+        }
         /**
-         * Create a new Model instance in database
+         * Get depreciation chart accounts for current financial year
          */
-        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;
+        ChartAccountsDepreciationService.prototype.getCurrent = function () {
+            return this.get()
+                .pipe(operators.map(function (chartAccountsDepreciations) {
+                return chartAccountsDepreciations
+                    .find(function (chartAccountsDepreciation) {
+                    return chartAccountsDepreciation.effectiveYear === new FinancialYear().year;
+                });
             }));
         };
+        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: [{
+                type: i0.Injectable,
+                args: [{
+                        providedIn: 'root'
+                    }]
+            }] });
+
+    /**
+     * Chart accounts service
+     */
+    var ChartAccountsService = /** @class */ (function () {
+        function ChartAccountsService(http, environment) {
+            this.http = http;
+            this.environment = environment;
+            this.chartAccountsSubject = new rxjs.ReplaySubject(1);
+        }
         /**
-         * Create multiple new Model instances in database
+         * get all parent and child chart accounts and group it
          */
-        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
-     */
-    var ChartAccountsDepreciationService = /** @class */ (function (_super) {
-        __extends(ChartAccountsDepreciationService, _super);
-        function ChartAccountsDepreciationService() {
-            var _this = _super.apply(this, __spreadArray([], __read(arguments))) || this;
-            _this.url = 'chart-accounts-depreciations';
-            _this.modelClass = ChartAccountsDepreciation;
-            _this.isHydra = true;
-            return _this;
-        }
-        /**
-         * Get depreciation chart accounts for current financial year
-         */
-        ChartAccountsDepreciationService.prototype.getCurrent = function () {
-            return this.get()
-                .pipe(operators.map(function (chartAccountsDepreciations) {
-                return chartAccountsDepreciations
-                    .find(function (chartAccountsDepreciation) {
-                    return chartAccountsDepreciation.effectiveYear === new FinancialYear().year;
-                });
-            }));
-        };
-        return ChartAccountsDepreciationService;
-    }(RestService$1));
-    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'
-                    }]
-            }] });
-
-    /**
-     * Chart accounts service
-     */
-    var ChartAccountsService = /** @class */ (function () {
-        function ChartAccountsService(http, environment) {
-            this.http = http;
-            this.environment = environment;
-            this.chartAccountsSubject = new rxjs.ReplaySubject(1);
-        }
-        /**
-         * get all parent and child chart accounts and group it
-         */
-        ChartAccountsService.prototype.getChartAccounts = function () {
+        ChartAccountsService.prototype.getChartAccounts = function () {
             var _this = this;
             if (!this._chartAccounts) {
                 this._chartAccounts = [];
@@ -13350,9 +13126,9 @@
         };
         return ChartAccountsService;
     }());
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -13404,9 +13180,9 @@
         };
         return MessageService;
     }(RestService$1));
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -13520,9 +13296,9 @@
         };
         return MessageDocumentService;
     }());
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -13603,9 +13379,9 @@
         };
         return ChatService;
     }(RestService$1));
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -13678,9 +13454,9 @@
         };
         return ReceiptService;
     }());
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -13714,9 +13490,9 @@
         }
         return DepreciationReceiptService;
     }(ReceiptService));
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -13882,9 +13658,9 @@
         };
         return DepreciationService;
     }(RestService$1));
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -13943,9 +13719,9 @@
         };
         return DepreciationCapitalProjectService;
     }());
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -13967,9 +13743,9 @@
         }
         return DocumentService;
     }(RestService$1));
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -14041,9 +13817,9 @@
         };
         return DocumentFolderService;
     }(RestService$1));
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -14132,9 +13908,9 @@
         auth_type: 'rerequest',
         return_scopes: true
     };
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -14182,9 +13958,9 @@
         };
         return ClientIncomeTypesService;
     }());
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -14313,9 +14089,9 @@
         };
         return ClientInviteService;
     }(RestService$1));
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -14402,9 +14178,9 @@
         };
         return ClientMovementService;
     }(RestService$1));
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -14437,9 +14213,9 @@
         };
         return EmployeeService;
     }(RestService$1));
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -14486,9 +14262,9 @@
         };
         return EmployeeInviteService;
     }(RestService$1));
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -14514,9 +14290,9 @@
         };
         return ClientPortfolioReportService;
     }());
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -14592,9 +14368,9 @@
         };
         return FirmService;
     }());
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -14674,9 +14450,9 @@
         };
         return IncomeSourceForecastService;
     }(RestService$1));
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -14751,9 +14527,9 @@
         };
         return SalaryForecastService;
     }(RestService$1));
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -14835,9 +14611,9 @@
         };
         return SoleForecastService;
     }(RestService$1));
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -14945,9 +14721,9 @@
         };
         return IncomeSourceService;
     }(RestService$1));
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -15009,9 +14785,9 @@
         };
         return BorrowingExpenseService;
     }());
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -15149,9 +14925,9 @@
         };
         return LoanService;
     }(RestService$1));
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -15171,9 +14947,9 @@
         }
         return PropertyCategoryService;
     }(RestService$1));
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -15217,9 +14993,9 @@
         };
         return PropertyCategoryMovementService;
     }(RestService$1));
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -15276,9 +15052,9 @@
         };
         return PropertyDocumentService;
     }(RestService$1));
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -15296,9 +15072,9 @@
         }
         return TaxExemptionService;
     }(RestService$1));
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -15314,160 +15090,392 @@
             return _this;
         }
         /**
-         * @Todo should be extended from the RestService
+         * @Todo should be extended from the RestService
+         */
+        PropertySaleService.prototype.add = function (model) {
+            var _this = this;
+            return _super.prototype.add.call(this, model).pipe(operators.map(function (newPropertySale) {
+                _this.eventDispatcherService.dispatch(new AppEvent(exports.AppEventTypeEnum.PROPERTY_SALE_ADDED, newPropertySale));
+                return newPropertySale;
+            }));
+        };
+        /**
+         * @Todo should be extended from the RestService
+         */
+        PropertySaleService.prototype.delete = function (model) {
+            var _this = this;
+            return _super.prototype.delete.call(this, model).pipe(operators.map(function () {
+                _this.eventDispatcherService.dispatch(new AppEvent(exports.AppEventTypeEnum.PROPERTY_SALE_DELETED, model));
+            }));
+        };
+        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: [{
+                type: i0.Injectable,
+                args: [{
+                        providedIn: 'root'
+                    }]
+            }] });
+
+    // @TODO check and improve logic during refactoring
+    var PropertyShareService = /** @class */ (function (_super) {
+        __extends(PropertyShareService, _super);
+        function PropertyShareService() {
+            var _this = _super.apply(this, __spreadArray([], __read(arguments))) || this;
+            // api url parameter for properties shares
+            _this.url = 'properties/shares';
+            _this.modelClass = PropertyShare;
+            return _this;
+        }
+        /**
+         * Listen to Event Dispatcher events
+         */
+        PropertyShareService.prototype.listenEvents = function () {
+            this.listenUserUpdated();
+            this.listenSalesAdded();
+            this.listenSalesDeleted();
+        };
+        /**
+         * Updated loan
+         */
+        PropertyShareService.prototype.update = function (propertyShare) {
+            var _this = this;
+            return this.http.put(this.environment.apiV2 + "/" + this.url + "/" + propertyShare.id, propertyShare)
+                .pipe(operators.map(function (updatedPropertyShareBase) {
+                var updatedPropertyShare = classTransformer.plainToClass(PropertyShare, updatedPropertyShareBase);
+                // if loan type is NOT vehicle - fire EventDispatcher event
+                _this.eventDispatcherService.dispatch(new AppEvent(exports.AppEventTypeEnum.PROPERTY_SHARE_UPDATED, null));
+                replace(_this.cache, updatedPropertyShare);
+                _this.updateCache();
+                return updatedPropertyShare;
+            }));
+        };
+        /**
+         * Re-invite property share
+         * @param share user to share property
+         */
+        PropertyShareService.prototype.reinvite = function (share) {
+            return this.http.post(this.environment.apiV2 + "/" + this.url + "/" + share.id + "/reinvite", {});
+        };
+        PropertyShareService.prototype.getIncoming = function () {
+            return this.get()
+                .pipe(operators.map(function (propertyShares) {
+                var propertySharesIncoming = [];
+                propertyShares.forEach(function (propertyShare) {
+                    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
          */
-        PropertySaleService.prototype.add = function (model) {
+        RestService.prototype.delete = function (model) {
             var _this = this;
-            return _super.prototype.add.call(this, model).pipe(operators.map(function (newPropertySale) {
-                _this.eventDispatcherService.dispatch(new AppEvent(exports.AppEventTypeEnum.PROPERTY_SALE_ADDED, newPropertySale));
-                return newPropertySale;
+            this.handleAccessError('delete');
+            return this.http.delete(this.apiUrl + "/" + model.id)
+                .pipe(operators.map(function () {
+                _this.handleResponse([model], 'delete');
             }));
         };
         /**
-         * @Todo should be extended from the RestService
+         * Remove multiple Model instances from database
          */
-        PropertySaleService.prototype.delete = function (model) {
+        RestService.prototype.deleteBatch = function (models) {
             var _this = this;
-            return _super.prototype.delete.call(this, model).pipe(operators.map(function () {
-                _this.eventDispatcherService.dispatch(new AppEvent(exports.AppEventTypeEnum.PROPERTY_SALE_DELETED, model));
+            this.handleAccessError('deleteBatch');
+            return this.http.post(this.apiUrl + "/delete", models)
+                .pipe(operators.map(function () {
+                _this.handleResponse(models, 'delete');
             }));
         };
-        return PropertySaleService;
-    }(RestService$1));
-    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'
-                    }]
-            }] });
-
-    // @TODO check and improve logic during refactoring
-    var PropertyShareService = /** @class */ (function (_super) {
-        __extends(PropertyShareService, _super);
-        function PropertyShareService() {
-            var _this = _super.apply(this, __spreadArray([], __read(arguments))) || this;
-            // api url parameter for properties shares
-            _this.url = 'properties/shares';
-            _this.modelClass = PropertyShare;
-            return _this;
-        }
         /**
-         * Listen to Event Dispatcher events
+         * Refresh cache with actual backend data
          */
-        PropertyShareService.prototype.listenEvents = function () {
-            this.listenUserUpdated();
-            this.listenSalesAdded();
-            this.listenSalesDeleted();
+        RestService.prototype.resetCache = function () {
+            this.fetch()
+                .pipe(operators.first())
+                .subscribe();
         };
         /**
-         * Updated loan
+         * Get data from backend and fill the cache
          */
-        PropertyShareService.prototype.update = function (propertyShare) {
+        RestService.prototype.fetch = function () {
             var _this = this;
-            return this.http.put(this.environment.apiV2 + "/" + this.url + "/" + propertyShare.id, propertyShare)
-                .pipe(operators.map(function (updatedPropertyShareBase) {
-                var updatedPropertyShare = classTransformer.plainToClass(PropertyShare, updatedPropertyShareBase);
-                // if loan type is NOT vehicle - fire EventDispatcher event
-                _this.eventDispatcherService.dispatch(new AppEvent(exports.AppEventTypeEnum.PROPERTY_SHARE_UPDATED, null));
-                replace(_this.cache, updatedPropertyShare);
-                _this.updateCache();
-                return updatedPropertyShare;
+            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;
             }));
         };
+        ;
         /**
-         * Re-invite property share
-         * @param share user to share property
+         * Handle response data - update cache and dispatch event if it is needed
          */
-        PropertyShareService.prototype.reinvite = function (share) {
-            return this.http.post(this.environment.apiV2 + "/" + this.url + "/" + share.id + "/reinvite", {});
-        };
-        PropertyShareService.prototype.getIncoming = function () {
-            return this.get()
-                .pipe(operators.map(function (propertyShares) {
-                var propertySharesIncoming = [];
-                propertyShares.forEach(function (propertyShare) {
-                    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;
-            }));
+        RestService.prototype.handleResponse = function (response, method) {
+            this.updateCache(response, method);
+            // dispatch event for interested services
+            if (response[0] instanceof ObservableModel) {
+                this.dispatchEvent(method, response);
+            }
         };
         /**
-         * Get outcoming property shares list
+         * Update cache with passed items. Add/Update detects automatically, Delete via optional flag
          */
-        PropertyShareService.prototype.getOutcoming = function () {
+        RestService.prototype.updateCache = function (items, method) {
+            var _a;
             var _this = this;
-            return this.get().pipe(operators.map(function (propertyShares) {
-                return _this.filterOutcoming(propertyShares);
-            }));
+            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);
         };
         /**
-         * Filter outcoming property shares
+         * Generate and dispatch rest event
          */
-        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; });
-            }));
+        RestService.prototype.dispatchEvent = function (method, items) {
+            var eventName = this.modelClass.getEventName(method);
+            this.eventDispatcherService.dispatch2(new AppEvent2(eventName, items));
         };
         /**
-         * Listen to User updated event
+         * 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)
          */
-        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();
-                });
-            });
+        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);
         };
         /**
-         * @Todo Alex refactor after PropertyShare functionality in PropertyService will be cleared up
+         * Check if method is not disabled. Throw exception otherwise.
+         * Some entities does not have endpoints for all methods.
          */
-        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();
-            });
+        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.listenSalesDeleted = function () {
+        /**
+         * 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;
-            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();
+            methods.forEach(function (method) {
+                _this.eventDispatcherService.on2(modelClass.getEventName(method)).subscribe(function (data) {
+                    callback(data);
+                });
             });
         };
-        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: [{
+        /**
+         * 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.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: [{
                 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
@@ -15586,9 +15594,9 @@
         };
         return PropertyService;
     }(RestService));
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -15636,9 +15644,9 @@
         };
         return ServiceNotificationService;
     }(RestService$1));
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -15694,9 +15702,9 @@
         };
         return SoleBusinessService;
     }(RestService$1));
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -15714,9 +15722,9 @@
         }
         return SoleBusinessActivityService;
     }(RestService$1));
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -15746,9 +15754,9 @@
         };
         return SoleBusinessLossService;
     }(RestService$1));
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -15769,9 +15777,9 @@
         }
         return SoleBusinessLossOffsetRuleService;
     }(RestService$1));
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -15789,9 +15797,9 @@
         }
         return SoleContactService;
     }(RestService$1));
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -15851,9 +15859,9 @@
         };
         return SoleDepreciationMethodService;
     }());
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -15912,9 +15920,9 @@
         };
         return SoleDetailsService;
     }());
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -15997,9 +16005,9 @@
         };
         return SoleInvoiceService;
     }(RestService$1));
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -16017,9 +16025,9 @@
         }
         return SoleInvoiceTemplateService;
     }(RestService$1));
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -16037,9 +16045,9 @@
         }
         return BasReportService;
     }(RestService$1));
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -16060,9 +16068,9 @@
         }
         return ServicePriceService;
     }(RestService$1));
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -16189,9 +16197,9 @@
         };
         return SubscriptionService;
     }());
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -16232,9 +16240,9 @@
         };
         return TaxReviewHistoryService;
     }(RestService$1));
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -16331,9 +16339,9 @@
         };
         return TaxReviewService;
     }(RestService$1));
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -16394,9 +16402,9 @@
         };
         return TaxSummaryService;
     }());
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -16503,9 +16511,9 @@
         };
         return TransactionAllocationService;
     }(RestService$1));
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -16534,9 +16542,9 @@
         }
         return TransactionReceiptService;
     }(ReceiptService));
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -16875,9 +16883,9 @@
         };
         return TransactionService;
     }(RestService$1));
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -16909,9 +16917,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.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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -16936,9 +16944,9 @@
         }
         return VehicleService;
     }(RestService$1));
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -17019,9 +17027,9 @@
         };
         return VehicleClaimService;
     }(RestService$1));
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -17103,9 +17111,9 @@
         };
         return VehicleClaimDetailsService;
     }());
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -17130,9 +17138,9 @@
         }
         return VehicleLogbookService;
     }(RestService$1));
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -17167,9 +17175,9 @@
         };
         return OccupationService;
     }());
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -17219,9 +17227,9 @@
         };
         return UserEventSettingService;
     }(RestService$1));
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -17239,9 +17247,9 @@
         }
         return UserEventTypeService;
     }(RestService$1));
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -17261,9 +17269,9 @@
         }
         return UsersInviteService;
     }(RestService$1));
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -17462,9 +17470,9 @@
         };
         return AccountSetupService;
     }());
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -17492,9 +17500,9 @@
         };
         return RewardfulService;
     }());
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -17542,9 +17550,9 @@
         };
         return AssetsService;
     }());
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -17614,9 +17622,9 @@
         };
         return BankTransactionCalculationService;
     }());
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -17646,9 +17654,9 @@
         };
         return BankAccountCalculationService;
     }());
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -17675,9 +17683,9 @@
         };
         return ExportFormatterService;
     }());
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -17700,9 +17708,9 @@
         };
         return HeaderTitleService;
     }());
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -17737,9 +17745,9 @@
         };
         return IntercomService;
     }());
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -17806,9 +17814,9 @@
         };
         return PdfFromDomElementService;
     }());
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -17891,9 +17899,9 @@
         };
         return PdfFromTableService;
     }());
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -17929,9 +17937,9 @@
         };
         return PdfFromDataTableService;
     }(PdfFromTableService));
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -17970,9 +17978,9 @@
         };
         return PdfFromHtmlTableService;
     }(PdfFromTableService));
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -18006,9 +18014,9 @@
         };
         return EquityPositionChartService;
     }());
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -18196,9 +18204,9 @@
         };
         return PropertyCalculationService;
     }());
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -18255,9 +18263,9 @@
         };
         return PropertyTransactionReportService;
     }());
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -18339,9 +18347,9 @@
         };
         return TransactionCalculationService;
     }());
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -18405,9 +18413,9 @@
         };
         return LogbookBestPeriodService;
     }());
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -18451,9 +18459,9 @@
         };
         return XlsxService;
     }());
-    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: [{
+    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: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -21021,14 +21029,60 @@
 
     var TransactionForm = /** @class */ (function (_super) {
         __extends(TransactionForm, _super);
-        function TransactionForm(transaction, registeredForGst, controls) {
+        function TransactionForm(transaction, registeredForGst, allocations, controls) {
             if (controls === void 0) { controls = {}; }
-            var _this = _super.call(this, transaction, registeredForGst, controls) || this;
+            var _this = _super.call(this, transaction, registeredForGst, Object.assign(controls, { transactions: new forms.FormArray([]) })) || this;
+            // convert child transactions to controls
+            transaction.transactions.map(function (transaction) {
+                _this.addTransactionControl(transaction);
+            });
+            // forbid to add transactions before property ownership
             if (transaction.property) {
                 _this.get('date').addValidators(minDateValidator(transaction.property.myShare.fromDate, MessagesEnum.DATE_VALIDATION_ERROR));
             }
+            // property usually comes with fees, add empty control for new transactions
+            if (!transaction.id && transaction.property && !transaction.transactions.length) {
+                _this.addTransactionControl();
+            }
+            // forbid to edit amount for allocated transactions to prevent wrong allocations
+            if (allocations.length) {
+                _this.get('amount').disable();
+                _this.get('date').disable();
+            }
             return _this;
         }
+        TransactionForm.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);
+        };
+        TransactionForm.prototype.removeTransactionControl = function (index) {
+            this.get('transactions').removeAt(index);
+        };
+        /**
+         * income transactions might include adjustments (child transactions), like tips or fees.
+         * Adjustments inherit most of the fields from parent transaction
+         */
+        TransactionForm.prototype.buildTransactions = function (transaction) {
+            var _this = this;
+            return this.get('transactions').value.map(function (childTransaction) { return Object.assign({
+                description: childTransaction.chartAccounts.name,
+                date: transaction.date,
+                claimPercent: transaction.claimPercent,
+                source: exports.TransactionSourceEnum.BANK_TRANSACTION,
+                type: childTransaction.chartAccounts.isExpense() ? exports.TransactionTypeEnum.DEBIT : exports.TransactionTypeEnum.CREDIT,
+                incomeSource: transaction.incomeSource,
+                property: transaction.property
+            }, _this.model.transactions.find(function (transaction) { return transaction.id === childTransaction['id']; }) || {}, childTransaction); });
+        };
+        TransactionForm.prototype.submit = function (data) {
+            if (data === void 0) { data = {}; }
+            return _super.prototype.submit.call(this, Object.assign(data, { transactions: this.buildTransactions(this.currentValue) }));
+        };
         return TransactionForm;
     }(TransactionBaseForm));
 
@@ -21037,9 +21091,8 @@
         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([]),
+            _this = _super.call(this, transaction, registeredForGst, allocations, {
+                // additional data related to work income (like tax instalments)
                 metadata: new forms.FormArray((transaction.metadata || []).map(function (transactionMetadata) {
                     return new forms.FormGroup({
                         value: new forms.FormControl(transactionMetadata.value),
@@ -21052,15 +21105,13 @@
                 }, forms.Validators.required),
                 incomeSource: new forms.FormControl(transaction.incomeSource, [forms.Validators.required, autocompleteValidator()]),
             }) || this;
-            // @TODO vik move to TransactionForm
+            // salary adjustments (like tips)
+            if (transaction.id) {
+                _this.get('amount').setValue(_this.getAmount(transaction));
+            }
             if (allocations.length) {
-                _this.get('amount').disable();
-                _this.get('date').disable();
+                _this.get('chartAccounts').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();
             }
@@ -21091,12 +21142,14 @@
                     return;
                 }
                 _this.buildMetadataForm();
+                // tax make no sense for pre-paying tax category
                 if (value.isNRAS()) {
                     _this.get('tax').disable();
                 }
                 else {
                     _this.get('tax').enable();
                 }
+                // adjustments possible only for salary chartAccounts
                 if (value.isSalary()) {
                     _this.get('transactions').enable();
                 }
@@ -21120,37 +21173,28 @@
                 }));
             });
         };
-        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); });
+         * @param transaction
+         * @param includeAdjustments reduce result by adjustments included in salary if false or increase amount with included salary adjustments to match received payment if true,
+         * salary/wage comes to bankAccount together with related chartAccounts like tips (kind of salary, but reported in different tax summary section),
+         * adjustments used to clarify received payment by separating it into multiple transactions,
+         * formAmount always match received payment, it also matches parent transactionAmount when there are no adjustments,
+         * otherwise it includes such adjustments, so we should exclude it from formAmount to create a salary transaction (on submit)
+         * but include in form->amount to match bank transaction (on edit),
+         * ie bankTransaction=1000$, it includes 900$ salary and 100$ tips (should be reported in different tax summary sections),
+         * so we should show 1000$ in formAmount, but create 2 transactions with 900$ and 100$
+         */
+        WorkIncomeForm.prototype.getAmount = function (transaction, includeAdjustments) {
+            if (includeAdjustments === void 0) { includeAdjustments = true; }
+            if (!transaction.chartAccounts || !transaction.chartAccounts.isSalary()) {
+                return transaction.amount;
+            }
+            var includedTransactions = new Collection(transaction.transactions).filter(function (t) { return t.chartAccounts.isSalaryIncluded(); });
+            return transaction.amount + includedTransactions.sumBy('amount') * (includeAdjustments ? 1 : -1);
         };
         WorkIncomeForm.prototype.submit = function (data) {
             if (data === void 0) { data = {}; }
-            return _super.prototype.submit.call(this, Object.assign(data, { transactions: this.buildTransactions() }));
+            return _super.prototype.submit.call(this, Object.assign(data, { amount: this.getAmount(this.currentValue, false) }));
         };
         return WorkIncomeForm;
     }(TransactionForm));