taxtank-core 0.24.3 → 0.26.0

package/fesm2015/taxtank-core.js

@@ -1,27 +1,28 @@
 import * as i0 from '@angular/core';
 import { Injectable, Inject, NgModule, EventEmitter } from '@angular/core';
 import * as i1$1 from '@angular/common';
-import { CommonModule } from '@angular/common';
+import { CommonModule, DatePipe } from '@angular/common';
 import * as i1 from '@angular/common/http';
 import { HttpParams, HttpErrorResponse, HTTP_INTERCEPTORS } from '@angular/common/http';
 import { ReplaySubject, Subject, BehaviorSubject, throwError, combineLatest, of, Observable, forkJoin, from } from 'rxjs';
-import { map, filter, catchError, take, switchMap, finalize, mergeMap, distinctUntilChanged } from 'rxjs/operators';
+import { map, filter, catchError, take, switchMap, finalize, mergeMap, skip, distinctUntilChanged } from 'rxjs/operators';
 import { plainToClass, classToPlain, Type, Exclude, Transform, Expose } from 'class-transformer';
 import { JwtHelperService } from '@auth0/angular-jwt';
 import { __decorate, __awaiter } from 'tslib';
 import get from 'lodash/get';
 import last from 'lodash/last';
-import * as moment from 'moment';
-import { DateRange } from 'moment-range';
 import flatten from 'lodash/flatten';
 import hasIn from 'lodash/hasIn';
 import first from 'lodash/first';
+import * as moment from 'moment';
+import { DateRange } from 'moment-range';
 import uniqBy from 'lodash/uniqBy';
 import concat from 'lodash/concat';
 import { throwError as throwError$1 } from 'rxjs/internal/observable/throwError';
 import cloneDeep$1 from 'lodash/cloneDeep';
 import compact from 'lodash/compact';
-import { Validators, FormGroup, FormArray, FormControl } from '@angular/forms';
+import { Validators, FormGroup, FormControl, FormArray } from '@angular/forms';
+import isEqual from 'lodash/isEqual';
 import fromPairs from 'lodash/fromPairs';
 import _ from 'lodash';
 import { EventSourcePolyfill } from 'event-source-polyfill/src/eventsource.min.js';
@@ -245,9 +246,12 @@ var AppEventTypeEnum;
     AppEventTypeEnum[AppEventTypeEnum["USER_UPDATED"] = 46] = "USER_UPDATED";
     AppEventTypeEnum[AppEventTypeEnum["VEHICLE_CLAIM_UPDATED"] = 47] = "VEHICLE_CLAIM_UPDATED";
     AppEventTypeEnum[AppEventTypeEnum["VEHICLE_CLAIM_CREATED"] = 48] = "VEHICLE_CLAIM_CREATED";
