taxtank-core 0.8.3 → 0.8.7

package/bundles/taxtank-core.umd.js

@@ -1261,7 +1261,7 @@
         Collection.prototype.getIds = function () {
             return this.items.map(function (item) { return item['id']; });
         };
-        Collection.prototype.getOneBy = function (path, value) {
+        Collection.prototype.findBy = function (path, value) {
             return this.items.find(function (item) { return get__default["default"](item, path) === value; });
         };
         Collection.prototype.getBy = function (path, value) {
@@ -1952,8 +1952,8 @@
         });
         DepreciationCollection.prototype.getClaimAmountByYear = function (year) {
             if (year === void 0) { year = +localStorage.getItem('financialYear'); }
-            return this.items.reduce(function (sum, depreciation) {
-                return sum + depreciation.getClaimAmountByYear(year);
+            return this.amount - this.items.reduce(function (sum, depreciation) {
+                return sum + depreciation.getCloseBalanceByYear(year);
             }, 0);
         };
         DepreciationCollection.prototype.getCloseBalanceByYear = function (year) {
@@ -2536,12 +2536,12 @@
     /**
      * collection for tax return category items
      */
-    var TaxReturnCategoryItemCollection = /** @class */ (function (_super) {
-        __extends(TaxReturnCategoryItemCollection, _super);
-        function TaxReturnCategoryItemCollection() {
+    var ReportItemCollection = /** @class */ (function (_super) {
+        __extends(ReportItemCollection, _super);
+        function ReportItemCollection() {
             return _super !== null && _super.apply(this, arguments) || this;
         }
-        Object.defineProperty(TaxReturnCategoryItemCollection.prototype, "salary", {
+        Object.defineProperty(ReportItemCollection.prototype, "salary", {
             /**
              * Work income
              */
@@ -2552,7 +2552,7 @@
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(TaxReturnCategoryItemCollection.prototype, "workExpenses", {
+        Object.defineProperty(ReportItemCollection.prototype, "workExpenses", {
             /**
              * Work expenses
              */
@@ -2563,7 +2563,7 @@
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(TaxReturnCategoryItemCollection.prototype, "rentalIncome", {
+        Object.defineProperty(ReportItemCollection.prototype, "rentalIncome", {
             /**
              * Property income
              */
@@ -2574,7 +2574,7 @@
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(TaxReturnCategoryItemCollection.prototype, "rentalDeductions", {
+        Object.defineProperty(ReportItemCollection.prototype, "rentalDeductions", {
             /**
              * Property rental deductions
              */
@@ -2585,7 +2585,7 @@
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(TaxReturnCategoryItemCollection.prototype, "propertyExpenses", {
+        Object.defineProperty(ReportItemCollection.prototype, "propertyExpenses", {
             /**
              * Property expenses
              */
@@ -2595,7 +2595,7 @@
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(TaxReturnCategoryItemCollection.prototype, "interestDeductions", {
+        Object.defineProperty(ReportItemCollection.prototype, "interestDeductions", {
             /**
              * Property interest
              */
@@ -2606,7 +2606,7 @@
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(TaxReturnCategoryItemCollection.prototype, "capitalWorks", {
+        Object.defineProperty(ReportItemCollection.prototype, "capitalWorks", {
             /**
              * Property capital works depreciations
              */
@@ -2617,7 +2617,7 @@
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(TaxReturnCategoryItemCollection.prototype, "plantEquipment", {
+        Object.defineProperty(ReportItemCollection.prototype, "plantEquipment", {
             /**
              * Property plant & equipment depreciations
              */
@@ -2628,7 +2628,7 @@
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(TaxReturnCategoryItemCollection.prototype, "propertyDepreciations", {
+        Object.defineProperty(ReportItemCollection.prototype, "propertyDepreciations", {
             /**
              * Total property depreciaions
              */
@@ -2638,7 +2638,7 @@
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(TaxReturnCategoryItemCollection.prototype, "partnershipsAndTrusts", {
+        Object.defineProperty(ReportItemCollection.prototype, "partnershipsAndTrusts", {
             get: function () {
                 var _a;
                 return ((_a = this.getByCategory(exports.TaxReturnCategoryListEnum.PARTNERSHIPS_TRUSTS)) === null || _a === void 0 ? void 0 : _a.amount) || 0;
@@ -2646,7 +2646,7 @@
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(TaxReturnCategoryItemCollection.prototype, "pciAndSbeIncome", {
+        Object.defineProperty(ReportItemCollection.prototype, "pciAndSbeIncome", {
             get: function () {
                 var _a;
                 return ((_a = this.getByCategory(exports.TaxReturnCategoryListEnum.PCI_SBE_INCOME)) === null || _a === void 0 ? void 0 : _a.amount) || 0;
@@ -2654,7 +2654,7 @@
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(TaxReturnCategoryItemCollection.prototype, "capitalGains", {
+        Object.defineProperty(ReportItemCollection.prototype, "capitalGains", {
             get: function () {
                 var _a;
                 return ((_a = this.getByCategory(exports.TaxReturnCategoryListEnum.CAPITAL_GAINS)) === null || _a === void 0 ? void 0 : _a.amount) || 0;
@@ -2662,7 +2662,7 @@
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(TaxReturnCategoryItemCollection.prototype, "foreignSourceIncome", {
+        Object.defineProperty(ReportItemCollection.prototype, "foreignSourceIncome", {
             get: function () {
                 var _a;
                 return ((_a = this.getByCategory(exports.TaxReturnCategoryListEnum.FOREIGN_SOURCE_INCOME)) === null || _a === void 0 ? void 0 : _a.amount) || 0;
@@ -2670,7 +2670,7 @@
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(TaxReturnCategoryItemCollection.prototype, "otherIncome", {
+        Object.defineProperty(ReportItemCollection.prototype, "otherIncome", {
             /**
              * Other income
              */
@@ -2685,7 +2685,7 @@
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(TaxReturnCategoryItemCollection.prototype, "otherDeductions", {
+        Object.defineProperty(ReportItemCollection.prototype, "otherDeductions", {
             /**
              * Other expenses
              */
@@ -2696,7 +2696,7 @@
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(TaxReturnCategoryItemCollection.prototype, "taxInstalments", {
+        Object.defineProperty(ReportItemCollection.prototype, "taxInstalments", {
             get: function () {
                 var _a;
                 return ((_a = this.getTaxCreditsCollection().getByCategory(exports.TaxReturnCategoryListEnum.TAX_INSTALMENTS)) === null || _a === void 0 ? void 0 : _a.amount) || 0;
@@ -2704,7 +2704,7 @@
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(TaxReturnCategoryItemCollection.prototype, "frankingCredits", {
+        Object.defineProperty(ReportItemCollection.prototype, "frankingCredits", {
             get: function () {
                 var _a;
                 return ((_a = this.getTaxCreditsCollection().getByCategory(exports.TaxReturnCategoryListEnum.FRANKING_CREDITS)) === null || _a === void 0 ? void 0 : _a.amount) || 0;
@@ -2712,7 +2712,7 @@
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(TaxReturnCategoryItemCollection.prototype, "taxOffsets", {
+        Object.defineProperty(ReportItemCollection.prototype, "taxOffsets", {
             get: function () {
                 var _a;
                 return ((_a = this.getByCategory(exports.TaxReturnCategoryListEnum.TAX_OFFSETS)) === null || _a === void 0 ? void 0 : _a.amount) || 0;
@@ -2720,7 +2720,7 @@
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(TaxReturnCategoryItemCollection.prototype, "borrowingExpenses", {
+        Object.defineProperty(ReportItemCollection.prototype, "borrowingExpenses", {
             get: function () {
                 var _a;
                 return ((_a = this.getByCategory(exports.TaxReturnCategoryListEnum.BORROWING_EXPENSES)) === null || _a === void 0 ? void 0 : _a.amount) || 0;
@@ -2728,7 +2728,7 @@
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(TaxReturnCategoryItemCollection.prototype, "grossTaxPayable", {
+        Object.defineProperty(ReportItemCollection.prototype, "grossTaxPayable", {
             get: function () {
                 var _a;
                 return ((_a = this.getByCategory(exports.TaxReturnCategoryListEnum.GROSS_TAX_PAYABLE)) === null || _a === void 0 ? void 0 : _a.amount) || 0;
@@ -2739,22 +2739,22 @@
         /**
          * taxWithheld by section (work or other)
          */
-        TaxReturnCategoryItemCollection.prototype.getTaxWithheld = function (section) {
+        ReportItemCollection.prototype.getTaxWithheld = function (section) {
             if (section === void 0) { section = exports.TaxReturnCategorySectionEnum.WORK_TANK; }
             var _a;
             return ((_a = this.getTaxCreditsCollection().getByCategory(exports.TaxReturnCategoryListEnum.TAX_WITHHELD)) === null || _a === void 0 ? void 0 : _a.details.filter(function (details) { return details.section === section; }).reduce(function (sum, details) { return sum + details.amount; }, 0)) || 0;
         };
-        TaxReturnCategoryItemCollection.prototype.getTaxCreditsCollection = function () {
+        ReportItemCollection.prototype.getTaxCreditsCollection = function () {
             var _a;
-            return new TaxReturnCategoryItemCollection(((_a = this.getByCategory(exports.TaxReturnCategoryListEnum.TAX_CREDITS)) === null || _a === void 0 ? void 0 : _a.items) || []);
+            return new ReportItemCollection(((_a = this.getByCategory(exports.TaxReturnCategoryListEnum.TAX_CREDITS)) === null || _a === void 0 ? void 0 : _a.items) || []);
         };
-        TaxReturnCategoryItemCollection.prototype.getTotalAmountByIncomeSourceName = function (name) {
+        ReportItemCollection.prototype.getTotalAmountByIncomeSourceName = function (name) {
             return this.items.reduce((function (sum, item) { return sum + item.getAmountByIncomeSourceName(name); }), 0);
         };
-        TaxReturnCategoryItemCollection.prototype.getByCategory = function (category) {
+        ReportItemCollection.prototype.getByCategory = function (category) {
             return this.items.find(function (item) { return item.taxReturnCategory.id === category; });
         };
-        return TaxReturnCategoryItemCollection;
+        return ReportItemCollection;
     }(Collection));
 
     /**
@@ -2992,6 +2992,7 @@
          * Check if current tank is Work
          */
         TransactionBase.prototype.isWorkTank = function () {
+            // @TODO remove this hack
             if (this.tankType) {
                 return this.tankType === exports.TankTypeEnum.WORK;
             }
@@ -4756,7 +4757,7 @@
          * net capital gain tax (includes tax exemptions)
          */
         Property.prototype.calculateNetCGT = function (sale) {
-            return this.getCGTExemptionRatio(sale) * this.calculateCGT(sale);
+            return this.getCGTExemptionRatio(sale) * sale.cgt;
         };
         /**
          * guess tax exemption based on property details
@@ -4770,7 +4771,7 @@
                 case this.category.id === PropertyCategoryListEnum.OWNER_OCCUPIED:
                     return exports.TaxExemptionEnum.PPR;
                 // exemption for investment properties owned for at least one year
-                case this.getOwnershipDuration(sale, 'years') >= 1:
+                case this.isOneYearExemptionApplicable(sale):
                     return exports.TaxExemptionEnum.ONE_YEAR_RULE;
                 default:
                     return null;
@@ -4793,7 +4794,7 @@
                 // main residence become investment (exemption for home office percent usage)
                 case exports.TaxExemptionEnum.PPR_TO_INVESTMENT:
                     // 1 year CGT discount can still apply (on the income producing % if used for 12 months or more)
-                    var ratio = this.getOwnershipDuration(sale, 'years') >= 1 ? 0.5 : 1;
+                    var ratio = this.isOneYearExemptionApplicable(sale) ? 0.5 : 1;
                     return metadata.getClaimPercent() / 100 * ratio;
                 // full exemption
                 case exports.TaxExemptionEnum.PPR:
@@ -4806,6 +4807,9 @@
                     return 1;
             }
         };
+        Property.prototype.isOneYearExemptionApplicable = function (sale) {
+            return sale.cgt > 0 && this.getOwnershipDuration(sale, 'years') > 0;
+        };
         /**
          * ownership duration from purchase till sale
          */
@@ -7790,30 +7794,30 @@
      * Used in tax summary reports to show amounts relating to a tax return category entity and details of what this
      * amount is comprised of. Example here shows an amount of $951.96 and also details of what this amount is comprised of:
      */
-    var TaxReturnCategoryItem = /** @class */ (function () {
-        function TaxReturnCategoryItem() {
+    var ReportItem = /** @class */ (function () {
+        function ReportItem() {
         }
         /**
          * Get amount for one income source
          * @param name Name of income source for filter
          */
-        TaxReturnCategoryItem.prototype.getAmountByIncomeSourceName = function (name) {
+        ReportItem.prototype.getAmountByIncomeSourceName = function (name) {
             var _a;
             return ((_a = this.details.find(function (detail) { return detail.name === name; })) === null || _a === void 0 ? void 0 : _a.amount) || 0;
         };
-        return TaxReturnCategoryItem;
+        return ReportItem;
     }());
 
     /**
      * Used in tax summary reports to show specific details relating to an amount in the report.
-     * See structure in TaxReturnCategoryItem class.
+     * See structure in ReportItem class.
      * Example an amount of $550 for property income could be comprised of 2 different property amounts of $300 and $250.
      * This is useful in providing drill-down information for the tax summary report.
      */
-    var TaxReturnCategoryItemDetails = /** @class */ (function () {
-        function TaxReturnCategoryItemDetails() {
+    var ReportItemDetails = /** @class */ (function () {
+        function ReportItemDetails() {
         }
-        return TaxReturnCategoryItemDetails;
+        return ReportItemDetails;
     }());
 
     /**
@@ -7826,10 +7830,10 @@
         return TaxSummarySection;
     }());
     __decorate([
-        classTransformer.Type(function () { return TaxReturnCategoryItem; }),
+        classTransformer.Type(function () { return ReportItem; }),
         classTransformer.Transform(function (_a) {
             var value = _a.value;
-            return new TaxReturnCategoryItemCollection(value);
+            return new ReportItemCollection(value);
         })
     ], TaxSummarySection.prototype, "items", void 0);
     __decorate([
@@ -8256,8 +8260,8 @@
      * Model - entity service is working with
      * BaseModel - base entity model that extends by Model
      */
-    var BaseRestService = /** @class */ (function () {
-        function BaseRestService(http, eventDispatcherService, environment) {
+    var RestService = /** @class */ (function () {
+        function RestService(http, eventDispatcherService, environment) {
             this.http = http;
             this.eventDispatcherService = eventDispatcherService;
             this.environment = environment;
@@ -8267,7 +8271,7 @@
         /**
          * get cached list of all instances
          */
-        BaseRestService.prototype.get = function () {
+        RestService.prototype.get = function () {
             if (!this.cache) {
                 this.fetch().subscribe();
             }
@@ -8277,7 +8281,7 @@
          * get instance by id from cache
          * @param id ID of required item
          */
-        BaseRestService.prototype.getById = function (id) {
+        RestService.prototype.getById = function (id) {
             return this.get()
                 .pipe(operators.map(function (items) {
                 return items.find(function (item) { return item['id'] === id; });
@@ -8287,7 +8291,7 @@
          * get list of items filtered by id.
          * @param models Array of objects contains required items ids
          */
-        BaseRestService.prototype.getByIds = function (models) {
+        RestService.prototype.getByIds = function (models) {
             var idsArray = models.map(function (model) { return model['id']; });
             return this.get()
                 .pipe(operators.map(function (items) {
@@ -8298,7 +8302,7 @@
          * add new instance and update cache
          * @TODO rename to post
          */
-        BaseRestService.prototype.add = function (model, shouldUpdateCache) {
+        RestService.prototype.add = function (model, shouldUpdateCache) {
             var _this = this;
             if (shouldUpdateCache === void 0) { shouldUpdateCache = true; }
             return this.http.post(this.environment.apiV2 + "/" + this.url, classTransformer.classToPlain(model))
@@ -8320,7 +8324,7 @@
          * @param queryParams query parameters for request
          * @TODO rename to postBatch
          */
-        BaseRestService.prototype.addBatch = function (models, queryParams) {
+        RestService.prototype.addBatch = function (models, queryParams) {
             var _this = this;
             if (queryParams === void 0) { queryParams = {}; }
             return this.http.post(this.environment.apiV2 + "/" + this.url, classTransformer.classToPlain(models), queryParams)
@@ -8340,7 +8344,7 @@
          * @param queryParams query parameters for request
          * @TODO rename to put
          */
-        BaseRestService.prototype.update = function (model, queryParams) {
+        RestService.prototype.update = function (model, queryParams) {
             var _this = this;
             if (queryParams === void 0) { queryParams = {}; }
             return this.http.put(this.environment.apiV2 + "/" + this.url + "/" + model['id'], classTransformer.classToPlain(model), queryParams)
@@ -8357,7 +8361,7 @@
          * @param queryParams query parameters for request
          * TODO rename to putBatch
          */
-        BaseRestService.prototype.updateBatch = function (models, queryParams) {
+        RestService.prototype.updateBatch = function (models, queryParams) {
             var _this = this;
             if (queryParams === void 0) { queryParams = {}; }
             return this.http.put(this.environment.apiV2 + "/" + this.url, classTransformer.classToPlain(models), queryParams)
@@ -8374,7 +8378,7 @@
          * delete instance of class
          * @param model Class instance for deleting
          */
-        BaseRestService.prototype.delete = function (model) {
+        RestService.prototype.delete = function (model) {
             var _this = this;
             return this.http.delete(this.environment.apiV2 + "/" + this.url + "/" + model['id'])
                 .pipe(operators.map(function () {
@@ -8386,7 +8390,7 @@
          * delete multiple instances of class
          * @param models Class instances array for deleting
          */
-        BaseRestService.prototype.deleteBatch = function (models) {
+        RestService.prototype.deleteBatch = function (models) {
             var _this = this;
             return this.http.post(this.environment.apiV2 + "/" + this.url + "/delete", models)
                 .pipe(operators.map(function () {
@@ -8398,13 +8402,13 @@
         /**
          * clear service cache
          */
-        BaseRestService.prototype.resetCache = function () {
+        RestService.prototype.resetCache = function () {
             this.fetch().subscribe();
         };
         /**
          * get list of base class instances directly from backend
          */
-        BaseRestService.prototype.fetch = function () {
+        RestService.prototype.fetch = function () {
             var _this = this;
             return this.http.get(this.environment.apiV2 + "/" + this.url)
                 .pipe(operators.map(function (response) {
@@ -8420,7 +8424,7 @@
         /**
          * Update cache subject with current cache array value
          */
-        BaseRestService.prototype.updateCache = function () {
+        RestService.prototype.updateCache = function () {
             this.cacheSubject.next(this.cache.slice());
         };
         /**
@@ -8428,14 +8432,14 @@
          * @param model The class for which you want to create an instance
          * @param baseModel base model instance that we will use as constructor options
          */
-        BaseRestService.prototype.createModelInstance = function (model, baseModel) {
+        RestService.prototype.createModelInstance = function (model, baseModel) {
             return classTransformer.plainToClass(model, baseModel, { excludePrefixes: ['@'] });
         };
-        return BaseRestService;
+        return RestService;
     }());
-    BaseRestService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BaseRestService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    BaseRestService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BaseRestService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BaseRestService, decorators: [{
+    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'
@@ -8460,7 +8464,7 @@
             return _this;
         }
         return BankService;
-    }(BaseRestService));
+    }(RestService));
     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: [{
@@ -8572,7 +8576,7 @@
             });
         };
         return BankAccountService;
-    }(BaseRestService));
+    }(RestService));
     BankAccountService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BankAccountService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], 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: [{
@@ -8716,7 +8720,7 @@
             });
         };
         return BankConnectionService;
-    }(BaseRestService));
+    }(RestService));
     BankConnectionService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BankConnectionService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], 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: [{
@@ -8802,7 +8806,7 @@
             });
         };
         return BankTransactionService;
-    }(BaseRestService));
+    }(RestService));
     BankTransactionService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BankTransactionService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], 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: [{
@@ -8893,7 +8897,7 @@
             });
         };
         return BasiqService;
-    }(BaseRestService));
+    }(RestService));
     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' }], 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: [{
@@ -9087,7 +9091,7 @@
             }));
         };
         return ChartAccountsDepreciationService;
-    }(BaseRestService));
+    }(RestService));
     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: [{
@@ -9199,7 +9203,7 @@
             });
         };
         return ChatService;
-    }(BaseRestService));
+    }(RestService));
     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: 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: [{
@@ -9258,7 +9262,7 @@
             });
         };
         return MessageService;
-    }(BaseRestService));
+    }(RestService));
     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: 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: [{
@@ -9478,7 +9482,7 @@
             }));
         };
         return ClientInviteService;
-    }(BaseRestService));
+    }(RestService));
     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: [{
@@ -9568,7 +9572,7 @@
             });
         };
         return ClientMovementService;
-    }(BaseRestService));
+    }(RestService));
     ClientMovementService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ClientMovementService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], 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: [{
@@ -9619,13 +9623,13 @@
     /**
      * Service for work with DepreciationCapitalProjects
      */
-    var CapitalProjectService = /** @class */ (function () {
-        function CapitalProjectService(http, environment) {
+    var DepreciationCapitalProjectService = /** @class */ (function () {
+        function DepreciationCapitalProjectService(http, environment) {
             this.http = http;
             this.environment = environment;
             this.cacheSubject = new rxjs.ReplaySubject(1);
         }
-        CapitalProjectService.prototype.get = function (propertyId) {
+        DepreciationCapitalProjectService.prototype.get = function (propertyId) {
             var _this = this;
             this.cacheSubject.next([]);
             this.http.get(this.environment.apiV2 + "/properties/" + propertyId + "/depreciation-capital-projects")
@@ -9637,7 +9641,7 @@
             });
             return this.cacheSubject.asObservable();
         };
-        CapitalProjectService.prototype.add = function (capitalProject, propertyId) {
+        DepreciationCapitalProjectService.prototype.add = function (capitalProject, propertyId) {
             var _this = this;
             return this.http.post(this.environment.apiV2 + "/properties/" + propertyId + "/depreciation-capital-projects", capitalProject)
                 .pipe(operators.map(function (capitalProjectBase) {
@@ -9645,7 +9649,7 @@
                 _this.cacheSubject.next(_this.cache);
             }));
         };
-        CapitalProjectService.prototype.update = function (capitalProject, propertyId) {
+        DepreciationCapitalProjectService.prototype.update = function (capitalProject, propertyId) {
             var _this = this;
             return this.http.put(this.environment.apiV2 + "/properties/" + propertyId + "/depreciation-capital-projects/" + capitalProject.id, capitalProject)
                 .pipe(operators.map(function (capitalProjectBase) {
@@ -9653,7 +9657,7 @@
                 _this.cacheSubject.next(_this.cache);
             }));
         };
-        CapitalProjectService.prototype.delete = function (capitalProject, propertyId) {
+        DepreciationCapitalProjectService.prototype.delete = function (capitalProject, propertyId) {
             var _this = this;
             return this.http.delete(this.environment.apiV2 + "/properties/" + propertyId + "/depreciation-capital-projects/" + capitalProject.id)
                 .pipe(operators.map(function () {
@@ -9661,11 +9665,11 @@
                 _this.cacheSubject.next(_this.cache);
             }));
         };
-        return CapitalProjectService;
+        return DepreciationCapitalProjectService;
     }());
-    CapitalProjectService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: CapitalProjectService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    CapitalProjectService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: CapitalProjectService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: CapitalProjectService, 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'
@@ -9808,7 +9812,7 @@
             });
         };
         return DepreciationService;
-    }(BaseRestService));
+    }(RestService));
     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' }], 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: [{
@@ -9890,7 +9894,7 @@
             }));
         };
         return DocumentFolderService;
-    }(BaseRestService));
+    }(RestService));
     DocumentFolderService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: DocumentFolderService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], 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: [{
@@ -9930,7 +9934,7 @@
             }));
         };
         return EmployeeService;
-    }(BaseRestService));
+    }(RestService));
     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: [{
@@ -9979,7 +9983,7 @@
             }));
         };
         return EmployeeInviteService;
-    }(BaseRestService));
+    }(RestService));
     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: [{
@@ -10182,7 +10186,7 @@
             return this.incomeSourceTypeSubject.asObservable();
         };
         return IncomeSourceService;
-    }(BaseRestService));
+    }(RestService));
     IncomeSourceService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: IncomeSourceService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], 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: [{
@@ -10268,7 +10272,7 @@
             }).flat();
         };
         return IncomeSourceForecastService;
-    }(BaseRestService));
+    }(RestService));
     IncomeSourceForecastService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: IncomeSourceForecastService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], 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: [{
@@ -10354,7 +10358,7 @@
             }).flat();
         };
         return SalaryForecastService;
-    }(BaseRestService));
+    }(RestService));
     SalaryForecastService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SalaryForecastService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], 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: [{
@@ -10437,7 +10441,7 @@
             }).flat();
         };
         return SoleForecastService;
-    }(BaseRestService));
+    }(RestService));
     SoleForecastService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SoleForecastService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], 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: [{
@@ -10623,7 +10627,7 @@
             }));
         };
         return LoanService;
-    }(BaseRestService));
+    }(RestService));
     LoanService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: LoanService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], 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: [{
@@ -10641,9 +10645,9 @@
     /**
      * Service to handle service notifications logic
      */
-    var NotificationService = /** @class */ (function (_super) {
-        __extends(NotificationService, _super);
-        function NotificationService(http, eventDispatcherService, environment, sseService) {
+    var ServiceNotificationService = /** @class */ (function (_super) {
+        __extends(ServiceNotificationService, _super);
+        function ServiceNotificationService(http, eventDispatcherService, environment, sseService) {
             var _this = _super.call(this, http, eventDispatcherService, environment) || this;
             _this.http = http;
             _this.eventDispatcherService = eventDispatcherService;
@@ -10658,13 +10662,13 @@
         /**
          * SSE and Event Dispatcher Services listeners
          */
-        NotificationService.prototype.listenEvents = function () {
+        ServiceNotificationService.prototype.listenEvents = function () {
             this.listenNotifications();
         };
         /**
          * subscribe to new chat messages
          */
-        NotificationService.prototype.listenNotifications = function () {
+        ServiceNotificationService.prototype.listenNotifications = function () {
             var _this = this;
             this.sseService.on("serviceNotification").subscribe(function (notificationBase) {
                 var notification = classTransformer.plainToClass(Notification, notificationBase);
@@ -10681,11 +10685,11 @@
                 _this.eventDispatcherService.dispatch(new AppEvent(exports.AppEventTypeEnum.NOTIFICATION_ADDED, notification));
             });
         };
-        return NotificationService;
-    }(BaseRestService));
-    NotificationService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: NotificationService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: SseService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    NotificationService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: NotificationService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: NotificationService, decorators: [{
+        return ServiceNotificationService;
+    }(RestService));
+    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: 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'
@@ -10952,7 +10956,7 @@
             return this.get().pipe(operators.map(function (properties) { return properties.filter(function (property) { return property.isActive; }); }));
         };
         return PropertyService;
-    }(BaseRestService));
+    }(RestService));
     PropertyService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], 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: [{
@@ -11109,7 +11113,7 @@
             return _this;
         }
         return PropertyCategoryService;
-    }(BaseRestService));
+    }(RestService));
     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: [{
@@ -11172,7 +11176,7 @@
             });
         };
         return PropertyDocumentService;
-    }(BaseRestService));
+    }(RestService));
     PropertyDocumentService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyDocumentService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], 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: [{
@@ -11284,7 +11288,7 @@
             });
         };
         return PropertyShareService;
-    }(BaseRestService));
+    }(RestService));
     PropertyShareService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyShareService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], 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: [{
@@ -11308,7 +11312,7 @@
             return _this;
         }
         return PropertySaleService;
-    }(BaseRestService));
+    }(RestService));
     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: [{
@@ -11395,7 +11399,7 @@
             }));
         };
         return PropertyCategoryMovementService;
-    }(BaseRestService));
+    }(RestService));
     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: [{
@@ -11644,7 +11648,7 @@
             });
         };
         return TaxReviewService;
-    }(BaseRestService));
+    }(RestService));
     TaxReviewService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TaxReviewService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], 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: [{
@@ -11682,7 +11686,7 @@
             return _this;
         }
         return TaxReviewHistoryService;
-    }(BaseRestService));
+    }(RestService));
     TaxReviewHistoryService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TaxReviewHistoryService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], 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: [{
@@ -12077,7 +12081,7 @@
             });
         };
         return TransactionService;
-    }(BaseRestService));
+    }(RestService));
     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' }], 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: [{
@@ -12162,7 +12166,7 @@
             });
         };
         return TransactionAllocationService;
-    }(BaseRestService));
+    }(RestService));
     TransactionAllocationService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TransactionAllocationService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], 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: [{
@@ -12428,7 +12432,7 @@
             }));
         };
         return UserEventSettingService;
