taxtank-core 0.32.47 → 0.32.49

package/fesm2022/taxtank-core.mjs

@@ -775,9 +775,6 @@ let AnnualClientDetails$1 = class AnnualClientDetails {
 let ClientDetails$1 = class ClientDetails extends AbstractModel {
 };
 
-let ClientIncomeTypes$1 = class ClientIncomeTypes extends ObservableModel {
-};
-
 let Occupation$1 = class Occupation extends AbstractModel {
 };
 
@@ -863,7 +860,7 @@ var TransactionOperationEnum;
     TransactionOperationEnum[TransactionOperationEnum["ALLOCATE"] = 1] = "ALLOCATE";
     TransactionOperationEnum[TransactionOperationEnum["FIND_AND_MATCH"] = 2] = "FIND_AND_MATCH";
     TransactionOperationEnum[TransactionOperationEnum["TRANSFER"] = 3] = "TRANSFER";
-    TransactionOperationEnum[TransactionOperationEnum["MATCH_INVOICE"] = 5] = "MATCH_INVOICE";
+    TransactionOperationEnum[TransactionOperationEnum["ALLOCATE_INVOICE"] = 5] = "ALLOCATE_INVOICE";
 })(TransactionOperationEnum || (TransactionOperationEnum = {}));
 
 /**
@@ -876,7 +873,7 @@ class AllocationGroup extends AbstractModel {
     static fromInvoice(invoice, bankTransactions, allocations) {
         return plainToClass(AllocationGroup, {
             date: invoice.dateFrom,
-            operation: TransactionOperationEnum.MATCH_INVOICE,
+            operation: TransactionOperationEnum.ALLOCATE_INVOICE,
             description: invoice.reference,
             invoiceNumber: invoice.getNumber(),
             tankType: TankTypeEnum.SOLE,
@@ -902,9 +899,6 @@ class AllocationGroup extends AbstractModel {
     isFindMatch() {
         return this.operation === TransactionOperationEnum.FIND_AND_MATCH;
     }
-    isMatchInvoice() {
-        return this.operation === TransactionOperationEnum.MATCH_INVOICE;
-    }
     isTransfer() {
         return this.operation === TransactionOperationEnum.TRANSFER;
     }
@@ -1437,6 +1431,14 @@ var TaxReturnItemEnum;
     TaxReturnItemEnum[TaxReturnItemEnum["LEASE_EXPENSES"] = 176] = "LEASE_EXPENSES";
 })(TaxReturnItemEnum || (TaxReturnItemEnum = {}));
 
+var ServicePriceListEnum;
+(function (ServicePriceListEnum) {
+    ServicePriceListEnum[ServicePriceListEnum["WORK_MONTHLY"] = 4] = "WORK_MONTHLY";
+    ServicePriceListEnum[ServicePriceListEnum["SOLE_MONTHLY"] = 6] = "SOLE_MONTHLY";
+    ServicePriceListEnum[ServicePriceListEnum["PROPERTY_MONTHLY"] = 7] = "PROPERTY_MONTHLY";
+    ServicePriceListEnum[ServicePriceListEnum["HOLDING_MONTHLY"] = 17] = "HOLDING_MONTHLY";
+})(ServicePriceListEnum || (ServicePriceListEnum = {}));
+
 // @TODO Artem TT-2308 move everything
 
 /**
@@ -4132,15 +4134,6 @@ __decorate([
     Type(() => ClientDetails)
 ], AnnualClientDetails.prototype, "clientDetails", void 0);
 
-class ClientIncomeTypes extends ClientIncomeTypes$1 {
-    /**
-     * Get count of selected income types
-     */
-    get length() {
-        return Object.values(this).filter((value) => typeof value === 'boolean' && value).length;
-    }
-}
-
 var ClientInviteStatusEnum;
 (function (ClientInviteStatusEnum) {
     ClientInviteStatusEnum[ClientInviteStatusEnum["PENDING"] = 1] = "PENDING";
@@ -4763,6 +4756,13 @@ __decorate([
     Type(() => SoleBusinessLossOffsetRule)
 ], SoleBusinessLoss.prototype, "offsetRule", void 0);
 
+var SoleInvoiceTaxTypeEnum;
+(function (SoleInvoiceTaxTypeEnum) {
+    SoleInvoiceTaxTypeEnum[SoleInvoiceTaxTypeEnum["TAX_EXCLUSIVE"] = 0] = "TAX_EXCLUSIVE";
+    SoleInvoiceTaxTypeEnum[SoleInvoiceTaxTypeEnum["TAX_INCLUSIVE"] = 1] = "TAX_INCLUSIVE";
+    SoleInvoiceTaxTypeEnum[SoleInvoiceTaxTypeEnum["NO_TAX"] = 2] = "NO_TAX";
+})(SoleInvoiceTaxTypeEnum || (SoleInvoiceTaxTypeEnum = {}));
+
 class SoleInvoiceItem extends SoleInvoiceItem$1 {
     constructor() {
         super(...arguments);
@@ -4771,6 +4771,25 @@ class SoleInvoiceItem extends SoleInvoiceItem$1 {
     get totalPrice() {
         return this.price * this.quantity;
     }
+    getTotalPrice(taxType, includeGST = false) {
+        const totalPrice = this.totalPrice;
+        if (includeGST) {
+            const coefficient = this.isGST && taxType === SoleInvoiceTaxTypeEnum.TAX_EXCLUSIVE ? ChartAccounts.GSTCoefficient : 1;
+            return totalPrice * coefficient;
+        }
+        const coefficient = this.isGST && taxType === SoleInvoiceTaxTypeEnum.TAX_INCLUSIVE ? ChartAccounts.GSTCoefficient : 1;
+        return totalPrice / coefficient;
+    }
+    toTransaction() {
+        return plainToClass(Transaction, {
+            chartAccounts: this.chartAccounts,
+            description: this.description,
+            source: TransactionSourceEnum.BANK_TRANSACTION,
+            isGST: this.isGST,
+            operation: TransactionOperationEnum.ALLOCATE_INVOICE,
+            invoiceItem: this
+        });
+    }
 }
 __decorate([
     Type(() => SoleInvoice)
@@ -4780,7 +4799,7 @@ __decorate([
 ], SoleInvoiceItem.prototype, "chartAccounts", void 0);
 __decorate([
     Type(() => Transaction)
-], SoleInvoiceItem.prototype, "transaction", void 0);
+], SoleInvoiceItem.prototype, "transactions", void 0);
 
 // @TODO Alex/Vik: Create some base class for User and SoleContact with common methods and properties
 class SoleContact extends SoleContact$1 {
@@ -4808,25 +4827,16 @@ var SoleInvoiceStatusesEnum;
 (function (SoleInvoiceStatusesEnum) {
     SoleInvoiceStatusesEnum[SoleInvoiceStatusesEnum["CANCELED"] = 0] = "CANCELED";
     SoleInvoiceStatusesEnum[SoleInvoiceStatusesEnum["DRAFT"] = 1] = "DRAFT";
-    SoleInvoiceStatusesEnum[SoleInvoiceStatusesEnum["PENDING"] = 2] = "PENDING";
-    SoleInvoiceStatusesEnum[SoleInvoiceStatusesEnum["PAID"] = 3] = "PAID";
-    SoleInvoiceStatusesEnum[SoleInvoiceStatusesEnum["PAID_CASH"] = 4] = "PAID_CASH";
+    SoleInvoiceStatusesEnum[SoleInvoiceStatusesEnum["OPEN"] = 2] = "OPEN";
 })(SoleInvoiceStatusesEnum || (SoleInvoiceStatusesEnum = {}));
 
-var SoleInvoiceTaxTypeEnum;
-(function (SoleInvoiceTaxTypeEnum) {
-    SoleInvoiceTaxTypeEnum[SoleInvoiceTaxTypeEnum["TAX_EXCLUSIVE"] = 0] = "TAX_EXCLUSIVE";
-    SoleInvoiceTaxTypeEnum[SoleInvoiceTaxTypeEnum["TAX_INCLUSIVE"] = 1] = "TAX_INCLUSIVE";
-    SoleInvoiceTaxTypeEnum[SoleInvoiceTaxTypeEnum["NO_TAX"] = 2] = "NO_TAX";
-})(SoleInvoiceTaxTypeEnum || (SoleInvoiceTaxTypeEnum = {}));
-
 class SoleInvoice extends SoleInvoice$1 {
     constructor() {
         super(...arguments);
         this.status = SoleInvoiceStatusesEnum.DRAFT;
         this.taxType = SoleInvoiceTaxTypeEnum.NO_TAX;
     }
-    static { this.NUMBER_LENGTH = 4; }
+    static { this.numberLength = 4; }
     /**
      * Get items array as collection
      */
@@ -4834,55 +4844,19 @@ class SoleInvoice extends SoleInvoice$1 {
         return new SoleInvoiceItemCollection(this.items);
     }
     /**
-     * Total price of all items
-     */
-    get price() {
-        return this.itemsCollection.sumBy('totalPrice');
-    }
-    /**
-     * Total invoice price without GST
+     * total without GST
      */
     get netPrice() {
-        if (this.isTaxInclusive()) {
-            // round up to make sure invoice is fully paid
-            return ceil(this.price - this.GSTAmount, 2);
-        }
-        return this.price;
+        return ceil(this.itemsCollection.getTotalPrice(this.taxType), 2);
     }
     /**
-     * Total final price (net + GST)
+     * total + GST
      */
     get grossPrice() {
-        if (this.isTaxExclusive()) {
-            // round up to make sure invoice is fully paid
-            return ceil(this.price + this.GSTAmount, 2);
-        }
-        return this.price;
+        return ceil(this.itemsCollection.getTotalPrice(this.taxType, true), 2);
     }
-    /**
-     * Total GST amount
-     */
-    get GSTAmount() {
-        switch (this.taxType) {
-            case SoleInvoiceTaxTypeEnum.TAX_INCLUSIVE:
-                return this.inclusiveGSTAmount;
-            case SoleInvoiceTaxTypeEnum.TAX_EXCLUSIVE:
-                return this.exclusiveGSTAmount;
-            case SoleInvoiceTaxTypeEnum.NO_TAX:
-                return 0;
-        }
-    }
-    /**
-     * When tax inclusive, GST amount is included to total price
-     */
-    get inclusiveGSTAmount() {
-        return this.itemsCollection.gstItems.reduce((sum, item) => sum + item.totalPrice - (item.totalPrice / (1 + ChartAccounts.GSTRatio)));
-    }
-    /**
-     * When tax exclusive, GST amount should be added additionally to total price
-     */
-    get exclusiveGSTAmount() {
-        return this.itemsCollection.gstItems.reduce((sum, item) => sum + item.totalPrice * ChartAccounts.GSTRatio);
+    get gstAmount() {
+        return this.grossPrice - this.netPrice;
     }
     isDraft() {
         return this.status === SoleInvoiceStatusesEnum.DRAFT;
@@ -4890,26 +4864,23 @@ class SoleInvoice extends SoleInvoice$1 {
     isCancelled() {
         return this.status === SoleInvoiceStatusesEnum.CANCELED;
     }
-    isPending() {
-        return this.status === SoleInvoiceStatusesEnum.PENDING;
+    isOpen() {
+        return this.status === SoleInvoiceStatusesEnum.OPEN;
     }
-    isAllocated() {
-        return this.status === SoleInvoiceStatusesEnum.PAID;
+    isPending() {
+        return this.isOpen() && this.dateTo > new Date(Date.now() - (60 * 60 * 24 * 1000));
     }
-    isPaidCash() {
-        return this.status === SoleInvoiceStatusesEnum.PAID_CASH;
+    /**
+     * overdue next day after dateTo
+     */
+    isOverdue() {
+        return this.isOpen() && this.dateTo < new Date(Date.now() - (60 * 60 * 24 * 1000));
     }
-    isPaid() {
-        return this.isAllocated() || this.isPaidCash();
+    getUnpaidAmount(transactions) {
+        return this.grossPrice - transactions.filterBy('invoiceItem.id', this.itemsCollection.getIds()).sumBy('grossAmount');
     }
     isEditable() {
-        return this.isDraft() || this.isPending();
-    }
-    isOverdue() {
-        return this.isPending() && this.dateTo < new Date();
-    }
-    isUnpaid() {
-        return this.isPending() && this.dateTo >= new Date();
+        return this.isDraft() || this.isOpen();
     }
     /**
      * GST is not available for invoices without taxes
@@ -4932,13 +4903,37 @@ class SoleInvoice extends SoleInvoice$1 {
         return this.taxType === SoleInvoiceTaxTypeEnum.TAX_INCLUSIVE;
     }
     getNumber() {
-        return String(this.number).padStart(SoleInvoice.NUMBER_LENGTH, '0');
+        return String(this.number).padStart(SoleInvoice.numberLength, '0');
     }
     get name() {
         return `invoice-${this.getNumber()}.pdf`;
     }
-    getTransactionsIds() {
-        return new Collection(this.items).mapBy('transaction.id');
+    /**
+     * allocate invoice to bankTransaction = create transactions/allocations for specific amount or full
+     */
+    allocate(bankTransaction, amount) {
+        // Percent of allocation: When amount is less than invoice unallocated amount then we have to allocate its items proportianally
+        const allocationCoefficient = amount ? amount / this.grossPrice : 1;
+        return this.items.map((item) => {
+            const transaction = plainToClass(Transaction, item.toTransaction());
+            transaction.date = bankTransaction.date;
+            transaction.amount = round(item.getTotalPrice(this.taxType) * allocationCoefficient, 2);
+            transaction.allocations = [plainToClass(TransactionAllocation, {
+                    amount: transaction.grossAmount,
+                    bankTransaction: bankTransaction,
+                })];
+            return transaction;
+        });
+    }
+    createTransactions(date, amount) {
+        // Percent of allocation: When amount is less than invoice unallocated amount then we have to allocate its items proportianally
+        const allocationCoefficient = amount ? amount / this.grossPrice : 1;
+        return this.items.map((item) => {
+            const transaction = plainToClass(Transaction, item.toTransaction());
+            transaction.date = date;
+            transaction.amount = round(item.getTotalPrice(this.taxType) * allocationCoefficient, 2);
+            return transaction;
+        });
     }
 }
 __decorate([
@@ -6275,7 +6270,7 @@ class Transaction extends Transaction$1 {
         this.amount = 0;
     }
     get invoiceId() {
-        return this.soleInvoiceItem?.invoice.id;
+        return this.invoiceItem?.invoice.id;
     }
     isDebit() {
         return this.type === TransactionTypeEnum.DEBIT;
@@ -6355,9 +6350,6 @@ class Transaction extends Transaction$1 {
     isFindAndMatch() {
         return this.operation === TransactionOperationEnum.FIND_AND_MATCH;
     }
-    isMatchInvoice() {
-        return this.operation === TransactionOperationEnum.MATCH_INVOICE;
-    }
     get debit() {
         return this.isDebit() ? Math.abs(this.grossAmount) : 0;
     }
@@ -6408,16 +6400,6 @@ class Transaction extends Transaction$1 {
     getAllocatedAmount(allocations) {
         return allocations.filterBy('transaction.id', this.id).sumBy('amount');
     }
-    /**
-     * @TODO vik TT-3363
-     */
-    getAllocatedClaimAmount(allocations) {
-        let coef = 1;
-        if (this.isSoleTank() && this.isIncome() && this.isGST) {
-            coef = ChartAccounts.GSTCoefficient;
-        }
-        return this.getAllocatedAmount(allocations) * this.claimRatio / coef;
-    }
     getUnallocatedAmount(allocations) {
         return this.netAmount - this.getAllocatedAmount(allocations);
     }
@@ -6485,7 +6467,7 @@ __decorate([
 ], Transaction.prototype, "allocations", void 0);
 __decorate([
     Type(() => SoleInvoiceItem)
-], Transaction.prototype, "soleInvoiceItem", void 0);
+], Transaction.prototype, "invoiceItem", void 0);
 __decorate([
     Transform(({ value }) => +value)
 ], Transaction.prototype, "tax", void 0);
@@ -6804,17 +6786,17 @@ class TransactionCollection extends ExportableCollection {
     getByAllocations(allocations) {
         return new TransactionCollection(this.items.filter((transaction) => allocations.hasTransaction(transaction)));
     }
-    setAllocatedClaimAmount(allocations, invoices) {
-        const allocationsByTransaction = allocations.groupBy('transaction.id');
-        const paidCacheTransactionsIds = invoices.getPaidCash().getTransactionsIds();
-        this.items.forEach((transaction) => {
-            // for paidCash invoices we haven't allocations and should use just claim amount
-            if (paidCacheTransactionsIds.includes(transaction.id)) {
-                return;
-            }
-            transaction.claimAmount = transaction.getAllocatedClaimAmount(allocationsByTransaction.get(transaction.id));
+    getByInvoices(invoices) {
+        return this.filterBy('invoiceItem.id', invoices.getInvoiceItemsIds());
+    }
+    getAmountPerInvoice() {
+        // @TODO invoiceItem.invoice will be removed on backend
+        const transactionsByInvoice = this.groupBy('invoiceItem.invoice.id');
+        const dictionary = new Dictionary([]);
+        transactionsByInvoice.keys.forEach((key) => {
+            dictionary.add(key, transactionsByInvoice.get(key).sumBy('grossAmount'));
         });
-        return this;
+        return dictionary;
     }
     /**
      * Get transactions related to Vehicle category
@@ -6906,33 +6888,17 @@ class TransactionCollection extends ExportableCollection {
         });
         return chartData;
     }
-    /**
-     * user pays GST only from allocated part (or paid) of income
-     */
-    calculateAllocatedClaimAmount(allocations) {
-        return this.reduce((sum, transaction) => sum + transaction.getAllocatedClaimAmount(allocations));
-    }
-    calculateAllocatedGST(allocations) {
-        return this.filterBy('isGST', true).reduce((sum, transaction) => sum + transaction.getAllocatedClaimAmount(allocations)) * ChartAccounts.GSTRatio;
-    }
     getAllocatedAmount(allocations) {
         return allocations.getByTransactionsIds(this.getIds()).sumBy('amount');
     }
     /**
      * @TODO vik business transactions calculated differently, separated collection?
      */
-    getBusinessClaimAmount(allocations, businessId = null) {
+    getBusinessClaimAmount(businessId = null) {
         const transactions = businessId ? this.filterBy('business.id', businessId) : this;
         const expenses = transactions.getExpenseTransactions();
         const incomes = transactions.getIncomeTransactions();
-        return incomes.calculateAllocatedClaimAmount(allocations) + expenses.sumBy('claimAmount');
-    }
-    groupByInvoice(invoices) {
-        const transactionsByInvoices = new TransactionCollection([]).groupBy();
-        invoices.toArray().forEach((invoice) => {
-            transactionsByInvoices.add(invoice.id, this.filterBy('id', invoice.getTransactionsIds()));
-        });
-        return transactionsByInvoices;
+        return incomes.sumBy('grossClaimAmount') + expenses.sumBy('claimAmount');
     }
 }
 
@@ -6972,13 +6938,6 @@ class TransactionAllocationCollection extends Collection {
     hasBankTransaction(bankTransaction) {
         return !!this.items.find((allocation) => allocation.bankTransaction.id === bankTransaction.id);
     }
-    groupByInvoice(invoices) {
-        const allocationsByInvoices = new TransactionAllocationCollection([]).groupBy();
-        invoices.toArray().forEach((invoice) => {
-            allocationsByInvoices.add(invoice.id, this.filterBy('transaction.id', invoice.getTransactionsIds()));
-        });
-        return allocationsByInvoices;
-    }
 }
 
 class DepreciationCollection extends Collection {
@@ -7377,118 +7336,6 @@ class MyTaxBusinessIncome {
     }
 }
 
-const TAX_RETURN_CATEGORIES = {
-    work: {
-        income: [
-            TaxReturnCategoryListEnum.SALARY,
-            TaxReturnCategoryListEnum.ALLOWANCES_EARNINGS_TIPS_DIRECTOR_FEES,
-            TaxReturnCategoryListEnum.EMPLOYER_LUMP_SUM_PAYMENTS,
-            TaxReturnCategoryListEnum.ETP,
-            TaxReturnCategoryListEnum.GOVERNMENT_ALLOWANCES,
-            TaxReturnCategoryListEnum.GOVERNMENT_PENSIONS,
-            TaxReturnCategoryListEnum.ANNUITIES_SUPER_INCOME_STREAMS,
-            TaxReturnCategoryListEnum.SUPERANNUATION_LUMP_SUM_PAYMENTS,
-            TaxReturnCategoryListEnum.ATTRIBUTED_PSI_INCOME,
-            TaxReturnCategoryListEnum.DIVIDENDS,
-            TaxReturnCategoryListEnum.GROSS_INTEREST
-        ],
-        expenses: [
-            TaxReturnCategoryListEnum.WORK_EXPENSES
-        ],
-        interest: [],
-        taxWithheld: [
-            TaxReturnCategoryListEnum.TAX_WITHHELD
-        ]
-    },
-    property: {
-        income: [
-            TaxReturnCategoryListEnum.GROSS_RENT
-        ],
-        expenses: [
-            TaxReturnCategoryListEnum.OTHER_RENTAL_DEDUCTIONS
-        ],
-        interest: [
-            TaxReturnCategoryListEnum.INTEREST_DEDUCTIONS
-        ],
-        depreciation: [
-            TaxReturnCategoryListEnum.CAPITAL_WORKS,
-            // @TODO Nik/Alex (it was TaxReturnCategoryListEnum.DEPRECIATION which doesn't exist)
-            TaxReturnCategoryListEnum.PLANT_AND_EQUIPMENT
-        ]
-    },
-    other: {
-        income: [
-            TaxReturnCategoryListEnum.GROSS_INTEREST,
-            TaxReturnCategoryListEnum.SHARE_SCHEMES,
-            TaxReturnCategoryListEnum.PARTNERSHIPS,
-            TaxReturnCategoryListEnum.PARTNERSHIPS_TRUSTS,
-            TaxReturnCategoryListEnum.TRUSTS,
-            TaxReturnCategoryListEnum.PSI_SBE_INCOME,
-            TaxReturnCategoryListEnum.SOLE_TRADER_BUSINESS_INCOME,
-            TaxReturnCategoryListEnum.CAPITAL_GAINS,
-            TaxReturnCategoryListEnum.FOREIGN_SOURCE_INCOME,
-            TaxReturnCategoryListEnum.BONUSES_FROM_LIFE_INSURANCE,
-            TaxReturnCategoryListEnum.FORESTRY_MANAGED_INVESTMENT_SCHEMES,
-            TaxReturnCategoryListEnum.OTHER_INCOME
-        ],
-        expenses: [
-            TaxReturnCategoryListEnum.OTHER_DEDUCTIONS
-        ],
-        taxCredits: [
-            TaxReturnCategoryListEnum.TAX_CREDITS
-        ],
-        taxOffsets: [
-            TaxReturnCategoryListEnum.TAX_OFFSETS,
-            TaxReturnCategoryListEnum.TAX_OFFSETS_LOW,
-            TaxReturnCategoryListEnum.TAX_OFFSETS_MIDDLE,
-        ]
-    },
-    sole: {
-        income: [
-            TaxReturnCategoryListEnum.GROSS_PAYMENTS_NO_ABN_GIVEN,
-            TaxReturnCategoryListEnum.GROSS_PAYMENTS_VOLUNTARY_AGREEMENT,
-            TaxReturnCategoryListEnum.GROSS_PAYMENTS_LABOUR_HIRE_OR_OTHER,
-            TaxReturnCategoryListEnum.ASSESSABLE_GOVERNMENT_PAYMENTS,
-            TaxReturnCategoryListEnum.OTHER_BUSINESS_INCOME
-        ],
-        expenses: [
-            TaxReturnCategoryListEnum.PURCHASES_AND_OTHER_COSTS,
-            TaxReturnCategoryListEnum.CONTRACTORS_SUBCONTRACTORS_COMMISSION_EXPENSES,
-            TaxReturnCategoryListEnum.SUPERANNUATION_EXPENSES,
-            TaxReturnCategoryListEnum.BAD_DEBTS,
-            TaxReturnCategoryListEnum.LEASE_EXPENSES,
-            TaxReturnCategoryListEnum.RENT_EXPENSES,
-            TaxReturnCategoryListEnum.INTEREST_EXPENSES_WITHIN_AUSTRALIA,
-            TaxReturnCategoryListEnum.INTEREST_EXPENSES_OVERSEAS,
-            TaxReturnCategoryListEnum.MOTOR_VEHICLE_EXPENSES,
-            TaxReturnCategoryListEnum.ALL_OTHER_EXPENSES
-        ],
-        depreciation: [
-            TaxReturnCategoryListEnum.DEPRECIATION_EXPENSES,
-        ],
-        loss: [
-            TaxReturnCategoryListEnum.DEFERRED_BUSINESS_LOSSES_FROM_PRIOR_YEAR,
-        ],
-        lossCurrent: [
-            TaxReturnCategoryListEnum.DEFERRED_BUSINESS_LOSSES,
-        ],
-        taxOffsets: [
-            TaxReturnCategoryListEnum.TAX_OFFSETS_SOLE
-        ],
-    },
-    summary: {
-        income: [
-            TaxReturnCategoryListEnum.GROSS_TAX_PAYABLE, TaxReturnCategoryListEnum.TAX_PAYABLE
-        ],
-        taxCredits: [
-            TaxReturnCategoryListEnum.TAX_CREDITS
-        ],
-        taxOffsets: [
-            TaxReturnCategoryListEnum.TAX_OFFSETS,
-        ]
-    }
-};
-
 var TaxSummarySectionEnum;
 (function (TaxSummarySectionEnum) {
     TaxSummarySectionEnum[TaxSummarySectionEnum["WORK_TANK"] = 1] = "WORK_TANK";
@@ -7503,7 +7350,7 @@ var TaxSummarySectionEnum;
  * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/4644110466/Tax+Return+MyTax+-+Online+Form (section "Business income or losses")
  */
 class MyTaxBusinessLosses {
-    constructor(transactions, depreciations, allocations, businessLosses, currentLoss, taxSummary) {
+    constructor(transactions, depreciations, businessLosses, currentLoss, taxSummary) {
         this.currentLoss = currentLoss;
         this.purchasesAndOtherCostsAmount = Math.abs(transactions.getExpenseTransactions()
             .filterBy('chartAccounts.id', ChartAccountsListEnum.PURCHASES_STOCK_INVENTORY)
@@ -7557,7 +7404,7 @@ class MyTaxBusinessLosses {
             .getSBPDepreciations()
             .sumBy('claimAmount');
         this.currentYearNetNonPrimaryIncomeOrLossesAmount = new TransactionCollection(transactions.toArray(), depreciations.toArray())
-            .getBusinessClaimAmount(allocations);
+            .getBusinessClaimAmount();
         this.priorYearsNonPrimaryLossesAmount = businessLosses.sumBy('openBalance');
         this.netNonPrimaryIncomeOrLossesAmount = this.currentYearNetNonPrimaryIncomeOrLossesAmount -
             this.priorYearsNonPrimaryLossesAmount;
@@ -7927,12 +7774,9 @@ class MyTaxInterest {
  * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/4644110466/Tax+Return+MyTax+-+Online+Form ("Losses" section)
  */
 class MyTaxLosses {
-    constructor(businessLosses, transactions, allocations) {
-        this.businessLosses = businessLosses;
-        this.transactions = transactions;
-        this.allocations = allocations;
+    constructor(businessLosses, transactions) {
         this.businessLossDeferred = businessLosses.sumBy('openBalance');
-        this.businessLossApplied = businessLosses.calculateBusinessLossApplied(transactions, allocations);
+        this.businessLossApplied = businessLosses.calculateBusinessLossApplied(transactions);
     }
 }
 
@@ -8084,11 +7928,11 @@ const atoLinks = {
  * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/4641357930/Rules+when+a+business+makes+a+loss+Tax+Summary
  */
 class SoleBusinessLossReport extends AbstractModel {
-    constructor(loss, transactions, depreciations, allocations) {
+    constructor(loss, transactions, depreciations) {
         super();
         this.openBalance = loss.openBalance;
         const claimAmount = new TransactionCollection(transactions.toArray(), depreciations.toArray())
-            .getBusinessClaimAmount(new TransactionAllocationCollection(allocations), loss.business.id);
+            .getBusinessClaimAmount(loss.business.id);
         this.netIncome = claimAmount;
         this.closeBalance = loss.offsetRule ? 0 : Math.min(0, claimAmount - this.openBalance);
     }
@@ -8124,60 +7968,13 @@ class VehicleExpenseCollection extends Collection {
     }
 }
 
-/**
- * @TODO refactor with Map
- * List of objects grouped by passed property
- */
-class Dictionary {
-    constructor(items, path = 'id') {
-        this.items = {};
-        if (!items.length) {
-            return;
-        }
-        this.groupItems(items, path);
-    }
-    add(key, value) {
-        this.items[key] = value;
-    }
-    get(key) {
-        return this.items[key] !== undefined ? this.items[key] : null;
-    }
-    merge(dictionary) {
-        Object.assign(this.items, dictionary.items);
-        return this;
-    }
-    toArray() {
-        return Object.values(this.items);
-    }
-    groupItems(items, path) {
-        // Do nothing if provided path was not found in the 1st item
-        if (!hasIn(items[0], path.split('.')[0])) {
-            return;
-        }
-        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';
-            }
-            this.items[key] = item;
-        });
-    }
-    get keys() {
-        return Object.keys(this.items);
-    }
-    get length() {
-        return this.keys.length;
-    }
-}
-
 class SoleBusinessLossesCollection extends Collection {
     /**
      * Business loss applied in current year, includes previous year losses and current year losses for businesses matching offset rule
      */
-    calculateBusinessLossApplied(transactions, allocations) {
+    calculateBusinessLossApplied(transactions) {
         // claim amounts for businesses that can be applied to be reduced by prior year business losses
-        const claimAmountsByBusinessId = this.getClaimAmountsByBusinessId(transactions, allocations);
+        const claimAmountsByBusinessId = this.getClaimAmountsByBusinessId(transactions);
         return Object.keys(claimAmountsByBusinessId.items).reduce((sum, businessId) => {
             const loss = this.findBy('business.id', +businessId);
             const lossOpenBalance = loss?.openBalance || 0;
@@ -8190,7 +7987,7 @@ class SoleBusinessLossesCollection extends Collection {
      * businesses with income or businesses with a loss, but which met the non-commercial loss rules
      * https://www.ato.gov.au/Business/Non-commercial-losses/
      */
-    getClaimAmountsByBusinessId(transactions, allocations) {
+    getClaimAmountsByBusinessId(transactions) {
         const claimAmountsByBusinessId = new Dictionary([]);
         const transactionsByBusinessId = transactions.groupBy('business.id');
         transactionsByBusinessId.keys.forEach((businessId) => {
@@ -8198,7 +7995,7 @@ class SoleBusinessLossesCollection extends Collection {
             const lossOffsetRule = this.findBy('business.id', +businessId)?.offsetRule;
             const businessClaimAmount = transactionsByBusinessId
                 .get(businessId)
-                .getBusinessClaimAmount(allocations, +businessId);
+                .getBusinessClaimAmount(+businessId);
             // @TODO vik it has nothing to do with getClaimAmountsByBusinessId
             // no way to apply loss for business without profit if offset rules not met
             if (businessClaimAmount < 0 && !lossOffsetRule) {
@@ -8214,46 +8011,35 @@ class SoleInvoiceItemCollection extends Collection {
     get gstItems() {
         return this.filterBy('isGST', true);
     }
+    getTotalPrice(taxType, includeGST = false) {
+        return this.reduce((sum, item) => sum + item.getTotalPrice(taxType, includeGST));
+    }
 }
 
 class SoleInvoiceCollection extends Collection {
     getOverdue() {
         return this.filter((invoice) => invoice.isOverdue());
     }
-    getUnpaid() {
-        return this.filter((invoice) => invoice.isUnpaid());
-    }
-    getPaid() {
-        return this.filter((invoice) => invoice.isAllocated());
-    }
-    getPaidCash() {
-        return this.filter((invoice) => invoice.isPaidCash());
-    }
     getPending() {
         return this.filter((invoice) => invoice.isPending());
     }
-    getTransactionsIds() {
-        return flatten(this.items.map((invoice) => invoice.getTransactionsIds()));
+    getPaid(transactions) {
+        return this.filter(invoice => transactions.getAmountPerInvoice().get(invoice.id) >= invoice.grossPrice);
     }
-    getUnallocated(allocations) {
-        return this.filter((invoice) => {
-            const invoiceAllocatedAmount = allocations.filterBy('transaction.id', invoice.getTransactionsIds()).sumBy('amount');
-            return invoice.grossPrice > invoiceAllocatedAmount;
-        });
+    getUnpaid(transactions) {
+        return this.getOpen().filter(invoice => transactions.getAmountPerInvoice().get(invoice.id) < invoice.grossPrice);
     }
-    getUnallocatedAmount(allocations) {
-        return this.sumBy('grossPrice') - allocations.filterBy('transaction.id', this.getTransactionsIds()).sumBy('amount');
+    getOpen() {
+        return this.filter((invoice) => invoice.isOpen());
     }
-    getPaidAmountById(allocations) {
-        const allocationsByTransactionId = allocations.groupBy('transaction.id');
-        const dictionary = new Dictionary([]);
-        this.toArray().forEach((invoice) => {
-            // fully paid if user marked invoice as paid with cash
-            const amount = invoice.isPaidCash() ? invoice.grossPrice
-                : allocationsByTransactionId.merge(invoice.itemsCollection.mapBy('transaction.id')).amount || 0;
-            dictionary.add(invoice.id, amount);
-        });
-        return dictionary;
+    getInvoiceItemsIds() {
+        return flatten(this.map(invoice => invoice.items.map(item => item.id)));
+    }
+    getUnpaidAmount(transactions) {
+        return this.sumBy('grossPrice') - transactions.getByInvoices(this).sumBy('grossAmount');
+    }
+    allocate(bankTransaction, amount) {
+        return flatten(this.map(invoice => invoice.allocate(bankTransaction, amount)));
     }
 }
 
@@ -8477,6 +8263,118 @@ class ReportItemCollection extends Collection {
     }
 }
 
+const TAX_RETURN_CATEGORIES = {
+    work: {
+        income: [
+            TaxReturnCategoryListEnum.SALARY,
+            TaxReturnCategoryListEnum.ALLOWANCES_EARNINGS_TIPS_DIRECTOR_FEES,
+            TaxReturnCategoryListEnum.EMPLOYER_LUMP_SUM_PAYMENTS,
+            TaxReturnCategoryListEnum.ETP,
+            TaxReturnCategoryListEnum.GOVERNMENT_ALLOWANCES,
+            TaxReturnCategoryListEnum.GOVERNMENT_PENSIONS,
+            TaxReturnCategoryListEnum.ANNUITIES_SUPER_INCOME_STREAMS,
+            TaxReturnCategoryListEnum.SUPERANNUATION_LUMP_SUM_PAYMENTS,
+            TaxReturnCategoryListEnum.ATTRIBUTED_PSI_INCOME,
+            TaxReturnCategoryListEnum.DIVIDENDS,
+            TaxReturnCategoryListEnum.GROSS_INTEREST
+        ],
+        expenses: [
+            TaxReturnCategoryListEnum.WORK_EXPENSES
+        ],
+        interest: [],
+        taxWithheld: [
+            TaxReturnCategoryListEnum.TAX_WITHHELD
+        ]
+    },
+    property: {
+        income: [
+            TaxReturnCategoryListEnum.GROSS_RENT
+        ],
+        expenses: [
+            TaxReturnCategoryListEnum.OTHER_RENTAL_DEDUCTIONS
+        ],
+        interest: [
+            TaxReturnCategoryListEnum.INTEREST_DEDUCTIONS
+        ],
+        depreciation: [
+            TaxReturnCategoryListEnum.CAPITAL_WORKS,
+            // @TODO Nik/Alex (it was TaxReturnCategoryListEnum.DEPRECIATION which doesn't exist)
+            TaxReturnCategoryListEnum.PLANT_AND_EQUIPMENT
+        ]
+    },
+    other: {
+        income: [
+            TaxReturnCategoryListEnum.GROSS_INTEREST,
+            TaxReturnCategoryListEnum.SHARE_SCHEMES,
+            TaxReturnCategoryListEnum.PARTNERSHIPS,
+            TaxReturnCategoryListEnum.PARTNERSHIPS_TRUSTS,
+            TaxReturnCategoryListEnum.TRUSTS,
+            TaxReturnCategoryListEnum.PSI_SBE_INCOME,
+            TaxReturnCategoryListEnum.SOLE_TRADER_BUSINESS_INCOME,
+            TaxReturnCategoryListEnum.CAPITAL_GAINS,
+            TaxReturnCategoryListEnum.FOREIGN_SOURCE_INCOME,
+            TaxReturnCategoryListEnum.BONUSES_FROM_LIFE_INSURANCE,
+            TaxReturnCategoryListEnum.FORESTRY_MANAGED_INVESTMENT_SCHEMES,
+            TaxReturnCategoryListEnum.OTHER_INCOME
+        ],
+        expenses: [
+            TaxReturnCategoryListEnum.OTHER_DEDUCTIONS
+        ],
+        taxCredits: [
+            TaxReturnCategoryListEnum.TAX_CREDITS
+        ],
+        taxOffsets: [
+            TaxReturnCategoryListEnum.TAX_OFFSETS,
+            TaxReturnCategoryListEnum.TAX_OFFSETS_LOW,
+            TaxReturnCategoryListEnum.TAX_OFFSETS_MIDDLE,
+        ]
+    },
+    sole: {
+        income: [
+            TaxReturnCategoryListEnum.GROSS_PAYMENTS_NO_ABN_GIVEN,
+            TaxReturnCategoryListEnum.GROSS_PAYMENTS_VOLUNTARY_AGREEMENT,
+            TaxReturnCategoryListEnum.GROSS_PAYMENTS_LABOUR_HIRE_OR_OTHER,
+            TaxReturnCategoryListEnum.ASSESSABLE_GOVERNMENT_PAYMENTS,
+            TaxReturnCategoryListEnum.OTHER_BUSINESS_INCOME
+        ],
+        expenses: [
+            TaxReturnCategoryListEnum.PURCHASES_AND_OTHER_COSTS,
+            TaxReturnCategoryListEnum.CONTRACTORS_SUBCONTRACTORS_COMMISSION_EXPENSES,
+            TaxReturnCategoryListEnum.SUPERANNUATION_EXPENSES,
+            TaxReturnCategoryListEnum.BAD_DEBTS,
+            TaxReturnCategoryListEnum.LEASE_EXPENSES,
+            TaxReturnCategoryListEnum.RENT_EXPENSES,
+            TaxReturnCategoryListEnum.INTEREST_EXPENSES_WITHIN_AUSTRALIA,
+            TaxReturnCategoryListEnum.INTEREST_EXPENSES_OVERSEAS,
+            TaxReturnCategoryListEnum.MOTOR_VEHICLE_EXPENSES,
+            TaxReturnCategoryListEnum.ALL_OTHER_EXPENSES
+        ],
+        depreciation: [
+            TaxReturnCategoryListEnum.DEPRECIATION_EXPENSES,
+        ],
+        loss: [
+            TaxReturnCategoryListEnum.DEFERRED_BUSINESS_LOSSES_FROM_PRIOR_YEAR,
+        ],
+        lossCurrent: [
+            TaxReturnCategoryListEnum.DEFERRED_BUSINESS_LOSSES,
+        ],
+        taxOffsets: [
+            TaxReturnCategoryListEnum.TAX_OFFSETS_SOLE
+        ],
+    },
+    summary: {
+        income: [
+            TaxReturnCategoryListEnum.GROSS_TAX_PAYABLE, TaxReturnCategoryListEnum.TAX_PAYABLE
+        ],
+        taxCredits: [
+            TaxReturnCategoryListEnum.TAX_CREDITS
+        ],
+        taxOffsets: [
+            TaxReturnCategoryListEnum.TAX_OFFSETS,
+        ]
+    }
+};
+
 class VehicleLogbookCollection extends Collection {
     /**
      * Calculate total kilometers traveled
@@ -10005,6 +9903,53 @@ __decorate([
     Expose()
 ], Message.prototype, "documents", void 0);
 
+/**
+ * @TODO refactor with Map
+ * List of objects grouped by passed property
+ */
+class Dictionary {
+    constructor(items, path = 'id') {
+        this.items = {};
+        if (!items.length) {
+            return;
+        }
+        this.groupItems(items, path);
+    }
+    add(key, value) {
+        this.items[key] = value;
+    }
+    get(key) {
+        return this.items[key] !== undefined ? this.items[key] : null;
+    }
+    merge(dictionary) {
+        Object.assign(this.items, dictionary.items);
+        return this;
+    }
+    toArray() {
+        return Object.values(this.items);
+    }
+    groupItems(items, path) {
+        // Do nothing if provided path was not found in the 1st item
+        if (!hasIn(items[0], path.split('.')[0])) {
+            return;
+        }
+        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';
+            }
+            this.items[key] = item;
+        });
+    }
+    get keys() {
+        return Object.keys(this.items);
+    }
+    get length() {
+        return this.keys.length;
+    }
+}
+
 /**
  * @TODO Alex remove
  */
@@ -11065,7 +11010,7 @@ let RestService$1 = class RestService extends DataService {
      * Listen for Server-Sent Events (SSE) on the specified Mercure topic
      */
     listenSSE() {
-        if (!this.mercureTopic) {
+        if (!this.mercureTopic || !this.cache) {
             return;
         }
         this.sseService.on(this.mercureTopic).pipe(map((response) => {
@@ -12209,24 +12154,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
                 }]
         }] });
 
-class ClientIncomeTypesService extends RestService$1 {
-    constructor() {
-        super(...arguments);
-        this.modelClass = ClientIncomeTypes;
-        this.collectionClass = Collection;
-        this.endpointUri = 'client-income-types';
-        this.disabledMethods = ['postBatch', 'putBatch', 'delete', 'deleteBatch'];
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ClientIncomeTypesService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ClientIncomeTypesService, providedIn: 'root' }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ClientIncomeTypesService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root'
-                }]
-        }] });
-
 class ClientInviteService extends RestService$1 {
     constructor(environment) {
         super(environment);
@@ -13976,37 +13903,10 @@ class SoleInvoiceService extends RestService {
         this.modelClass = SoleInvoice;
         this.url = 'sole-invoices';
         this.roles = [UserRolesEnum.SOLE_TANK];
-        this.listenEvents();
-    }
-    listenEvents() {
-        this.listenAllocations();
-    }
-    add(invoice) {
-        return super.add(invoice).pipe(map((newInvoice) => {
-            // invoice published right away skipping draft status
-            if (newInvoice.isPending()) {
-                this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.SOLE_INVOICE_PUBLISHED, newInvoice));
-            }
-            return newInvoice;
-        }));
-    }
-    update(invoice) {
-        return super.update(invoice).pipe(map((updatedInvoice) => {
-            if (!updatedInvoice.isDraft()) {
-                // @TODO vik use different event to reload transactions
-                this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.SOLE_INVOICE_PUBLISHED, updatedInvoice));
-            }
-            return updatedInvoice;
-        }));
     }
     updateStatus(invoice, status) {
         // @TODO use id only to avoid unexpected changes
-        return this.update(Object.assign({}, invoice, { status })).pipe(map((updatedInvoice) => {
-            if (updatedInvoice.isPending()) {
-                this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.SOLE_INVOICE_PUBLISHED, updatedInvoice));
-            }
-            return updatedInvoice;
-        }));
+        return this.update(Object.assign({}, invoice, { status }));
     }
     send(invoice, file) {
         const formData = new FormData();
@@ -14025,14 +13925,6 @@ class SoleInvoiceService extends RestService {
         const number = last(this.cache)?.number ?? 0;
         return number + 1;
     }
-    listenAllocations() {
-        this.eventDispatcherService.on([
-            AppEventTypeEnum.TRANSACTION_ALLOCATION_CREATED,
-            AppEventTypeEnum.TRANSACTION_ALLOCATION_DELETED
-        ]).subscribe(() => {
-            this.refreshCache();
-        });
-    }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: SoleInvoiceService, deps: [{ token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: SoleInvoiceService, providedIn: 'root' }); }
 }
@@ -14926,7 +14818,6 @@ class TransactionService extends RestService {
         this.listenPropertyShareUpdate();
         this.listenVehicleClaimChanges();
         this.listenPropertyForecastUpdate();
-        this.listenInvoicesPublish();
     }
     /**
      * get list of all user's TaxTank transactions
@@ -15060,6 +14951,11 @@ class TransactionService extends RestService {
             return updatedTransactions;
         }));
     }
+    deleteBatch(models) {
+        return super.deleteBatch(models).pipe(map(() => {
+            this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.TRANSACTION_DELETED, models[0]));
+        }));
+    }
     /**
      * delete transaction and related transactions
      * @param model
@@ -15143,11 +15039,6 @@ class TransactionService extends RestService {
         replace(this.cache, transactionToReplace);
         this.updateCache();
     }
-    listenInvoicesPublish() {
-        this.eventDispatcherService.on(AppEventTypeEnum.SOLE_INVOICE_PUBLISHED).subscribe(() => {
-            this.refreshCache();
-        });
-    }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: TransactionService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: TransactionService, providedIn: 'root' }); }
 }
@@ -18995,27 +18886,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
                 }]
         }], ctorParameters: function () { return [{ type: PropertyService }, { type: TransactionService }, { type: DepreciationService }, { type: ChartAccountsService }]; } });
 
-/**
- * @TODO Alex: refactor, move methods to collections and models, remove this service
- */
-class TransactionCalculationService {
-    getAllocationsByInvoices(invoices, allocations) {
-        const allocationsByInvoices = new TransactionAllocationCollection([]).groupBy();
-        invoices.toArray().forEach((invoice) => {
-            allocationsByInvoices.add(invoice.id, allocations.filterBy('transaction.id', invoice.getTransactionsIds()));
-        });
-        return allocationsByInvoices;
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: TransactionCalculationService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: TransactionCalculationService, providedIn: 'root' }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: TransactionCalculationService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root'
-                }]
-        }] });
-
 const EXCEL_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=UTF-8';
 /**
  * Service to work with XLSX (generate, download, e.t.c.)
@@ -19330,7 +19200,6 @@ const ENDPOINTS = {
     CLIENT_MOVEMENTS_CLOSE: new Endpoint('PUT', '\\/client-movements\\/\\d+\\/close'),
     CLIENT_MOVEMENTS_GET: new Endpoint('GET', '\\/client-movements'),
     CLIENT_MOVEMENTS_POST: new Endpoint('POST', '\\/client-movements'),
-    CLIENT_INCOME_TYPES_POST: new Endpoint('POST', '\\/client-income-types'),
     COUNTRIES_GET: new Endpoint('GET', '\\/countries'),
     CORELOGIC_TOKEN_GET: new Endpoint('GET', '/access\\/oauth\\/token.*$'),
     ANNUAL_CLIENT_DETAILS_GET: new Endpoint('GET', '\\/annual-client-details'),
@@ -21293,7 +21162,7 @@ class SoleInvoiceTemplateForm extends AbstractForm {
  * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/268533936/BAS+Report
  */
 class BasReportForm extends AbstractForm {
-    constructor(report, transactions, allocations, depreciations) {
+    constructor(report, transactions, depreciations) {
         super({
             dateFrom: new UntypedFormControl(report.dateFrom, Validators.required),
             dateTo: new UntypedFormControl(report.dateTo, Validators.required),
@@ -21308,7 +21177,6 @@ class BasReportForm extends AbstractForm {
             fuelTaxCredit: new UntypedFormControl(report.fuelTaxCredit, Validators.required),
             gst: new UntypedFormControl({ value: report.gst, disabled: true }),
         }, report);
-        this.report = report;
         // prefill income/expense data based on transactions/depreciations filtered by specified date
         combineLatest([this.get('dateFrom').valueChanges, this.get('dateTo').valueChanges])
             .subscribe(([dateFrom, dateTo]) => {
@@ -21318,8 +21186,8 @@ class BasReportForm extends AbstractForm {
             const expenseTransactions = new TransactionCollection(filteredTransactions.getExpenseTransactions().toArray(), filteredDepreciations.toArray());
             // all sole income claimed as 100%
             // @TODO temp fix, waiting for TT-3503/TT-3495 breaking changes
-            this.patchField('income', incomeTransactions.getAllocatedAmount(allocations));
-            this.patchField('incomeGST', incomeTransactions.calculateAllocatedGST(allocations));
+            this.patchField('income', incomeTransactions.sumBy('amount'));
+            this.patchField('incomeGST', incomeTransactions.sumBy('gstAmount'));
             this.patchField('expenseGST', expenseTransactions.filterBy('isGST', true).sumBy('gstClaimAmount'));
         });
         // calculate taxWithheldTotal
@@ -21553,18 +21421,6 @@ class AnnualClientDetailsForm extends AbstractForm {
     }
 }
 
-class ClientIncomeTypesForm extends AbstractForm {
-    constructor(clientIncomeTypes = plainToClass(ClientIncomeTypes, {})) {
-        super({
-            work: new UntypedFormControl(clientIncomeTypes.work || false),
-            property: new UntypedFormControl(clientIncomeTypes.property || false),
-            sole: new UntypedFormControl(clientIncomeTypes.sole || false),
-            holdings: new UntypedFormControl(clientIncomeTypes.holdings || false)
-        }, clientIncomeTypes, atLeastOneCheckedValidator());
-        this.clientIncomeTypes = clientIncomeTypes;
-    }
-}
-
 class LoginForm extends AbstractForm {
     constructor() {
         super({
@@ -23683,5 +23539,5 @@ var MessagesEnum;
  * Generated bundle index. Do not edit.
  */
 
-export { AbstractForm, AbstractModel, AccountSetupItem, AccountSetupItemCollection, AccountSetupService, Address, AddressForm, AddressService, AddressTypeEnum, AllocationGroup, AllocationGroupCollection, AllocationRule, AllocationRuleCollection, AllocationRuleConditionComparisonOperatorEnum, AllocationRuleConditionFieldEnum, AllocationRuleConditionOperatorEnum, AllocationRuleForm, AllocationRuleService, AllocationRuleTransaction, AllocationRuleTransactionMetaField, AllocationRuleTypeEnum, AlphabetColorsEnum, AnnualClientDetails, AnnualClientDetailsForm, AnnualClientDetailsService, AnnualFrequencyEnum, AppCurrencyPipe, AppEvent, AppEvent2, AppEventTypeEnum, AppFile, AssetEntityTypeEnum, AssetSale, AssetSaleCollection, AssetTypeEnum, AssetsService, AuthService, BANK_ACCOUNT_TYPES, Badge, BadgeColorEnum, Bank, BankAccount, BankAccountAddManualForm, BankAccountAllocationForm, BankAccountCalculationService, BankAccountChartData, BankAccountCollection, BankAccountImportForm, BankAccountPropertiesForm, BankAccountProperty, BankAccountService, BankAccountStatusEnum, BankAccountTypeEnum, BankAccountsImportForm, BankConnection, BankConnectionMessagesEnum, BankConnectionService, BankConnectionStatusEnum, BankExternalStats, BankPopularEnum, BankProviderEnum, BankService, BankTransaction, BankTransactionChartData, BankTransactionCollection, BankTransactionService, BankTransactionSummaryFieldsEnum, BankTransactionTypeEnum, BasReport, BasReportForm, BasReportService, BasiqConfig, BasiqJob, BasiqJobResponse, BasiqJobStep, BasiqMessagesEnum, BasiqService, BasiqToken, BasiqTokenService, BestVehicleLogbookCollection, BorrowingExpense, BorrowingExpenseLoan, BorrowingExpenseService, BorrowingReport, BorrowingReportForm, BorrowingReportMessagesEnum, BorrowingReportService, Budget, BudgetForm, BudgetMessagesEnum, BudgetRule, BudgetService, BusinessTypeEnum, CAPITAL_COSTS_ITEMS, CHART_ACCOUNTS_CATEGORIES, CalculationFormItem, CalculationFormTypeEnum, CgtExemptionAndRolloverCodeEnum, ChartAccounts, ChartAccountsCategoryECollection, ChartAccountsCategoryEnum, ChartAccountsCollection, ChartAccountsDepreciation, ChartAccountsDepreciationService, ChartAccountsEtpEnum, ChartAccountsHeading, ChartAccountsHeadingListEnum, ChartAccountsHeadingTaxDeductibleEnum, ChartAccountsHeadingTaxableEnum, ChartAccountsHeadingVehicleListEnum, ChartAccountsHoldingUntaxedIncomeListEnum, ChartAccountsInvoiceExpenseEnum, ChartAccountsKeepSign, ChartAccountsListEnum, ChartAccountsMetaField, ChartAccountsMetaFieldListEnum, ChartAccountsMetaFieldTypeEnum, ChartAccountsSalaryAdjustmentsListEnum, ChartAccountsSalaryIncludedListEnum, ChartAccountsService, ChartAccountsTaxLabelsEnum, ChartAccountsTypeEnum, ChartAccountsUnallocatableListEnum, ChartAccountsValue, ChartAccountsValueService, ChartData, ChartSerie, Chat, ChatCollection, ChatService, ChatStatusEnum, ChatViewTypeEnum, ClientCollection, ClientDetails, ClientDetailsForm, ClientDetailsMedicareExemptionEnum, ClientDetailsWorkDepreciationCalculationEnum, ClientDetailsWorkingHolidayMakerEnum, ClientIncomeTypes, ClientIncomeTypesForm, ClientIncomeTypesService, ClientInvite, ClientInviteCollection, ClientInviteMessages, 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, DepreciationForm, DepreciationGroup, DepreciationGroupEnum, DepreciationGroupItem, DepreciationLvpAssetTypeEnum, DepreciationLvpRateEnum, DepreciationLvpReportItem, DepreciationLvpReportItemCollection, DepreciationReportItem, DepreciationReportItemCollection, DepreciationService, DepreciationTypeEnum, DepreciationWriteOffAmountEnum, Dictionary, Document, DocumentApiUrlPrefixEnum, DocumentFolder, DocumentFolderForm, DocumentFolderMessagesEnum, DocumentFolderService, DocumentForm, DocumentMessagesEnum, DocumentService, DocumentTypeEnum, ENDPOINTS, EmployeeCollection, EmployeeDetails, EmployeeInvite, EmployeeInviteService, EmployeeMessagesEnum, EmployeeService, Endpoint, EquityPositionChartService, EventDispatcherService, ExportDataTable, ExportFormatEnum, ExportFormatterService, ExportableCollection, FacebookService, FileService, FileValidator, FinancialYear, FinancialYearService, Firm, FirmForm, FirmMessagesEnum, FirmService, FirmTypeEnum, FormValidationsEnum, GoogleService, HeaderTitleService, Holding, HoldingCollection, HoldingForm, HoldingImport, HoldingImportForm, HoldingImportMessagesEnum, HoldingImportService, HoldingIncomeForm, HoldingMessagesEnum, HoldingReinvest, HoldingReinvestForm, HoldingSale, HoldingSaleCollection, HoldingSaleForm, HoldingSaleMessagesEnum, HoldingSaleService, HoldingService, HoldingType, HoldingTypeCategoryEnum, HoldingTypeCollection, HoldingTypeExchange, HoldingTypeExchangeListEnum, HoldingTypeExchangeService, HoldingTypeForm, HoldingTypeMessagesEnum, HoldingTypeService, IconsFileEnum, IncomeAmountTypeEnum, IncomePosition, IncomeSource, IncomeSourceChartData, IncomeSourceCollection, IncomeSourceForecast, IncomeSourceForecastCollection, IncomeSourceForecastService, IncomeSourceForecastTrustTypeEnum, IncomeSourceMessagesEnum, IncomeSourceService, IncomeSourceType, IncomeSourceTypeEnum, IncomeSourceTypeListHoldingEnum, IncomeSourceTypeListOtherEnum, IncomeSourceTypeListSoleEnum, IncomeSourceTypeListWorkEnum, IncomeSourceTypeService, InterceptorsModule, IntercomService, InviteStatusEnum, JsPdf, JwtService, Loan, LoanBankTypeEnum, LoanCollection, LoanForm, LoanFrequencyEnum, LoanInterestTypeEnum, LoanInterestTypeLabelEnum, LoanMaxNumberOfPaymentsEnum, LoanPayment, LoanPaymentCollection, LoanPayout, LoanPayoutTypeEnum, LoanRepaymentFrequencyEnum, LoanRepaymentTypeEnum, LoanRepaymentTypeLabelEnum, LoanService, LoanTypeEnum, LoanVehicleTypeEnum, LoginForm, LossTypeEnum, MODULE_URL_LIST, MONTHS, Message, MessageCollection, MessageDocument, MessageDocumentCollection, MessageDocumentService, MessageService, MessagesEnum, MixpanelService, MonthNameShortEnum, MonthNumberEnum, MyAccountHistory, MyAccountHistoryInitiatedByEnum, MyAccountHistoryStatusEnum, MyAccountHistoryTypeEnum, MyTaxBusinessDetails, MyTaxBusinessDetailsForm, MyTaxBusinessIncome, MyTaxBusinessIncomeForm, MyTaxBusinessIncomeOrLossesForm, MyTaxBusinessLosses, MyTaxBusinessLossesForm, MyTaxCgt, MyTaxCgtForm, MyTaxDeductions, MyTaxDeductionsForm, MyTaxDividends, MyTaxDividendsForm, 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, PdfFromTableService, PdfOrientationEnum, PdfService, PdfSettings, Phone, PhoneForm, PhoneTypeEnum, PreloaderService, Property, PropertyAddForm, PropertyCalculationService, PropertyCategory, PropertyCategoryListEnum, PropertyCategoryMovement, PropertyCategoryMovementCollection, PropertyCategoryMovementForm, PropertyCategoryMovementService, PropertyCategoryService, PropertyCollection, PropertyDepreciationCalculationEnum, PropertyDocument, PropertyDocumentForm, PropertyDocumentMessagesEnum, PropertyDocumentService, PropertyEditForm, PropertyEquityChartData, PropertyEquityChartItem, PropertyEquityChartTypeEnum, PropertyForecast, PropertyForecastForm, PropertyMessagesEnum, PropertyReportItem, PropertyReportItemCollection, PropertyReportItemDepreciation, PropertyReportItemDepreciationCollection, PropertyReportItemTransaction, PropertyReportItemTransactionCollection, PropertySale, PropertySaleCollection, PropertySaleCostBase, PropertySaleCostBaseForm, PropertySaleCostSaleForm, PropertySaleExemptionsForm, PropertySaleService, PropertySaleTaxExemptionMetaField, PropertySaleTaxExemptionMetaFieldCollection, PropertyService, PropertyShare, PropertyShareAccessEnum, PropertyShareCollection, PropertyShareForm, PropertyShareService, PropertyShareStatusEnum, PropertySubscription, PropertyTransactionReportService, PropertyValuation, PropertyValuationCollection, PropertyValuationForm, PropertyValuationMessages, PropertyValuationService, RegisterClientForm, RegisterFirmForm, RegistrationInvite, RegistrationInviteStatusEnum, ReportItem, ReportItemCollection, ReportItemDetails, ResetPasswordForm, RestService$1 as RestService, RewardfulService, SERVICE_PRODUCT_ROLES, SafeUrlPipe, SalaryForecast, SalaryForecastFrequencyEnum, SalaryForecastService, ServiceNotificationService, ServiceNotificationStatusEnum, ServiceNotificationTypeEnum, ServicePayment, ServicePaymentMethod, ServicePaymentMethodService, ServicePaymentService, ServicePaymentStatusEnum, ServicePrice, ServicePriceCollection, ServicePriceRecurringIntervalEnum, ServicePriceService, ServicePriceTypeEnum, ServiceProduct, ServiceProductCollection, ServiceProductIconsEnum, ServiceProductIdEnum, ServiceProductService, ServiceProductStatusEnum, ServicePromoCode, ServiceSubscription, ServiceSubscriptionCollection, ServiceSubscriptionItem, ServiceSubscriptionStatusEnum, SetupItemTypeEnum, SoleBusiness, SoleBusinessActivity, SoleBusinessActivityService, SoleBusinessAllocation, SoleBusinessAllocationsForm, SoleBusinessForm, SoleBusinessLoss, SoleBusinessLossForm, SoleBusinessLossOffsetRule, SoleBusinessLossOffsetRuleService, SoleBusinessLossReport, SoleBusinessLossService, SoleBusinessLossesCollection, SoleBusinessMessagesEnum, SoleBusinessService, SoleContact, SoleContactForm, SoleContactService, SoleDepreciationMethod, SoleDepreciationMethodEnum, SoleDepreciationMethodForm, SoleDepreciationMethodService, SoleDetails, SoleDetailsForm, SoleDetailsService, SoleForecast, SoleForecastService, SoleIncomeForm, SoleInvoice, SoleInvoiceCollection, SoleInvoiceForm, SoleInvoiceItem, SoleInvoiceItemCollection, SoleInvoiceItemForm, SoleInvoiceService, SoleInvoiceStatusesEnum, SoleInvoiceTaxTypeEnum, SoleInvoiceTemplate, SoleInvoiceTemplateForm, SoleInvoiceTemplateService, SoleInvoiceTemplateTaxTypeEnum, SpareDocumentSpareTypeEnum, SseService, StatesEnum, SubscriptionItemCollection, SubscriptionMessagesEnum, SubscriptionService, TAX_RETURN_CATEGORIES, TYPE_LOAN, TankTypeEnum, TaxCalculationMedicareExemptionEnum, TaxCalculationTypeEnum, TaxExemption, TaxExemptionEnum, TaxExemptionMetaField, TaxExemptionMetaFieldEnum, TaxExemptionService, TaxReturn, TaxReturnCategory, TaxReturnCategoryListEnum, TaxReturnCategorySectionEnum, TaxReturnItem, TaxReturnItemEnum, TaxReturnItemService, TaxReview, TaxReviewCollection, TaxReviewHistoryService, TaxReviewMessagesEnum, TaxReviewService, TaxReviewStatusEnum, TaxSummary, TaxSummaryListEnum, TaxSummarySection, TaxSummarySectionEnum, TaxSummaryService, TaxSummaryTaxSummaryEnum, TaxSummaryTypeEnum, TicketFeedbackEnum, TicketStatusEnum, TicketTypesEnum, Toast, ToastService, ToastTypeEnum, Transaction, TransactionAllocation, TransactionAllocationCollection, TransactionAllocationService, TransactionBase, TransactionBaseForm, TransactionCalculationService, TransactionCategoryEnum, TransactionCollection, TransactionForm, TransactionMetaField, TransactionOperationEnum, TransactionService, TransactionSourceEnum, TransactionTypeEnum, TtCoreModule, USER_ROLES, USER_WORK_POSITION, UniqueEmailValidator, User, UserEventSetting, UserEventSettingCollection, UserEventSettingFieldEnum, UserEventSettingService, UserEventStatusEnum, UserEventType, UserEventTypeCategory, UserEventTypeClientTypeEnum, UserEventTypeCollection, UserEventTypeEmployeeTypeEnum, UserEventTypeFrequencyEnum, UserEventTypeService, UserEventTypeUserTypeEnum, UserForm, UserInviteForm, UserMedicareExemptionEnum, UserMessagesEnum, UserRolesEnum, UserService, UserStatusEnum, UserSwitcherService, UserTitleEnum, UserToRegister, UserWorkDepreciationCalculationEnum, UserWorkingHolidayMakerEnum, UsersInviteService, Vehicle, VehicleClaim, VehicleClaimCollection, VehicleClaimDetails, VehicleClaimDetailsForm, VehicleClaimDetailsMethodEnum, VehicleClaimDetailsService, VehicleClaimForm, VehicleClaimService, VehicleExpense, VehicleExpenseCollection, VehicleForm, VehicleLogbook, VehicleLogbookCollection, VehicleLogbookForm, VehicleLogbookMessages, VehicleLogbookPurposeEnum, VehicleLogbookService, VehicleMessagesEnum, VehicleService, WorkExpenseForm, WorkIncomeForm, XlsxService, YoutubeService, atLeastOneCheckedValidator, atoLinks, autocompleteValidator, cloneDeep, compare, compareMatOptions, conditionalValidator, createDate, currentFinYearValidator, displayMatOptions, enumToList, fieldsSumValidator, getDocIcon, greaterThanValidator, minDateValidator, passwordMatchValidator, passwordValidator, replace, sort, sortDeep, taxReviewFilterPredicate, toArray };
+export { AbstractForm, AbstractModel, AccountSetupItem, AccountSetupItemCollection, AccountSetupService, Address, AddressForm, AddressService, AddressTypeEnum, AllocationGroup, AllocationGroupCollection, AllocationRule, AllocationRuleCollection, AllocationRuleConditionComparisonOperatorEnum, AllocationRuleConditionFieldEnum, AllocationRuleConditionOperatorEnum, AllocationRuleForm, AllocationRuleService, AllocationRuleTransaction, AllocationRuleTransactionMetaField, AllocationRuleTypeEnum, AlphabetColorsEnum, AnnualClientDetails, AnnualClientDetailsForm, AnnualClientDetailsService, AnnualFrequencyEnum, AppCurrencyPipe, AppEvent, AppEvent2, AppEventTypeEnum, AppFile, AssetEntityTypeEnum, AssetSale, AssetSaleCollection, AssetTypeEnum, AssetsService, AuthService, BANK_ACCOUNT_TYPES, Badge, BadgeColorEnum, Bank, BankAccount, BankAccountAddManualForm, BankAccountAllocationForm, BankAccountCalculationService, BankAccountChartData, BankAccountCollection, BankAccountImportForm, BankAccountPropertiesForm, BankAccountProperty, BankAccountService, BankAccountStatusEnum, BankAccountTypeEnum, BankAccountsImportForm, BankConnection, BankConnectionMessagesEnum, BankConnectionService, BankConnectionStatusEnum, BankExternalStats, BankPopularEnum, BankProviderEnum, BankService, BankTransaction, BankTransactionChartData, BankTransactionCollection, BankTransactionService, BankTransactionSummaryFieldsEnum, BankTransactionTypeEnum, BasReport, BasReportForm, BasReportService, BasiqConfig, BasiqJob, BasiqJobResponse, BasiqJobStep, BasiqMessagesEnum, BasiqService, BasiqToken, BasiqTokenService, BestVehicleLogbookCollection, BorrowingExpense, BorrowingExpenseLoan, BorrowingExpenseService, BorrowingReport, BorrowingReportForm, BorrowingReportMessagesEnum, BorrowingReportService, Budget, BudgetForm, BudgetMessagesEnum, BudgetRule, BudgetService, BusinessTypeEnum, CAPITAL_COSTS_ITEMS, CHART_ACCOUNTS_CATEGORIES, CalculationFormItem, CalculationFormTypeEnum, CgtExemptionAndRolloverCodeEnum, ChartAccounts, ChartAccountsCategoryECollection, ChartAccountsCategoryEnum, ChartAccountsCollection, ChartAccountsDepreciation, ChartAccountsDepreciationService, ChartAccountsEtpEnum, ChartAccountsHeading, ChartAccountsHeadingListEnum, ChartAccountsHeadingTaxDeductibleEnum, ChartAccountsHeadingTaxableEnum, ChartAccountsHeadingVehicleListEnum, ChartAccountsHoldingUntaxedIncomeListEnum, ChartAccountsInvoiceExpenseEnum, ChartAccountsKeepSign, ChartAccountsListEnum, ChartAccountsMetaField, ChartAccountsMetaFieldListEnum, ChartAccountsMetaFieldTypeEnum, ChartAccountsSalaryAdjustmentsListEnum, ChartAccountsSalaryIncludedListEnum, ChartAccountsService, ChartAccountsTaxLabelsEnum, ChartAccountsTypeEnum, ChartAccountsUnallocatableListEnum, ChartAccountsValue, ChartAccountsValueService, ChartData, ChartSerie, Chat, ChatCollection, ChatService, ChatStatusEnum, ChatViewTypeEnum, ClientCollection, ClientDetails, ClientDetailsForm, ClientDetailsMedicareExemptionEnum, ClientDetailsWorkDepreciationCalculationEnum, ClientDetailsWorkingHolidayMakerEnum, ClientInvite, ClientInviteCollection, ClientInviteMessages, 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, DepreciationForm, DepreciationGroup, DepreciationGroupEnum, DepreciationGroupItem, DepreciationLvpAssetTypeEnum, DepreciationLvpRateEnum, DepreciationLvpReportItem, DepreciationLvpReportItemCollection, DepreciationReportItem, DepreciationReportItemCollection, DepreciationService, DepreciationTypeEnum, DepreciationWriteOffAmountEnum, Dictionary, Document, DocumentApiUrlPrefixEnum, DocumentFolder, DocumentFolderForm, DocumentFolderMessagesEnum, DocumentFolderService, DocumentForm, DocumentMessagesEnum, DocumentService, DocumentTypeEnum, ENDPOINTS, EmployeeCollection, EmployeeDetails, EmployeeInvite, EmployeeInviteService, EmployeeMessagesEnum, EmployeeService, Endpoint, EquityPositionChartService, EventDispatcherService, ExportDataTable, ExportFormatEnum, ExportFormatterService, ExportableCollection, FacebookService, FileService, FileValidator, FinancialYear, FinancialYearService, Firm, FirmForm, FirmMessagesEnum, FirmService, FirmTypeEnum, FormValidationsEnum, GoogleService, HeaderTitleService, Holding, HoldingCollection, HoldingForm, HoldingImport, HoldingImportForm, HoldingImportMessagesEnum, HoldingImportService, HoldingIncomeForm, HoldingMessagesEnum, HoldingReinvest, HoldingReinvestForm, HoldingSale, HoldingSaleCollection, HoldingSaleForm, HoldingSaleMessagesEnum, HoldingSaleService, HoldingService, HoldingType, HoldingTypeCategoryEnum, HoldingTypeCollection, HoldingTypeExchange, HoldingTypeExchangeListEnum, HoldingTypeExchangeService, HoldingTypeForm, HoldingTypeMessagesEnum, HoldingTypeService, IconsFileEnum, IncomeAmountTypeEnum, IncomePosition, IncomeSource, IncomeSourceChartData, IncomeSourceCollection, IncomeSourceForecast, IncomeSourceForecastCollection, IncomeSourceForecastService, IncomeSourceForecastTrustTypeEnum, IncomeSourceMessagesEnum, IncomeSourceService, IncomeSourceType, IncomeSourceTypeEnum, IncomeSourceTypeListHoldingEnum, IncomeSourceTypeListOtherEnum, IncomeSourceTypeListSoleEnum, IncomeSourceTypeListWorkEnum, IncomeSourceTypeService, InterceptorsModule, IntercomService, InviteStatusEnum, JsPdf, JwtService, Loan, LoanBankTypeEnum, LoanCollection, LoanForm, LoanFrequencyEnum, LoanInterestTypeEnum, LoanInterestTypeLabelEnum, LoanMaxNumberOfPaymentsEnum, LoanPayment, LoanPaymentCollection, LoanPayout, LoanPayoutTypeEnum, LoanRepaymentFrequencyEnum, LoanRepaymentTypeEnum, LoanRepaymentTypeLabelEnum, LoanService, LoanTypeEnum, LoanVehicleTypeEnum, LoginForm, LossTypeEnum, MODULE_URL_LIST, MONTHS, Message, MessageCollection, MessageDocument, MessageDocumentCollection, MessageDocumentService, MessageService, MessagesEnum, MixpanelService, MonthNameShortEnum, MonthNumberEnum, MyAccountHistory, MyAccountHistoryInitiatedByEnum, MyAccountHistoryStatusEnum, MyAccountHistoryTypeEnum, MyTaxBusinessDetails, MyTaxBusinessDetailsForm, MyTaxBusinessIncome, MyTaxBusinessIncomeForm, MyTaxBusinessIncomeOrLossesForm, MyTaxBusinessLosses, MyTaxBusinessLossesForm, MyTaxCgt, MyTaxCgtForm, MyTaxDeductions, MyTaxDeductionsForm, MyTaxDividends, MyTaxDividendsForm, 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, PdfFromTableService, PdfOrientationEnum, PdfService, PdfSettings, Phone, PhoneForm, PhoneTypeEnum, PreloaderService, Property, PropertyAddForm, PropertyCalculationService, PropertyCategory, PropertyCategoryListEnum, PropertyCategoryMovement, PropertyCategoryMovementCollection, PropertyCategoryMovementForm, PropertyCategoryMovementService, PropertyCategoryService, PropertyCollection, PropertyDepreciationCalculationEnum, PropertyDocument, PropertyDocumentForm, PropertyDocumentMessagesEnum, PropertyDocumentService, PropertyEditForm, PropertyEquityChartData, PropertyEquityChartItem, PropertyEquityChartTypeEnum, PropertyForecast, PropertyForecastForm, PropertyMessagesEnum, PropertyReportItem, PropertyReportItemCollection, PropertyReportItemDepreciation, PropertyReportItemDepreciationCollection, PropertyReportItemTransaction, PropertyReportItemTransactionCollection, PropertySale, PropertySaleCollection, PropertySaleCostBase, PropertySaleCostBaseForm, PropertySaleCostSaleForm, PropertySaleExemptionsForm, PropertySaleService, PropertySaleTaxExemptionMetaField, PropertySaleTaxExemptionMetaFieldCollection, PropertyService, PropertyShare, PropertyShareAccessEnum, PropertyShareCollection, PropertyShareForm, PropertyShareService, PropertyShareStatusEnum, PropertySubscription, PropertyTransactionReportService, PropertyValuation, PropertyValuationCollection, PropertyValuationForm, PropertyValuationMessages, PropertyValuationService, RegisterClientForm, RegisterFirmForm, RegistrationInvite, RegistrationInviteStatusEnum, ReportItem, ReportItemCollection, ReportItemDetails, ResetPasswordForm, RestService$1 as RestService, RewardfulService, SERVICE_PRODUCT_ROLES, SafeUrlPipe, SalaryForecast, SalaryForecastFrequencyEnum, SalaryForecastService, ServiceNotificationService, ServiceNotificationStatusEnum, ServiceNotificationTypeEnum, ServicePayment, ServicePaymentMethod, ServicePaymentMethodService, ServicePaymentService, ServicePaymentStatusEnum, ServicePrice, ServicePriceCollection, ServicePriceListEnum, ServicePriceRecurringIntervalEnum, ServicePriceService, ServicePriceTypeEnum, ServiceProduct, ServiceProductCollection, ServiceProductIconsEnum, ServiceProductIdEnum, ServiceProductService, ServiceProductStatusEnum, ServicePromoCode, ServiceSubscription, ServiceSubscriptionCollection, ServiceSubscriptionItem, ServiceSubscriptionStatusEnum, SetupItemTypeEnum, SoleBusiness, SoleBusinessActivity, SoleBusinessActivityService, SoleBusinessAllocation, SoleBusinessAllocationsForm, SoleBusinessForm, SoleBusinessLoss, SoleBusinessLossForm, SoleBusinessLossOffsetRule, SoleBusinessLossOffsetRuleService, SoleBusinessLossReport, SoleBusinessLossService, SoleBusinessLossesCollection, SoleBusinessMessagesEnum, SoleBusinessService, SoleContact, SoleContactForm, SoleContactService, SoleDepreciationMethod, SoleDepreciationMethodEnum, SoleDepreciationMethodForm, SoleDepreciationMethodService, SoleDetails, SoleDetailsForm, SoleDetailsService, SoleForecast, SoleForecastService, SoleIncomeForm, SoleInvoice, SoleInvoiceCollection, SoleInvoiceForm, SoleInvoiceItem, SoleInvoiceItemCollection, SoleInvoiceItemForm, SoleInvoiceService, SoleInvoiceStatusesEnum, SoleInvoiceTaxTypeEnum, SoleInvoiceTemplate, SoleInvoiceTemplateForm, SoleInvoiceTemplateService, SoleInvoiceTemplateTaxTypeEnum, SpareDocumentSpareTypeEnum, SseService, StatesEnum, SubscriptionItemCollection, SubscriptionMessagesEnum, SubscriptionService, TAX_RETURN_CATEGORIES, TYPE_LOAN, TankTypeEnum, TaxCalculationMedicareExemptionEnum, TaxCalculationTypeEnum, TaxExemption, TaxExemptionEnum, TaxExemptionMetaField, TaxExemptionMetaFieldEnum, TaxExemptionService, TaxReturn, TaxReturnCategory, TaxReturnCategoryListEnum, TaxReturnCategorySectionEnum, TaxReturnItem, TaxReturnItemEnum, TaxReturnItemService, TaxReview, TaxReviewCollection, TaxReviewHistoryService, TaxReviewMessagesEnum, TaxReviewService, TaxReviewStatusEnum, TaxSummary, TaxSummaryListEnum, TaxSummarySection, TaxSummarySectionEnum, TaxSummaryService, TaxSummaryTaxSummaryEnum, TaxSummaryTypeEnum, TicketFeedbackEnum, TicketStatusEnum, TicketTypesEnum, Toast, ToastService, ToastTypeEnum, Transaction, TransactionAllocation, TransactionAllocationCollection, TransactionAllocationService, TransactionBase, TransactionBaseForm, TransactionCategoryEnum, TransactionCollection, TransactionForm, TransactionMetaField, TransactionOperationEnum, TransactionService, TransactionSourceEnum, TransactionTypeEnum, TtCoreModule, USER_ROLES, USER_WORK_POSITION, UniqueEmailValidator, User, UserEventSetting, UserEventSettingCollection, UserEventSettingFieldEnum, UserEventSettingService, UserEventStatusEnum, UserEventType, UserEventTypeCategory, UserEventTypeClientTypeEnum, UserEventTypeCollection, UserEventTypeEmployeeTypeEnum, UserEventTypeFrequencyEnum, UserEventTypeService, UserEventTypeUserTypeEnum, UserForm, UserInviteForm, UserMedicareExemptionEnum, UserMessagesEnum, UserRolesEnum, UserService, UserStatusEnum, UserSwitcherService, UserTitleEnum, UserToRegister, UserWorkDepreciationCalculationEnum, UserWorkingHolidayMakerEnum, UsersInviteService, Vehicle, VehicleClaim, VehicleClaimCollection, VehicleClaimDetails, VehicleClaimDetailsForm, VehicleClaimDetailsMethodEnum, VehicleClaimDetailsService, VehicleClaimForm, VehicleClaimService, VehicleExpense, VehicleExpenseCollection, VehicleForm, VehicleLogbook, VehicleLogbookCollection, VehicleLogbookForm, VehicleLogbookMessages, VehicleLogbookPurposeEnum, VehicleLogbookService, VehicleMessagesEnum, VehicleService, WorkExpenseForm, WorkIncomeForm, XlsxService, YoutubeService, atLeastOneCheckedValidator, atoLinks, autocompleteValidator, cloneDeep, compare, compareMatOptions, conditionalValidator, createDate, currentFinYearValidator, displayMatOptions, enumToList, fieldsSumValidator, getDocIcon, greaterThanValidator, minDateValidator, passwordMatchValidator, passwordValidator, replace, sort, sortDeep, taxReviewFilterPredicate, toArray };
 //# sourceMappingURL=taxtank-core.mjs.map