-    AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_CREATED"] = 49] = "VEHICLE_LOGBOOK_CREATED";
-    AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_UPDATED"] = 50] = "VEHICLE_LOGBOOK_UPDATED";
-    AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_DELETED"] = 51] = "VEHICLE_LOGBOOK_DELETED";
+    AppEventTypeEnum[AppEventTypeEnum["VEHICLE_CLAIM_DETAILS_UPDATED"] = 49] = "VEHICLE_CLAIM_DETAILS_UPDATED";
+    AppEventTypeEnum[AppEventTypeEnum["VEHICLE_CLAIM_DETAILS_CREATED"] = 50] = "VEHICLE_CLAIM_DETAILS_CREATED";
+    AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_CREATED"] = 51] = "VEHICLE_LOGBOOK_CREATED";
+    AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_UPDATED"] = 52] = "VEHICLE_LOGBOOK_UPDATED";
+    AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_DELETED"] = 53] = "VEHICLE_LOGBOOK_DELETED";
+    AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_BEST_PERIOD_UPDATED"] = 54] = "VEHICLE_LOGBOOK_BEST_PERIOD_UPDATED";
 })(AppEventTypeEnum || (AppEventTypeEnum = {}));
 
 class EventDispatcherService {
@@ -672,6 +676,10 @@ const ENDPOINTS = {
     SOLE_BUSINESSES_GET: new Endpoint('GET', '\\/sole-businesses'),
     SOLE_BUSINESSES_POST: new Endpoint('POST', '\\/sole-businesses'),
     SOLE_BUSINESSES_PUT: new Endpoint('PUT', '\\/sole-businesses\\d+'),
+    SOLE_INVOICE_TEMPLATES_GET: new Endpoint('GET', '\\/sole-invoice-templates'),
+    SOLE_INVOICE_TEMPLATES_POST: new Endpoint('POST', '\\/sole-invoice-templates'),
+    SOLE_INVOICE_TEMPLATES_PUT: new Endpoint('PUT', '\\/sole-invoice-templates\\d+'),
+    SOLE_INVOICE_TEMPLATES_DELETE: new Endpoint('DELETE', '\\/sole-invoice-templates\\d+'),
     TAX_CALCULATION_POST: new Endpoint('POST', '\\/tax-calculation'),
     TAX_REVIEWS_GET: new Endpoint('GET', '\\/tax-reviews'),
     TAX_REVIEWS_DELETE: new Endpoint('DELETE', '\\/tax-reviews\\/\\d+'),
@@ -709,9 +717,14 @@ const ENDPOINTS = {
     VEHICLES_PUT: new Endpoint('PUT', '\\/vehicles\\/\\d+'),
     VEHICLE_CLAIMS_GET: new Endpoint('GET', '\\/vehicle-claims'),
     VEHICLE_CLAIMS_POST: new Endpoint('POST', '\\/vehicle-claims'),
-    VEHICLE_LOGBOOK_POST: new Endpoint('POST', '\\/vehicles\\/\\d+\\/logbooks'),
-    VEHICLE_LOGBOOK_PUT: new Endpoint('PUT', '\\/vehicles\\/\\d+\\/logbooks\\/\\d+'),
-    VEHICLE_CLAIMS_PUT: new Endpoint('PUT', '\\/vehicle-claims\\/\\d+')
+    VEHICLE_CLAIMS_PUT: new Endpoint('PUT', '\\/vehicle-claims\\/\\d+'),
+    VEHICLE_LOGBOOKS_GET: new Endpoint('GET', '\\/vehicles\\/logbooks'),
+    VEHICLE_LOGBOOKS_POST: new Endpoint('POST', '\\/vehicles\\/logbooks'),
+    VEHICLE_LOGBOOKS_PUT: new Endpoint('PUT', '\\/vehicles\\/logbooks\\/\\d+'),
+    VEHICLE_LOGBOOKS_DELETE: new Endpoint('DELETE', '\\/vehicles\\/logbooks\\/\\d+'),
+    VEHICLE_CLAIM_DETAILS_GET: new Endpoint('GET', '\\/vehicle-claim-details'),
+    VEHICLE_CLAIM_DETAILS_POST: new Endpoint('POST', '\\/vehicle-claim-details'),
+    VEHICLE_CLAIM_DETAILS_PUT: new Endpoint('PUT', '\\/vehicle-claim-details\\/\\d+'),
 };
 
 class PreloaderService {
@@ -1125,7 +1138,8 @@ var BankAccountTypeEnum;
     BankAccountTypeEnum[BankAccountTypeEnum["TRANSACTION"] = 1] = "TRANSACTION";
     BankAccountTypeEnum[BankAccountTypeEnum["SAVINGS"] = 2] = "SAVINGS";
     BankAccountTypeEnum[BankAccountTypeEnum["CREDIT_CARD"] = 3] = "CREDIT_CARD";
-    BankAccountTypeEnum[BankAccountTypeEnum["MORTGAGE"] = 4] = "MORTGAGE";
+    // @TODO Alex: should be removed by backend (TT-2107)
+    // MORTGAGE = 4,
     BankAccountTypeEnum[BankAccountTypeEnum["LOAN"] = 5] = "LOAN";
     BankAccountTypeEnum[BankAccountTypeEnum["INVESTMENT"] = 6] = "INVESTMENT";
     BankAccountTypeEnum[BankAccountTypeEnum["TERM_DEPOSIT"] = 7] = "TERM_DEPOSIT";
@@ -1220,207 +1234,510 @@ class FinancialYear {
 }
 FinancialYear.startMonthIndex = 6;
 
-class Loan extends Loan$1 {
+/**
+ * List of collections grouped by passed property
+ */
+class CollectionDictionary {
     /**
-     * Check if loan type is related to LoanVehicleTypeEnum
+     * @param collection The Collection instance to be grouped
+     * @param path Path to the property to be grouped (Examples: 'transaction', 'property.category')
+     * @param prop Optional: Field to group by (Default 'id', Examples: 'id', 'amount', 'date')
      */
-    isVehicle() {
-        return this.type in LoanVehicleTypeEnum;
+    constructor(collection, path = 'id') {
+        /**
+         * List of grouped collections
+         */
+        this.items = {};
+        this.collectionConstructor = collection.constructor;
+        // Nothing to group when collection is empty
+        if (!collection.length) {
+            return;
+        }
+        // Do nothing if provided path was not found in the 1st collection's item
+        if (!hasIn(collection.items[0], path.split('.')[0])) {
+            return;
+        }
+        this.groupItems(collection, path);
     }
     /**
-     * Get the last payment for passed financial year
-     * @param year financial year for filter
+     * List of collections keys
      */
-    getLastPaymentByYear(year) {
-        const finYear = new FinancialYear(new Date(year.toString()));
-        return last(this.payments.filter((payment) => payment.date > finYear.startDate && payment.date < finYear.endDate));
+    get keys() {
+        return Object.keys(this.items);
     }
-}
-__decorate([
-    Type(() => LoanPayment)
-], Loan.prototype, "payments", void 0);
-__decorate([
-    Type(() => Date)
-], Loan.prototype, "commencementDate", void 0);
-__decorate([
-    Type(() => LoanPayout)
-], Loan.prototype, "payout", void 0);
-
-var TankTypeEnum;
-(function (TankTypeEnum) {
-    TankTypeEnum[TankTypeEnum["PROPERTY"] = 1] = "PROPERTY";
-    TankTypeEnum[TankTypeEnum["WORK"] = 2] = "WORK";
-    TankTypeEnum[TankTypeEnum["OTHER"] = 3] = "OTHER";
-    TankTypeEnum[TankTypeEnum["SOLE"] = 4] = "SOLE";
-})(TankTypeEnum || (TankTypeEnum = {}));
-
-class BankAccountBalance extends AbstractModel {
-}
-
-class BankAccountProperty$1 extends AbstractModel {
-}
-
-class Property$1 extends AbstractModel {
-}
-
-class PropertySubscription$1 extends AbstractModel {
-}
-
-class User$1 extends AbstractModel {
-}
-
-var UserStatusEnum;
-(function (UserStatusEnum) {
-    UserStatusEnum[UserStatusEnum["INACTIVE"] = 0] = "INACTIVE";
-    UserStatusEnum[UserStatusEnum["ON_BOARDING"] = 1] = "ON_BOARDING";
-    UserStatusEnum[UserStatusEnum["ACTIVE"] = 2] = "ACTIVE";
-})(UserStatusEnum || (UserStatusEnum = {}));
-
-var UserRolesEnum;
-(function (UserRolesEnum) {
-    UserRolesEnum["FIRM_OWNER"] = "ROLE_FIRM_OWNER";
-    UserRolesEnum["FIRM_MANAGER"] = "ROLE_FIRM_MANAGER";
-    UserRolesEnum["CLIENT"] = "ROLE_CLIENT";
-    UserRolesEnum["EMPLOYEE"] = "ROLE_EMPLOYEE";
-    UserRolesEnum["ACCOUNTANT"] = "ROLE_ACCOUNTANT";
-    UserRolesEnum["ADVISOR"] = "ROLE_ADVISOR";
-    UserRolesEnum["USER"] = "ROLE_USER";
-    UserRolesEnum["SUBSCRIPTION"] = "ROLE_USER_SUBSCRIPTION";
-    UserRolesEnum["WORK_TANK"] = "ROLE_USER_WORK";
-    UserRolesEnum["PROPERTY_TANK"] = "ROLE_USER_PROPERTY";
-    UserRolesEnum["SOLE_TANK"] = "ROLE_USER_SOLE";
-    UserRolesEnum["SWITCH_USER"] = "ROLE_PREVIOUS_ADMIN";
-})(UserRolesEnum || (UserRolesEnum = {}));
-
-class Address$1 extends AbstractModel {
-}
-
-class Country$1 extends AbstractModel {
-}
-
-class Country extends Country$1 {
     /**
-     * Return country name with phone code
+     * Get collection by key or return empty collection if key does not exist
      */
-    get countryWithCode() {
-        return `${this.name} (+${this.callingCode})`;
+    get(key) {
+        return this.items[key] ? this.items[key] : this.createCollection([]);
     }
     /**
-     * Check if country calling code is Australian or not
+     * Add new item by key
      */
-    isAustralianCode() {
-        return this.callingCode === '61';
-    }
-}
-
-var AddressTypeEnum;
-(function (AddressTypeEnum) {
-    AddressTypeEnum[AddressTypeEnum["STREET"] = 1] = "STREET";
-    AddressTypeEnum[AddressTypeEnum["POSTAL"] = 2] = "POSTAL";
-})(AddressTypeEnum || (AddressTypeEnum = {}));
-
-class Address extends Address$1 {
-    constructor() {
-        super(...arguments);
-        this.type = AddressTypeEnum.STREET;
-    }
-    toString() {
-        return [this.unitNumber, this.address, this.city, this.state, this.postcode].filter(Boolean).join(', ');
-    }
-    get name() {
-        return `${this.unitNumber ? this.unitNumber + '/' : ''}${this.address}`;
+    add(key, value) {
+        this.items[key] = value;
     }
-    get nameLong() {
-        return `${this.name}, ${this.city}, ${this.state}`;
+    /**
+     * Join several collections by ids
+     */
+    merge(keys) {
+        return this.createCollection(flatten(keys.map((id) => this.get(id.toString()).items)));
     }
-}
-__decorate([
-    Type((() => Country))
-], Address.prototype, "country", void 0);
-
-const USER_WORK_POSITION = {
-    [UserRolesEnum.EMPLOYEE]: 'Employee',
-    [UserRolesEnum.FIRM_MANAGER]: 'Manager',
-    [UserRolesEnum.FIRM_OWNER]: 'Firm Owner'
-};
-
-class ClientDetails$1 extends AbstractModel {
-}
-
-class ClientDetails extends ClientDetails$1 {
-}
-
-class EmployeeDetails$1 extends AbstractModel {
-}
-
-class Firm$1 extends AbstractModel {
-}
-
-class Phone$1 extends AbstractModel {
-}
-
-var PhoneTypeEnum;
-(function (PhoneTypeEnum) {
-    PhoneTypeEnum[PhoneTypeEnum["MOBILE"] = 1] = "MOBILE";
-    PhoneTypeEnum[PhoneTypeEnum["OFFICE"] = 2] = "OFFICE";
-})(PhoneTypeEnum || (PhoneTypeEnum = {}));
-
-class Phone extends Phone$1 {
-    constructor() {
-        super(...arguments);
-        this.type = PhoneTypeEnum.MOBILE;
+    /**
+     * Create instance of collection
+     */
+    createCollection(items = []) {
+        return new this.collectionConstructor(items);
     }
-    toString() {
-        return `+${this.country.callingCode} ${this.number}`;
+    get length() {
+        return this.keys.length;
     }
-}
-
-class Firm extends Firm$1 {
     /**
-     * get firm photo link
+     * @Todo find a better solution to get list of the sorted keys
+     * Get array of the "keys" by provided order
      */
-    getPhoto() {
-        return this.photo;
+    getSortedKeys(isDesc = false) {
+        return this.keys.sort((a, b) => {
+            if (a > b) {
+                return !isDesc ? 1 : -1;
+            }
+            if (a < b) {
+                return !isDesc ? -1 : 1;
+            }
+            return 0;
+        });
     }
     /**
-     * get firm initials
+     * Group collection items by passed path into items object
      */
-    getPhotoPlaceholder() {
-        return `${this.name[0].toUpperCase()}${this.name[1]}`;
+    groupItems(collection, path) {
+        // Create empty initial object for groups
+        const obj = {};
+        // Group collection items
+        collection.items.forEach((item) => {
+            let key = get(item, path);
+            // if object does not have property for grouping it will be grouped as 'other'
+            if (key === undefined) {
+                key = 'other';
+            }
+            if (!obj[key]) {
+                obj[key] = [];
+            }
+            obj[key].push(item);
+        });
+        // Create collections from groups
+        Object.keys(obj).forEach((key) => {
+            this.items[key] = this.createCollection(obj[key]);
+        });
     }
 }
-__decorate([
-    Type(() => User)
-], Firm.prototype, "owner", void 0);
-__decorate([
-    Type(() => Address)
-], Firm.prototype, "address", void 0);
-__decorate([
-    Type(() => Phone)
-], Firm.prototype, "phone", void 0);
-
-class EmployeeDetails extends EmployeeDetails$1 {
-}
-__decorate([
-    Type(() => Firm)
-], EmployeeDetails.prototype, "firm", void 0);
-
-class ServiceSubscription$1 extends AbstractModel {
-}
-
-class ServiceSubscriptionItem$1 extends AbstractModel {
-}
-
-class ServicePrice$1 extends AbstractModel {
-}
-
-class ServiceProduct$1 extends AbstractModel {
-}
 
-var ServiceProductStatusEnum;
-(function (ServiceProductStatusEnum) {
-    ServiceProductStatusEnum[ServiceProductStatusEnum["ARCHIVED"] = 0] = "ARCHIVED";
-    ServiceProductStatusEnum[ServiceProductStatusEnum["ACTIVE"] = 1] = "ACTIVE";
+const DEFAULT_INDEX = 'other';
+/**
+ * Base collection class. Contains common properties and methods for all collections
+ */
+class Collection {
+    constructor(items = []) {
+        this.items = items;
+    }
+    /**
+     * Iterator that allow to iterate collection items
+     */
+    [Symbol.iterator]() {
+        return this.items.values();
+    }
+    create(items = []) {
+        return new this.constructor(items);
+    }
+    get length() {
+        return this.items.length;
+    }
+    toArray() {
+        return [...this.items];
+    }
+    get first() {
+        return first(this.items);
+    }
+    get last() {
+        return last(this.items);
+    }
+    getIds() {
+        return this.items.map((item) => item['id']);
+    }
+    mapBy(path) {
+        return this.items.map((item) => get(item, path));
+    }
+    sortBy(field = 'id', isDesc = true) {
+        sort(this.items, field, isDesc);
+        return this;
+    }
+    /**
+     * Get total sum of items by field
+     */
+    sumBy(path) {
+        return +this.items.reduce((sum, item) => sum + Number(get(item, path)), 0).toFixed(2);
+    }
+    groupBy(path = '') {
+        return new CollectionDictionary(this, path);
+    }
+    indexBy(path) {
+        // Create empty initial object for groups
+        const result = {};
+        this.toArray().forEach((model) => {
+            result[get(model, path, DEFAULT_INDEX)] = model;
+        });
+        return result;
+    }
+    filter(callback) {
+        return this.create(this.items.filter(callback));
+    }
+    filterBy(path, values) {
+        return this.filter((item) => (Array.isArray(values) ? values : [values]).includes(get(item, path)));
+    }
+    filterByRange(path, from, to) {
+        return this.filter((item) => get(item, path) >= from && get(item, path) <= to);
+    }
+    find(callback) {
+        return this.items.find(callback);
+    }
+    findBy(path, value) {
+        return this.items.find((model) => value === get(model, path));
+    }
+    findIndexBy(path, value) {
+        var _a;
+        return (_a = this.items.findIndex((item) => get(item, path) === value)) !== null && _a !== void 0 ? _a : null;
+    }
+    push(...items) {
+        this.items.push(...items);
+        return this.create(this.items);
+    }
+    replaceBy(path, value, item) {
+        const index = this.findIndexBy(path, value);
+        if (index >= 0) {
+            this.items.splice(index, 1, item);
+        }
+        return this;
+    }
+    remove(items) {
+        return this.filter((model) => !items.map((item) => item.id).includes(model.id));
+    }
+    removeBy(path, values) {
+        return this.filter((item) => !(Array.isArray(values) ? values : [values]).includes(get(item, path)));
+    }
+    minBy(path) {
+        return this.items.reduce((prev, current) => (get(prev, path) < get(current, path) ? prev : current));
+    }
+    maxBy(path) {
+        return this.items.reduce((prev, current) => (get(prev, path) > get(current, path) ? prev : current));
+    }
+}
+
+class ExportDataTable {
+}
+
+class ExportableCollection extends Collection {
+    getExportFooter(type) {
+        return [];
+    }
+    ;
+    export(type) {
+        return plainToClass(ExportDataTable, {
+            header: this.getExportHeader(type),
+            body: this.getExportBody(type),
+            footer: [this.getExportFooter(type)]
+        });
+    }
+}
+
+/**
+ * export table column
+ */
+class ExportCell {
+}
+
+/**
+ * type of export table column value
+ */
+var ExportCellTypeEnum;
+(function (ExportCellTypeEnum) {
+    ExportCellTypeEnum[ExportCellTypeEnum["STRING"] = 0] = "STRING";
+    ExportCellTypeEnum[ExportCellTypeEnum["CURRENCY"] = 1] = "CURRENCY";
+    ExportCellTypeEnum[ExportCellTypeEnum["DATE"] = 2] = "DATE";
+})(ExportCellTypeEnum || (ExportCellTypeEnum = {}));
+
+class LoanPaymentCollection extends ExportableCollection {
+    getExportHeader() {
+        return [
+            'Pmt No.',
+            'Date',
+            'Payment Due',
+            'Interest Accrued',
+            'Principal Paid',
+            'Principal Balance',
+            'Payout'
+        ];
+    }
+    getExportBody() {
+        return this.items.map((payment) => {
+            return [
+                plainToClass(ExportCell, { value: payment.number, type: ExportCellTypeEnum.STRING }),
+                plainToClass(ExportCell, { value: payment.date, type: ExportCellTypeEnum.DATE }),
+                plainToClass(ExportCell, { value: payment.paymentDue, type: ExportCellTypeEnum.CURRENCY }),
+                plainToClass(ExportCell, { value: payment.interestAccrued, type: ExportCellTypeEnum.CURRENCY }),
+                plainToClass(ExportCell, { value: payment.principalPaid, type: ExportCellTypeEnum.CURRENCY }),
+                plainToClass(ExportCell, { value: payment.principalBalance, type: ExportCellTypeEnum.CURRENCY }),
+                plainToClass(ExportCell, { value: payment.payout, type: ExportCellTypeEnum.CURRENCY }),
+            ];
+        });
+    }
+    get paymentDue() {
+        return this.sumBy('paymentDue');
+    }
+    getByFinYear(finYear = new FinancialYear()) {
+        return this.filter((payment) => {
+            return new Date(payment.date) >= finYear.startDate &&
+                new Date(payment.date) <= finYear.endDate;
+        });
+    }
+    getForCurrentYear() {
+        return this.getByFinYear(new FinancialYear());
+    }
+}
+
+class Loan extends Loan$1 {
+    /**
+     * Check if loan type is related to LoanVehicleTypeEnum
+     */
+    isVehicle() {
+        return !this.bankAccount && this.type in LoanVehicleTypeEnum;
+    }
+    /**
+     * Get the last payment for passed financial year
+     * @param year financial year for filter
+     */
+    getLastPaymentByYear(year) {
+        const finYear = new FinancialYear(new Date(year.toString()));
+        return last(this.payments.filter((payment) => payment.date > finYear.startDate && payment.date < finYear.endDate));
+    }
+    /**
+     * The size of loan interest
+     * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/212369955/Loans+vehicle+loans
+     * @TODO Vik/Nicole: need to update documentation. Derek gave the right formulas to Mikhail
+     */
+    getInterest() {
+        return new LoanPaymentCollection(this.payments).paymentDue - this.amount;
+    }
+    /**
+     * The last payment size
+     * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/212369955/Loans+vehicle+loans
+     * @TODO Vik/Nicole: need to update documentation. Derek gave the right formulas to Mikhail
+     */
+    getBalloonPayment() {
+        const lastPaymentDueAmount = new LoanPaymentCollection(this.payments).last.paymentDue;
+        return (lastPaymentDueAmount - this.repaymentAmount) > 0 ? lastPaymentDueAmount - this.repaymentAmount : 0;
+    }
+    /**
+     * Percent of ballon payment from all payments
+     * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/212369955/Loans+vehicle+loans
+     * @TODO Vik/Nicole: need to update documentation. Derek gave the right formulas to Mikhail
+     */
+    getBalloonPaymentPercentage() {
+        return this.getBalloonPayment() / new LoanPaymentCollection(this.payments).paymentDue * 100;
+    }
+}
+/**
+ * 30 years is default mortgage term
+ */
+Loan.mortgageDefaultTerm = 360;
+/**
+ * 5 years is default bank loan term
+ */
+Loan.loanDefaultTerm = 60;
+__decorate([
+    Type(() => LoanPayment)
+], Loan.prototype, "payments", void 0);
+__decorate([
+    Type(() => Date)
+], Loan.prototype, "commencementDate", void 0);
+__decorate([
+    Type(() => LoanPayout)
+], Loan.prototype, "payout", void 0);
+
+var TankTypeEnum;
+(function (TankTypeEnum) {
+    TankTypeEnum[TankTypeEnum["PROPERTY"] = 1] = "PROPERTY";
+    TankTypeEnum[TankTypeEnum["WORK"] = 2] = "WORK";
+    TankTypeEnum[TankTypeEnum["OTHER"] = 3] = "OTHER";
+    TankTypeEnum[TankTypeEnum["SOLE"] = 4] = "SOLE";
+})(TankTypeEnum || (TankTypeEnum = {}));
+
+class BankAccountBalance extends AbstractModel {
+}
+
+class BankAccountProperty$1 extends AbstractModel {
+}
+
+class Property$1 extends AbstractModel {
+}
+
+class PropertySubscription$1 extends AbstractModel {
+}
+
+class User$1 extends AbstractModel {
+}
+
+var UserStatusEnum;
+(function (UserStatusEnum) {
+    UserStatusEnum[UserStatusEnum["INACTIVE"] = 0] = "INACTIVE";
+    UserStatusEnum[UserStatusEnum["ON_BOARDING"] = 1] = "ON_BOARDING";
+    UserStatusEnum[UserStatusEnum["ACTIVE"] = 2] = "ACTIVE";
+})(UserStatusEnum || (UserStatusEnum = {}));
+
+var UserRolesEnum;
+(function (UserRolesEnum) {
+    UserRolesEnum["FIRM_OWNER"] = "ROLE_FIRM_OWNER";
+    UserRolesEnum["FIRM_MANAGER"] = "ROLE_FIRM_MANAGER";
+    UserRolesEnum["CLIENT"] = "ROLE_CLIENT";
+    UserRolesEnum["EMPLOYEE"] = "ROLE_EMPLOYEE";
+    UserRolesEnum["ACCOUNTANT"] = "ROLE_ACCOUNTANT";
+    UserRolesEnum["ADVISOR"] = "ROLE_ADVISOR";
+    UserRolesEnum["USER"] = "ROLE_USER";
+    UserRolesEnum["SUBSCRIPTION"] = "ROLE_USER_SUBSCRIPTION";
+    UserRolesEnum["WORK_TANK"] = "ROLE_USER_WORK";
+    UserRolesEnum["PROPERTY_TANK"] = "ROLE_USER_PROPERTY";
+    UserRolesEnum["SOLE_TANK"] = "ROLE_USER_SOLE";
+    UserRolesEnum["SWITCH_USER"] = "ROLE_PREVIOUS_ADMIN";
+})(UserRolesEnum || (UserRolesEnum = {}));
+
+class Address$1 extends AbstractModel {
+}
+
+class Country$1 extends AbstractModel {
+}
+
+class Country extends Country$1 {
+    /**
+     * Return country name with phone code
+     */
+    get countryWithCode() {
+        return `${this.name} (+${this.callingCode})`;
+    }
+    /**
+     * Check if country calling code is Australian or not
+     */
+    isAustralianCode() {
+        return this.callingCode === '61';
+    }
+}
+
+var AddressTypeEnum;
+(function (AddressTypeEnum) {
+    AddressTypeEnum[AddressTypeEnum["STREET"] = 1] = "STREET";
+    AddressTypeEnum[AddressTypeEnum["POSTAL"] = 2] = "POSTAL";
+})(AddressTypeEnum || (AddressTypeEnum = {}));
+
+class Address extends Address$1 {
+    constructor() {
+        super(...arguments);
+        this.type = AddressTypeEnum.STREET;
+    }
+    toString() {
+        return [this.unitNumber, this.address, this.city, this.state, this.postcode].filter(Boolean).join(', ');
+    }
+    get name() {
+        return `${this.unitNumber ? this.unitNumber + '/' : ''}${this.address}`;
+    }
+    get nameLong() {
+        return `${this.name}, ${this.city}, ${this.state}`;
+    }
+}
+__decorate([
+    Type((() => Country))
+], Address.prototype, "country", void 0);
+
+const USER_WORK_POSITION = {
+    [UserRolesEnum.EMPLOYEE]: 'Employee',
+    [UserRolesEnum.FIRM_MANAGER]: 'Manager',
+    [UserRolesEnum.FIRM_OWNER]: 'Firm Owner'
+};
+
+class ClientDetails$1 extends AbstractModel {
+}
+
+class ClientDetails extends ClientDetails$1 {
+}
+
+class EmployeeDetails$1 extends AbstractModel {
+}
+
+class Firm$1 extends AbstractModel {
+}
+
+class Phone$1 extends AbstractModel {
+}
+
+var PhoneTypeEnum;
+(function (PhoneTypeEnum) {
+    PhoneTypeEnum[PhoneTypeEnum["MOBILE"] = 1] = "MOBILE";
+    PhoneTypeEnum[PhoneTypeEnum["OFFICE"] = 2] = "OFFICE";
+})(PhoneTypeEnum || (PhoneTypeEnum = {}));
+
+class Phone extends Phone$1 {
+    constructor() {
+        super(...arguments);
+        this.type = PhoneTypeEnum.MOBILE;
+    }
+    toString() {
+        return `+${this.country.callingCode} ${this.number}`;
+    }
+}
+
+class Firm extends Firm$1 {
+    /**
+     * get firm photo link
+     */
+    getPhoto() {
+        return this.photo;
+    }
+    /**
+     * get firm initials
+     */
+    getPhotoPlaceholder() {
+        return `${this.name[0].toUpperCase()}${this.name[1]}`;
+    }
+}
+__decorate([
+    Type(() => User)
+], Firm.prototype, "owner", void 0);
+__decorate([
+    Type(() => Address)
+], Firm.prototype, "address", void 0);
+__decorate([
+    Type(() => Phone)
+], Firm.prototype, "phone", void 0);
+
+class EmployeeDetails extends EmployeeDetails$1 {
+}
+__decorate([
+    Type(() => Firm)
+], EmployeeDetails.prototype, "firm", void 0);
+
+class ServiceSubscription$1 extends AbstractModel {
+}
+
+class ServiceSubscriptionItem$1 extends AbstractModel {
+}
+
+class ServicePrice$1 extends AbstractModel {
+}
+
+class ServiceProduct$1 extends AbstractModel {
+}
+
+var ServiceProductStatusEnum;
+(function (ServiceProductStatusEnum) {
+    ServiceProductStatusEnum[ServiceProductStatusEnum["ARCHIVED"] = 0] = "ARCHIVED";
+    ServiceProductStatusEnum[ServiceProductStatusEnum["ACTIVE"] = 1] = "ACTIVE";
 })(ServiceProductStatusEnum || (ServiceProductStatusEnum = {}));
 
 var ServiceProductIdEnum;
@@ -2095,6 +2412,9 @@ class SoleInvoiceTemplate$1 extends AbstractModel {
 }
 
 class SoleInvoiceTemplate extends SoleInvoiceTemplate$1 {
+    static create(businessId) {
+        return plainToClass(SoleInvoiceTemplate, { business: { id: businessId }, isTaxIncluded: false });
+    }
 }
 __decorate([
     Type(() => SoleBusiness)
@@ -2130,25 +2450,105 @@ __decorate([
 class VehicleClaim$1 extends AbstractModel {
 }
 
-var VehicleClaimMethodEnum;
-(function (VehicleClaimMethodEnum) {
-    VehicleClaimMethodEnum[VehicleClaimMethodEnum["KMS"] = 1] = "KMS";
-    VehicleClaimMethodEnum[VehicleClaimMethodEnum["LOGBOOK"] = 2] = "LOGBOOK";
-})(VehicleClaimMethodEnum || (VehicleClaimMethodEnum = {}));
+class VehicleClaimDetails$1 extends AbstractModel {
+}
 
-var TransactionSourceEnum;
-(function (TransactionSourceEnum) {
-    TransactionSourceEnum[TransactionSourceEnum["CASH"] = 1] = "CASH";
-    TransactionSourceEnum[TransactionSourceEnum["BANK_TRANSACTION"] = 2] = "BANK_TRANSACTION";
-})(TransactionSourceEnum || (TransactionSourceEnum = {}));
+var VehicleClaimDetailsMethodEnum;
+(function (VehicleClaimDetailsMethodEnum) {
+    VehicleClaimDetailsMethodEnum[VehicleClaimDetailsMethodEnum["KMS"] = 1] = "KMS";
+    VehicleClaimDetailsMethodEnum[VehicleClaimDetailsMethodEnum["LOGBOOK"] = 2] = "LOGBOOK";
+})(VehicleClaimDetailsMethodEnum || (VehicleClaimDetailsMethodEnum = {}));
 
-var TransactionTypeEnum;
-(function (TransactionTypeEnum) {
-    TransactionTypeEnum[TransactionTypeEnum["DEBIT"] = 1] = "DEBIT";
-    TransactionTypeEnum[TransactionTypeEnum["CREDIT"] = 2] = "CREDIT";
-})(TransactionTypeEnum || (TransactionTypeEnum = {}));
+class VehicleClaimDetails extends VehicleClaimDetails$1 {
+    isLogbookMethod() {
+        return this.method === VehicleClaimDetailsMethodEnum.LOGBOOK;
+    }
+    isKlmsMethod() {
+        return this.method === VehicleClaimDetailsMethodEnum.KMS;
+    }
+    // @TODO Alex: discuss with Vik and think about abstract method in AbstractModel
+    static create() {
+        return plainToClass(VehicleClaimDetails, {
+            isManual: true,
+            method: VehicleClaimDetailsMethodEnum.KMS,
+            financialYear: new FinancialYear().year
+        });
+    }
+}
+__decorate([
+    Type(() => User)
+], VehicleClaimDetails.prototype, "user", void 0);
+
+class VehicleClaim extends VehicleClaim$1 {
+    isWorkTank() {
+        return !this.business;
+    }
+    isSoleTank() {
+        return !!this.business;
+    }
+    get tankType() {
+        return this.isSoleTank() ? TankTypeEnum.SOLE : TankTypeEnum.WORK;
+    }
+    /**
+     * Claim amount for KLMs method. Exists only for KLMs method.
+     */
+    getKLMsClaimAmount(vehicleClaimRate) {
+        return +(this.kilometers * vehicleClaimRate).toFixed(2);
+    }
+    /**
+     * Get logbook claim amount. Exists only for logbook method.
+     * ClaimAmount = WorkUsage * transaction/depreciation amount
+     */
+    getLogbookClaimAmount(transactions) {
+        const transactionsAmount = transactions
+            .getByVehicleClaim(this)
+            .getLogbookTransactions()
+            .sumBy('amount');
+        // Math.abs because amount will be negative (because we sum expenses), but we don't want negative percent value
+        return Math.abs(transactionsAmount) * this.workUsage / 100;
+    }
+    getKlmsChartAccountsIdByTankType(tankType = this.tankType) {
+        return tankType === TankTypeEnum.WORK
+            ? ChartAccountsListEnum.KLMS_TRAVELLED_FOR_WORK
+            : ChartAccountsListEnum.KLMS_TRAVELLED;
+    }
+    static create(details, business) {
+        return plainToClass(VehicleClaim, {
+            kilometers: 0,
+            workUsage: 0,
+            details,
+            business
+        });
+    }
+}
+/**
+ * limit for kms claim method
+ */
+VehicleClaim.totalKmsLimit = 5000;
+/**
+ * limit for work usage claim method
+  */
+VehicleClaim.totalWorkUsagePercent = 100;
+__decorate([
+    Type(() => VehicleClaimDetails)
+], VehicleClaim.prototype, "details", void 0);
+__decorate([
+    Type(() => SoleBusiness)
+], VehicleClaim.prototype, "business", void 0);
 
 class TransactionBase extends AbstractModel {
+    get tankType() {
+        switch (true) {
+            case this.isPropertyTank():
+                return TankTypeEnum.PROPERTY;
+            case this.isWorkTank():
+                return TankTypeEnum.WORK;
+            case this.isSoleTank():
+                return TankTypeEnum.SOLE;
+            default:
+                return TankTypeEnum.OTHER;
+        }
+    }
     /**
      * Check if current tank is Property
      */
@@ -2190,16 +2590,9 @@ __decorate([
     })
 ], TransactionBase.prototype, "file", void 0);
 
-class Transaction$1 extends TransactionBase {
+class Depreciation$1 extends TransactionBase {
 }
 
-var TransactionOperationEnum;
-(function (TransactionOperationEnum) {
-    TransactionOperationEnum[TransactionOperationEnum["ALLOCATE"] = 1] = "ALLOCATE";
-    TransactionOperationEnum[TransactionOperationEnum["FIND_AND_MATCH"] = 2] = "FIND_AND_MATCH";
-    TransactionOperationEnum[TransactionOperationEnum["TRANSFER"] = 3] = "TRANSFER";
-})(TransactionOperationEnum || (TransactionOperationEnum = {}));
-
 var DepreciationTypeEnum;
 (function (DepreciationTypeEnum) {
     DepreciationTypeEnum[DepreciationTypeEnum["PLANT_EQUIPMENT"] = 1] = "PLANT_EQUIPMENT";
@@ -2217,6 +2610,80 @@ var DepreciationCalculationEnum;
     DepreciationCalculationEnum[DepreciationCalculationEnum["AMORTISATION"] = 5] = "AMORTISATION";
 })(DepreciationCalculationEnum || (DepreciationCalculationEnum = {}));
 
+class DepreciationCapitalProject$1 extends AbstractModel {
+}
+
+class DepreciationCapitalProject extends DepreciationCapitalProject$1 {
+}
+__decorate([
+    Type(() => Date)
+], DepreciationCapitalProject.prototype, "effectiveDate", void 0);
+
+class DepreciationForecast$1 extends AbstractModel {
+}
+
+class DepreciationForecast extends DepreciationForecast$1 {
+    get dailyClaimAmount() {
+        return this.claimAmount / this.daysApplied;
+    }
+    get daysApplied() {
+        return moment(this.toDate).diff(moment(this.fromDate), 'days');
+    }
+    getDaysByMonth(month) {
+        // @TODO find a better place
+        const year = this.financialYear - (month > 5 ? 1 : 0);
+        // forecast date intersect by month
+        const range = new DateRange(this.fromDate, this.toDate).intersect(new DateRange(new Date(year, month, 1), new Date(year, month + 1, 0)));
+        return range ? range.duration('days') + 1 : 0;
+    }
+    get claimOpenBalance() {
+        return this.openBalance * this.claimRate;
+    }
+    get claimCloseBalance() {
+        return this.closeBalance * this.claimRate;
+    }
+    get claimAmount() {
+        return this.amount * this.claimRate;
+    }
+    get claimRate() {
+        return this.claimPercent / 100;
+    }
+    getClaimAmountByMonth(month) {
+        return this.getDaysByMonth(month) * this.dailyClaimAmount;
+    }
+}
+
+class BankTransaction$1 extends AbstractModel {
+}
+
+var BankTransactionTypeEnum;
+(function (BankTransactionTypeEnum) {
+    BankTransactionTypeEnum[BankTransactionTypeEnum["DEBIT"] = 1] = "DEBIT";
+    BankTransactionTypeEnum[BankTransactionTypeEnum["CREDIT"] = 2] = "CREDIT";
+})(BankTransactionTypeEnum || (BankTransactionTypeEnum = {}));
+
+var TransactionSourceEnum;
+(function (TransactionSourceEnum) {
+    TransactionSourceEnum[TransactionSourceEnum["CASH"] = 1] = "CASH";
+    TransactionSourceEnum[TransactionSourceEnum["BANK_TRANSACTION"] = 2] = "BANK_TRANSACTION";
+})(TransactionSourceEnum || (TransactionSourceEnum = {}));
+
+class Transaction$1 extends TransactionBase {
+}
+
+var TransactionTypeEnum;
+(function (TransactionTypeEnum) {
+    TransactionTypeEnum[TransactionTypeEnum["DEBIT"] = 1] = "DEBIT";
+    TransactionTypeEnum[TransactionTypeEnum["CREDIT"] = 2] = "CREDIT";
+})(TransactionTypeEnum || (TransactionTypeEnum = {}));
+
+var TransactionOperationEnum;
+(function (TransactionOperationEnum) {
+    TransactionOperationEnum[TransactionOperationEnum["ALLOCATE"] = 1] = "ALLOCATE";
+    TransactionOperationEnum[TransactionOperationEnum["FIND_AND_MATCH"] = 2] = "FIND_AND_MATCH";
+    TransactionOperationEnum[TransactionOperationEnum["TRANSFER"] = 3] = "TRANSFER";
+})(TransactionOperationEnum || (TransactionOperationEnum = {}));
+
 class TransactionReceipt$1 extends AbstractModel {
 }
 
@@ -2264,474 +2731,206 @@ var IncomeSourceTypeEnum;
 class SalaryForecast$1 extends AbstractModel {
 }
 
-class SalaryForecast extends SalaryForecast$1 {
-}
-__decorate([
-    Transform(({ obj }) => obj.netPay + obj.tax),
-    Expose()
-], SalaryForecast.prototype, "grossAmount", void 0);
-__decorate([
-    Type(() => IncomeSource)
-], SalaryForecast.prototype, "incomeSource", void 0);
-
-class SoleForecast$1 extends AbstractModel {
-}
-
-class SoleForecast extends SoleForecast$1 {
-    get netPay() {
-        return this.amount;
-    }
-    ;
-}
-__decorate([
-    Type(() => IncomeSource)
-], SoleForecast.prototype, "incomeSource", void 0);
-
-class IncomeSourceForecast$1 extends AbstractModel {
-}
-
-var SalaryForecastFrequencyEnum;
-(function (SalaryForecastFrequencyEnum) {
-    SalaryForecastFrequencyEnum[SalaryForecastFrequencyEnum["ANNUAL"] = 1] = "ANNUAL";
-    SalaryForecastFrequencyEnum[SalaryForecastFrequencyEnum["MONTHLY"] = 12] = "MONTHLY";
-    SalaryForecastFrequencyEnum[SalaryForecastFrequencyEnum["FORTNIGHTLY"] = 26] = "FORTNIGHTLY";
-    SalaryForecastFrequencyEnum[SalaryForecastFrequencyEnum["WEEKLY"] = 52] = "WEEKLY";
-})(SalaryForecastFrequencyEnum || (SalaryForecastFrequencyEnum = {}));
-
-class IncomeSourceType$1 extends AbstractModel {
-}
-
-var IncomeSourceTypeListWorkEnum;
-(function (IncomeSourceTypeListWorkEnum) {
-    IncomeSourceTypeListWorkEnum[IncomeSourceTypeListWorkEnum["BONUSES"] = 1] = "BONUSES";
-    IncomeSourceTypeListWorkEnum[IncomeSourceTypeListWorkEnum["DIRECTOR_FEES"] = 2] = "DIRECTOR_FEES";
-    IncomeSourceTypeListWorkEnum[IncomeSourceTypeListWorkEnum["DIVIDENDS"] = 3] = "DIVIDENDS";
-    IncomeSourceTypeListWorkEnum[IncomeSourceTypeListWorkEnum["INTEREST"] = 4] = "INTEREST";
-    IncomeSourceTypeListWorkEnum[IncomeSourceTypeListWorkEnum["PENSIONS_AND_ALLOWANCES"] = 5] = "PENSIONS_AND_ALLOWANCES";
-    IncomeSourceTypeListWorkEnum[IncomeSourceTypeListWorkEnum["SUPERANNUATION"] = 8] = "SUPERANNUATION";
-    IncomeSourceTypeListWorkEnum[IncomeSourceTypeListWorkEnum["ATTRIBUTED_P_S_I"] = 11] = "ATTRIBUTED_P_S_I";
-})(IncomeSourceTypeListWorkEnum || (IncomeSourceTypeListWorkEnum = {}));
-
-var IncomeSourceTypeListOtherEnum;
-(function (IncomeSourceTypeListOtherEnum) {
-    IncomeSourceTypeListOtherEnum[IncomeSourceTypeListOtherEnum["PSI"] = 6] = "PSI";
-    IncomeSourceTypeListOtherEnum[IncomeSourceTypeListOtherEnum["SOLE_TRADER"] = 7] = "SOLE_TRADER";
-    IncomeSourceTypeListOtherEnum[IncomeSourceTypeListOtherEnum["TRUSTS"] = 9] = "TRUSTS";
-    IncomeSourceTypeListOtherEnum[IncomeSourceTypeListOtherEnum["OTHER_INCOME"] = 10] = "OTHER_INCOME";
-    IncomeSourceTypeListOtherEnum[IncomeSourceTypeListOtherEnum["PARTNERSHIPS"] = 12] = "PARTNERSHIPS";
-})(IncomeSourceTypeListOtherEnum || (IncomeSourceTypeListOtherEnum = {}));
-
-var IncomeSourceTypeListSoleEnum;
-(function (IncomeSourceTypeListSoleEnum) {
-    IncomeSourceTypeListSoleEnum[IncomeSourceTypeListSoleEnum["SOLE_TRADER"] = 7] = "SOLE_TRADER";
-})(IncomeSourceTypeListSoleEnum || (IncomeSourceTypeListSoleEnum = {}));
-
-class IncomeSourceType extends IncomeSourceType$1 {
-    isBonuses() {
-        return this.id === IncomeSourceTypeListWorkEnum.BONUSES;
-    }
-    isWork() {
-        return !!IncomeSourceTypeListWorkEnum[this.id];
-    }
-    isOther() {
-        return !!IncomeSourceTypeListOtherEnum[this.id];
-    }
-    isSole() {
-        return !!IncomeSourceTypeListSoleEnum[this.id];
-    }
-    get type() {
-        switch (true) {
-            case this.isWork():
-                return IncomeSourceTypeEnum.WORK;
-            case this.isSole():
-                return IncomeSourceTypeEnum.SOLE;
-            default:
-                return IncomeSourceTypeEnum.OTHER;
-        }
-    }
-}
-
-class IncomeSourceForecast extends IncomeSourceForecast$1 {
-    constructor() {
-        super(...arguments);
-        this.paygIncome = 0;
-        this.frequency = SalaryForecastFrequencyEnum.ANNUAL;
-        this.isTaxFree = false;
-    }
-    /**
-     * Sometimes Income source has Salary & Income source forecasts,
-     * and we need these fields to work with Income source forecasts like with Salary Forecasts
-     */
-    get netPay() {
-        return this.amount;
-    }
-    get grossAmount() {
-        return this.amount + this.tax + this.taxInstalments + this.frankingCredits;
-    }
-}
-__decorate([
-    Type(() => IncomeSourceType)
-], IncomeSourceForecast.prototype, "incomeSourceType", void 0);
-__decorate([
-    Type(() => IncomeSource)
-], IncomeSourceForecast.prototype, "incomeSource", void 0);
-
-class IncomeSource extends IncomeSource$1 {
-    isSalaryIncome() {
-        return !!this.salaryForecasts.length;
-        // @TODO Vik: old code
-        // return this.type === IncomeSourceTypeEnum.SALARY;
-    }
-    isSoleIncome() {
-        return this.type === IncomeSourceTypeEnum.SOLE;
-    }
-    isWorkIncome() {
-        return this.type === IncomeSourceTypeEnum.WORK;
-    }
-    isOtherIncome() {
-        return this.type === IncomeSourceTypeEnum.OTHER;
-    }
-    /**
-     * Get salary and other income forecasts
-     */
-    get forecasts() {
-        return [...this.salaryForecasts, ...this.incomeSourceForecasts, ...this.soleForecasts];
-    }
-    /**
-     * Get actual (1st from the list) forecast
-     */
-    get actualForecast() {
-        return this.forecasts[0];
-    }
-    /**
-     * Check if user was working in month taken by the index
-     * @param monthIndex by which month should be taken
-     */
-    isWorkedInMonth(monthIndex) {
-        const monthDate = new FinancialYear().getMonthDate(monthIndex);
-        return (!this.dateFrom || monthDate >= this.dateFrom) && (!this.dateTo || monthDate < this.dateTo);
-    }
-}
-__decorate([
-    Type(() => SalaryForecast)
-], IncomeSource.prototype, "salaryForecasts", void 0);
-__decorate([
-    Type(() => SoleForecast)
-], IncomeSource.prototype, "soleForecasts", void 0);
-__decorate([
-    Type(() => IncomeSourceForecast)
-], IncomeSource.prototype, "incomeSourceForecasts", void 0);
-__decorate([
-    Type(() => Date)
-], IncomeSource.prototype, "dateFrom", void 0);
-__decorate([
-    Type(() => Date)
-], IncomeSource.prototype, "dateTo", void 0);
-
-class TransactionMetadata$1 extends AbstractModel {
-}
-
-class TransactionMetadata extends TransactionMetadata$1 {
-}
-__decorate([
-    Type(() => ChartAccountsMetadata)
-], TransactionMetadata.prototype, "metadata", void 0);
-
-class TransactionAllocation$1 extends AbstractModel {
-}
-
-class BankTransaction$1 extends AbstractModel {
-}
-
-var BankTransactionTypeEnum;
-(function (BankTransactionTypeEnum) {
-    BankTransactionTypeEnum[BankTransactionTypeEnum["DEBIT"] = 1] = "DEBIT";
-    BankTransactionTypeEnum[BankTransactionTypeEnum["CREDIT"] = 2] = "CREDIT";
-})(BankTransactionTypeEnum || (BankTransactionTypeEnum = {}));
-
-class BankTransaction extends BankTransaction$1 {
-    constructor() {
-        super(...arguments);
-        // allocated money amount for bank transaction
-        this.allocatedAmount = 0;
-        this.unallocatedAmount = 0;
-    }
-    /**
-     * get allocated amount value but with +/- sign
-     */
-    get balanceAmount() {
-        return this.isCredit() ? this.allocatedAmount : -this.allocatedAmount;
-    }
-    /**
-     * check if bank transaction is debit
-     */
-    isDebit() {
-        return this.type === BankTransactionTypeEnum.DEBIT;
-    }
-    /**
-     * check if bank transaction is credit
-     */
-    isCredit() {
-        return this.type === BankTransactionTypeEnum.CREDIT;
-    }
-    /**
-     * Create Transaction instance based on Bank Transaction
-     */
-    toTransaction() {
-        return plainToClass(Transaction, {
-            amount: +this.amount.toFixed(2),
-            description: this.description,
-            date: this.date,
-            source: TransactionSourceEnum.BANK_TRANSACTION,
-            operation: this.operation,
-            type: this.type,
-        });
-    }
-    /**
-     * Check if bank transaction is completely allocated
-     */
-    isAllocated(allocations) {
-        return this.amount === this.getAllocatedAmount(allocations);
-    }
-    /**
-     * Get bank transaction allocated amount
-     */
-    getAllocatedAmount(allocations) {
-        return allocations.getByBankTransactionsIds([this.id]).amount;
-    }
-    /**
-     * Get bank transaction unallocated amount
-     */
-    getUnallocatedAmount(allocations) {
-        return this.amount - this.getAllocatedAmount(allocations);
-    }
-}
-__decorate([
-    Type(() => Date)
-], BankTransaction.prototype, "date", void 0);
-
-class TransactionAllocation extends TransactionAllocation$1 {
-    /**
-     * Create a new instance of transaction allocation
-     * transaction could be empty since we can POST allocation inside a new transaction
-     */
-    static create(amount, bankTransaction, transaction) {
-        return plainToClass(TransactionAllocation, { amount, transaction, bankTransaction });
-    }
+class SalaryForecast extends SalaryForecast$1 {
 }
 __decorate([
-    Type(() => BankTransaction)
-], TransactionAllocation.prototype, "bankTransaction", void 0);
+    Transform(({ obj }) => obj.netPay + obj.tax),
+    Expose()
+], SalaryForecast.prototype, "grossAmount", void 0);
 __decorate([
-    Type(() => Transaction)
-], TransactionAllocation.prototype, "transaction", void 0);
-
-/**
- * Enum with income amount types (Net or Gross)
- */
-var IncomeAmountTypeEnum;
-(function (IncomeAmountTypeEnum) {
-    IncomeAmountTypeEnum[IncomeAmountTypeEnum["NET"] = 0] = "NET";
-    IncomeAmountTypeEnum[IncomeAmountTypeEnum["GROSS"] = 1] = "GROSS";
-})(IncomeAmountTypeEnum || (IncomeAmountTypeEnum = {}));
+    Type(() => IncomeSource)
+], SalaryForecast.prototype, "incomeSource", void 0);
 
-class Depreciation$1 extends TransactionBase {
+class SoleForecast$1 extends AbstractModel {
 }
 
-class DepreciationCapitalProject$1 extends AbstractModel {
+class SoleForecast extends SoleForecast$1 {
+    get netPay() {
+        return this.amount;
+    }
+    ;
 }
+__decorate([
+    Type(() => IncomeSource)
+], SoleForecast.prototype, "incomeSource", void 0);
 
-class DepreciationCapitalProject extends DepreciationCapitalProject$1 {
+class IncomeSourceForecast$1 extends AbstractModel {
 }
-__decorate([
-    Type(() => Date)
-], DepreciationCapitalProject.prototype, "effectiveDate", void 0);
 
-class DepreciationForecast$1 extends AbstractModel {
+var SalaryForecastFrequencyEnum;
+(function (SalaryForecastFrequencyEnum) {
+    SalaryForecastFrequencyEnum[SalaryForecastFrequencyEnum["ANNUAL"] = 1] = "ANNUAL";
+    SalaryForecastFrequencyEnum[SalaryForecastFrequencyEnum["MONTHLY"] = 12] = "MONTHLY";
+    SalaryForecastFrequencyEnum[SalaryForecastFrequencyEnum["FORTNIGHTLY"] = 26] = "FORTNIGHTLY";
+    SalaryForecastFrequencyEnum[SalaryForecastFrequencyEnum["WEEKLY"] = 52] = "WEEKLY";
+})(SalaryForecastFrequencyEnum || (SalaryForecastFrequencyEnum = {}));
+
+class IncomeSourceType$1 extends AbstractModel {
 }
 
-class DepreciationForecast extends DepreciationForecast$1 {
-    get dailyClaimAmount() {
-        return this.claimAmount / this.daysApplied;
-    }
-    get daysApplied() {
-        return moment(this.toDate).diff(moment(this.fromDate), 'days');
-    }
-    getDaysByMonth(month) {
-        // @TODO find a better place
-        const year = this.financialYear - (month > 5 ? 1 : 0);
-        // forecast date intersect by month
-        const range = new DateRange(this.fromDate, this.toDate).intersect(new DateRange(new Date(year, month, 1), new Date(year, month + 1, 0)));
-        return range ? range.duration('days') + 1 : 0;
-    }
-    get claimOpenBalance() {
-        return this.openBalance * this.claimRate;
+var IncomeSourceTypeListWorkEnum;
+(function (IncomeSourceTypeListWorkEnum) {
+    IncomeSourceTypeListWorkEnum[IncomeSourceTypeListWorkEnum["BONUSES"] = 1] = "BONUSES";
+    IncomeSourceTypeListWorkEnum[IncomeSourceTypeListWorkEnum["DIRECTOR_FEES"] = 2] = "DIRECTOR_FEES";
+    IncomeSourceTypeListWorkEnum[IncomeSourceTypeListWorkEnum["DIVIDENDS"] = 3] = "DIVIDENDS";
+    IncomeSourceTypeListWorkEnum[IncomeSourceTypeListWorkEnum["INTEREST"] = 4] = "INTEREST";
+    IncomeSourceTypeListWorkEnum[IncomeSourceTypeListWorkEnum["PENSIONS_AND_ALLOWANCES"] = 5] = "PENSIONS_AND_ALLOWANCES";
+    IncomeSourceTypeListWorkEnum[IncomeSourceTypeListWorkEnum["SUPERANNUATION"] = 8] = "SUPERANNUATION";
+    IncomeSourceTypeListWorkEnum[IncomeSourceTypeListWorkEnum["ATTRIBUTED_P_S_I"] = 11] = "ATTRIBUTED_P_S_I";
+})(IncomeSourceTypeListWorkEnum || (IncomeSourceTypeListWorkEnum = {}));
+
+var IncomeSourceTypeListOtherEnum;
+(function (IncomeSourceTypeListOtherEnum) {
+    IncomeSourceTypeListOtherEnum[IncomeSourceTypeListOtherEnum["PSI"] = 6] = "PSI";
+    IncomeSourceTypeListOtherEnum[IncomeSourceTypeListOtherEnum["SOLE_TRADER"] = 7] = "SOLE_TRADER";
+    IncomeSourceTypeListOtherEnum[IncomeSourceTypeListOtherEnum["TRUSTS"] = 9] = "TRUSTS";
+    IncomeSourceTypeListOtherEnum[IncomeSourceTypeListOtherEnum["OTHER_INCOME"] = 10] = "OTHER_INCOME";
+    IncomeSourceTypeListOtherEnum[IncomeSourceTypeListOtherEnum["PARTNERSHIPS"] = 12] = "PARTNERSHIPS";
+})(IncomeSourceTypeListOtherEnum || (IncomeSourceTypeListOtherEnum = {}));
+
+var IncomeSourceTypeListSoleEnum;
+(function (IncomeSourceTypeListSoleEnum) {
+    IncomeSourceTypeListSoleEnum[IncomeSourceTypeListSoleEnum["SOLE_TRADER"] = 7] = "SOLE_TRADER";
+})(IncomeSourceTypeListSoleEnum || (IncomeSourceTypeListSoleEnum = {}));
+
+class IncomeSourceType extends IncomeSourceType$1 {
+    isBonuses() {
+        return this.id === IncomeSourceTypeListWorkEnum.BONUSES;
     }
-    get claimCloseBalance() {
-        return this.closeBalance * this.claimRate;
+    isWork() {
+        return !!IncomeSourceTypeListWorkEnum[this.id];
     }
-    get claimAmount() {
-        return this.amount * this.claimRate;
+    isOther() {
+        return !!IncomeSourceTypeListOtherEnum[this.id];
     }
-    get claimRate() {
-        return this.claimPercent / 100;
+    isSole() {
+        return !!IncomeSourceTypeListSoleEnum[this.id];
     }
-    getClaimAmountByMonth(month) {
-        return this.getDaysByMonth(month) * this.dailyClaimAmount;
+    get type() {
+        switch (true) {
+            case this.isWork():
+                return IncomeSourceTypeEnum.WORK;
+            case this.isSole():
+                return IncomeSourceTypeEnum.SOLE;
+            default:
+                return IncomeSourceTypeEnum.OTHER;
+        }
     }
 }
 
-class Depreciation extends Depreciation$1 {
+class IncomeSourceForecast extends IncomeSourceForecast$1 {
     constructor() {
         super(...arguments);
-        this.forecasts = [];
-        this.type = DepreciationTypeEnum.PLANT_EQUIPMENT;
-        /**
-         * @TODO remove after ? signs removed from db models
-         */
-        this.amount = 0;
-    }
-    isCapital() {
-        return this.type === DepreciationTypeEnum.CAPITAL_WORKS;
-    }
-    isBorrowingExpense() {
-        return this.type === DepreciationTypeEnum.BORROWING_EXPENSES;
-    }
-    isAsset() {
-        return this.type === DepreciationTypeEnum.PLANT_EQUIPMENT;
-    }
-    /**
-     * check if depreciation should be displayed in written off category
-     * details in project documentation
-     * @TODO new FinancialYear(this.writeOffDate) === new FinancialYear()
-     */
-    isWrittenOff() {
-        return this.isAsset && this.writeOffDate && new FinancialYear(this.writeOffDate).year === this.financialYear;
+        this.paygIncome = 0;
+        this.frequency = SalaryForecastFrequencyEnum.ANNUAL;
+        this.isTaxFree = false;
     }
     /**
-     * Check if depreciation is Plant & Equipment
+     * Sometimes Income source has Salary & Income source forecasts,
+     * and we need these fields to work with Income source forecasts like with Salary Forecasts
      */
-    isPlantEquipment() {
-        return this.isAsset() && !this.isWrittenOff() && !this.isLowValuePool();
+    get netPay() {
+        return this.amount;
     }
-    /**
-     * check if depreciation should be displayed in low value pool
-     * details in project documentation
-     * @TODO new FinancialYear(this.writeOffDate) === new FinancialYear()
-     */
-    isLowValuePool() {
-        return this.isAsset &&
-            this.calculation === DepreciationCalculationEnum.DIMINISHING &&
-            this.amount > Depreciation.WRITTEN_OFF_THRESHOLD &&
-            this.amount <= Depreciation.LOW_VALUE_POOL_THRESHOLD;
+    get grossAmount() {
+        return this.amount + this.tax + this.taxInstalments + this.frankingCredits;
     }
-    isPrimeCost() {
-        return this.calculation === DepreciationCalculationEnum.PRIME_COST;
+}
+__decorate([
+    Type(() => IncomeSourceType)
+], IncomeSourceForecast.prototype, "incomeSourceType", void 0);
+__decorate([
+    Type(() => IncomeSource)
+], IncomeSourceForecast.prototype, "incomeSource", void 0);
+
+class IncomeSource extends IncomeSource$1 {
+    isSalaryIncome() {
+        return !!this.salaryForecasts.length;
+        // @TODO Vik: old code
+        // return this.type === IncomeSourceTypeEnum.SALARY;
     }
-    isDiminishing() {
-        return this.calculation === DepreciationCalculationEnum.DIMINISHING;
+    isSoleIncome() {
+        return this.type === IncomeSourceTypeEnum.SOLE;
     }
-    /**
-     * Check if depreciation chart accounts heading related to vehicles category
-     */
-    isVehicleDepreciation() {
-        var _a;
-        return ((_a = this.chartAccounts.heading) === null || _a === void 0 ? void 0 : _a.id) === ChartAccountsHeadingVehicleListEnum.DEPRECIATION_VEHICLES;
+    isWorkIncome() {
+        return this.type === IncomeSourceTypeEnum.WORK;
     }
-    /**
-     * Get depreciation purchase date
-     */
-    getDate() {
-        return this.date;
+    isOtherIncome() {
+        return this.type === IncomeSourceTypeEnum.OTHER;
     }
     /**
-     * @TODO Vik: Research a problem with depreciations without current year forecast
+     * Get salary and other income forecasts
      */
-    get currentYearForecast() {
-        return this.forecasts.find((forecast) => {
-            return forecast.financialYear === new FinancialYear().year;
-        }) || plainToClass(DepreciationForecast, {
-            financialYear: new FinancialYear().year,
-            openBalance: 0,
-            closeBalance: 0,
-            amount: 0,
-            claimPercent: 0
-        });
-    }
-    getForecastByYear(year) {
-        return this.forecasts.find((forecast) => {
-            return forecast.financialYear === year;
-        });
-    }
-    getClaimAmountByYear(year) {
-        var _a;
-        return ((_a = this.getForecastByYear(year)) === null || _a === void 0 ? void 0 : _a.claimAmount) || 0;
-    }
-    getCloseBalanceByYear(year) {
-        var _a;
-        return ((_a = this.getForecastByYear(year)) === null || _a === void 0 ? void 0 : _a.closeBalance) || 0;
-    }
-    isBuildingAtCost() {
-        return this.chartAccounts.id === ChartAccountsListEnum.BUILDING_AT_COST;
+    get forecasts() {
+        return [...this.salaryForecasts, ...this.incomeSourceForecasts, ...this.soleForecasts];
     }
     /**
-     * Create a new transaction from current depreciation
+     * Get actual (1st from the list) forecast
      */
-    toTransaction(params = {}) {
-        return plainToClass(Transaction, Object.assign(params, this, { amount: this.currentYearForecast.amount }));
+    get actualForecast() {
+        return this.forecasts[0];
     }
     /**
-     * @TODO Michael: remove and check everywhere in reports
+     * Check if user was working in month taken by the index
+     * @param monthIndex by which month should be taken
      */
-    get claimAmount() {
-        var _a;
-        return ((_a = this.currentYearForecast) === null || _a === void 0 ? void 0 : _a.claimAmount) || 0;
+    isWorkedInMonth(monthIndex) {
+        const monthDate = new FinancialYear().getMonthDate(monthIndex);
+        return (!this.dateFrom || monthDate >= this.dateFrom) && (!this.dateTo || monthDate < this.dateTo);
     }
 }
-Depreciation.WRITTEN_OFF_THRESHOLD = 300;
-Depreciation.LOW_VALUE_POOL_THRESHOLD = 1000;
 __decorate([
-    Type(() => Date)
-], Depreciation.prototype, "purchaseDate", void 0);
+    Type(() => SalaryForecast)
+], IncomeSource.prototype, "salaryForecasts", void 0);
 __decorate([
-    Type(() => Date)
-], Depreciation.prototype, "date", void 0);
+    Type(() => SoleForecast)
+], IncomeSource.prototype, "soleForecasts", void 0);
 __decorate([
-    Type(() => Date)
-], Depreciation.prototype, "lowValuePoolDate", void 0);
+    Type(() => IncomeSourceForecast)
+], IncomeSource.prototype, "incomeSourceForecasts", void 0);
 __decorate([
     Type(() => Date)
-], Depreciation.prototype, "writeOffManualDate", void 0);
+], IncomeSource.prototype, "dateFrom", void 0);
 __decorate([
     Type(() => Date)
-], Depreciation.prototype, "writeOffDate", void 0);
-__decorate([
-    Type(() => DepreciationCapitalProject)
-], Depreciation.prototype, "depreciationCapitalProject", void 0);
-__decorate([
-    Type(() => DepreciationForecast),
-    Transform(({ value, obj }) => {
-        // value = array of DepreciationForecast
-        // obj = plain (whole Depreciation object)
-        // Set isLVP flag for each DepreciationForecast
-        // @TODO refactor
-        value.forEach((forecast) => {
-            forecast.isLVP =
-                forecast.closeBalance < 1000 &&
-                    obj.calculation === DepreciationCalculationEnum.DIMINISHING &&
-                    obj.type === DepreciationTypeEnum.PLANT_EQUIPMENT &&
-                    !(obj.amount > Depreciation.WRITTEN_OFF_THRESHOLD && obj.amount < Depreciation.LOW_VALUE_POOL_THRESHOLD) &&
-                    !(obj.writeOffDate && new FinancialYear(new Date(obj.writeOffDate)).year === obj.financialYear);
-        });
-        return value;
-    })
-], Depreciation.prototype, "forecasts", void 0);
+], IncomeSource.prototype, "dateTo", void 0);
+
+class TransactionMetadata$1 extends AbstractModel {
+}
+
+class TransactionMetadata extends TransactionMetadata$1 {
+}
 __decorate([
-    Type(() => ChartAccounts)
-], Depreciation.prototype, "chartAccounts", void 0);
+    Type(() => ChartAccountsMetadata)
+], TransactionMetadata.prototype, "metadata", void 0);
+
+class TransactionAllocation$1 extends AbstractModel {
+}
+
+class TransactionAllocation extends TransactionAllocation$1 {
+    /**
+     * Create a new instance of transaction allocation
+     * transaction could be empty since we can POST allocation inside a new transaction
+     */
+    static create(amount, bankTransaction, transaction) {
+        return plainToClass(TransactionAllocation, { amount, transaction, bankTransaction });
+    }
+}
 __decorate([
     Type(() => BankTransaction)
-], Depreciation.prototype, "bankTransaction", void 0);
+], TransactionAllocation.prototype, "bankTransaction", void 0);
+__decorate([
+    Type(() => Transaction)
+], TransactionAllocation.prototype, "transaction", void 0);
+
+/**
+ * Enum with income amount types (Net or Gross)
+ */
+var IncomeAmountTypeEnum;
+(function (IncomeAmountTypeEnum) {
+    IncomeAmountTypeEnum[IncomeAmountTypeEnum["NET"] = 0] = "NET";
+    IncomeAmountTypeEnum[IncomeAmountTypeEnum["GROSS"] = 1] = "GROSS";
+})(IncomeAmountTypeEnum || (IncomeAmountTypeEnum = {}));
 
 // @TODO refactor with baseModel in constructor
 class Transaction extends Transaction$1 {
@@ -2939,613 +3138,543 @@ __decorate([
     Type(() => TransactionAllocation)
 ], Transaction.prototype, "allocations", void 0);
 
-const WEEKS_IN_YEAR = 52;
-class VehicleClaim extends VehicleClaim$1 {
+class BankTransaction extends BankTransaction$1 {
     constructor() {
         super(...arguments);
-        // limit for kms claim method
-        this.kmsLimit = 5000;
-        this.financialYear = new FinancialYear().year;
-        this.method = VehicleClaimMethodEnum.KMS;
-        this.kilometers = 0;
-        this.workUsage = 0;
-        this.isManual = true;
+        // allocated money amount for bank transaction
+        this.allocatedAmount = 0;
+        this.unallocatedAmount = 0;
     }
     /**
-     * get amount of kilometres per week
+     * get allocated amount value but with +/- sign
      */
-    get averageWeeklyTraveledKms() {
-        return this.kilometers / WEEKS_IN_YEAR;
-    }
-    isLogbookMethod() {
-        return this.method === VehicleClaimMethodEnum.LOGBOOK;
-    }
-    isKLMsMethod() {
-        return this.method === VehicleClaimMethodEnum.KMS;
-    }
-    isWorkTank() {
-        return !this.business;
-    }
-    isSoleTank() {
-        return !!this.business;
-    }
-    get tankType() {
-        return this.isSoleTank() ? TankTypeEnum.SOLE : TankTypeEnum.WORK;
+    get balanceAmount() {
+        return this.isCredit() ? this.allocatedAmount : -this.allocatedAmount;
     }
     /**
-     * Claim amount for KLMs method. Exists only for KLMs method.
+     * check if bank transaction is debit
      */
-    getKLMsClaimAmount(vehicleClaimRate) {
-        if (!this.isKLMsMethod()) {
-            return 0;
-        }
-        return +(this.kilometers * vehicleClaimRate).toFixed(2);
+    isDebit() {
+        return this.type === BankTransactionTypeEnum.DEBIT;
     }
     /**
-     * Get logbook claim amount. Exists only for logbook method.
-     * ClaimAmount = WorkUsage * transaction/depreciation amount
+     * check if bank transaction is credit
      */
-    getLogbookClaimAmount(transactions) {
-        if (!this.isLogbookMethod()) {
-            return 0;
-        }
-        const transactionsAmount = transactions
-            .getByTankType(this.tankType)
-            .getVehicleTransactions()
-            // except klms transactions because they needed only for klms method
-            .filter((transaction) => !transaction.chartAccounts.isKLMsByTankType(this.tankType))
-            .sumBy('amount');
-        // Math.abs because amount will be negative (because we sum expenses), but we don't want negative percent value
-        return Math.abs(transactionsAmount) * this.workUsage / 100;
+    isCredit() {
+        return this.type === BankTransactionTypeEnum.CREDIT;
     }
     /**
-     * Create KLMs transaction based on vehicle claim and vehicle claim rate
-     * @TODO handle on backend: Create klms transaction when vhicle claim created
+     * Create Transaction instance based on Bank Transaction
      */
-    toTransaction(vehicleClaimRate) {
+    toTransaction() {
         return plainToClass(Transaction, {
-            amount: this.kilometers * vehicleClaimRate,
-            source: TransactionSourceEnum.CASH,
-            type: TransactionTypeEnum.DEBIT,
-            taxWithheld: 0,
-            description: 'Klm’s method',
-            date: new Date(`${new FinancialYear().year}-06-30`),
-            claimPercent: 100,
-            chartAccounts: {
-                id: this.getKlmsChartAccountsIdByTankType(this.tankType)
-            }
+            amount: +this.amount.toFixed(2),
+            description: this.description,
+            date: this.date,
+            source: TransactionSourceEnum.BANK_TRANSACTION,
+            operation: this.operation,
+            type: this.type,
         });
     }
-    getKlmsChartAccountsIdByTankType(tankType = this.tankType) {
-        if (tankType === TankTypeEnum.WORK) {
-            return ChartAccountsListEnum.KLMS_TRAVELLED_FOR_WORK;
-        }
-        return ChartAccountsListEnum.KLMS_TRAVELLED;
+    /**
+     * Check if bank transaction is completely allocated
+     */
+    isAllocated(allocations) {
+        return this.amount === this.getAllocatedAmount(allocations);
     }
-}
-
-class SoleBusiness extends SoleBusiness$1 {
-    getPhotoPlaceholder() {
-        return `${this.name[0]}${this.name[1]}`;
+    /**
+     * Get bank transaction allocated amount
+     */
+    getAllocatedAmount(allocations) {
+        return allocations.getByBankTransactionsIds([this.id]).amount;
     }
-    getPhoto() {
-        return this.logo;
+    /**
+     * Get bank transaction unallocated amount
+     */
+    getUnallocatedAmount(allocations) {
+        return this.amount - this.getAllocatedAmount(allocations);
     }
 }
 __decorate([
-    Type(() => User)
-], SoleBusiness.prototype, "user", void 0);
-__decorate([
-    Type(() => SoleBusinessAllocation)
-], SoleBusiness.prototype, "allocations", void 0);
-__decorate([
-    Type(() => SoleBusinessLoss)
-], SoleBusiness.prototype, "losses", void 0);
-__decorate([
-    Type(() => SoleInvoice)
-], SoleBusiness.prototype, "invoices", void 0);
-__decorate([
-    Type(() => SoleInvoiceTemplate)
-], SoleBusiness.prototype, "invoiceTemplates", void 0);
-__decorate([
-    Type(() => VehicleClaim)
-], SoleBusiness.prototype, "vehicleClaims", void 0);
-__decorate([
-    Type(() => Transaction)
-], SoleBusiness.prototype, "transactions", void 0);
-__decorate([
-    Type(() => Depreciation)
-], SoleBusiness.prototype, "depreciations", void 0);
-
-class SoleDetails$1 extends AbstractModel {
-}
-
-class SoleDetails extends SoleDetails$1 {
-}
-__decorate([
-    Type(() => User)
-], SoleDetails.prototype, "user", void 0);
+    Type(() => Date)
+], BankTransaction.prototype, "date", void 0);
 
-class User extends User$1 {
-    get fullName() {
-        return `${this.firstName} ${this.lastName}`;
+class Depreciation extends Depreciation$1 {
+    constructor() {
+        super(...arguments);
+        this.forecasts = [];
+        this.type = DepreciationTypeEnum.PLANT_EQUIPMENT;
+        /**
+         * @TODO remove after ? signs removed from db models
+         */
+        this.amount = 0;
     }
-    get activeSubscription() {
-        return this.subscriptions.find((ss) => ss.isActive);
+    isCapital() {
+        return this.type === DepreciationTypeEnum.CAPITAL_WORKS;
     }
-    get lastSubscription() {
-        return this.subscriptions[this.subscriptions.length - 1];
+    isBorrowingExpense() {
+        return this.type === DepreciationTypeEnum.BORROWING_EXPENSES;
+    }
+    isAsset() {
+        return this.type === DepreciationTypeEnum.PLANT_EQUIPMENT;
     }
     /**
-     * @TODO refactor
-     *
+     * check if depreciation should be displayed in written off category
+     * details in project documentation
+     * @TODO new FinancialYear(this.writeOffDate) === new FinancialYear()
      */
-    get position() {
-        switch (true) {
-            case this.isFirmOwner():
-                return USER_WORK_POSITION[UserRolesEnum.FIRM_OWNER];
-            case this.isManager():
-                return USER_WORK_POSITION[UserRolesEnum.FIRM_MANAGER];
-            case this.isEmployee():
-                return USER_WORK_POSITION[UserRolesEnum.EMPLOYEE];
-            default:
-                return '';
-        }
-    }
-    hasRole(role) {
-        return this.roles.includes(role);
-    }
-    isOnboarding() {
-        return this.status === UserStatusEnum.ON_BOARDING;
-    }
-    hasSubscription() {
-        return this.roles.includes(UserRolesEnum.SUBSCRIPTION);
-    }
-    isLoggedIn() {
-        return this.id === +localStorage.getItem('userId');
-    }
-    isClient() {
-        return this.roles.includes(UserRolesEnum.CLIENT);
-    }
-    isEmployee() {
-        return this.isAccountant() || this.isAdvisor();
+    isWrittenOff() {
+        return this.isAsset && this.writeOffDate && new FinancialYear(this.writeOffDate).year === this.financialYear;
     }
-    isAccountant() {
-        return this.roles.includes(UserRolesEnum.ACCOUNTANT);
+    /**
+     * Check if depreciation is Plant & Equipment
+     */
+    isPlantEquipment() {
+        return this.isAsset() && !this.isWrittenOff() && !this.isLowValuePool();
     }
-    isAdvisor() {
-        return this.roles.includes(UserRolesEnum.ADVISOR);
+    /**
+     * check if depreciation should be displayed in low value pool
+     * details in project documentation
+     * @TODO new FinancialYear(this.writeOffDate) === new FinancialYear()
+     */
+    isLowValuePool() {
+        return this.isAsset &&
+            this.calculation === DepreciationCalculationEnum.DIMINISHING &&
+            this.amount > Depreciation.WRITTEN_OFF_THRESHOLD &&
+            this.amount <= Depreciation.LOW_VALUE_POOL_THRESHOLD;
     }
-    isImpersonator() {
-        return this.roles.includes(UserRolesEnum.SWITCH_USER);
+    isPrimeCost() {
+        return this.calculation === DepreciationCalculationEnum.PRIME_COST;
     }
-    /**
-     * Check if current user is firm owner
-     */
-    isFirmOwner() {
-        return this.roles.includes(UserRolesEnum.FIRM_OWNER);
+    isDiminishing() {
+        return this.calculation === DepreciationCalculationEnum.DIMINISHING;
     }
     /**
-     * Check if current user is firm manager
+     * Check if depreciation chart accounts heading related to vehicles category
      */
-    isManager() {
-        return this.roles.includes(UserRolesEnum.FIRM_MANAGER) || this.roles.includes(UserRolesEnum.FIRM_OWNER);
+    isVehicleDepreciation() {
+        var _a;
+        return ((_a = this.chartAccounts.heading) === null || _a === void 0 ? void 0 : _a.id) === ChartAccountsHeadingVehicleListEnum.DEPRECIATION_VEHICLES;
     }
     /**
-     * check if user has property tank access
+     * Get depreciation purchase date
      */
-    hasPropertyTank() {
-        return this.roles ?
-            this.roles.includes(UserRolesEnum.PROPERTY_TANK) :
-            !!this.getSubscriptionRole(UserRolesEnum.PROPERTY_TANK);
+    getDate() {
+        return this.date;
     }
     /**
-     * check if user has property tank access
+     * @TODO Vik: Research a problem with depreciations without current year forecast
      */
-    hasWorkTank() {
-        return this.roles ?
-            this.roles.includes(UserRolesEnum.WORK_TANK) :
-            !!this.getSubscriptionRole(UserRolesEnum.WORK_TANK);
+    get currentYearForecast() {
+        return this.forecasts.find((forecast) => {
+            return forecast.financialYear === new FinancialYear().year;
+        }) || plainToClass(DepreciationForecast, {
+            financialYear: new FinancialYear().year,
+            openBalance: 0,
+            closeBalance: 0,
+            amount: 0,
+            claimPercent: 0
+        });
     }
-    /**
-     * Get user subscription role by provided role type
-     * @param roleType by which role should be returned
-     */
-    getSubscriptionRole(roleType) {
+    getForecastByYear(year) {
+        return this.forecasts.find((forecast) => {
+            return forecast.financialYear === year;
+        });
+    }
+    getClaimAmountByYear(year) {
         var _a;
-        /**
-         * Add @TODO for Alex to check if we should use getLastSubscription here
-         */
-        return (_a = this.activeSubscription) === null || _a === void 0 ? void 0 : _a.items.find((subscriptionItem) => subscriptionItem.price.product.role.includes(roleType));
+        return ((_a = this.getForecastByYear(year)) === null || _a === void 0 ? void 0 : _a.claimAmount) || 0;
+    }
+    getCloseBalanceByYear(year) {
+        var _a;
+        return ((_a = this.getForecastByYear(year)) === null || _a === void 0 ? void 0 : _a.closeBalance) || 0;
+    }
+    isBuildingAtCost() {
+        return this.chartAccounts.id === ChartAccountsListEnum.BUILDING_AT_COST;
     }
     /**
-     * Get user's photo link
+     * Create a new transaction from current depreciation
      */
-    getPhoto() {
-        return this.photo;
+    toTransaction(params = {}) {
+        return plainToClass(Transaction, Object.assign(params, this, { amount: this.currentYearForecast.amount }));
     }
     /**
-     * get user's initials
+     * @TODO Michael: remove and check everywhere in reports
      */
-    getPhotoPlaceholder() {
-        return `${this.firstName[0].toUpperCase()}${this.lastName[0].toUpperCase()}`;
+    get claimAmount() {
+        var _a;
+        return ((_a = this.currentYearForecast) === null || _a === void 0 ? void 0 : _a.claimAmount) || 0;
     }
 }
+Depreciation.WRITTEN_OFF_THRESHOLD = 300;
+Depreciation.LOW_VALUE_POOL_THRESHOLD = 1000;
 __decorate([
-    Type(() => ServiceSubscription)
-], User.prototype, "subscriptions", void 0);
-__decorate([
-    Type(() => ClientDetails)
-], User.prototype, "clientDetails", void 0);
-__decorate([
-    Type(() => EmployeeDetails)
-], User.prototype, "employeeDetails", void 0);
-__decorate([
-    Type(() => SoleDetails)
-], User.prototype, "soleDetails", void 0);
-__decorate([
-    Type(() => Address)
-], User.prototype, "address", void 0);
+    Type(() => Date)
+], Depreciation.prototype, "purchaseDate", void 0);
 __decorate([
-    Type(() => Phone)
-], User.prototype, "phone", void 0);
+    Type(() => Date)
+], Depreciation.prototype, "date", void 0);
 __decorate([
     Type(() => Date)
-], User.prototype, "createdAt", void 0);
+], Depreciation.prototype, "lowValuePoolDate", void 0);
 __decorate([
-    Type(() => User)
-], User.prototype, "clients", void 0);
-
-class PropertySubscription extends PropertySubscription$1 {
-}
+    Type(() => Date)
+], Depreciation.prototype, "writeOffManualDate", void 0);
 __decorate([
     Type(() => Date)
-], PropertySubscription.prototype, "createdAt", void 0);
+], Depreciation.prototype, "writeOffDate", void 0);
 __decorate([
-    Type(() => User)
-], PropertySubscription.prototype, "user", void 0);
-
-class PropertyCategory$1 extends AbstractModel {
-}
-
-class PropertyCategory extends PropertyCategory$1 {
-    // @Todo check if category is Owner Occupied. If will be needed to check more categories - move the checking to the backend
-    isOwnerOccupied() {
-        return this.name === 'Owner Occupied';
-    }
-    isVacantLand() {
-        return this.name === 'Vacant Land';
-    }
-}
-
-class PropertyValuation$1 extends AbstractModel {
-}
-
-class PropertyDocument$1 extends AbstractModel {
-    getApiUrlPrefix() {
-        return '';
-    }
-    getEntity() {
-        return undefined;
-    }
-}
-
-class PropertyDocument extends PropertyDocument$1 {
-    constructor() {
-        super(...arguments);
-        this.type = AssetTypeEnum.DOCUMENTS;
-        this.entityType = AssetEntityTypeEnum.PROPERTIES;
-    }
-    getApiUrlPrefix() {
-        return '';
-    }
-    getEntity() {
-        return this.property;
-    }
-}
-
-class PropertyValuation extends PropertyValuation$1 {
-    get financialYear() {
-        return new FinancialYear(this.date).year;
-    }
-    isCurrentYear() {
-        return this.financialYear === new FinancialYear(new Date()).year;
-    }
-}
+    Type(() => DepreciationCapitalProject)
+], Depreciation.prototype, "depreciationCapitalProject", void 0);
 __decorate([
-    Type(() => Date)
-], PropertyValuation.prototype, "date", void 0);
+    Type(() => DepreciationForecast),
+    Transform(({ value, obj }) => {
+        // value = array of DepreciationForecast
+        // obj = plain (whole Depreciation object)
+        // Set isLVP flag for each DepreciationForecast
+        // @TODO refactor
+        value.forEach((forecast) => {
+            forecast.isLVP =
+                forecast.closeBalance < 1000 &&
+                    obj.calculation === DepreciationCalculationEnum.DIMINISHING &&
+                    obj.type === DepreciationTypeEnum.PLANT_EQUIPMENT &&
+                    !(obj.amount > Depreciation.WRITTEN_OFF_THRESHOLD && obj.amount < Depreciation.LOW_VALUE_POOL_THRESHOLD) &&
+                    !(obj.writeOffDate && new FinancialYear(new Date(obj.writeOffDate)).year === obj.financialYear);
+        });
+        return value;
+    })
+], Depreciation.prototype, "forecasts", void 0);
 __decorate([
-    Type(() => PropertyDocument)
-], PropertyValuation.prototype, "document", void 0);
+    Type(() => ChartAccounts)
+], Depreciation.prototype, "chartAccounts", void 0);
 __decorate([
-    Exclude()
-], PropertyValuation.prototype, "documentFile", void 0);
-
-class PropertyForecast$1 extends AbstractModel {
-}
+    Type(() => BankTransaction)
+], Depreciation.prototype, "bankTransaction", void 0);
 
-class PropertyForecast extends PropertyForecast$1 {
-    /**
-     * Get cash position
-     * Cash Position = Income - Expense - Interest
-     */
-    get cashPosition() {
-        return this.income + this.expense + this.interest;
-    }
-    /**
-     * Get tax position
-     * Tax Position = Income - Expense - Interest - Depreciation
-     */
-    get taxPosition() {
-        return this.cashPosition + this.depreciation;
-    }
-    /**
-     * Get rental return percent
-     * Rental Return = Income / Market Value
-     */
-    get rentalReturn() {
-        return this.income / this.marketValue;
+class SoleBusiness extends SoleBusiness$1 {
+    getPhotoPlaceholder() {
+        return `${this.name[0]}${this.name[1]}`;
     }
-    /**
-     * Check if forecast is for real current fin year (not selected in the sidebar)
-     */
-    isCurrentYear() {
-        return this.financialYear === new FinancialYear(new Date()).year;
+    getPhoto() {
+        return this.logo;
     }
 }
 __decorate([
-    Transform(({ value }) => +value)
-], PropertyForecast.prototype, "income", void 0);
-__decorate([
-    Transform(({ value }) => -Math.abs(+value))
-], PropertyForecast.prototype, "expense", void 0);
-__decorate([
-    Transform(({ value }) => -Math.abs(+value))
-], PropertyForecast.prototype, "interest", void 0);
+    Type(() => User)
+], SoleBusiness.prototype, "user", void 0);
 __decorate([
-    Transform(({ value }) => -Math.abs(+value))
-], PropertyForecast.prototype, "depreciation", void 0);
+    Type(() => SoleBusinessAllocation)
+], SoleBusiness.prototype, "allocations", void 0);
 __decorate([
-    Transform(({ value }) => +value)
-], PropertyForecast.prototype, "loanBalance", void 0);
+    Type(() => SoleBusinessLoss)
+], SoleBusiness.prototype, "losses", void 0);
 __decorate([
-    Transform(({ value }) => +value)
-], PropertyForecast.prototype, "marketValue", void 0);
-
-class PropertyCategoryMovement$1 extends AbstractModel {
-}
-
-class PropertyCategoryMovement extends PropertyCategoryMovement$1 {
-}
+    Type(() => SoleInvoice)
+], SoleBusiness.prototype, "invoices", void 0);
 __decorate([
-    Type(() => PropertyValuation)
-], PropertyCategoryMovement.prototype, "valuation", void 0);
+    Type(() => SoleInvoiceTemplate)
+], SoleBusiness.prototype, "invoiceTemplates", void 0);
 __decorate([
-    Type(() => PropertyCategory)
-], PropertyCategoryMovement.prototype, "propertyCategory", void 0);
+    Type(() => VehicleClaim)
+], SoleBusiness.prototype, "vehicleClaims", void 0);
 __decorate([
-    Type(() => Date)
-], PropertyCategoryMovement.prototype, "fromDate", void 0);
+    Type(() => Transaction)
+], SoleBusiness.prototype, "transactions", void 0);
 __decorate([
-    Type(() => Date)
-], PropertyCategoryMovement.prototype, "toDate", void 0);
+    Type(() => Depreciation)
+], SoleBusiness.prototype, "depreciations", void 0);
 
-var TaxExemptionEnum;
-(function (TaxExemptionEnum) {
-    TaxExemptionEnum[TaxExemptionEnum["ONE_YEAR_RULE"] = 1] = "ONE_YEAR_RULE";
-    // principle place of residence
-    TaxExemptionEnum[TaxExemptionEnum["PPR"] = 2] = "PPR";
-    TaxExemptionEnum[TaxExemptionEnum["SIX_YEARS_RULE"] = 3] = "SIX_YEARS_RULE";
-    TaxExemptionEnum[TaxExemptionEnum["INVESTMENT_TO_PPR"] = 4] = "INVESTMENT_TO_PPR";
-    TaxExemptionEnum[TaxExemptionEnum["PPR_TO_INVESTMENT"] = 5] = "PPR_TO_INVESTMENT";
-    TaxExemptionEnum[TaxExemptionEnum["TRANSFER"] = 6] = "TRANSFER";
-    TaxExemptionEnum[TaxExemptionEnum["OTHER"] = 7] = "OTHER";
-})(TaxExemptionEnum || (TaxExemptionEnum = {}));
+class SoleDetails$1 extends AbstractModel {
+}
 
-var PropertyCategoryListEnum;
-(function (PropertyCategoryListEnum) {
-    PropertyCategoryListEnum[PropertyCategoryListEnum["OWNER_OCCUPIED"] = 3] = "OWNER_OCCUPIED";
-    PropertyCategoryListEnum[PropertyCategoryListEnum["VACANT_LAND"] = 5] = "VACANT_LAND";
-})(PropertyCategoryListEnum || (PropertyCategoryListEnum = {}));
+class SoleDetails extends SoleDetails$1 {
+}
+__decorate([
+    Type(() => User)
+], SoleDetails.prototype, "user", void 0);
 
-/**
- * List of collections grouped by passed property
- */
-class CollectionDictionary {
+class User extends User$1 {
+    get fullName() {
+        return `${this.firstName} ${this.lastName}`;
+    }
+    get activeSubscription() {
+        return this.subscriptions.find((ss) => ss.isActive);
+    }
+    get lastSubscription() {
+        return this.subscriptions[this.subscriptions.length - 1];
+    }
     /**
-     * @param collection The Collection instance to be grouped
-     * @param path Path to the property to be grouped (Examples: 'transaction', 'property.category')
-     * @param prop Optional: Field to group by (Default 'id', Examples: 'id', 'amount', 'date')
+     * @TODO refactor
+     *
      */
-    constructor(collection, path = 'id') {
-        /**
-         * List of grouped collections
-         */
-        this.items = {};
-        this.collectionConstructor = collection.constructor;
-        // Nothing to group when collection is empty
-        if (!collection.length) {
-            return;
-        }
-        // Do nothing if provided path was not found in the 1st collection's item
-        if (!hasIn(collection.items[0], path.split('.')[0])) {
-            return;
+    get position() {
+        switch (true) {
+            case this.isFirmOwner():
+                return USER_WORK_POSITION[UserRolesEnum.FIRM_OWNER];
+            case this.isManager():
+                return USER_WORK_POSITION[UserRolesEnum.FIRM_MANAGER];
+            case this.isEmployee():
+                return USER_WORK_POSITION[UserRolesEnum.EMPLOYEE];
+            default:
+                return '';
         }
-        this.groupItems(collection, path);
     }
-    /**
-     * List of collections keys
-     */
-    get keys() {
-        return Object.keys(this.items);
+    hasRole(role) {
+        return this.roles.includes(role);
     }
-    /**
-     * Get collection by key or return empty collection if key does not exist
-     */
-    get(key) {
-        return this.items[key] ? this.items[key] : this.createCollection([]);
+    isOnboarding() {
+        return this.status === UserStatusEnum.ON_BOARDING;
+    }
+    hasSubscription() {
+        return this.roles.includes(UserRolesEnum.SUBSCRIPTION);
+    }
+    isLoggedIn() {
+        return this.id === +localStorage.getItem('userId');
+    }
+    isClient() {
+        return this.roles.includes(UserRolesEnum.CLIENT);
+    }
+    isEmployee() {
+        return this.isAccountant() || this.isAdvisor();
+    }
+    isAccountant() {
+        return this.roles.includes(UserRolesEnum.ACCOUNTANT);
+    }
+    isAdvisor() {
+        return this.roles.includes(UserRolesEnum.ADVISOR);
+    }
+    isImpersonator() {
+        return this.roles.includes(UserRolesEnum.SWITCH_USER);
     }
     /**
-     * Add new item by key
+     * Check if current user is firm owner
      */
-    add(key, value) {
-        this.items[key] = value;
+    isFirmOwner() {
+        return this.roles.includes(UserRolesEnum.FIRM_OWNER);
     }
     /**
-     * Join several collections by ids
+     * Check if current user is firm manager
      */
-    merge(keys) {
-        return this.createCollection(flatten(keys.map((id) => this.get(id.toString()).items)));
+    isManager() {
+        return this.roles.includes(UserRolesEnum.FIRM_MANAGER) || this.roles.includes(UserRolesEnum.FIRM_OWNER);
     }
     /**
-     * Create instance of collection
+     * check if user has property tank access
      */
-    createCollection(items = []) {
-        return new this.collectionConstructor(items);
-    }
-    get length() {
-        return this.keys.length;
+    hasPropertyTank() {
+        return this.roles ?
+            this.roles.includes(UserRolesEnum.PROPERTY_TANK) :
+            !!this.getSubscriptionRole(UserRolesEnum.PROPERTY_TANK);
     }
     /**
-     * @Todo find a better solution to get list of the sorted keys
-     * Get array of the "keys" by provided order
+     * check if user has property tank access
      */
-    getSortedKeys(isDesc = false) {
-        return this.keys.sort((a, b) => {
-            if (a > b) {
-                return !isDesc ? 1 : -1;
-            }
-            if (a < b) {
-                return !isDesc ? -1 : 1;
-            }
-            return 0;
-        });
+    hasWorkTank() {
+        return this.roles ?
+            this.roles.includes(UserRolesEnum.WORK_TANK) :
+            !!this.getSubscriptionRole(UserRolesEnum.WORK_TANK);
     }
     /**
-     * Group collection items by passed path into items object
+     * Get user subscription role by provided role type
+     * @param roleType by which role should be returned
      */
-    groupItems(collection, path) {
-        // Create empty initial object for groups
-        const obj = {};
-        // Group collection items
-        collection.items.forEach((item) => {
-            let key = get(item, path);
-            // if object does not have property for grouping it will be grouped as 'other'
-            if (key === undefined) {
-                key = 'other';
-            }
-            if (!obj[key]) {
-                obj[key] = [];
-            }
-            obj[key].push(item);
-        });
-        // Create collections from groups
-        Object.keys(obj).forEach((key) => {
-            this.items[key] = this.createCollection(obj[key]);
-        });
-    }
-}
-
-const DEFAULT_INDEX = 'other';
-/**
- * Base collection class. Contains common properties and methods for all collections
- */
-class Collection {
-    constructor(items = []) {
-        this.items = items;
+    getSubscriptionRole(roleType) {
+        var _a;
+        /**
+         * Add @TODO for Alex to check if we should use getLastSubscription here
+         */
+        return (_a = this.activeSubscription) === null || _a === void 0 ? void 0 : _a.items.find((subscriptionItem) => subscriptionItem.price.product.role.includes(roleType));
     }
     /**
-     * Iterator that allow to iterate collection items
+     * Get user's photo link
      */
-    [Symbol.iterator]() {
-        return this.items.values();
-    }
-    create(items = []) {
-        return new this.constructor(items);
-    }
-    get length() {
-        return this.items.length;
-    }
-    toArray() {
-        return [...this.items];
-    }
-    get first() {
-        return first(this.items);
-    }
-    get last() {
-        return last(this.items);
-    }
-    getIds() {
-        return this.items.map((item) => item['id']);
-    }
-    mapBy(path) {
-        return this.items.map((item) => get(item, path));
-    }
-    sortBy(field = 'id', isDesc = true) {
-        sort(this.items, field, isDesc);
-        return this;
+    getPhoto() {
+        return this.photo;
     }
     /**
-     * Get total sum of items by field
+     * get user's initials
      */
-    sumBy(path) {
-        return +this.items.reduce((sum, item) => sum + Number(get(item, path)), 0).toFixed(2);
-    }
-    groupBy(path = '') {
-        return new CollectionDictionary(this, path);
+    getPhotoPlaceholder() {
+        return `${this.firstName[0].toUpperCase()}${this.lastName[0].toUpperCase()}`;
     }
-    indexBy(path) {
-        // Create empty initial object for groups
-        const result = {};
-        this.toArray().forEach((model) => {
-            result[get(model, path, DEFAULT_INDEX)] = model;
-        });
-        return result;
+}
+__decorate([
+    Type(() => ServiceSubscription)
+], User.prototype, "subscriptions", void 0);
+__decorate([
+    Type(() => ClientDetails)
+], User.prototype, "clientDetails", void 0);
+__decorate([
+    Type(() => EmployeeDetails)
+], User.prototype, "employeeDetails", void 0);
+__decorate([
+    Type(() => SoleDetails)
+], User.prototype, "soleDetails", void 0);
+__decorate([
+    Type(() => Address)
+], User.prototype, "address", void 0);
+__decorate([
+    Type(() => Phone)
+], User.prototype, "phone", void 0);
+__decorate([
+    Type(() => Date)
+], User.prototype, "createdAt", void 0);
+__decorate([
+    Type(() => User)
+], User.prototype, "clients", void 0);
+
+class PropertySubscription extends PropertySubscription$1 {
+}
+__decorate([
+    Type(() => Date)
+], PropertySubscription.prototype, "createdAt", void 0);
+__decorate([
+    Type(() => User)
+], PropertySubscription.prototype, "user", void 0);
+
+class PropertyCategory$1 extends AbstractModel {
+}
+
+class PropertyCategory extends PropertyCategory$1 {
+    // @Todo check if category is Owner Occupied. If will be needed to check more categories - move the checking to the backend
+    isOwnerOccupied() {
+        return this.name === 'Owner Occupied';
     }
-    filter(callback) {
-        return this.create(this.items.filter(callback));
+    isVacantLand() {
+        return this.name === 'Vacant Land';
     }
-    filterBy(path, values) {
-        return this.filter((item) => (Array.isArray(values) ? values : [values]).includes(get(item, path)));
+}
+
+class PropertyValuation$1 extends AbstractModel {
+}
+
+class PropertyDocument$1 extends AbstractModel {
+    getApiUrlPrefix() {
+        return '';
     }
-    filterByRange(path, from, to) {
-        return this.filter((item) => get(item, path) >= from && get(item, path) <= to);
+    getEntity() {
+        return undefined;
     }
-    find(callback) {
-        return this.items.find(callback);
+}
+
+class PropertyDocument extends PropertyDocument$1 {
+    constructor() {
+        super(...arguments);
+        this.type = AssetTypeEnum.DOCUMENTS;
+        this.entityType = AssetEntityTypeEnum.PROPERTIES;
     }
-    findBy(path, value) {
-        return this.items.find((model) => value === get(model, path));
+    getApiUrlPrefix() {
+        return '';
     }
-    findIndexBy(path, value) {
-        var _a;
-        return (_a = this.items.findIndex((item) => get(item, path) === value)) !== null && _a !== void 0 ? _a : null;
+    getEntity() {
+        return this.property;
     }
-    push(...items) {
-        this.items.push(...items);
-        return this.create(this.items);
+}
+
+class PropertyValuation extends PropertyValuation$1 {
+    get financialYear() {
+        return new FinancialYear(this.date).year;
     }
-    replaceBy(path, value, item) {
-        const index = this.findIndexBy(path, value);
-        if (index >= 0) {
-            this.items.splice(index, 1, item);
-        }
-        return this;
+    isCurrentYear() {
+        return this.financialYear === new FinancialYear(new Date()).year;
     }
-    remove(items) {
-        return this.filter((model) => !items.map((item) => item.id).includes(model.id));
+}
+__decorate([
+    Type(() => Date)
+], PropertyValuation.prototype, "date", void 0);
+__decorate([
+    Type(() => PropertyDocument)
+], PropertyValuation.prototype, "document", void 0);
+__decorate([
+    Exclude()
+], PropertyValuation.prototype, "documentFile", void 0);
+
+class PropertyForecast$1 extends AbstractModel {
+}
+
+class PropertyForecast extends PropertyForecast$1 {
+    /**
+     * Get cash position
+     * Cash Position = Income - Expense - Interest
+     */
+    get cashPosition() {
+        return this.income + this.expense + this.interest;
     }
-    removeBy(path, values) {
-        return this.filter((item) => !(Array.isArray(values) ? values : [values]).includes(get(item, path)));
+    /**
+     * Get tax position
+     * Tax Position = Income - Expense - Interest - Depreciation
+     */
+    get taxPosition() {
+        return this.cashPosition + this.depreciation;
     }
-    minBy(path) {
-        return this.items.reduce((prev, current) => (get(prev, path) < get(current, path) ? prev : current));
+    /**
+     * Get rental return percent
+     * Rental Return = Income / Market Value
+     */
+    get rentalReturn() {
+        return this.income / this.marketValue;
     }
-    maxBy(path) {
-        return this.items.reduce((prev, current) => (get(prev, path) > get(current, path) ? prev : current));
+    /**
+     * Check if forecast is for real current fin year (not selected in the sidebar)
+     */
+    isCurrentYear() {
+        return this.financialYear === new FinancialYear(new Date()).year;
     }
 }
+__decorate([
+    Transform(({ value }) => +value)
+], PropertyForecast.prototype, "income", void 0);
+__decorate([
+    Transform(({ value }) => -Math.abs(+value))
+], PropertyForecast.prototype, "expense", void 0);
+__decorate([
+    Transform(({ value }) => -Math.abs(+value))
+], PropertyForecast.prototype, "interest", void 0);
+__decorate([
+    Transform(({ value }) => -Math.abs(+value))
+], PropertyForecast.prototype, "depreciation", void 0);
+__decorate([
+    Transform(({ value }) => +value)
+], PropertyForecast.prototype, "loanBalance", void 0);
+__decorate([
+    Transform(({ value }) => +value)
+], PropertyForecast.prototype, "marketValue", void 0);
+
+class PropertyCategoryMovement$1 extends AbstractModel {
+}
+
+class PropertyCategoryMovement extends PropertyCategoryMovement$1 {
+}
+__decorate([
+    Type(() => PropertyValuation)
+], PropertyCategoryMovement.prototype, "valuation", void 0);
+__decorate([
+    Type(() => PropertyCategory)
+], PropertyCategoryMovement.prototype, "propertyCategory", void 0);
+__decorate([
+    Type(() => Date)
+], PropertyCategoryMovement.prototype, "fromDate", void 0);
+__decorate([
+    Type(() => Date)
+], PropertyCategoryMovement.prototype, "toDate", void 0);
+
+var TaxExemptionEnum;
+(function (TaxExemptionEnum) {
+    TaxExemptionEnum[TaxExemptionEnum["ONE_YEAR_RULE"] = 1] = "ONE_YEAR_RULE";
+    // principle place of residence
+    TaxExemptionEnum[TaxExemptionEnum["PPR"] = 2] = "PPR";
+    TaxExemptionEnum[TaxExemptionEnum["SIX_YEARS_RULE"] = 3] = "SIX_YEARS_RULE";
+    TaxExemptionEnum[TaxExemptionEnum["INVESTMENT_TO_PPR"] = 4] = "INVESTMENT_TO_PPR";
+    TaxExemptionEnum[TaxExemptionEnum["PPR_TO_INVESTMENT"] = 5] = "PPR_TO_INVESTMENT";
+    TaxExemptionEnum[TaxExemptionEnum["TRANSFER"] = 6] = "TRANSFER";
+    TaxExemptionEnum[TaxExemptionEnum["OTHER"] = 7] = "OTHER";
+})(TaxExemptionEnum || (TaxExemptionEnum = {}));
+
+var PropertyCategoryListEnum;
+(function (PropertyCategoryListEnum) {
+    PropertyCategoryListEnum[PropertyCategoryListEnum["OWNER_OCCUPIED"] = 3] = "OWNER_OCCUPIED";
+    PropertyCategoryListEnum[PropertyCategoryListEnum["VACANT_LAND"] = 5] = "VACANT_LAND";
+})(PropertyCategoryListEnum || (PropertyCategoryListEnum = {}));
 
 var TaxExemptionMetadataEnum;
 (function (TaxExemptionMetadataEnum) {
@@ -3924,10 +4053,9 @@ class BankAccount extends BankAccount$1 {
     }
     /**
      * check if bank account type is Loan
-     * @TODO nicole check
      */
     isLoan() {
-        return [BankAccountTypeEnum.MORTGAGE, BankAccountTypeEnum.LOAN].includes(this.type);
+        return this.type === BankAccountTypeEnum.LOAN;
     }
     /**
      * check if bank account type is Credit card
@@ -4013,10 +4141,12 @@ class BankAccount extends BankAccount$1 {
         return this.bankConnection.user.id === userId;
     }
 }
-BankAccount.loanTypes = [BankAccountTypeEnum.LOAN, BankAccountTypeEnum.MORTGAGE];
 __decorate([
     Type(() => BankAccountProperty)
 ], BankAccount.prototype, "bankAccountProperties", void 0);
+__decorate([
+    Type(() => SoleBusinessAllocation)
+], BankAccount.prototype, "businessAllocations", void 0);
 __decorate([
     Type(() => BankAccountBalance)
 ], BankAccount.prototype, "balances", void 0);
@@ -4026,9 +4156,11 @@ __decorate([
 __decorate([
     Type(() => BankConnection)
 ], BankAccount.prototype, "bankConnection", void 0);
+__decorate([
+    Transform(({ value }) => value === 4 ? BankAccountTypeEnum.LOAN : value)
+], BankAccount.prototype, "type", void 0);
 
 const TYPE_LOAN = [
-    BankAccountTypeEnum.MORTGAGE,
     BankAccountTypeEnum.CREDIT_CARD,
     BankAccountTypeEnum.LOAN
 ];
@@ -4488,37 +4620,224 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImpo
                 }]
         }] });
 
-class TtCoreModule {
-    static forRoot(environment) {
-        localStorage.setItem('api_uri', environment['api_uri']);
-        return {
-            ngModule: TtCoreModule,
-            providers: [
-                {
-                    provide: 'environment',
-                    useValue: environment
+class TtCoreModule {
+    static forRoot(environment) {
+        localStorage.setItem('api_uri', environment['api_uri']);
+        return {
+            ngModule: TtCoreModule,
+            providers: [
+                {
+                    provide: 'environment',
+                    useValue: environment
+                }
+            ]
+        };
+    }
+}
+TtCoreModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TtCoreModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
+TtCoreModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TtCoreModule, imports: [CommonModule,
+        InterceptorsModule] });
+TtCoreModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TtCoreModule, imports: [[
+            CommonModule,
+            InterceptorsModule
+        ]] });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TtCoreModule, decorators: [{
+            type: NgModule,
+            args: [{
+                    declarations: [],
+                    imports: [
+                        CommonModule,
+                        InterceptorsModule
+                    ]
+                }]
+        }] });
+
+/**
+ * Class contains traveled kilometers and work usage percent in 12 weeks date range
+ * @TODO Vik: Best period: move this and related logic to backend
+ */
+class LogbookPeriod {
+    isEndOfYear() {
+        return this.to === new FinancialYear().endDate;
+    }
+    getWorkUsageByClaim(claim) {
+        const claimKilometers = this.logbooks.getByVehicleClaim(claim).getClaimableLogbooks().kilometers;
+        return Math.round(this.workUsage * (claimKilometers / this.kilometers));
+    }
+}
+__decorate([
+    Type(() => Date)
+], LogbookPeriod.prototype, "from", void 0);
+__decorate([
+    Type(() => Date)
+], LogbookPeriod.prototype, "to", void 0);
+
+class Vehicle$1 extends AbstractModel {
+}
+
+class VehicleLogbook$1 extends AbstractModel {
+}
+
+class VehicleLogbook extends VehicleLogbook$1 {
+    get kilometers() {
+        return this.odometerEnd - this.odometerStart;
+    }
+    get tankType() {
+        return this.isSoleTank() ? TankTypeEnum.SOLE : TankTypeEnum.WORK;
+    }
+    isWorkTank() {
+        return !this.business;
+    }
+    isSoleTank() {
+        return !!this.business;
+    }
+}
+/**
+ * 12 weeks in milliseconds
+ * "To work out your business-use percentage, you need to keep a logbook and the odometer readings for the logbook period.
+ * The logbook period is a minimum continuous period of 12 weeks." © Nicole Kelly
+ */
+VehicleLogbook.periodDuration = 7257600000;
+__decorate([
+    Type(() => Date)
+], VehicleLogbook.prototype, "date", void 0);
+__decorate([
+    Type(() => SoleBusiness)
+], VehicleLogbook.prototype, "business", void 0);
+
+class Vehicle extends Vehicle$1 {
+}
+__decorate([
+    Type(() => VehicleLogbook)
+], Vehicle.prototype, "logbook", void 0);
+
+class VehicleClaimCollection extends Collection {
+    /**
+     * Get remaining kilometers limit. Total limit ({@link VehicleClaim.totalKmsLimit}) - claimed kilometers from other vehicle claims
+     * @param claim may not exist when user come to vehicle claim page 1st time and not created claim yet
+     */
+    getKlmsLimitForClaim(claim) {
+        let collection = this;
+        if (claim) {
+            collection = collection.removeBy('id', claim.id);
+        }
+        return VehicleClaim.totalKmsLimit - collection.sumBy('kilometers');
+    }
+    /**
+     * Get remaining work usage limit. Total limit ({@link VehicleClaim.totalWorkUsagePercent}) - claimed percent from other vehicle claims
+     * @param claim may not exist when user come to vehicle claim page 1st time and not created claim yet
+     */
+    getWorkUsageLimitForClaim(claim) {
+        let collection = this;
+        if (claim) {
+            collection = collection.removeBy('id', claim.id);
+        }
+        return VehicleClaim.totalWorkUsagePercent - collection.sumBy('workUsage');
+    }
+}
+
+class VehicleLogbookCollection extends Collection {
+    /**
+     * Best period may be calculated only when user has logbooks minimum for {@link VehicleLogbook.periodDuration}
+     * @TODO Vik: Best period: move this and related logic to backend
+     */
+    isBestPeriodExist() {
+        if (this.items.length < 2) {
+            return false;
+        }
+        return VehicleLogbook.periodDuration < (this.last.date.getTime() - this.first.date.getTime());
+    }
+    /**
+     * Get collection of non-personal logbooks (work-related, sole-related).
+     * @TODO Vik: Best period: move this and related logic to backend
+     */
+    getClaimableLogbooks() {
+        return this.filterBy('isPersonal', false);
+    }
+    /**
+     * Logbook Period is the best when it has the biggest work usage percent
+     * Best period duration is defined as {@link VehicleLogbook.periodDuration} by the ATO
+     * @TODO Vik: Best period: move this and related logic to backend
+     */
+    getBestPeriod() {
+        if (!this.isBestPeriodExist()) {
+            return null;
+        }
+        // declare best period variable
+        let bestPeriod;
+        // get list of all logbooks available for best period calculation
+        const claimableLogbooks = this.getClaimableLogbooks().toArray();
+        for (let i = 0; i < claimableLogbooks.length; i++) {
+            // no sense to check next logbooks because we already get the end of the year
+            if (bestPeriod && bestPeriod.isEndOfYear()) {
+                break;
+            }
+            // get date range started from current handling logbook date
+            const dateRange = this.getPeriodRange(claimableLogbooks[i].date);
+            // get all logbooks included in current logbook period
+            const logbooksInRange = this.filterByRange('date', dateRange.from, dateRange.to);
+            const currentPeriod = plainToClass(LogbookPeriod, {
+                from: dateRange.from,
+                to: dateRange.to,
+                kilometers: logbooksInRange.getClaimableLogbooks().kilometers,
+                workUsage: logbooksInRange.getWorkUsage(),
+                logbooks: logbooksInRange
+            });
+            // compare with previous best period and overwrite if needs
+            if (!bestPeriod || currentPeriod.workUsage > bestPeriod.workUsage) {
+                bestPeriod = currentPeriod;
+            }
+            else if (currentPeriod.workUsage === bestPeriod.workUsage) {
+                // if work usage is the same then get period with the biggest work usage for work tank
+                const oldWorkUsage = bestPeriod.logbooks.filterBy('tankType', TankTypeEnum.WORK).getWorkUsage();
+                const currentWorkUsage = currentPeriod.logbooks.filterBy('tankType', TankTypeEnum.WORK).getWorkUsage();
+                if (oldWorkUsage < currentWorkUsage) {
+                    bestPeriod = currentPeriod;
                 }
-            ]
-        };
+            }
+        }
+        return bestPeriod;
+    }
+    /**
+     * Calculate total kilometers traveled
+     */
+    get kilometers() {
+        return this.sumBy('kilometers');
+    }
+    /**
+     * Calculate work usage (percent of business-related kilometers from total kilometers)
+     * @TODO Alex: TT-2089 replace with getter
+     */
+    getWorkUsage() {
+        const workKilometers = this.getClaimableLogbooks().kilometers;
+        return Math.round(workKilometers / this.kilometers * 100);
+    }
+    /**
+     * Get LOGBOOK_PERIOD_DURATION date range from passed start date
+     * @TODO Vik: Best period: move this and related logic to backend
+     */
+    getPeriodRange(from) {
+        // set end date as VehicleLogbook.periodDuration after start date
+        let to = new Date(from.getTime() + VehicleLogbook.periodDuration);
+        const financialYear = new FinancialYear();
+        // set as period last VehicleLogbook.periodDuration of current year if period end date after end of current year
+        if (to > financialYear.endDate) {
+            to = financialYear.endDate;
+            from = new Date(to.getTime() - VehicleLogbook.periodDuration);
+        }
+        return { from, to };
+    }
+    /**
+     * Get list of logbooks related to passed vehicle claim
+     */
+    getByVehicleClaim(claim) {
+        return claim.isWorkTank()
+            ? this.filterBy('tankType', TankTypeEnum.WORK)
+            : this.filterBy('business.id', claim.business.id);
     }
 }
-TtCoreModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TtCoreModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-TtCoreModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TtCoreModule, imports: [CommonModule,
-        InterceptorsModule] });
-TtCoreModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TtCoreModule, imports: [[
-            CommonModule,
-            InterceptorsModule
-        ]] });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TtCoreModule, decorators: [{
-            type: NgModule,
-            args: [{
-                    declarations: [],
-                    imports: [
-                        CommonModule,
-                        InterceptorsModule
-                    ]
-                }]
-        }] });
+
+// @TODO Alex move here all collections
 
 class AccountSetupItemCollection extends Collection {
     constructor(items) {
@@ -4741,39 +5060,6 @@ class ClientPortfolioReportCollection extends Collection {
     }
 }
 
-class ExportDataTable {
-}
-
-class ExportableCollection extends Collection {
-    getExportFooter(type) {
-        return [];
-    }
-    ;
-    export(type) {
-        return plainToClass(ExportDataTable, {
-            header: this.getExportHeader(type),
-            body: this.getExportBody(type),
-            footer: [this.getExportFooter(type)]
-        });
-    }
-}
-
-/**
- * export table column
- */
-class ExportCell {
-}
-
-/**
- * type of export table column value
- */
-var ExportCellTypeEnum;
-(function (ExportCellTypeEnum) {
-    ExportCellTypeEnum[ExportCellTypeEnum["STRING"] = 0] = "STRING";
-    ExportCellTypeEnum[ExportCellTypeEnum["CURRENCY"] = 1] = "CURRENCY";
-    ExportCellTypeEnum[ExportCellTypeEnum["DATE"] = 2] = "DATE";
-})(ExportCellTypeEnum || (ExportCellTypeEnum = {}));
-
 /**
  * Collection of transactions
  */
@@ -4937,6 +5223,24 @@ class TransactionCollection extends ExportableCollection {
             ];
         });
     }
+    /**
+     * Get list of vehicle transactions filtered by vehicle claim
+     */
+    getByVehicleClaim(vehicleClaim) {
+        return vehicleClaim.isSoleTank()
+            // sole tank may have multiple vehicle claims, so we need to filter by business.id
+            ? this.getVehicleTransactions().filterBy('business.id', vehicleClaim.business.id)
+            // work tank may have only one vehicle claim, so we need to filter by tank type
+            : this.getVehicleTransactions().filterBy('tankType', TankTypeEnum.WORK);
+    }
+    /**
+     * Get list of vehicle transactions except KLMS transactions
+     */
+    getLogbookTransactions() {
+        return this
+            .getVehicleTransactions()
+            .removeBy('chartAccounts.id', [ChartAccountsListEnum.KLMS_TRAVELLED_FOR_WORK, ChartAccountsListEnum.KLMS_TRAVELLED]);
+    }
 }
 
 class DepreciationCollection extends Collection {
@@ -5041,6 +5345,16 @@ class DepreciationCollection extends Collection {
     toTransactions() {
         return new TransactionCollection(this.items.map((item) => item.toTransaction()));
     }
+    /**
+     * Get depreciations by vehicle claim. Only vehicle depreciations may be related to vehicle claim
+     */
+    getByVehicleClaim(vehicleClaim) {
+        return vehicleClaim.isSoleTank()
+            // sole tank may have multiple vehicle claims, so we need to filter by business.id
+            ? this.getVehicleDepreciations().filterBy('business.id', vehicleClaim.business.id)
+            // work tank may have only one vehicle claim, so we need to filter by tank type
+            : this.getVehicleDepreciations().filterBy('tankType', TankTypeEnum.WORK);
+    }
 }
 
 /**
@@ -5108,32 +5422,13 @@ class LoanCollection extends Collection {
     getByBankAccountId(id) {
         return this.items.find((loan) => { var _a; return ((_a = loan.bankAccount) === null || _a === void 0 ? void 0 : _a.id) === id; });
     }
-}
-
-class LoanPaymentCollection extends ExportableCollection {
-    getExportHeader() {
-        return [
-            'Pmt No.',
-            'Date',
-            'Payment Due',
-            'Interest Accrued',
-            'Principal Paid',
-            'Principal Balance',
-            'Payout'
-        ];
-    }
-    getExportBody() {
-        return this.items.map((payment) => {
-            return [
-                plainToClass(ExportCell, { value: payment.number, type: ExportCellTypeEnum.STRING }),
-                plainToClass(ExportCell, { value: payment.date, type: ExportCellTypeEnum.DATE }),
-                plainToClass(ExportCell, { value: payment.paymentDue, type: ExportCellTypeEnum.CURRENCY }),
-                plainToClass(ExportCell, { value: payment.interestAccrued, type: ExportCellTypeEnum.CURRENCY }),
-                plainToClass(ExportCell, { value: payment.principalPaid, type: ExportCellTypeEnum.CURRENCY }),
-                plainToClass(ExportCell, { value: payment.principalBalance, type: ExportCellTypeEnum.CURRENCY }),
-                plainToClass(ExportCell, { value: payment.payout, type: ExportCellTypeEnum.CURRENCY }),
-            ];
-        });
+    /**
+     * Get list of current fin year payments grouped by loan id
+     */
+    groupCurrentYearPaymentsByLoans() {
+        const dictionary = new CollectionDictionary(new LoanPaymentCollection([]));
+        this.items.forEach((loan) => dictionary.add(loan.id, new LoanPaymentCollection(loan.payments).getForCurrentYear()));
+        return dictionary;
     }
 }
 
@@ -5753,157 +6048,49 @@ class TransactionAllocationCollection extends Collection {
     get amount() {
         return this.sumBy('amount');
     }
-    getByTransactionsIds(ids) {
-        return new TransactionAllocationCollection(this.items.filter((allocation) => ids.includes(allocation.transaction.id)));
-    }
-    getByBankTransactionsIds(ids) {
-        return new TransactionAllocationCollection(this.items.filter((allocation) => ids.includes(allocation.bankTransaction.id)));
-    }
-    /**
-     * Group allocations by bank account via bank transactions collection
-     */
-    groupByBankAccount(bankTransactions) {
-        // Group bank transactions by bank account id
-        const bankTransactionsByBankAccount = new CollectionDictionary(bankTransactions, 'bankAccount.id');
-        // Create empty dictionary of transaction allocations
-        const allocationsByBankAccount = new CollectionDictionary(new TransactionAllocationCollection([]));
-        // Fill allocations dictionary with bank transactions dictionary keys and allocations related with each bank transaction collection
-        bankTransactionsByBankAccount.keys.forEach((key) => {
-            allocationsByBankAccount.add(key, this.getByBankTransactionsIds(bankTransactionsByBankAccount.get(key).getIds()));
-        });
-        return allocationsByBankAccount;
-    }
-    /**
-     * check if collection includes allocation of passed transaction
-     */
-    hasTransaction(transaction) {
-        return !!this.items.find((allocation) => allocation.transaction.id === transaction.id);
-    }
-    /**
-     * Check if bank transaction is related with current allocations
-     */
-    hasBankTransaction(bankTransaction) {
-        return !!this.items.find((allocation) => allocation.bankTransaction.id === bankTransaction.id);
-    }
-}
-
-/**
- * Collection of user event settings
- */
-class UserEventSettingCollection extends Collection {
-    getConfigurableBy(field) {
-        return new UserEventSettingCollection(this.items.filter((setting) => setting[field] !== null));
-    }
-}
-
-/**
- * Class contains traveled kilometers and work usage percent in 12 weeks date range
- */
-class LogbookPeriod {
-    isEndOfYear() {
-        return this.to === new FinancialYear().endDate;
-    }
-}
-__decorate([
-    Type(() => Date)
-], LogbookPeriod.prototype, "from", void 0);
-__decorate([
-    Type(() => Date)
-], LogbookPeriod.prototype, "to", void 0);
-
-/**
- * 12 weeks in milliseconds
- * "To work out your business-use percentage, you need to keep a logbook and the odometer readings for the logbook period.
- * The logbook period is a minimum continuous period of 12 weeks." © Nicole Kelly
- */
-const LOGBOOK_PERIOD_DURATION = 12 * 7 * 24 * 3600 * 1000;
-class VehicleLogbookCollection extends Collection {
-    /**
-     * Check if we can calculate the best period
-     */
-    isBestPeriodExist() {
-        if (this.items.length < 2) {
-            return false;
-        }
-        return LOGBOOK_PERIOD_DURATION < (this.last.date.getTime() - this.first.date.getTime());
-    }
-    /**
-     * Get collection of non-personal logbooks (work-related, sole-related).
-     */
-    getBusinessLogbooks() {
-        return this.create(this.items.filter((logbook) => logbook.isBusiness()));
-    }
-    /**
-     * Logbook Period is the best when it has the biggest amount of work kilometers
-     * Best period duration is defined as LOGBOOK_PERIOD_DURATION (12 weeks) by the ATO
-     */
-    getBestPeriod() {
-        if (!this.isBestPeriodExist()) {
-            return null;
-        }
-        let bestPeriod;
-        const businessLogbooks = this.getBusinessLogbooks().toArray();
-        for (let i = 0; i < businessLogbooks.length; i++) {
-            const logbook = businessLogbooks[i];
-            // no sense to check next logbooks because we already get the end of the year
-            if (bestPeriod && bestPeriod.isEndOfYear()) {
-                break;
-            }
-            const dateRange = this.getPeriodRange(logbook.date);
-            // get logbooks included in current logbook period
-            const logbooksInRange = this.filterByRange('date', logbook.date, new Date(logbook.date.getTime() + LOGBOOK_PERIOD_DURATION));
-            const workUsage = logbooksInRange.getWorkUsage();
-            // compare with previous best period and overwrite if needs
-            if (!bestPeriod || workUsage > bestPeriod.workUsage) {
-                bestPeriod = plainToClass(LogbookPeriod, {
-                    from: dateRange.from,
-                    to: dateRange.to,
-                    kilometers: logbooksInRange.getBusinessLogbooks().getKlms(),
-                    workUsage: workUsage
-                });
-            }
-        }
-        return bestPeriod;
-    }
+    getByTransactionsIds(ids) {
+        return new TransactionAllocationCollection(this.items.filter((allocation) => ids.includes(allocation.transaction.id)));
+    }
+    getByBankTransactionsIds(ids) {
+        return new TransactionAllocationCollection(this.items.filter((allocation) => ids.includes(allocation.bankTransaction.id)));
+    }
     /**
-     * Calculate total kilometers traveled
+     * Group allocations by bank account via bank transactions collection
      */
-    getKlms() {
-        return this.items.reduce((sum, logbook) => sum + logbook.getKlms(), 0);
+    groupByBankAccount(bankTransactions) {
+        // Group bank transactions by bank account id
+        const bankTransactionsByBankAccount = new CollectionDictionary(bankTransactions, 'bankAccount.id');
+        // Create empty dictionary of transaction allocations
+        const allocationsByBankAccount = new CollectionDictionary(new TransactionAllocationCollection([]));
+        // Fill allocations dictionary with bank transactions dictionary keys and allocations related with each bank transaction collection
+        bankTransactionsByBankAccount.keys.forEach((key) => {
+            allocationsByBankAccount.add(key, this.getByBankTransactionsIds(bankTransactionsByBankAccount.get(key).getIds()));
+        });
+        return allocationsByBankAccount;
     }
     /**
-     * Calculate work usage (percent of business-related kilometers from total kilometers)
+     * check if collection includes allocation of passed transaction
      */
-    getWorkUsage() {
-        const totalKilometers = this.getKlms();
-        const workKilometers = this.getBusinessLogbooks().getKlms();
-        return Math.round(workKilometers / totalKilometers * 100);
+    hasTransaction(transaction) {
+        return !!this.items.find((allocation) => allocation.transaction.id === transaction.id);
     }
     /**
-     * Get LOGBOOK_PERIOD_DURATION date range from passed start date
+     * Check if bank transaction is related with current allocations
      */
-    getPeriodRange(from) {
-        // set end date after LOGBOOK_PERIOD_DURATION after start date
-        let to = new Date(from.getTime() + LOGBOOK_PERIOD_DURATION);
-        const financialYear = new FinancialYear();
-        // set as period last LOGBOOK_PERIOD_DURATION of current year if period end date after end of current year
-        if (to > financialYear.endDate) {
-            to = financialYear.endDate;
-            from = new Date(to.getTime() - LOGBOOK_PERIOD_DURATION);
-        }
-        return { from, to };
+    hasBankTransaction(bankTransaction) {
+        return !!this.items.find((allocation) => allocation.bankTransaction.id === bankTransaction.id);
     }
 }
 
-class VehicleCollection extends Collection {
-    getLogbooks() {
-        return new VehicleLogbookCollection(flatten(this.items.map((vehicle) => vehicle.logbook)));
+/**
+ * Collection of user event settings
+ */
+class UserEventSettingCollection extends Collection {
+    getConfigurableBy(field) {
+        return new UserEventSettingCollection(this.items.filter((setting) => setting[field] !== null));
     }
 }
 
-/**
- * Collection of tax review
- */
 class ClientInviteCollection extends Collection {
     getPending() {
         return this.filter((invite) => invite.isPending());
@@ -6467,7 +6654,6 @@ const BANK_ACCOUNT_TYPES = [
     { key: BankAccountTypeEnum.TERM_DEPOSIT, value: 'Deposit Accounts' },
     { key: BankAccountTypeEnum.INVESTMENT, value: 'Investment Accounts' },
     { key: BankAccountTypeEnum.LOAN, value: 'Loan Accounts' },
-    { key: BankAccountTypeEnum.MORTGAGE, value: 'Mortgage Accounts' },
     { key: BankAccountTypeEnum.OFFSET, value: 'Offset' },
     { key: BankAccountTypeEnum.SAVINGS, value: 'Savings Accounts' },
     { key: BankAccountTypeEnum.TRANSACTION, value: 'Transaction Accounts' },
@@ -7245,62 +7431,6 @@ var LoanMaxNumberOfPaymentsEnum;
     LoanMaxNumberOfPaymentsEnum[LoanMaxNumberOfPaymentsEnum["MONTHLY"] = 60] = "MONTHLY";
 })(LoanMaxNumberOfPaymentsEnum || (LoanMaxNumberOfPaymentsEnum = {}));
 
-/**
- * Default vehicle transaction object,
- * which could be used to create transaction with 'Klms travelled for work' chart accounts category
- */
-const DEFAULT_VEHICLE_EXPENSE = {
-    source: TransactionSourceEnum.CASH,
-    tankType: TankTypeEnum.WORK,
-    type: TransactionTypeEnum.DEBIT,
-    taxWithheld: 0,
-    description: 'Klm’s method',
-    date: new Date(`${new FinancialYear().year}-06-30`),
-    chartAccounts: { id: ChartAccountsListEnum.KLMS_TRAVELLED_FOR_WORK },
-    claimPercent: 100
-};
-
-const WORK_TANK_LOGBOOK_PURPOSE_OPTIONS = [
-    { label: 'Business', value: VehicleLogbookPurposeEnum.BUSINESS },
-    { label: 'Personal', value: VehicleLogbookPurposeEnum.PERSONAL }
-];
-
-class Vehicle$1 extends AbstractModel {
-}
-
-class VehicleLogbook$1 extends AbstractModel {
-}
-
-class VehicleLogbook extends VehicleLogbook$1 {
-    /**
-     * Get amount of kilometers in this logbook
-     */
-    getKlms() {
-        return this.odometerEnd - this.odometerStart;
-    }
-    /**
-     * Check if logbook is business-related
-     */
-    isBusiness() {
-        return this.purpose === VehicleLogbookPurposeEnum.BUSINESS;
-    }
-}
-__decorate([
-    Type(() => Date)
-], VehicleLogbook.prototype, "date", void 0);
-
-class Vehicle extends Vehicle$1 {
-    /**
-     * Get vehicle's logbooks as collection
-     */
-    getLogbooks() {
-        return new VehicleLogbookCollection(this.logbook);
-    }
-}
-__decorate([
-    Type(() => VehicleLogbook)
-], Vehicle.prototype, "logbook", void 0);
-
 class ServiceNotification extends AbstractModel {
 }
 
@@ -7859,10 +7989,11 @@ var DeductionSelfEducationTypeEnum;
 })(DeductionSelfEducationTypeEnum || (DeductionSelfEducationTypeEnum = {}));
 
 class MyTaxDeductions {
-    constructor(transactions, depreciations, vehicleClaim, vehicleClaimRate) {
+    constructor(transactions, depreciations, vehicleClaim, vehicleClaimDetails, vehicleClaimRate) {
         this.transactions = transactions;
         this.depreciations = depreciations;
         this.vehicleClaim = vehicleClaim;
+        this.vehicleClaimDetails = vehicleClaimDetails;
         this.vehicleClaimRate = vehicleClaimRate;
         // user can have no selected vehicle claim
         if (this.vehicleClaim) {
@@ -7913,9 +8044,8 @@ class MyTaxDeductions {
             .sumBy('claimAmount');
     }
     getVehicleExpensesTotalAmount() {
-        var _a;
-        if (this.vehicleClaim) {
-            return ((_a = this.vehicleClaim) === null || _a === void 0 ? void 0 : _a.isLogbookMethod()) ? this.totalExpensesAmount : this.klmsMethodClaimAmount;
+        if (this.vehicleClaimDetails) {
+            return this.vehicleClaimDetails.isLogbookMethod() ? this.totalExpensesAmount : this.klmsMethodClaimAmount;
         }
         return 0;
     }
@@ -8619,26 +8749,288 @@ class SoleBusinessService extends RestService {
         this.isHydra = true;
     }
 }
-SoleBusinessService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleBusinessService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-SoleBusinessService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleBusinessService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleBusinessService, decorators: [{
+SoleBusinessService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleBusinessService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+SoleBusinessService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleBusinessService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleBusinessService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }] });
+
+class SoleContactService extends RestService {
+    constructor() {
+        super(...arguments);
+        this.modelClass = SoleContact;
+        this.url = 'sole-contacts';
+        this.isHydra = true;
+    }
+}
+SoleContactService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleContactService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+SoleContactService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleContactService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleContactService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }] });
+
+/**
+ * @TODO TT-1777 Alex: extend from rest service when it refactored
+ */
+class SoleDetailsService {
+    constructor(http, environment) {
+        this.http = http;
+        this.environment = environment;
+        this.cacheSubject = new ReplaySubject(1);
+    }
+    get() {
+        if (!this.cache) {
+            this.http.get(`${this.environment.apiV2}/sole-details`)
+                .pipe(map((response) => plainToClass(SoleDetails, response['hydra:member'][0])))
+                .subscribe((soleDetails) => {
+                // undefined when user not created sole details
+                if (!soleDetails) {
+                    soleDetails = plainToClass(SoleDetails, {});
+                }
+                this.cache = soleDetails;
+                this.cacheSubject.next(this.cache);
+                return soleDetails;
+            });
+        }
+        return this.cacheSubject.asObservable();
+    }
+    add(soleDetails) {
+        return this.http.post(`${this.environment.apiV2}/sole-details`, soleDetails).pipe(map((soleDetailsBase) => {
+            this.cache = plainToClass(SoleDetails, soleDetailsBase);
+            this.cacheSubject.next(this.cache);
+            return this.cache;
+        }));
+    }
+    update(soleDetails) {
+        return this.http.put(`${this.environment.apiV2}/sole-details/${soleDetails.id}`, soleDetails).pipe(map((soleDetailsBase) => {
+            this.cache = plainToClass(SoleDetails, soleDetailsBase);
+            this.cacheSubject.next(this.cache);
+            return this.cache;
+        }));
+    }
+}
+SoleDetailsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleDetailsService, deps: [{ token: i1.HttpClient }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
+SoleDetailsService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleDetailsService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleDetailsService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: undefined, decorators: [{
+                    type: Inject,
+                    args: ['environment']
+                }] }]; } });
+
+class SoleInvoiceTemplateService extends RestService {
+    constructor() {
+        super(...arguments);
+        this.modelClass = SoleInvoiceTemplate;
+        this.url = 'sole-invoice-templates';
+        this.isHydra = true;
+    }
+}
+SoleInvoiceTemplateService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleInvoiceTemplateService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+SoleInvoiceTemplateService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleInvoiceTemplateService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleInvoiceTemplateService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }] });
+
+/**
+ * Service that allows to work with WorkTank operations
+ */
+class VehicleService extends RestService {
+    constructor() {
+        super(...arguments);
+        this.url = 'vehicles';
+        this.modelClass = Vehicle;
+    }
+}
+VehicleService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: VehicleService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+VehicleService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: VehicleService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: VehicleService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }] });
+
+class VehicleClaimService extends RestService {
+    constructor() {
+        super(...arguments);
+        this.modelClass = VehicleClaim;
+        this.url = 'vehicle-claims';
+    }
+    listenEvents() {
+        this.listenVehicleClaimDetailsChanges();
+        this.listenBestPeriodChanges();
+    }
+    add(model) {
+        return super.add(model).pipe(map((vehicleClaim) => {
+            this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.VEHICLE_CLAIM_CREATED, vehicleClaim));
+            return vehicleClaim;
+        }));
+    }
+    update(model, queryParams = {}) {
+        return super.update(model, queryParams).pipe(map((vehicleClaim) => {
+            this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.VEHICLE_CLAIM_UPDATED, vehicleClaim));
+            return vehicleClaim;
+        }));
+    }
+    /**
+     * Details changes may affect vehicle claims:
+     * when details method changed, all claims current values become 0
+     */
+    listenVehicleClaimDetailsChanges() {
+        this.eventDispatcherService.on([
+            AppEventTypeEnum.VEHICLE_CLAIM_DETAILS_CREATED,
+            AppEventTypeEnum.VEHICLE_CLAIM_DETAILS_UPDATED
+        ])
+            .subscribe(() => {
+            this.resetCache();
+        });
+    }
+    /**
+     * Best period changes affect to claims workUsage
+     * @TODO Vik: Best period move this and related logic to backend
+     */
+    listenBestPeriodChanges() {
+        this.eventDispatcherService.on(AppEventTypeEnum.VEHICLE_LOGBOOK_BEST_PERIOD_UPDATED)
+            .subscribe((bestPeriod) => {
+            // no need to update claims when best period become null
+            // (case when logbook removed and user don't have enough logbooks for claim period)
+            if (!bestPeriod) {
+                return;
+            }
+            this.updateWorkUsage(bestPeriod);
+        });
+    }
+    /**
+     * Update workUsage for all vehicle claims if logbook best period changed
+     * @TODO Vik: Best period move this and related logic to backend
+     */
+    updateWorkUsage(bestPeriod) {
+        // We are sure this.cache exist here because logbook best period calculation is based on vehicle claims,
+        // so before we can get logbook best period changes, we must get vehicle claims
+        const batch$ = this.cache.map((claim) => {
+            const claimToUpdate = plainToClass(VehicleClaim, Object.assign({}, claim, { workUsage: bestPeriod === null || bestPeriod === void 0 ? void 0 : bestPeriod.getWorkUsageByClaim(claim) }));
+            return this.update(claimToUpdate);
+        });
+        // take(1) is using to avoid unnecessary callback calling whe user updated details directly
+        combineLatest(batch$).pipe(take(1)).subscribe();
+    }
+}
+VehicleClaimService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: VehicleClaimService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+VehicleClaimService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: VehicleClaimService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: VehicleClaimService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }] });
+
+/**
+ * @TODO TT-1777 Alex: extend from rest service when it refactored
+ */
+class VehicleClaimDetailsService {
+    constructor(environment, http, eventDispatcherService) {
+        this.environment = environment;
+        this.http = http;
+        this.eventDispatcherService = eventDispatcherService;
+        this.cacheSubject = new ReplaySubject(1);
+        this.url = 'vehicle-claim-details';
+        this.listenEvents();
+    }
+    listenEvents() {
+        this.listenBestPeriodChanges();
+    }
+    get() {
+        if (!this.cache) {
+            this.http.get(`${this.environment.apiV2}/${this.url}`)
+                .pipe(map((response) => plainToClass(VehicleClaimDetails, response['hydra:member'][0], { excludePrefixes: ['@'] })))
+                .subscribe((vehicleClaimDetails) => {
+                this.cache = vehicleClaimDetails;
+                this.cacheSubject.next(this.cache);
+            });
+        }
+        return this.cacheSubject.asObservable();
+    }
+    add(details) {
+        return this.http.post(`${this.environment.apiV2}/${this.url}`, details).pipe(map((newDetails) => {
+            const details = plainToClass(VehicleClaimDetails, newDetails);
+            this.cache = details;
+            this.cacheSubject.next(details);
+            this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.VEHICLE_CLAIM_DETAILS_CREATED, details));
+            return details;
+        }));
+    }
+    update(details) {
+        return this.http.put(`${this.environment.apiV2}/${this.url}/${details.id}`, details).pipe(map((updatedDetails) => {
+            const details = plainToClass(VehicleClaimDetails, updatedDetails, { excludePrefixes: ['@'] });
+            this.cache = details;
+            this.cacheSubject.next(details);
+            this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.VEHICLE_CLAIM_DETAILS_UPDATED, details));
+            return details;
+        }));
+    }
+    /**
+     * Listen logbook best period updates
+     * @TODO Vik: Best period move this and related logic to backend
+     */
+    listenBestPeriodChanges() {
+        this.eventDispatcherService.on(AppEventTypeEnum.VEHICLE_LOGBOOK_BEST_PERIOD_UPDATED)
+            .subscribe((bestPeriod) => {
+            // Set details as manual if best period stop exist (removed logbook case)
+            if (!bestPeriod) {
+                this.updateToManual();
+            }
+        });
+    }
+    /**
+     * Set vehicle claim details as manual
+     * @TODO Vik: Best period move this and related logic to backend
+     */
+    updateToManual() {
+        // We are sure this.cache exist here because logbook best period calculation is based on vehicle claim details,
+        // so before we can get logbook best period changes, we must get vehicle claim details
+        const vehicleClaimDetails = plainToClass(VehicleClaimDetails, Object.assign({}, this.cache, { isManual: true }));
+        // take(1) is using to avoid unnecessary callback calling whe user updated details directly
+        this.update(vehicleClaimDetails).pipe(take(1)).subscribe();
+    }
+}
+VehicleClaimDetailsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: VehicleClaimDetailsService, deps: [{ token: 'environment' }, { token: i1.HttpClient }, { token: EventDispatcherService }], target: i0.ɵɵFactoryTarget.Injectable });
+VehicleClaimDetailsService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: VehicleClaimDetailsService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: VehicleClaimDetailsService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }] });
+        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
+                    type: Inject,
+                    args: ['environment']
+                }] }, { type: i1.HttpClient }, { type: EventDispatcherService }]; } });
 