-    }(BaseRestService));
+    }(RestService));
     UserEventSettingService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: UserEventSettingService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], 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: [{
@@ -12456,7 +12460,7 @@
             return _this;
         }
         return UserEventTypeService;
-    }(BaseRestService));
+    }(RestService));
     UserEventTypeService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: UserEventTypeService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], 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: [{
@@ -12473,9 +12477,10 @@
 
     /**
      * Service that allows to work with WorkTank operations
+     * @TODO separate into multiple services, extend restService
      */
-    var WorkTankService = /** @class */ (function () {
-        function WorkTankService(http, transactionService, depreciationService, chartAccountsService, eventDispatcherService, environment) {
+    var VehicleService = /** @class */ (function () {
+        function VehicleService(http, transactionService, depreciationService, chartAccountsService, eventDispatcherService, environment) {
             this.http = http;
             this.transactionService = transactionService;
             this.depreciationService = depreciationService;
@@ -12488,7 +12493,7 @@
             this.vehicleTaxReturnSubject = new rxjs.ReplaySubject(1);
             this.incomePositionsSubject = new rxjs.ReplaySubject(1);
         }
-        WorkTankService.prototype.getVehicles = function () {
+        VehicleService.prototype.getVehicles = function () {
             var _this = this;
             // @TODO create backend for get logbook
             if (!this._vehicles) {
@@ -12506,7 +12511,7 @@
         /**
          * Get vehicles claim amount
          */
-        WorkTankService.prototype.getVehiclesClaim = function () {
+        VehicleService.prototype.getVehiclesClaim = function () {
             var _this = this;
             if (!this._vehicleClaim) {
                 this.http.get(this.environment.apiV2 + "/vehicle-claims")
@@ -12525,7 +12530,7 @@
          * Add new vehicle claim
          * @param claim object which should be added
          */
-        WorkTankService.prototype.addVehicleClaim = function (claim) {
+        VehicleService.prototype.addVehicleClaim = function (claim) {
             var _this = this;
             return this.http.post(this.environment.apiV2 + "/vehicle-claims", claim).pipe(operators.map(function (response) {
                 _this._vehicleClaim = classTransformer.plainToClass(VehicleClaim, response);
@@ -12536,7 +12541,7 @@
         /**
          * Get vehicles claim rate for current financial year
          */
-        WorkTankService.prototype.getVehiclesClaimRate = function () {
+        VehicleService.prototype.getVehiclesClaimRate = function () {
             var _this = this;
             if (!this._vehicleClaimRate) {
                 this.chartAccountsService.getChartAccountsById(exports.ChartAccountsListEnum.KLMS_TRAVELLED_FOR_WORK)
@@ -12553,7 +12558,7 @@
         /**
          * Get vehicles tax return for vehicle transactions & depreciations
          */
-        WorkTankService.prototype.getVehiclesTaxReturn = function () {
+        VehicleService.prototype.getVehiclesTaxReturn = function () {
             var _this = this;
             if (!this._vehicleTaxReturn) {
                 rxjs.combineLatest([
@@ -12590,7 +12595,7 @@
          *
          * @TODO alex refresh depreciation/transaction cache
          */
-        WorkTankService.prototype.updateVehicleClaim = function (claim) {
+        VehicleService.prototype.updateVehicleClaim = function (claim) {
             var _this = this;
             return this.http.put(this.environment.apiV2 + "/vehicle-claims/" + claim.id, claim).pipe(operators.map(function (response) {
                 var updatedVehicleClaim = classTransformer.plainToClass(VehicleClaim, response);
@@ -12605,7 +12610,7 @@
          * @param logbook which should be added
          * @param vehicle for which logbook object should be added
          */
-        WorkTankService.prototype.addLogbook = function (logbook, vehicle) {
+        VehicleService.prototype.addLogbook = function (logbook, vehicle) {
             var _this = this;
             return this.http.post(this.environment.apiV2 + "/vehicles/" + vehicle.id + "/logbooks", logbook)
                 .pipe(operators.map(function (response) {
@@ -12620,7 +12625,7 @@
          * @param logbook which should be updated
          * @param vehicle for which logbook object should be updated
          */
-        WorkTankService.prototype.updateLogbook = function (logbook, vehicle) {
+        VehicleService.prototype.updateLogbook = function (logbook, vehicle) {
             var _this = this;
             return this.http.put(this.environment.apiV2 + "/vehicles/" + vehicle.id + "/logbooks/" + logbook.id, logbook).pipe(operators.map(function (response) {
                 var editedVehicle = _this._vehicles.find(function (v) { return v.id === vehicle.id; });
@@ -12636,7 +12641,7 @@
          * @param logbook for which trip should be deleted
          * @param vehicle for which trip should be deleted
          */
-        WorkTankService.prototype.deleteTrip = function (logbook, vehicle) {
+        VehicleService.prototype.deleteTrip = function (logbook, vehicle) {
             var _this = this;
             return this.http.delete(this.environment.apiV2 + "/vehicles/" + vehicle.id + "/logbooks/" + logbook.id)
                 .pipe(operators.map(function () {
@@ -12652,7 +12657,7 @@
          * Add new vehicle
          * @param vehicle which should be added
          */
-        WorkTankService.prototype.addVehicle = function (vehicle) {
+        VehicleService.prototype.addVehicle = function (vehicle) {
             var _this = this;
             return this.http.post(this.environment.apiV2 + "/vehicles", { name: vehicle.name })
                 .pipe(operators.map(function (response) {
@@ -12664,7 +12669,7 @@
          * Update vehicle
          * @param vehicle which should be updated
          */
-        WorkTankService.prototype.updateVehicle = function (vehicle) {
+        VehicleService.prototype.updateVehicle = function (vehicle) {
             var _this = this;
             return this.http.put(this.environment.apiV2 + "/vehicles/" + vehicle.id, { name: vehicle.name })
                 .pipe(operators.map(function (response) {
@@ -12677,7 +12682,7 @@
          * Delete vehicle
          * @param vehicle which should be deleted
          */
-        WorkTankService.prototype.deleteVehicle = function (vehicle) {
+        VehicleService.prototype.deleteVehicle = function (vehicle) {
             var _this = this;
             return this.http.delete(this.environment.apiV2 + "/vehicles/" + vehicle.id)
                 .pipe(operators.map(function () {
@@ -12688,11 +12693,11 @@
                 _this.vehiclesSubject.next(_this._vehicles.map(function (item) { return classTransformer.plainToClass(Vehicle, item); }));
             }));
         };
-        return WorkTankService;
+        return VehicleService;
     }());
-    WorkTankService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: WorkTankService, deps: [{ token: i1__namespace.HttpClient }, { token: TransactionService }, { token: DepreciationService }, { token: ChartAccountsService }, { token: EventDispatcherService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    WorkTankService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: WorkTankService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: WorkTankService, decorators: [{
+    VehicleService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: VehicleService, deps: [{ token: i1__namespace.HttpClient }, { token: TransactionService }, { token: DepreciationService }, { token: ChartAccountsService }, { token: EventDispatcherService }, { token: 'environment' }], 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'
@@ -12767,7 +12772,7 @@
             return _this;
         }
         return TaxExemptionService;
-    }(BaseRestService));
+    }(RestService));
     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: [{
@@ -12986,7 +12991,6 @@
     exports.CAPITAL_COSTS_ITEMS = CAPITAL_COSTS_ITEMS;
     exports.CHART_ACCOUNTS_CATEGORIES = CHART_ACCOUNTS_CATEGORIES;
     exports.CalculationFormItem = CalculationFormItem;
-    exports.CapitalProjectService = CapitalProjectService;
     exports.ChartAccounts = ChartAccounts;
     exports.ChartAccountsDepreciation = ChartAccountsDepreciation;
     exports.ChartAccountsDepreciationService = ChartAccountsDepreciationService;
@@ -13020,6 +13024,7 @@
     exports.DataTableColumn = DataTableColumn;
     exports.Depreciation = Depreciation;
     exports.DepreciationCapitalProject = DepreciationCapitalProject;
+    exports.DepreciationCapitalProjectService = DepreciationCapitalProjectService;
     exports.DepreciationCollection = DepreciationCollection;
     exports.DepreciationForecast = DepreciationForecast;
     exports.DepreciationForecastCollection = DepreciationForecastCollection;
@@ -13072,7 +13077,6 @@
     exports.MessageService = MessageService;
     exports.MyAccountHistory = MyAccountHistory;
     exports.Notification = Notification;
-    exports.NotificationService = NotificationService;
     exports.Occupation = Occupation;
     exports.OccupationService = OccupationService;
     exports.PasswordForm = PasswordForm;
@@ -13102,11 +13106,15 @@
     exports.RegisterClientForm = RegisterClientForm;
     exports.RegisterFirmForm = RegisterFirmForm;
     exports.RegistrationInvite = RegistrationInvite;
+    exports.ReportItem = ReportItem;
+    exports.ReportItemCollection = ReportItemCollection;
+    exports.ReportItemDetails = ReportItemDetails;
     exports.ResetPasswordForm = ResetPasswordForm;
     exports.SUBSCRIPTION_DESCRIPTION = SUBSCRIPTION_DESCRIPTION;
     exports.SUBSCRIPTION_TITLE = SUBSCRIPTION_TITLE;
     exports.SalaryForecast = SalaryForecast;
     exports.SalaryForecastService = SalaryForecastService;
+    exports.ServiceNotificationService = ServiceNotificationService;
     exports.ServicePayment = ServicePayment;
     exports.ServicePrice = ServicePrice;
     exports.ServicePriceCollection = ServicePriceCollection;
@@ -13122,9 +13130,6 @@
     exports.TaxExemption = TaxExemption;
     exports.TaxExemptionMetadata = TaxExemptionMetadata;
     exports.TaxExemptionService = TaxExemptionService;
-    exports.TaxReturnCategoryItem = TaxReturnCategoryItem;
-    exports.TaxReturnCategoryItemCollection = TaxReturnCategoryItemCollection;
-    exports.TaxReturnCategoryItemDetails = TaxReturnCategoryItemDetails;
     exports.TaxReview = TaxReview;
     exports.TaxReviewCollection = TaxReviewCollection;
     exports.TaxReviewHistoryService = TaxReviewHistoryService;
@@ -13158,8 +13163,8 @@
     exports.Vehicle = Vehicle;
     exports.VehicleClaim = VehicleClaim;
     exports.VehicleLogbook = VehicleLogbook;
+    exports.VehicleService = VehicleService;
     exports.WORK_TANK_LOGBOOK_PURPOSE_OPTIONS = WORK_TANK_LOGBOOK_PURPOSE_OPTIONS;
-    exports.WorkTankService = WorkTankService;
     exports.XlsxService = XlsxService;
     exports.cloneDeep = cloneDeep;
     exports.compare = compare;