-class SoleContactService extends RestService {
+/**
+ * Vehicle logbook service. Allows user to add, update or delete vehicle trips
+ */
+class VehicleLogbookService extends RestService {
     constructor() {
         super(...arguments);
-        this.modelClass = SoleContact;
-        this.url = 'sole-contacts';
-        this.isHydra = true;
+        this.url = 'vehicles/logbooks';
+        this.modelClass = VehicleLogbook;
     }
 }
-SoleContactService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleContactService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-SoleContactService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleContactService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleContactService, decorators: [{
+VehicleLogbookService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: VehicleLogbookService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+VehicleLogbookService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: VehicleLogbookService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: VehicleLogbookService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -8646,56 +9038,66 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImpo
         }] });
 
 /**
- * @TODO TT-1777 Alex: extend from rest service when it refactored
+ * Service for logbook best period calculation
+ * @TODO Vik: improve structure for such cases (TT-2043)
+ * @TODO Vik: Best period move this and related logic to backend
  */
-class SoleDetailsService {
-    constructor(http, environment) {
-        this.http = http;
-        this.environment = environment;
-        this.cacheSubject = new ReplaySubject(1);
+class LogbookBestPeriodService {
+    constructor(vehicleClaimDetailsService, vehicleClaimService, vehicleLogbookService, eventDispatcherService) {
+        this.vehicleClaimDetailsService = vehicleClaimDetailsService;
+        this.vehicleClaimService = vehicleClaimService;
+        this.vehicleLogbookService = vehicleLogbookService;
+        this.eventDispatcherService = eventDispatcherService;
+        this.cacheSubject = new ReplaySubject();
+        this.listenEvents();
+    }
+    listenEvents() {
+        this.listenCacheUpdates();
     }
     get() {
         if (!this.cache) {
-            this.http.get(`${this.environment.apiV2}/sole-details`)
-                .pipe(map((response) => plainToClass(SoleDetails, response['hydra:member'][0])))
-                .subscribe((soleDetails) => {
-                // undefined when user not created sole details
-                if (!soleDetails) {
-                    soleDetails = plainToClass(SoleDetails, {});
+            combineLatest([
+                this.vehicleClaimDetailsService.get(),
+                this.vehicleLogbookService.get().pipe(map((logbooks) => new VehicleLogbookCollection(logbooks)))
+            ])
+                .subscribe(([details, logbooks]) => {
+                let period;
+                // calculate current initial best period
+                if ((details === null || details === void 0 ? void 0 : details.isManual) || !(details === null || details === void 0 ? void 0 : details.isLogbookMethod()) || !logbooks.isBestPeriodExist()) {
+                    period = null;
+                }
+                else {
+                    period = logbooks.getBestPeriod();
+                }
+                // update cache only when best period changed
+                if (!isEqual(this.cache, period)) {
+                    this.cache = period;
+                    this.cacheSubject.next(this.cache);
                 }
-                this.cache = soleDetails;
-                this.cacheSubject.next(this.cache);
-                return soleDetails;
             });
         }
         return this.cacheSubject.asObservable();
     }
-    add(soleDetails) {
-        return this.http.post(`${this.environment.apiV2}/sole-details`, soleDetails).pipe(map((soleDetailsBase) => {
-            this.cache = plainToClass(SoleDetails, soleDetailsBase);
-            this.cacheSubject.next(this.cache);
-            return this.cache;
-        }));
-    }
-    update(soleDetails) {
-        return this.http.put(`${this.environment.apiV2}/sole-details/${soleDetails.id}`, soleDetails).pipe(map((soleDetailsBase) => {
-            this.cache = plainToClass(SoleDetails, soleDetailsBase);
-            this.cacheSubject.next(this.cache);
-            return this.cache;
-        }));
+    /**
+     * Dispatch event when logbook best period changed
+     */
+    listenCacheUpdates() {
+        // Skip initial calculation and fire event only when subject changed
+        this.cacheSubject
+            .pipe(skip(1))
+            .subscribe((period) => {
+            this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.VEHICLE_LOGBOOK_BEST_PERIOD_UPDATED, period));
+        });
     }
 }
-SoleDetailsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleDetailsService, deps: [{ token: i1.HttpClient }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
-SoleDetailsService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleDetailsService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleDetailsService, decorators: [{
+LogbookBestPeriodService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: LogbookBestPeriodService, deps: [{ token: VehicleClaimDetailsService }, { token: VehicleClaimService }, { token: VehicleLogbookService }, { token: EventDispatcherService }], target: i0.ɵɵFactoryTarget.Injectable });
+LogbookBestPeriodService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: LogbookBestPeriodService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: LogbookBestPeriodService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: undefined, decorators: [{
-                    type: Inject,
-                    args: ['environment']
-                }] }]; } });
+        }], ctorParameters: function () { return [{ type: VehicleClaimDetailsService }, { type: VehicleClaimService }, { type: VehicleLogbookService }, { type: EventDispatcherService }]; } });
 
 /**
  * Enum list of all possible account setup items. Using with [ACCOUNT_SETUP_ITEMS]{@link ACCOUNT_SETUP_ITEMS}
@@ -9196,38 +9598,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImpo
                 }]
         }] });
 
-var MessagesEnum;
-(function (MessagesEnum) {
-    MessagesEnum["VEHICLE_CREATED"] = "Vehicle created successfully";
-    MessagesEnum["VEHICLE_UPDATED"] = "Vehicle updated successfully";
-    MessagesEnum["VEHICLE_DELETED"] = "Vehicle deleted successfully";
-    MessagesEnum["VEHICLE_CLAIM_CREATED"] = "Vehicle claim created successfully";
-    MessagesEnum["VEHICLE_CLAIM_UPDATED"] = "Vehicle claim updated successfully";
-    MessagesEnum["VEHICLE_CLAIM_DELETED"] = "Vehicle claim deleted successfully";
-    MessagesEnum["VEHICLE_LOGBOOK_CREATED"] = "Vehicle logbook created successfully";
-    MessagesEnum["VEHICLE_LOGBOOK_UPDATED"] = "Vehicle logbook updated successfully";
-    MessagesEnum["VEHICLE_LOGBOOK_DELETED"] = "Vehicle logbook deleted successfully";
-})(MessagesEnum || (MessagesEnum = {}));
-
-class VehicleClaimService extends RestService {
-    constructor() {
-        super(...arguments);
-        this.modelClass = VehicleClaim;
-        this.url = 'vehicle-claims';
-        this.messageCreated = MessagesEnum.VEHICLE_CLAIM_CREATED;
-        this.messageUpdated = MessagesEnum.VEHICLE_CLAIM_UPDATED;
-        this.messageDeleted = MessagesEnum.VEHICLE_CLAIM_DELETED;
-    }
-}
-VehicleClaimService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: VehicleClaimService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-VehicleClaimService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: VehicleClaimService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: VehicleClaimService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root'
-                }]
-        }] });
-
 function enumToList(data) {
     const list = [];
     for (const key in data) {
@@ -9327,6 +9697,7 @@ class TransactionService extends RestService {
         this.listenPropertyShareUpdate();
         this.listenReceiptAdded();
         this.listenReceiptDeleted();
+        this.listenVehicleClaimChanges();
     }
     /**
      * get list of all user's TaxTank transactions
@@ -9606,6 +9977,16 @@ class TransactionService extends RestService {
             this.updateCache();
         });
     }
+    listenVehicleClaimChanges() {
+        this.eventDispatcherService.on([
+            AppEventTypeEnum.VEHICLE_CLAIM_CREATED,
+            AppEventTypeEnum.VEHICLE_CLAIM_UPDATED,
+            AppEventTypeEnum.VEHICLE_CLAIM_DETAILS_CREATED,
+            AppEventTypeEnum.VEHICLE_CLAIM_DETAILS_UPDATED
+        ]).subscribe(() => {
+            this.resetCache();
+        });
+    }
 }
 TransactionService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TransactionService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }, { token: TransactionReceiptService }], target: i0.ɵɵFactoryTarget.Injectable });
 TransactionService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TransactionService, providedIn: 'root' });
@@ -10484,6 +10865,9 @@ class ClientInviteService extends RestService {
         this.url = 'clients/invites';
         this.modelClass = ClientInvite;
     }
+    listenEvents() {
+        this.listenNotifications();
+    }
     /**
      * Import employees for firm from CSV file
      * @param file
@@ -10560,6 +10944,16 @@ class ClientInviteService extends RestService {
             return newInvite;
         }));
     }
+    /**
+     * Reset cache on client/firm invite events
+     */
+    listenNotifications() {
+        this.eventDispatcherService.on(AppEventTypeEnum.NOTIFICATION_ADDED).subscribe((notification) => {
+            if (!notification.isRead && (notification.eventType === UserEventTypeClientTypeEnum.FIRM_INVITE_ACCEPTED || notification.eventType === UserEventTypeClientTypeEnum.CLIENT_INVITE)) {
+                this.resetCache();
+            }
+        });
+    }
 }
 ClientInviteService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ClientInviteService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
 ClientInviteService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ClientInviteService, providedIn: 'root' });
@@ -10577,6 +10971,10 @@ class ClientMovementService extends RestService {
         this.url = 'client-movements';
         this.isHydra = true;
     }
+    listenEvents() {
+        this.listenNotifications();
+        this.listenClientInvites();
+    }
     /**
      * @TODO BaseRestService should return collection
      */
@@ -10621,11 +11019,12 @@ class ClientMovementService extends RestService {
             this.updateCache();
         }));
     }
-    /**
-     * Listen Event Dispatcher service
-     */
-    listenEvents() {
-        this.listenClientInvites();
+    listenNotifications() {
+        this.eventDispatcherService.on(AppEventTypeEnum.NOTIFICATION_ADDED).subscribe((notification) => {
+            if (!notification.isRead && notification.eventType === UserEventTypeClientTypeEnum.FIRM_INVITE_ACCEPTED) {
+                this.resetCache();
+            }
+        });
     }
     /**
      * Listen to EventDispatcherService event related to clients invitations
@@ -10633,10 +11032,7 @@ class ClientMovementService extends RestService {
     listenClientInvites() {
         this.eventDispatcherService.on(AppEventTypeEnum.CLIENT_INVITE_ACCEPTED)
             .subscribe(() => {
-            this.fetch().subscribe((clientMovements) => {
-                this.cache = clientMovements;
-                this.updateCache();
-            });
+            this.resetCache();
         });
     }
 }
@@ -10765,7 +11161,7 @@ class DepreciationService extends RestService {
      */
     listenEvents() {
         this.listenToUpdatedLoan();
-        this.listenToVehicleClaim();
+        this.listenVehicleClaimChanges();
         this.listenToUpdatedBankAccount();
     }
     getOpenBalance(depreciation) {
@@ -10812,9 +11208,14 @@ class DepreciationService extends RestService {
     /**
      * Listen to EventDispatcherService event related to updated vehicle claim
      */
-    listenToVehicleClaim() {
-        this.eventDispatcherService.on([AppEventTypeEnum.VEHICLE_CLAIM_CREATED, AppEventTypeEnum.VEHICLE_CLAIM_UPDATED]).subscribe(() => {
-            this.fetch().subscribe();
+    listenVehicleClaimChanges() {
+        this.eventDispatcherService.on([
+            AppEventTypeEnum.VEHICLE_CLAIM_CREATED,
+            AppEventTypeEnum.VEHICLE_CLAIM_UPDATED,
+            AppEventTypeEnum.VEHICLE_CLAIM_DETAILS_CREATED,
+            AppEventTypeEnum.VEHICLE_CLAIM_DETAILS_UPDATED
+        ]).subscribe(() => {
+            this.resetCache();
         });
     }
 }
@@ -12409,6 +12810,7 @@ class TaxReviewService extends RestService {
     listenEvents() {
         this.listenFirmChanges();
         this.listenClientTransfer();
+        this.listenNotifications();
     }
     /**
      * Add new Tax Review (request from client to firm)
@@ -12447,8 +12849,7 @@ class TaxReviewService extends RestService {
     listenFirmChanges() {
         this.eventDispatcherService.on([AppEventTypeEnum.CLIENT_MOVEMENT_CLOSED, AppEventTypeEnum.CLIENT_INVITE_ACCEPTED])
             .subscribe(() => {
-            this.cache = [];
-            this.updateCache();
+            this.resetCache();
         });
     }
     /**
@@ -12468,6 +12869,13 @@ class TaxReviewService extends RestService {
             this.updateCache();
         });
     }
+    listenNotifications() {
+        this.eventDispatcherService.on(AppEventTypeEnum.NOTIFICATION_ADDED).subscribe((notification) => {
+            if (!notification.isRead && notification.eventType === UserEventTypeClientTypeEnum.FIRM_INVITE_ACCEPTED) {
+                this.resetCache();
+            }
+        });
+    }
 }
 TaxReviewService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TaxReviewService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
 TaxReviewService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TaxReviewService, providedIn: 'root' });
@@ -12862,138 +13270,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImpo
                 }]
         }] });
 
-/**
- * Service to work with invitations for unregistered users
- */
-class UsersInviteService extends RestService {
-    constructor() {
-        super(...arguments);
-        this.modelClass = RegistrationInvite;
-        this.url = 'users/invite';
-    }
-}
-UsersInviteService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: UsersInviteService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-UsersInviteService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: UsersInviteService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: UsersInviteService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root'
-                }]
-        }] });
-
-/**
- * Service that allows to work with WorkTank operations
- * @TODO separate vehicles and logbooks to different api
- */
-class VehicleService extends RestService {
-    constructor() {
-        super(...arguments);
-        this.url = 'vehicles';
-        this.modelClass = Vehicle;
-        this.messageCreated = MessagesEnum.VEHICLE_CREATED;
-        this.messageUpdated = MessagesEnum.VEHICLE_UPDATED;
-        this.messageDeleted = MessagesEnum.VEHICLE_DELETED;
-    }
-    listenEvents() {
-        this.listenLogbookAdded();
-        this.listenLogbookUpdated();
-        this.listenLogbookDeleted();
-    }
-    /**
-     * Add a new logbook items to the vehicle when a new one created
-     */
-    listenLogbookAdded() {
-        this.eventDispatcherService.on(AppEventTypeEnum.VEHICLE_LOGBOOK_CREATED)
-            .subscribe((result) => {
-            const tempCache = cloneDeep$1(this.cache);
-            tempCache.find((vehicle) => vehicle.id === result.vehicleId).logbook.push(result.logbook);
-            this.cache = tempCache;
-            this.updateCache();
-        });
-    }
-    /**
-     * Replace vehicle's logbook with updated instance when logbook item updated
-     */
-    listenLogbookUpdated() {
-        this.eventDispatcherService.on(AppEventTypeEnum.VEHICLE_LOGBOOK_UPDATED)
-            .subscribe((result) => {
-            const tempCache = cloneDeep$1(this.cache);
-            replace(tempCache.find((vehicle) => vehicle.id === result.vehicleId).logbook, result.logbook);
-            this.cache = tempCache;
-            this.updateCache();
-        });
-    }
-    /**
-     * Remove logbook item from vehicle when logbook deleted
-     */
-    listenLogbookDeleted() {
-        this.eventDispatcherService.on(AppEventTypeEnum.VEHICLE_LOGBOOK_DELETED)
-            .subscribe((result) => {
-            const tempCache = cloneDeep$1(this.cache);
-            const vehicle = tempCache.find((vehicle) => vehicle.id === result.vehicleId);
-            vehicle.logbook = vehicle.logbook.filter((logbook) => logbook.id !== result.logbook.id);
-            this.cache = tempCache;
-            this.updateCache();
-        });
-    }
-}
-VehicleService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: VehicleService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-VehicleService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: VehicleService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: VehicleService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root'
-                }]
-        }] });
-
-/**
- * Vehicle logbook service. Allows user to add, update or delete vehicle trips
- * @TODO extend rest service after it refactored
- */
-class VehicleLogbookService {
-    constructor(http, eventDispatcherService, environment, toastService) {
-        this.http = http;
-        this.eventDispatcherService = eventDispatcherService;
-        this.environment = environment;
-        this.toastService = toastService;
-    }
-    add(logbook, vehicleId) {
-        return this.http.post(`${this.environment.apiV2}/vehicles/${vehicleId}/logbooks`, logbook)
-            .pipe(map((vehicleLogbookBase) => {
-            const newVehicleLogbook = plainToClass(VehicleLogbook, vehicleLogbookBase);
-            this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.VEHICLE_LOGBOOK_CREATED, { logbook: newVehicleLogbook, vehicleId }));
-            this.toastService.success(MessagesEnum.VEHICLE_LOGBOOK_CREATED);
-            return newVehicleLogbook;
-        }));
-    }
-    update(logbook, vehicleId) {
-        return this.http.put(`${this.environment.apiV2}/vehicles/${vehicleId}/logbooks/${logbook.id}`, logbook).pipe(map((vehicleLogbookBase) => {
-            const updatedVehicleLogbook = plainToClass(VehicleLogbook, vehicleLogbookBase);
-            this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.VEHICLE_LOGBOOK_UPDATED, { logbook: updatedVehicleLogbook, vehicleId }));
-            this.toastService.success(MessagesEnum.VEHICLE_LOGBOOK_UPDATED);
-            return plainToClass(VehicleLogbook, updatedVehicleLogbook);
-        }));
-    }
-    delete(logbook, vehicleId) {
-        return this.http.delete(`${this.environment.apiV2}/vehicles/${vehicleId}/logbooks/${logbook.id}`)
-            .pipe(map(() => {
-            this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.VEHICLE_LOGBOOK_DELETED, { logbook, vehicleId }));
-            this.toastService.success(MessagesEnum.VEHICLE_LOGBOOK_DELETED);
-        }));
-    }
-}
-VehicleLogbookService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: VehicleLogbookService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }], target: i0.ɵɵFactoryTarget.Injectable });
-VehicleLogbookService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: VehicleLogbookService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: VehicleLogbookService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root'
-                }]
-        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
-                    type: Inject,
-                    args: ['environment']
-                }] }, { type: ToastService }]; } });
-
 /**
  * Service to work with XLSX (generate, download, e.t.c.)
  */
@@ -13247,13 +13523,28 @@ function taxReviewFilterPredicate(data, filter) {
 /**
  * Abstract form class
  * @TODO rename to AbstractFormGroup
+ * @TODO Alex: refactor: check and improve logic
  */
 class AbstractForm extends FormGroup {
     constructor(controls, model, validatorOrOpts, asyncValidator) {
         super(controls, validatorOrOpts, asyncValidator);
+        /**
+         * Flag display if some form values changed
+         */
+        this.unsaved = false;
         this.onSubmit = new EventEmitter();
         this.model = model || this.createModelInstance();
         this.modelClass = this.model.constructor;
+        this.initialValue = this.value;
+        if (model && !model['id']) {
+            this.markAsUnsaved();
+        }
+        this.valueChanges.subscribe(() => {
+            !!model && !!model['id'] && isEqual(this.value, this.initialValue) ? this.markAsSaved() : this.markAsUnsaved();
+        });
+    }
+    get saved() {
+        return !this.unsaved;
     }
     /**
      * Check validation and return a new instance of generic model.
@@ -13270,14 +13561,97 @@ class AbstractForm extends FormGroup {
         this.onSubmit.emit(model);
         return model;
     }
-    addControl(name, control, options) {
-        super.addControl(name, control, options);
-        return this;
+    addControl(name, control, options) {
+        super.addControl(name, control, options);
+        return this;
+    }
+    markAsUnsaved() {
+        this.unsaved = true;
+    }
+    markAsSaved() {
+        this.unsaved = false;
+    }
+    createModelInstance(data = {}) {
+        return plainToClass(this.modelClass, data);
+    }
+}
+
+/**
+ * Form with loan details.
+ * Loan could be created from bank account (Bank Loan) or directly from loan page (Vehicle Loan)
+ */
+class LoanForm extends AbstractForm {
+    constructor(loan = plainToClass(Loan, {})) {
+        super({
+            type: new FormControl(loan.type, Validators.required),
+            amount: new FormControl(loan.amount, Validators.required),
+            interestRate: new FormControl(loan.interestRate, [Validators.required, Validators.min(0), Validators.max(100)]),
+            commencementDate: new FormControl(loan.commencementDate, Validators.required),
+            repaymentAmount: new FormControl(loan.repaymentAmount, Validators.required),
+            repaymentFrequency: new FormControl(loan.repaymentFrequency, Validators.required),
+            term: new FormControl(loan.term, Validators.required),
+            // interestType is predefined for vehicle loans
+            interestType: new FormControl({ value: loan.interestType, disabled: !loan.bankAccount }, Validators.required),
+            // availableRedraw is predefined for vehicle loans
+            availableRedraw: new FormControl({ value: loan.availableRedraw, disabled: !loan.bankAccount }, Validators.required),
+            // repaymentType is predefined for vehicle loans
+            repaymentType: new FormControl({ value: loan.repaymentType, disabled: !loan.bankAccount }, Validators.required),
+        }, loan);
+        this.loan = loan;
+        // Set data which always the same for vehicle loans
+        if (!loan.bankAccount) {
+            Object.assign(this.model, {
+                repaymentType: LoanRepaymentTypeEnum.PRINCIPAL_AND_INTEREST,
+                availableRedraw: 0,
+                interestType: LoanInterestTypeEnum.FIXED_RATE
+            });
+        }
+        this.updateTermValidation();
+        this.listenEvents();
+    }
+    listenEvents() {
+        // We need to set term automatically only for bank loans.
+        // For vehicle loans user should fill it manually with validation depended of frequency
+        if (!!this.loan.bankAccount) {
+            this.listenTypeChanges();
+        }
+        else {
+            this.listenRepaymentFrequencyChanges();
+        }
+    }
+    /**
+     * Set term automatically by loan type changes
+     */
+    listenTypeChanges() {
+        this.get('type').valueChanges.subscribe((type) => {
+            this.get('term').setValue(LoanForm.mortgageLoanTypes.includes(type) ? Loan.mortgageDefaultTerm : Loan.loanDefaultTerm);
+        });
+    }
+    /**
+     * term validation depends on selected repaymentFrequency
+     */
+    listenRepaymentFrequencyChanges() {
+        this.get('repaymentFrequency').valueChanges.subscribe(() => {
+            this.updateTermValidation();
+        });
     }
-    createModelInstance(data = {}) {
-        return plainToClass(this.modelClass, data);
+    /**
+     * For vehicle loans term has a maximum value depended of repayment frequency
+     */
+    updateTermValidation() {
+        const currentRepaymentFrequency = this.get('repaymentFrequency').value;
+        // term validation depends on selected repayment frequency, so can not validate when frequency is empty
+        // repaymentType is required field, so we don't need to clear validation
+        if (!currentRepaymentFrequency) {
+            return;
+        }
+        const termControl = this.get('term');
+        const maxTermValue = LoanMaxNumberOfPaymentsEnum[LoanRepaymentFrequencyEnum[currentRepaymentFrequency]];
+        termControl.setValidators([Validators.max(maxTermValue)]);
+        termControl.updateValueAndValidity();
     }
 }
+LoanForm.mortgageLoanTypes = [LoanTypeEnum.MORTGAGE, LoanTypeEnum.HOME_EQUITY_LINE_OF_CREDIT, LoanTypeEnum.HOME_LOAN];
 
 /**
  * Check if at least one form field is true, otherwise form is invalid.
@@ -13362,6 +13736,23 @@ function passwordMatchValidator(newPassControlName, confirmPassControlName) {
     };
 }
 
+var MessagesEnum;
+(function (MessagesEnum) {
+    MessagesEnum["INVALID_DATE"] = "The date should not be before $1";
+})(MessagesEnum || (MessagesEnum = {}));
+
+/**
+ * Validation function, that checks If date form value is more than provided date
+ */
+function minDateValidator(date, message = MessagesEnum.INVALID_DATE.replace('$1', new DatePipe('en-US').transform(date))) {
+    return (control) => {
+        if (!control.value || (control.value >= date)) {
+            return null;
+        }
+        return { minDate: message };
+    };
+}
+
 /**
  * Validator that check if sum amount of provided fields is greater than provided sum
  * @param field to check in each formArray element
@@ -13448,50 +13839,144 @@ class BankAccountPropertiesForm extends FormArray {
     }
 }
 
+class SoleBusinessForm extends AbstractForm {
+    constructor(business = plainToClass(SoleBusiness, {})) {
+        super({
+            name: new FormControl(business.name, Validators.required),
+            code: new FormControl(business.code, Validators.required),
+            description: new FormControl(business.description),
+            website: new FormControl(business.website)
+        }, business);
+    }
+}
+
+/**
+ * Form array with bank account business allocations
+ * @TODO create AbstractFormArray
+ */
+class SoleBusinessAllocationsForm extends FormArray {
+    constructor(businessAllocations) {
+        super(((businessAllocations === null || businessAllocations === void 0 ? void 0 : businessAllocations.length) ? businessAllocations : [plainToClass(SoleBusinessAllocation, {})])
+            .map((businessAllocation) => {
+            return new FormGroup({
+                business: new FormControl(businessAllocation === null || businessAllocation === void 0 ? void 0 : businessAllocation.business, Validators.required),
+                percent: new FormControl(businessAllocation.percent, Validators.required)
+            });
+        }), [
+            conditionalValidator((control) => control.get('tankType').value === TankTypeEnum.SOLE, Validators.required),
+            fieldsSumValidator('percent', 100)
+        ]);
+    }
+    add() {
+        this.push(new FormGroup({
+            business: new FormControl(null, Validators.required),
+            // @TODO disable for loans
+            percent: new FormControl({ value: this.getRemainingPercent(), disabled: !this.at(0).contains('percent') }, Validators.required),
+            // @TODO enable for loans
+            // amount: new FormControl(
+            //   {value: this.bankAccount.currentBalance * businessAllocation.percent / 100},
+            //   [Validators.required, Validators.max(Math.abs(this.bankAccount.currentBalance))]
+            // ),
+        }));
+    }
+    // @TODO enable for loans
+    // /**
+    //  * Recalculate business allocation percentage for current business form group and round to no more than 3 decimal places
+    //  * @param amount: new control value
+    //  * @param currentBusinessGroup for which amount will be recalculated
+    //  */
+    // recalculateBusinessPercentage(amount: number, currentBusinessGroup: FormGroup): void {
+    //   currentBusinessGroup.get('percent').setValue(
+    //     roundTo(amount / this.bankAccount.currentBalance, 3)
+    //   );
+    // }
+    enablePercent() {
+        this.controls.forEach((businessFormGroup) => {
+            businessFormGroup.get('percent').enable();
+        });
+    }
+    disablePercent() {
+        this.controls.forEach((businessFormGroup) => {
+            businessFormGroup.get('percent').disable();
+        });
+    }
+    /**
+     * Percentage available for adding a new bank account business allocation.
+     * Remaining percent can't be more than 100 and less than 0
+     */
+    getRemainingPercent() {
+        const currentTotalPercent = this.controls.reduce((sum, control) => sum + control.get('percent').value, 0);
+        return currentTotalPercent < 100 ? 100 - currentTotalPercent : 0;
+    }
+}
+
+class SoleContactForm extends AbstractForm {
+    constructor(contact = plainToClass(SoleContact, {})) {
+        super({
+            name: new FormControl(contact.name, Validators.required),
+            abn: new FormControl(contact.abn, [Validators.minLength(11), Validators.maxLength(11)]),
+            firstName: new FormControl(contact.firstName, Validators.required),
+            lastName: new FormControl(contact.lastName, Validators.required),
+            email: new FormControl(contact.email, [Validators.required, Validators.email]),
+            // @TODO Alex: create phone form and phone form control
+            phone: new FormControl(contact.phone),
+            // @TODO Alex: create address form and address form control
+            address: new FormControl(contact.address)
+        }, contact);
+    }
+}
+
+class SoleDetailsForm extends AbstractForm {
+    constructor(soleDetails) {
+        super({
+            abn: new FormControl(soleDetails.abn, [Validators.required, Validators.minLength(11), Validators.maxLength(11)]),
+            isGST: new FormControl(soleDetails.isGST || false)
+        }, soleDetails);
+    }
+}
+
+class SoleInvoiceTemplateForm extends AbstractForm {
+    constructor(invoiceTemplate) {
+        super({
+            name: new FormControl(invoiceTemplate.name, Validators.required),
+            isTaxIncluded: new FormControl(invoiceTemplate.isTaxIncluded),
+            term: new FormControl(invoiceTemplate.term, [Validators.required, Validators.min(0)]),
+            bankAccount: new FormControl(invoiceTemplate.bankAccount)
+        }, invoiceTemplate);
+    }
+}
+
 class BankAccountAllocationForm extends AbstractForm {
     constructor(bankAccount) {
         super({
-            tankType: new FormControl(bankAccount ? bankAccount.tankType : null, Validators.required),
+            tankType: new FormControl(bankAccount ? bankAccount.tankType : null, Validators.required)
         }, plainToClass(BankAccount, bankAccount || {}));
         this.bankAccount = bankAccount;
         if (bankAccount === null || bankAccount === void 0 ? void 0 : bankAccount.isPropertyTank()) {
             this.addControl('bankAccountProperties', new BankAccountPropertiesForm(bankAccount.bankAccountProperties));
         }
+        if (bankAccount === null || bankAccount === void 0 ? void 0 : bankAccount.isSoleTank()) {
+            this.addControl('businessAllocations', new SoleBusinessAllocationsForm(bankAccount.businessAllocations));
+        }
         this.watchTankType();
     }
     watchTankType() {
         this.get('tankType').valueChanges.subscribe((tankType) => {
-            var _a;
-            // @TODO vik add businessAllocation
-            if (tankType === TankTypeEnum.PROPERTY) {
-                this.addControl('bankAccountProperties', new BankAccountPropertiesForm((_a = this.bankAccount) === null || _a === void 0 ? void 0 : _a.bankAccountProperties));
-            }
-            else {
-                this.removeControl('bankAccountProperties');
+            var _a, _b;
+            this.removeControl('bankAccountProperties');
+            this.removeControl('businessAllocations');
+            switch (tankType) {
+                case TankTypeEnum.PROPERTY:
+                    this.addControl('bankAccountProperties', new BankAccountPropertiesForm((_a = this.bankAccount) === null || _a === void 0 ? void 0 : _a.bankAccountProperties));
+                    break;
+                case TankTypeEnum.SOLE:
+                    this.addControl('businessAllocations', new SoleBusinessAllocationsForm((_b = this.bankAccount) === null || _b === void 0 ? void 0 : _b.businessAllocations));
+                    break;
             }
         });
     }
 }
 
-/**
- * Form with bank account loan details
- */
-class BankAccountLoanForm extends AbstractForm {
-    constructor(loan = plainToClass(Loan, {})) {
-        super({
-            type: new FormControl(loan.type, Validators.required),
-            amount: new FormControl(loan.amount, Validators.required),
-            repaymentType: new FormControl(loan.repaymentType, Validators.required),
-            interestRate: new FormControl(loan.interestRate, [Validators.required, Validators.min(0), Validators.max(100)]),
-            interestType: new FormControl(loan.interestType, Validators.required),
-            availableRedraw: new FormControl(loan.availableRedraw, Validators.required),
-            commencementDate: new FormControl(loan.commencementDate, Validators.required),
-            repaymentAmount: new FormControl(loan.repaymentAmount, Validators.required),
-            repaymentFrequency: new FormControl(loan.repaymentFrequency, Validators.required)
-        }, loan);
-    }
-}
-
 /**
  * Form is using for import basiq bank accounts.
  * Basiq accounts has all data except tank type, properties and loan partially
@@ -13500,7 +13985,10 @@ class BankAccountImportForm extends BankAccountAllocationForm {
     constructor(bankAccount) {
         super(bankAccount);
         if (bankAccount.isLoan()) {
-            this.addControl('loan', new BankAccountLoanForm(bankAccount.loan));
+            // Attach bank account to loan for LoanForm's logic
+            // @TODO Alex/Vik: we should use separated API for bank accounts and loans
+            const loan = plainToClass(Loan, Object.assign(bankAccount.loan, { bankAccount: Object.assign(bankAccount, { loan: null }) }));
+            this.addControl('loan', new LoanForm(loan));
         }
         // basiq account import form should be disabled (unchecked) by default
         this.disable();
@@ -13529,8 +14017,9 @@ class BankAccountAddManualForm extends BankAccountAllocationForm {
      */
     listenTypeChanges() {
         this.get('type').valueChanges.subscribe((type) => {
-            if (BankAccount.loanTypes.includes(type)) {
-                this.addControl('loan', new BankAccountLoanForm());
+            if (type === BankAccountTypeEnum.LOAN) {
+                // Set prefilled term for bank account loan
+                this.addControl('loan', new LoanForm(plainToClass(Loan, { bankAccount: this.model })));
             }
             else {
                 this.removeControl('loan');
@@ -13724,125 +14213,6 @@ class UserInviteForm extends AbstractForm {
     }
 }
 
-class VehicleForm extends AbstractForm {
-    constructor(vehicle = plainToClass(Vehicle, {})) {
-        super({
-            name: new FormControl(vehicle.name, [Validators.required, Validators.maxLength(VehicleForm.maxNameLength)])
-        }, vehicle);
-        this.vehicle = vehicle;
-    }
-}
-VehicleForm.maxNameLength = 60;
-
-class VehicleClaimForm extends AbstractForm {
-    constructor(vehicleClaim, logbooks) {
-        super({
-            method: new FormControl(vehicleClaim.method, Validators.required),
-            isManual: new FormControl(vehicleClaim.isManual),
-            kilometers: new FormControl({
-                value: vehicleClaim.kilometers,
-                disabled: !vehicleClaim.isManual
-            }),
-            workUsage: new FormControl({
-                value: vehicleClaim.workUsage,
-                disabled: !vehicleClaim.isManual
-            })
-        }, vehicleClaim);
-        this.vehicleClaim = vehicleClaim;
-        this.logbooks = logbooks;
-        this.setIsManualState();
-        this.listenMethodChanges();
-        this.listenIsManualChanges();
-    }
-    /**
-     * Check if vehicle claim method changed
-     */
-    isMethodChanged() {
-        return this.vehicleClaim.method !== this.get('method').value;
-    }
-    /**
-     * Check if KLMs method selected
-     */
-    isKLMsMethod() {
-        return this.get('method').value === VehicleClaimMethodEnum.KMS;
-    }
-    /**
-     * Check if Logbook method selected
-     */
-    isLogbookMethod() {
-        return this.get('method').value === VehicleClaimMethodEnum.LOGBOOK;
-    }
-    /**
-     * Check if user selected manual calculation
-     */
-    isManual() {
-        return this.get('isManual').value;
-    }
-    /**
-     * @TODO save model, add generics and handle it in AbstractForm
-     */
-    submit() {
-        return plainToClass(VehicleClaim, Object.assign({}, this.vehicleClaim, this.getRawValue()));
-    }
-    setIsManualState() {
-        if (this.logbooks.isBestPeriodExist()) {
-            this.get('isManual').enable();
-        }
-        else {
-            this.get('isManual').disable();
-            this.get('isManual').setValue(true);
-        }
-    }
-    /**
-     * Handle method field value changes.
-     * Set work usage value depended of selected method.
-     */
-    listenMethodChanges() {
-        this.get('method').valueChanges.subscribe((method) => {
-            if (method === VehicleClaimMethodEnum.KMS) {
-                this.get('workUsage').setValue(0);
-            }
-            else if (method === VehicleClaimMethodEnum.LOGBOOK && !this.isManual()) {
-                this.get('workUsage').setValue(this.logbooks.getBestPeriod().workUsage);
-            }
-            this.setValues();
-        });
-    }
-    /**
-     * Handle isManual field value changes.
-     * Enable/disable fields depended of isManual value
-     */
-    listenIsManualChanges() {
-        this.get('isManual').valueChanges.subscribe((isManual) => {
-            if (isManual) {
-                this.get('kilometers').enable();
-                this.get('workUsage').enable();
-            }
-            else {
-                this.get('kilometers').disable();
-                this.get('workUsage').disable();
-            }
-            this.setValues();
-        });
-    }
-    /**
-     * Set automatic calculated values depended of current method for non-manual vehicle claim
-     */
-    setValues() {
-        if (this.isManual()) {
-            return;
-        }
-        switch (this.get('method').value) {
-            case VehicleClaimMethodEnum.LOGBOOK:
-                this.get('workUsage').setValue(this.logbooks.getBestPeriod().workUsage);
-                break;
-            case VehicleClaimMethodEnum.KMS:
-                const businessKms = this.logbooks.getBusinessLogbooks().getKlms();
-                this.get('kilometers').setValue(businessKms < this.vehicleClaim.kmsLimit ? businessKms : this.vehicleClaim.kmsLimit);
-        }
-    }
-}
-
 /**
  * @Todo waiting for the Sole tank implementation
  */
@@ -13879,7 +14249,7 @@ class MyTaxDeductionsForm extends AbstractForm {
         var _a;
         super({
             vehicleClaimMethod: new FormControl({
-                value: (_a = deductions.vehicleClaim) === null || _a === void 0 ? void 0 : _a.method,
+                value: (_a = deductions.vehicleClaimDetails) === null || _a === void 0 ? void 0 : _a.method,
                 disabled: true
             }),
             vehicleExpensesTotalAmount: new FormControl({
@@ -14222,41 +14592,110 @@ class MyTaxRentForm extends AbstractForm {
     }
 }
 
-class SoleBusinessForm extends AbstractForm {
-    constructor(business = plainToClass(SoleBusiness, {})) {
+/**
+ * Add/Edit Vehicle form
+ */
+class VehicleForm extends AbstractForm {
+    constructor(vehicle = plainToClass(Vehicle, {})) {
         super({
-            name: new FormControl(business.name, Validators.required),
-            code: new FormControl(business.code, Validators.required),
-            description: new FormControl(business.description),
-            website: new FormControl(business.website)
-        }, business);
+            name: new FormControl(vehicle.name, [Validators.required, Validators.maxLength(VehicleForm.maxNameLength)])
+        }, vehicle);
+        this.vehicle = vehicle;
     }
 }
+VehicleForm.maxNameLength = 60;
 
-class SoleContactForm extends AbstractForm {
-    constructor(contact = plainToClass(SoleContact, {})) {
+/**
+ * Add/Edit Vehicle Claim form
+ */
+class VehicleClaimForm extends AbstractForm {
+    /**
+     * @param vehicleClaim required even for the new claim, because claim needs business for sole tank
+     * @param details required for form controls disabled state management
+     */
+    constructor(vehicleClaim, details) {
         super({
-            name: new FormControl(contact.name, Validators.required),
-            abn: new FormControl(contact.abn, [Validators.minLength(11), Validators.maxLength(11)]),
-            firstName: new FormControl(contact.firstName, Validators.required),
-            lastName: new FormControl(contact.lastName, Validators.required),
-            email: new FormControl(contact.email, [Validators.required, Validators.email]),
-            // @TODO Alex: create phone form and phone form control
-            phone: new FormControl(contact.phone),
-            // @TODO Alex: create address form and address form control
-            address: new FormControl(contact.address)
-        }, contact);
+            kilometers: new FormControl({
+                value: vehicleClaim.kilometers,
+                disabled: !details.isManual || details.isLogbookMethod()
+            }),
+            workUsage: new FormControl({
+                value: vehicleClaim.workUsage,
+                disabled: !details.isManual || details.isKlmsMethod()
+            })
+        }, vehicleClaim);
     }
 }
 
-class SoleDetailsForm extends AbstractForm {
-    constructor(soleDetails) {
+/**
+ * Add/Edit vehicle claim details form
+ */
+class VehicleClaimDetailsForm extends AbstractForm {
+    /**
+     * @param vehicleClaimDetails required because we create a new details with prefilled data (like Financial year)
+     * @param logbooks required for isManual field disabled state management
+     */
+    constructor(vehicleClaimDetails, logbooks) {
         super({
-            abn: new FormControl(soleDetails.abn, [Validators.required, Validators.minLength(11), Validators.maxLength(11)]),
-            isGST: new FormControl(soleDetails.isGST || false)
-        }, soleDetails);
+            method: new FormControl(vehicleClaimDetails.method, Validators.required),
+            isManual: new FormControl({
+                value: vehicleClaimDetails.isManual,
+                disabled: !logbooks.isBestPeriodExist()
+            }),
+        }, vehicleClaimDetails);
+    }
+}
+
+/**
+ * Add/Edit vehicle logbook form.
+ * Behavior cases:
+ * 1) Create the first logbook OR Edit the single logbook: all fields enabled
+ * 2) Create the non-first logbook OR Edit the last logbook: odometerStart disabled
+ * 3) Edit the non-last logbook: odometerStart, odometerEnd, date disabled
+ */
+class VehicleLogbookForm extends AbstractForm {
+    /**
+     * @param logbook required because we need to set vehicle allocation and we can not set in in the form
+     * @param logbooks list of all logbooks related to current logbook's vehicle. Required for form fields validation and disabled state management
+     */
+    constructor(logbook, logbooks) {
+        super({
+            description: new FormControl(logbook.description, [Validators.required, Validators.maxLength(VehicleLogbookForm.maxDescriptionLength)]),
+            isPersonal: new FormControl(logbook.isPersonal),
+            date: new FormControl(logbook.date, Validators.required),
+            odometerStart: new FormControl(logbook.odometerStart, Validators.required),
+            odometerEnd: new FormControl(logbook.odometerEnd, Validators.required),
+            business: new FormControl(logbook.business),
+            // @TODO Alex: remove when backend fixed
+            purpose: new FormControl(VehicleLogbookPurposeEnum.BUSINESS)
+        }, logbook);
+        this.logbook = logbook;
+        this.logbooks = logbooks;
+        switch (true) {
+            // Create the first or edit the single logbook
+            case !logbook.id && !logbooks.length:
+            case !!logbook.id && logbooks.length === 1:
+                this.get('odometerStart').setValidators(Validators.min(0));
+                this.get('date').setValidators(dateRangeValidator(new FinancialYear().startDate, new FinancialYear().endDate));
+                break;
+            // Create the non-first or edit the last logbook
+            case !logbook.id && !!logbooks.length:
+            case !!logbook.id && logbook.id === logbooks.last.id && logbooks.length > 1:
+                this.get('odometerStart').disable();
+                this.get('odometerEnd').setValidators(Validators.min(logbooks.last.odometerEnd));
+                if (!!logbook.id) {
+                }
+                this.get('date').setValidators(dateRangeValidator(logbooks.last.date, new FinancialYear().endDate));
+                break;
+            // Edit the non-last logbook
+            case !!logbook.id && logbook.id !== logbooks.last.id && logbooks.length > 1:
+                this.get('odometerStart').disable();
+                this.get('odometerEnd').disable();
+                this.get('date').disable();
+        }
     }
 }
+VehicleLogbookForm.maxDescriptionLength = 60;
 
 // @TODO Alex: Create indexes everywhere and break this file to imports from indexes
 
@@ -14264,5 +14703,5 @@ class SoleDetailsForm extends AbstractForm {
  * Generated bundle index. Do not edit.
  */
 
-export { AbstractForm, AbstractModel, AccountSetupItem, AccountSetupItemCollection, AccountSetupService, Address, AddressService, AddressTypeEnum, AlphabetColorsEnum, AppEvent, AppEventTypeEnum, AssetEntityTypeEnum, AssetTypeEnum, AssetsService, AuthService, BANK_ACCOUNT_TYPES, Badge, BadgeColorEnum, Bank, BankAccount, BankAccountAddManualForm, BankAccountAllocationForm, BankAccountCalculationService, BankAccountChartData, BankAccountCollection, BankAccountImportForm, BankAccountLoanForm, BankAccountPropertiesForm, BankAccountProperty, BankAccountService, BankAccountStatusEnum, BankAccountTypeEnum, BankAccountsImportForm, BankConnection, BankConnectionService, BankConnectionStatusEnum, BankLoginData, BankLoginForm, BankService, BankTransaction, BankTransactionCalculationService, BankTransactionChartData, BankTransactionCollection, BankTransactionService, BankTransactionSummaryFieldsEnum, BankTransactionTypeEnum, BasiqConfig, BasiqJob, BasiqService, BasiqToken, BorrowingExpense, BorrowingExpenseLoan, BorrowingExpenseService, CAPITAL_COSTS_ITEMS, CHART_ACCOUNTS_CATEGORIES, CalculationFormItem, CalculationFormTypeEnum, CgtExemptionAndRolloverCodeEnum, ChartAccounts, ChartAccountsCategoryECollection, ChartAccountsCategoryEnum, ChartAccountsCollection, ChartAccountsDepreciation, ChartAccountsDepreciationService, ChartAccountsEtpEnum, ChartAccountsHeading, ChartAccountsHeadingListEnum, ChartAccountsHeadingTaxDeductibleEnum, ChartAccountsHeadingTaxableEnum, ChartAccountsHeadingVehicleListEnum, ChartAccountsListEnum, ChartAccountsMetadata, ChartAccountsMetadataListEnum, ChartAccountsMetadataTypeEnum, ChartAccountsService, ChartAccountsTaxLabelsEnum, ChartAccountsTypeEnum, ChartAccountsValue, ChartData, ChartSerie, Chat, ChatService, ChatStatusEnum, ChatViewTypeEnum, ClientCollection, ClientDetails, ClientDetailsMedicareExemptionEnum, ClientDetailsWorkDepreciationCalculationEnum, ClientDetailsWorkingHolidayMakerEnum, ClientIncomeTypes, ClientIncomeTypesForm, ClientIncomeTypesService, ClientInvite, ClientInviteCollection, ClientInviteService, ClientInviteStatusEnum, ClientInviteTypeEnum, ClientMovement, ClientMovementCollection, ClientMovementService, ClientPortfolioChartData, ClientPortfolioReport, ClientPortfolioReportCollection, ClientPortfolioReportService, Collection, CollectionDictionary, CorelogicService, CorelogicSuggestion, Country, DEDUCTION_CATEGORIES, DEFAULT_VEHICLE_EXPENSE, DEPRECIATION_GROUPS, DOCUMENT_FILE_TYPES, DeductionClothingTypeEnum, DeductionSelfEducationTypeEnum, Depreciation, DepreciationCalculationEnum, DepreciationCalculationPercentEnum, DepreciationCapitalProject, DepreciationCapitalProjectService, DepreciationCollection, DepreciationForecast, DepreciationForecastCollection, DepreciationGroup, DepreciationGroupEnum, DepreciationGroupItem, DepreciationLvpAssetTypeEnum, DepreciationLvpReportItem, DepreciationLvpReportItemCollection, DepreciationReceipt, DepreciationReportItem, DepreciationReportItemCollection, DepreciationService, DepreciationTypeEnum, DepreciationWriteOffAmountEnum, Dictionary, Document, DocumentApiUrlPrefixEnum, DocumentFolder, DocumentFolderService, ENDPOINTS, EmployeeCollection, EmployeeDetails, EmployeeInvite, EmployeeInviteService, EmployeeService, Endpoint, EquityPositionChartService, EventDispatcherService, ExportDataTable, ExportFormatEnum, ExportFormatterService, ExportableCollection, FacebookService, FinancialYear, Firm, FirmService, FirmTypeEnum, HeaderTitleService, IconsFileEnum, IncomeAmountTypeEnum, IncomePosition, IncomeSource, IncomeSourceChartData, IncomeSourceCollection, IncomeSourceForecast, IncomeSourceForecastService, IncomeSourceForecastTrustTypeEnum, IncomeSourceService, IncomeSourceType, IncomeSourceTypeEnum, IncomeSourceTypeListOtherEnum, IncomeSourceTypeListSoleEnum, IncomeSourceTypeListWorkEnum, InterceptorsModule, IntercomService, InviteStatusEnum, JwtService, KompassifyService, Loan, LoanBankTypeEnum, LoanCollection, LoanFrequencyEnum, LoanInterestTypeEnum, LoanMaxNumberOfPaymentsEnum, LoanPayment, LoanPaymentCollection, LoanPayout, LoanPayoutTypeEnum, LoanRepaymentFrequencyEnum, LoanRepaymentTypeEnum, LoanService, LoanTypeEnum, LoanVehicleTypeEnum, LogbookPeriod, LoginForm, MODULE_URL_LIST, MONTHS, Message, MessageCollection, MessageDocument, MessageDocumentCollection, MessageDocumentService, MessageService, MonthNameShortEnum, MonthNumberEnum, MyAccountHistory, MyAccountHistoryInitiatedByEnum, MyAccountHistoryStatusEnum, MyAccountHistoryTypeEnum, MyTaxBusinessOrLosses, MyTaxBusinessOrLossesForm, MyTaxCgt, MyTaxCgtForm, MyTaxDeductions, MyTaxDeductionsForm, MyTaxDividends, MyTaxDividendsForm, MyTaxEmployeeShareSchemes, MyTaxEmployeeShareSchemesForm, MyTaxEstimate, MyTaxIncomeStatements, MyTaxIncomeStatementsForm, MyTaxIncomeTests, MyTaxIncomeTestsForm, MyTaxInterest, MyTaxInterestForm, MyTaxLosses, MyTaxLossesForm, MyTaxMedicareForm, MyTaxOffsets, MyTaxOffsetsForm, MyTaxOtherIncome, MyTaxOtherIncomeForm, MyTaxPartnershipsAndTrusts, MyTaxPartnershipsAndTrustsForm, MyTaxRent, MyTaxRentForm, Notification, Occupation, OccupationService, PASSWORD_REGEXPS, PasswordForm, PdfFromDataTableService, PdfFromDomElementService, PdfFromHtmlTableService, PdfOrientationEnum, PdfSettings, Phone, PhoneTypeEnum, PreloaderService, Property, PropertyCalculationService, PropertyCategory, PropertyCategoryListEnum, PropertyCategoryMovement, PropertyCategoryMovementService, PropertyCategoryService, PropertyCollection, PropertyDepreciationCalculationEnum, PropertyDocument, PropertyDocumentService, PropertyEquityChartData, PropertyEquityChartItem, PropertyForecast, PropertyReportItem, PropertyReportItemCollection, PropertyReportItemDepreciationCollection, PropertyReportItemTransaction, PropertyReportItemTransactionCollection, PropertySale, PropertySaleCollection, PropertySaleService, PropertySaleTaxExemptionMetadata, PropertyService, PropertyShare, PropertyShareAccessEnum, PropertyShareService, PropertyShareStatusEnum, PropertySubscription, PropertyTransactionReportService, PropertyValuation, RegisterClientForm, RegisterFirmForm, RegistrationInvite, RegistrationInviteStatusEnum, ReportItem, ReportItemCollection, ReportItemDetails, ResetPasswordForm, SUBSCRIPTION_DESCRIPTION, SUBSCRIPTION_TITLE, SalaryForecast, SalaryForecastFrequencyEnum, SalaryForecastService, ServiceNotificationService, ServiceNotificationStatusEnum, ServiceNotificationTypeEnum, ServicePayment, ServicePaymentStatusEnum, ServicePrice, ServicePriceRecurringIntervalEnum, ServicePriceService, ServicePriceTypeEnum, ServiceProduct, ServiceProductIdEnum, ServiceProductStatusEnum, ServiceSubscription, ServiceSubscriptionCollection, ServiceSubscriptionItem, ServiceSubscriptionStatusEnum, ShareFilterOptionsEnum, SoleBusiness, SoleBusinessAllocation, SoleBusinessForm, SoleBusinessLoss, SoleBusinessService, SoleContact, SoleContactForm, SoleContactService, SoleDetails, SoleDetailsForm, SoleDetailsService, SoleForecast, SoleForecastService, SoleInvoice, SoleInvoiceItem, SoleInvoiceTemplate, SpareDocumentSpareTypeEnum, SseService, SubscriptionService, SubscriptionTypeEnum, TAX_RETURN_CATEGORIES, TYPE_LOAN, TankTypeEnum, TaxCalculationMedicareExemptionEnum, TaxCalculationTypeEnum, TaxExemption, TaxExemptionEnum, TaxExemptionMetadata, TaxExemptionMetadataEnum, TaxExemptionService, TaxReturnCategoryListEnum, TaxReturnCategorySectionEnum, TaxReview, TaxReviewCollection, TaxReviewHistoryService, TaxReviewService, TaxReviewStatusEnum, TaxSummary, TaxSummaryListEnum, TaxSummarySection, TaxSummarySectionEnum, TaxSummaryService, TaxSummaryTaxSummaryEnum, TaxSummaryTypeEnum, TicketFeedbackEnum, TicketStatusEnum, TicketTypesEnum, Toast, ToastService, ToastTypeEnum, Transaction, TransactionAllocation, TransactionAllocationCollection, TransactionAllocationService, TransactionBase, TransactionCalculationService, TransactionCategoryEnum, TransactionCollection, TransactionMetadata, TransactionOperationEnum, TransactionReceipt, TransactionService, TransactionSourceEnum, TransactionTypeEnum, TtCoreModule, TutorialVideoService, USER_ROLES, USER_WORK_POSITION, User, UserEventSetting, UserEventSettingCollection, UserEventSettingFieldEnum, UserEventSettingService, UserEventStatusEnum, UserEventType, UserEventTypeCategory, UserEventTypeClientTypeEnum, UserEventTypeEmployeeTypeEnum, UserEventTypeFrequencyEnum, UserEventTypeService, UserEventTypeUserTypeEnum, UserInviteForm, UserMedicareExemptionEnum, UserRolesEnum, UserService, UserStatusEnum, UserSwitcherService, UserTitleEnum, UserToRegister, UserWorkDepreciationCalculationEnum, UserWorkingHolidayMakerEnum, UsersInviteService, Vehicle, VehicleClaim, VehicleClaimForm, VehicleClaimMethodEnum, VehicleClaimService, VehicleCollection, VehicleExpense, VehicleExpenseCollection, VehicleForm, VehicleLogbook, VehicleLogbookCollection, VehicleLogbookPurposeEnum, VehicleLogbookService, VehicleService, WORK_TANK_LOGBOOK_PURPOSE_OPTIONS, XlsxService, atLeastOneCheckedValidator, atoLinks, autocompleteValidator, cloneDeep, compare, compareMatOptions, conditionalValidator, createDate, displayMatOptions, enumToList, getDocIcon, passwordMatchValidator, passwordValidator, replace, roundTo, sort, sortDeep, taxReviewFilterPredicate };
+export { AbstractForm, AbstractModel, AccountSetupItem, AccountSetupItemCollection, AccountSetupService, Address, AddressService, AddressTypeEnum, AlphabetColorsEnum, AppEvent, AppEventTypeEnum, AssetEntityTypeEnum, AssetTypeEnum, AssetsService, AuthService, BANK_ACCOUNT_TYPES, Badge, BadgeColorEnum, Bank, BankAccount, BankAccountAddManualForm, BankAccountAllocationForm, BankAccountCalculationService, BankAccountChartData, BankAccountCollection, BankAccountImportForm, BankAccountPropertiesForm, BankAccountProperty, BankAccountService, BankAccountStatusEnum, BankAccountTypeEnum, BankAccountsImportForm, BankConnection, BankConnectionService, BankConnectionStatusEnum, BankLoginData, BankLoginForm, BankService, BankTransaction, BankTransactionCalculationService, BankTransactionChartData, BankTransactionCollection, BankTransactionService, BankTransactionSummaryFieldsEnum, BankTransactionTypeEnum, BasiqConfig, BasiqJob, BasiqService, BasiqToken, BorrowingExpense, BorrowingExpenseLoan, BorrowingExpenseService, CAPITAL_COSTS_ITEMS, CHART_ACCOUNTS_CATEGORIES, CalculationFormItem, CalculationFormTypeEnum, CgtExemptionAndRolloverCodeEnum, ChartAccounts, ChartAccountsCategoryECollection, ChartAccountsCategoryEnum, ChartAccountsCollection, ChartAccountsDepreciation, ChartAccountsDepreciationService, ChartAccountsEtpEnum, ChartAccountsHeading, ChartAccountsHeadingListEnum, ChartAccountsHeadingTaxDeductibleEnum, ChartAccountsHeadingTaxableEnum, ChartAccountsHeadingVehicleListEnum, ChartAccountsListEnum, ChartAccountsMetadata, ChartAccountsMetadataListEnum, ChartAccountsMetadataTypeEnum, ChartAccountsService, ChartAccountsTaxLabelsEnum, ChartAccountsTypeEnum, ChartAccountsValue, ChartData, ChartSerie, Chat, ChatService, ChatStatusEnum, ChatViewTypeEnum, ClientCollection, ClientDetails, ClientDetailsMedicareExemptionEnum, ClientDetailsWorkDepreciationCalculationEnum, ClientDetailsWorkingHolidayMakerEnum, ClientIncomeTypes, ClientIncomeTypesForm, ClientIncomeTypesService, ClientInvite, ClientInviteCollection, ClientInviteService, ClientInviteStatusEnum, ClientInviteTypeEnum, ClientMovement, ClientMovementCollection, ClientMovementService, ClientPortfolioChartData, ClientPortfolioReport, ClientPortfolioReportCollection, ClientPortfolioReportService, Collection, CollectionDictionary, CorelogicService, CorelogicSuggestion, Country, DEDUCTION_CATEGORIES, DEPRECIATION_GROUPS, DOCUMENT_FILE_TYPES, DeductionClothingTypeEnum, DeductionSelfEducationTypeEnum, Depreciation, DepreciationCalculationEnum, DepreciationCalculationPercentEnum, DepreciationCapitalProject, DepreciationCapitalProjectService, DepreciationCollection, DepreciationForecast, DepreciationForecastCollection, DepreciationGroup, DepreciationGroupEnum, DepreciationGroupItem, DepreciationLvpAssetTypeEnum, DepreciationLvpReportItem, DepreciationLvpReportItemCollection, DepreciationReceipt, DepreciationReportItem, DepreciationReportItemCollection, DepreciationService, DepreciationTypeEnum, DepreciationWriteOffAmountEnum, Dictionary, Document, DocumentApiUrlPrefixEnum, DocumentFolder, DocumentFolderService, ENDPOINTS, EmployeeCollection, EmployeeDetails, EmployeeInvite, EmployeeInviteService, EmployeeService, Endpoint, EquityPositionChartService, EventDispatcherService, ExportDataTable, ExportFormatEnum, ExportFormatterService, ExportableCollection, FacebookService, FinancialYear, Firm, FirmService, FirmTypeEnum, HeaderTitleService, IconsFileEnum, IncomeAmountTypeEnum, IncomePosition, IncomeSource, IncomeSourceChartData, IncomeSourceCollection, IncomeSourceForecast, IncomeSourceForecastService, IncomeSourceForecastTrustTypeEnum, IncomeSourceService, IncomeSourceType, IncomeSourceTypeEnum, IncomeSourceTypeListOtherEnum, IncomeSourceTypeListSoleEnum, IncomeSourceTypeListWorkEnum, InterceptorsModule, IntercomService, InviteStatusEnum, JwtService, KompassifyService, Loan, LoanBankTypeEnum, LoanCollection, LoanForm, LoanFrequencyEnum, LoanInterestTypeEnum, LoanMaxNumberOfPaymentsEnum, LoanPayment, LoanPaymentCollection, LoanPayout, LoanPayoutTypeEnum, LoanRepaymentFrequencyEnum, LoanRepaymentTypeEnum, LoanService, LoanTypeEnum, LoanVehicleTypeEnum, LogbookBestPeriodService, LogbookPeriod, LoginForm, MODULE_URL_LIST, MONTHS, Message, MessageCollection, MessageDocument, MessageDocumentCollection, MessageDocumentService, MessageService, MonthNameShortEnum, MonthNumberEnum, MyAccountHistory, MyAccountHistoryInitiatedByEnum, MyAccountHistoryStatusEnum, MyAccountHistoryTypeEnum, MyTaxBusinessOrLosses, MyTaxBusinessOrLossesForm, MyTaxCgt, MyTaxCgtForm, MyTaxDeductions, MyTaxDeductionsForm, MyTaxDividends, MyTaxDividendsForm, MyTaxEmployeeShareSchemes, MyTaxEmployeeShareSchemesForm, MyTaxEstimate, MyTaxIncomeStatements, MyTaxIncomeStatementsForm, MyTaxIncomeTests, MyTaxIncomeTestsForm, MyTaxInterest, MyTaxInterestForm, MyTaxLosses, MyTaxLossesForm, MyTaxMedicareForm, MyTaxOffsets, MyTaxOffsetsForm, MyTaxOtherIncome, MyTaxOtherIncomeForm, MyTaxPartnershipsAndTrusts, MyTaxPartnershipsAndTrustsForm, MyTaxRent, MyTaxRentForm, Notification, Occupation, OccupationService, PASSWORD_REGEXPS, PasswordForm, PdfFromDataTableService, PdfFromDomElementService, PdfFromHtmlTableService, PdfOrientationEnum, PdfSettings, Phone, PhoneTypeEnum, PreloaderService, Property, PropertyCalculationService, PropertyCategory, PropertyCategoryListEnum, PropertyCategoryMovement, PropertyCategoryMovementService, PropertyCategoryService, PropertyCollection, PropertyDepreciationCalculationEnum, PropertyDocument, PropertyDocumentService, PropertyEquityChartData, PropertyEquityChartItem, PropertyForecast, PropertyReportItem, PropertyReportItemCollection, PropertyReportItemDepreciationCollection, PropertyReportItemTransaction, PropertyReportItemTransactionCollection, PropertySale, PropertySaleCollection, PropertySaleService, PropertySaleTaxExemptionMetadata, PropertyService, PropertyShare, PropertyShareAccessEnum, PropertyShareService, PropertyShareStatusEnum, PropertySubscription, PropertyTransactionReportService, PropertyValuation, RegisterClientForm, RegisterFirmForm, RegistrationInvite, RegistrationInviteStatusEnum, ReportItem, ReportItemCollection, ReportItemDetails, ResetPasswordForm, SUBSCRIPTION_DESCRIPTION, SUBSCRIPTION_TITLE, SalaryForecast, SalaryForecastFrequencyEnum, SalaryForecastService, ServiceNotificationService, ServiceNotificationStatusEnum, ServiceNotificationTypeEnum, ServicePayment, ServicePaymentStatusEnum, ServicePrice, ServicePriceRecurringIntervalEnum, ServicePriceService, ServicePriceTypeEnum, ServiceProduct, ServiceProductIdEnum, ServiceProductStatusEnum, ServiceSubscription, ServiceSubscriptionCollection, ServiceSubscriptionItem, ServiceSubscriptionStatusEnum, ShareFilterOptionsEnum, SoleBusiness, SoleBusinessAllocation, SoleBusinessAllocationsForm, SoleBusinessForm, SoleBusinessLoss, SoleBusinessService, SoleContact, SoleContactForm, SoleContactService, SoleDetails, SoleDetailsForm, SoleDetailsService, SoleForecast, SoleForecastService, SoleInvoice, SoleInvoiceItem, SoleInvoiceTemplate, SoleInvoiceTemplateForm, SoleInvoiceTemplateService, SpareDocumentSpareTypeEnum, SseService, SubscriptionService, SubscriptionTypeEnum, TAX_RETURN_CATEGORIES, TYPE_LOAN, TankTypeEnum, TaxCalculationMedicareExemptionEnum, TaxCalculationTypeEnum, TaxExemption, TaxExemptionEnum, TaxExemptionMetadata, TaxExemptionMetadataEnum, TaxExemptionService, TaxReturnCategoryListEnum, TaxReturnCategorySectionEnum, TaxReview, TaxReviewCollection, TaxReviewHistoryService, TaxReviewService, TaxReviewStatusEnum, TaxSummary, TaxSummaryListEnum, TaxSummarySection, TaxSummarySectionEnum, TaxSummaryService, TaxSummaryTaxSummaryEnum, TaxSummaryTypeEnum, TicketFeedbackEnum, TicketStatusEnum, TicketTypesEnum, Toast, ToastService, ToastTypeEnum, Transaction, TransactionAllocation, TransactionAllocationCollection, TransactionAllocationService, TransactionBase, TransactionCalculationService, TransactionCategoryEnum, TransactionCollection, TransactionMetadata, TransactionOperationEnum, TransactionReceipt, TransactionService, TransactionSourceEnum, TransactionTypeEnum, TtCoreModule, TutorialVideoService, USER_ROLES, USER_WORK_POSITION, User, UserEventSetting, UserEventSettingCollection, UserEventSettingFieldEnum, UserEventSettingService, UserEventStatusEnum, UserEventType, UserEventTypeCategory, UserEventTypeClientTypeEnum, UserEventTypeEmployeeTypeEnum, UserEventTypeFrequencyEnum, UserEventTypeService, UserEventTypeUserTypeEnum, UserInviteForm, UserMedicareExemptionEnum, UserRolesEnum, UserService, UserStatusEnum, UserSwitcherService, UserTitleEnum, UserToRegister, UserWorkDepreciationCalculationEnum, UserWorkingHolidayMakerEnum, Vehicle, VehicleClaim, VehicleClaimCollection, VehicleClaimDetails, VehicleClaimDetailsForm, VehicleClaimDetailsMethodEnum, VehicleClaimDetailsService, VehicleClaimForm, VehicleClaimService, VehicleExpense, VehicleExpenseCollection, VehicleForm, VehicleLogbook, VehicleLogbookCollection, VehicleLogbookForm, VehicleLogbookPurposeEnum, VehicleLogbookService, VehicleService, XlsxService, atLeastOneCheckedValidator, atoLinks, autocompleteValidator, cloneDeep, compare, compareMatOptions, conditionalValidator, createDate, displayMatOptions, enumToList, fieldsSumValidator, getDocIcon, minDateValidator, passwordMatchValidator, passwordValidator, replace, roundTo, sort, sortDeep, taxReviewFilterPredicate };
 //# sourceMappingURL=taxtank-core.js.map