taxtank-core 0.28.43 → 0.28.45

package/bundles/taxtank-core.umd.js

@@ -3239,6 +3239,7 @@
         ChartAccountsListEnum[ChartAccountsListEnum["ADVISOR_FEES"] = 286] = "ADVISOR_FEES";
         ChartAccountsListEnum[ChartAccountsListEnum["INCOME_TAX_VARIATION"] = 292] = "INCOME_TAX_VARIATION";
         ChartAccountsListEnum[ChartAccountsListEnum["PSI_ABN_NOT_QUOTED"] = 294] = "PSI_ABN_NOT_QUOTED";
+        ChartAccountsListEnum[ChartAccountsListEnum["PSI_LABOUR_HIRE_OR_OTHER"] = 294] = "PSI_LABOUR_HIRE_OR_OTHER";
         ChartAccountsListEnum[ChartAccountsListEnum["PSI_VOLUNTARY_AGREEMENT"] = 296] = "PSI_VOLUNTARY_AGREEMENT";
         ChartAccountsListEnum[ChartAccountsListEnum["RENTAL_INCOME"] = 298] = "RENTAL_INCOME";
         ChartAccountsListEnum[ChartAccountsListEnum["OTHER_RENTAL_INCOME"] = 300] = "OTHER_RENTAL_INCOME";
@@ -3248,7 +3249,6 @@
         ChartAccountsListEnum[ChartAccountsListEnum["TRANSFER"] = 615] = "TRANSFER";
         ChartAccountsListEnum[ChartAccountsListEnum["BUILDING_AT_COST"] = 304] = "BUILDING_AT_COST";
         ChartAccountsListEnum[ChartAccountsListEnum["KLMS_TRAVELLED_FOR_WORK"] = 24] = "KLMS_TRAVELLED_FOR_WORK";
-        ChartAccountsListEnum[ChartAccountsListEnum["KLMS_TRAVELLED"] = 683] = "KLMS_TRAVELLED";
         ChartAccountsListEnum[ChartAccountsListEnum["DIRECTOR_FEES"] = 6] = "DIRECTOR_FEES";
         ChartAccountsListEnum[ChartAccountsListEnum["SALARY_OR_WAGES"] = 2] = "SALARY_OR_WAGES";
         ChartAccountsListEnum[ChartAccountsListEnum["VEHICLES"] = 25] = "VEHICLES";
@@ -3282,9 +3282,42 @@
         ChartAccountsListEnum[ChartAccountsListEnum["ASSESSABLE_AMOUNT_CAPPED_DEFINED_BENEFIT"] = 639] = "ASSESSABLE_AMOUNT_CAPPED_DEFINED_BENEFIT";
         ChartAccountsListEnum[ChartAccountsListEnum["CODE_B_SUPERANNUATION_INCOME_STREAMS_DISABILITY"] = 558] = "CODE_B_SUPERANNUATION_INCOME_STREAMS_DISABILITY";
         ChartAccountsListEnum[ChartAccountsListEnum["CODE_A_SUPERANNUATION_INCOME_STREAMS_DEATH"] = 640] = "CODE_A_SUPERANNUATION_INCOME_STREAMS_DEATH";
+        ChartAccountsListEnum[ChartAccountsListEnum["SALES"] = 665] = "SALES";
+        ChartAccountsListEnum[ChartAccountsListEnum["LABOUR"] = 666] = "LABOUR";
+        ChartAccountsListEnum[ChartAccountsListEnum["UBER_INCOME"] = 667] = "UBER_INCOME";
+        ChartAccountsListEnum[ChartAccountsListEnum["COMMISSION"] = 668] = "COMMISSION";
+        ChartAccountsListEnum[ChartAccountsListEnum["PARTS_CONSUMABLES"] = 669] = "PARTS_CONSUMABLES";
+        ChartAccountsListEnum[ChartAccountsListEnum["OTHER_BUSINESS_INCOME"] = 670] = "OTHER_BUSINESS_INCOME";
+        ChartAccountsListEnum[ChartAccountsListEnum["ASSESSIBLE_GOVERNMENT_PAYMENTS"] = 671] = "ASSESSIBLE_GOVERNMENT_PAYMENTS";
+        ChartAccountsListEnum[ChartAccountsListEnum["GROSS_PAYMENTS_NO_ABN_GIVEN"] = 672] = "GROSS_PAYMENTS_NO_ABN_GIVEN";
+        ChartAccountsListEnum[ChartAccountsListEnum["GROSS_PAYMENTS_VOLUNTARY_AGREEMENT"] = 673] = "GROSS_PAYMENTS_VOLUNTARY_AGREEMENT";
+        ChartAccountsListEnum[ChartAccountsListEnum["GROSS_PAYMENTS_LABOUR_HIRE_OR_OTHER_SPECIFIED_PAYMENTS"] = 674] = "GROSS_PAYMENTS_LABOUR_HIRE_OR_OTHER_SPECIFIED_PAYMENTS";
+        ChartAccountsListEnum[ChartAccountsListEnum["PURCHASES_STOCK_INVENTORY"] = 675] = "PURCHASES_STOCK_INVENTORY";
+        ChartAccountsListEnum[ChartAccountsListEnum["CONTRACTORS_AND_COMMISSION"] = 676] = "CONTRACTORS_AND_COMMISSION";
+        ChartAccountsListEnum[ChartAccountsListEnum["SUPERANNUATION"] = 677] = "SUPERANNUATION";
+        ChartAccountsListEnum[ChartAccountsListEnum["BAD_DEBT"] = 678] = "BAD_DEBT";
+        ChartAccountsListEnum[ChartAccountsListEnum["LEASE_EXPENSES_COMMERCIAL"] = 679] = "LEASE_EXPENSES_COMMERCIAL";
+        ChartAccountsListEnum[ChartAccountsListEnum["RENT_EXPENSES_COMMERCIAL_PREMISES"] = 680] = "RENT_EXPENSES_COMMERCIAL_PREMISES";
+        ChartAccountsListEnum[ChartAccountsListEnum["INTEREST_EXPENSES_AUSTRALIA"] = 681] = "INTEREST_EXPENSES_AUSTRALIA";
+        ChartAccountsListEnum[ChartAccountsListEnum["INTEREST_EXPENSES_OVERSEAS"] = 682] = "INTEREST_EXPENSES_OVERSEAS";
+        ChartAccountsListEnum[ChartAccountsListEnum["KLMS_TRAVELLED"] = 683] = "KLMS_TRAVELLED";
+        ChartAccountsListEnum[ChartAccountsListEnum["FUEL_OIL"] = 684] = "FUEL_OIL";
+        ChartAccountsListEnum[ChartAccountsListEnum["SERVICES_MAINTENANCE"] = 685] = "SERVICES_MAINTENANCE";
+        ChartAccountsListEnum[ChartAccountsListEnum["REGISTRATION"] = 686] = "REGISTRATION";
+        ChartAccountsListEnum[ChartAccountsListEnum["LEASE_INTEREST_PAYMENTS"] = 687] = "LEASE_INTEREST_PAYMENTS";
+        ChartAccountsListEnum[ChartAccountsListEnum["SOLE_VEHICLE_LOAN_INTEREST"] = 688] = "SOLE_VEHICLE_LOAN_INTEREST";
+        ChartAccountsListEnum[ChartAccountsListEnum["INSURANCE"] = 689] = "INSURANCE";
+        ChartAccountsListEnum[ChartAccountsListEnum["TYRES"] = 690] = "TYRES";
+        ChartAccountsListEnum[ChartAccountsListEnum["BATTERIES"] = 691] = "BATTERIES";
+        ChartAccountsListEnum[ChartAccountsListEnum["CAR_WASH"] = 692] = "CAR_WASH";
+        ChartAccountsListEnum[ChartAccountsListEnum["PARKING_TOLLS"] = 693] = "PARKING_TOLLS";
+        ChartAccountsListEnum[ChartAccountsListEnum["OTHER_SOLE_EXPENSES"] = 694] = "OTHER_SOLE_EXPENSES";
         ChartAccountsListEnum[ChartAccountsListEnum["PERSONAL_EXPENSES"] = 628] = "PERSONAL_EXPENSES";
         ChartAccountsListEnum[ChartAccountsListEnum["PERSONAL_INCOME"] = 630] = "PERSONAL_INCOME";
         ChartAccountsListEnum[ChartAccountsListEnum["PLATFORM_FEES"] = 857] = "PLATFORM_FEES";
+        ChartAccountsListEnum[ChartAccountsListEnum["PSI_OTHER"] = 858] = "PSI_OTHER";
+        ChartAccountsListEnum[ChartAccountsListEnum["PSI_DEDUCTION_ASSOCIATES"] = 859] = "PSI_DEDUCTION_ASSOCIATES";
+        ChartAccountsListEnum[ChartAccountsListEnum["PSI_DEDUCTION_OTHER"] = 860] = "PSI_DEDUCTION_OTHER";
     })(exports.ChartAccountsListEnum || (exports.ChartAccountsListEnum = {}));
 
     exports.ChartAccountsCategoryEnum = void 0;
@@ -7341,6 +7374,73 @@
         return VehicleLogbookCollection;
     }(Collection));
 
+    /**
+     * List of objects grouped by passed property
+     */
+    var Dictionary = /** @class */ (function () {
+        function Dictionary(items, path) {
+            if (path === void 0) { path = 'id'; }
+            this.items = {};
+            if (!items.length) {
+                return;
+            }
+            // Do nothing if provided path was not found in the 1st item
+            if (!hasIn__default["default"](items[0], path.split('.')[0])) {
+                return;
+            }
+            this.groupItems(items, path);
+        }
+        Dictionary.prototype.add = function (key, value) {
+            this.items[key] = value;
+        };
+        Dictionary.prototype.get = function (key) {
+            return this.items[key] !== undefined ? this.items[key] : null;
+        };
+        Dictionary.prototype.groupItems = function (items, path) {
+            var _this = this;
+            items.forEach(function (item) {
+                var key = get__default["default"](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;
+            });
+        };
+        return Dictionary;
+    }());
+
+    var SoleBusinessLossesCollection = /** @class */ (function (_super) {
+        __extends(SoleBusinessLossesCollection, _super);
+        function SoleBusinessLossesCollection() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        /**
+         * Calculate business losses applied to the current year
+         */
+        SoleBusinessLossesCollection.prototype.calculateBusinessLossApplied = function (transactions) {
+            var _this = this;
+            var transactionsByBusinessIds = new CollectionDictionary(transactions, 'business.id');
+            // Dictionary with pairs key = business id, value = business claim amount
+            var claimAmountsByBusinessId = new Dictionary([]);
+            transactionsByBusinessIds.keys.forEach(function (businessId) {
+                var businessClaimAmount = transactionsByBusinessIds
+                    .get(businessId)
+                    .getClaimAmountByBusinessId(+businessId);
+                // only businesses with positive income are included in the calculation
+                if (businessClaimAmount > 0) {
+                    claimAmountsByBusinessId.add(businessId, businessClaimAmount);
+                }
+            });
+            return Object.keys(claimAmountsByBusinessId.items).reduce(function (sum, businessId) {
+                var _a;
+                var lossOpenBalance = ((_a = _this.findBy('business.id', +businessId)) === null || _a === void 0 ? void 0 : _a.openBalance) || 0;
+                return sum + Math.min(lossOpenBalance, claimAmountsByBusinessId.get(businessId));
+            }, 0);
+        };
+        return SoleBusinessLossesCollection;
+    }(Collection));
+
     var SoleInvoiceCollection = /** @class */ (function (_super) {
         __extends(SoleInvoiceCollection, _super);
         function SoleInvoiceCollection() {
@@ -7864,8 +7964,14 @@
         function TransactionBaseCollection() {
             return _super !== null && _super.apply(this, arguments) || this;
         }
-        TransactionBaseCollection.prototype.getClaimAmountByBusiness = function (business) {
-            return +this.filterBy('business.id', business.id).items.map(function (transaction) { return transaction instanceof Depreciation ? -transaction.claimAmount : transaction['claimAmount']; }).reduce(function (sum, claimAmount) { return sum + claimAmount; }, 0).toFixed(2);
+        TransactionBaseCollection.prototype.getClaimAmountByBusinessId = function (businessId) {
+            return +this.filterBy('business.id', businessId).items.map(function (transaction) { return transaction instanceof Depreciation ? -transaction.claimAmount : transaction['claimAmount']; }).reduce(function (sum, claimAmount) { return sum + claimAmount; }, 0).toFixed(2);
+        };
+        /**
+         * Get business related transactions
+         */
+        TransactionBaseCollection.prototype.getWithBusiness = function () {
+            return this.filter(function (transaction) { return !!transaction.business; });
         };
         return TransactionBaseCollection;
     }(Collection));
@@ -8071,42 +8177,6 @@
         return MessageCollection;
     }(Collection));
 
-    /**
-     * List of objects grouped by passed property
-     */
-    var Dictionary = /** @class */ (function () {
-        function Dictionary(items, path) {
-            if (path === void 0) { path = 'id'; }
-            this.items = {};
-            if (!items.length) {
-                return;
-            }
-            // Do nothing if provided path was not found in the 1st item
-            if (!hasIn__default["default"](items[0], path.split('.')[0])) {
-                return;
-            }
-            this.groupItems(items, path);
-        }
-        Dictionary.prototype.add = function (key, value) {
-            this.items[key] = value;
-        };
-        Dictionary.prototype.get = function (key) {
-            return this.items[key] !== undefined ? this.items[key] : null;
-        };
-        Dictionary.prototype.groupItems = function (items, path) {
-            var _this = this;
-            items.forEach(function (item) {
-                var key = get__default["default"](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;
-            });
-        };
-        return Dictionary;
-    }());
-
     exports.ChatStatusEnum = void 0;
     (function (ChatStatusEnum) {
         ChatStatusEnum[ChatStatusEnum["ACTIVE"] = 1] = "ACTIVE";
@@ -9326,6 +9396,8 @@
         ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["ALLOWANCES_EARNINGS_TIPS_DIRECTOR_FEES"] = 2] = "ALLOWANCES_EARNINGS_TIPS_DIRECTOR_FEES";
         ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["AUSTRALIAN_GOVERNMENT_ALLOWANCES_PAYMENTS"] = 4] = "AUSTRALIAN_GOVERNMENT_ALLOWANCES_PAYMENTS";
         ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["AUSTRALIAN_GOVERNMENT_PENSIONS_ALLOWANCES"] = 5] = "AUSTRALIAN_GOVERNMENT_PENSIONS_ALLOWANCES";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["WORK_RELATED_CAR_EXPENSES"] = 8] = "WORK_RELATED_CAR_EXPENSES";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["DEPRECIATION_VEHICLES"] = 9] = "DEPRECIATION_VEHICLES";
         ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["WORK_RELATED_TRAVEL_EXPENSES"] = 10] = "WORK_RELATED_TRAVEL_EXPENSES";
         ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["COMPULSORY_WORK_UNIFORM"] = 11] = "COMPULSORY_WORK_UNIFORM";
         ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["PROTECTION_CLOTHING"] = 12] = "PROTECTION_CLOTHING";
@@ -9350,6 +9422,23 @@
         ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["ETP"] = 39] = "ETP";
         ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["INTEREST_DEDUCTIONS"] = 47] = "INTEREST_DEDUCTIONS";
         ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["DIVIDEND_DEDUCTIONS"] = 48] = "DIVIDEND_DEDUCTIONS";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["PURCHASES_STOCK_INVENTORY"] = 52] = "PURCHASES_STOCK_INVENTORY";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["CONTRACTORS_COMMISSION"] = 53] = "CONTRACTORS_COMMISSION";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["SUPERANNUATION"] = 54] = "SUPERANNUATION";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["BAD_DEBT"] = 55] = "BAD_DEBT";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["LEASE_EXPENSES"] = 56] = "LEASE_EXPENSES";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["RENT_EXPENSES"] = 57] = "RENT_EXPENSES";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["INTEREST_EXPENSES_AUSTRALIA"] = 58] = "INTEREST_EXPENSES_AUSTRALIA";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["INTEREST_EXPENSES_OVERSEAS"] = 59] = "INTEREST_EXPENSES_OVERSEAS";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["KLMS"] = 60] = "KLMS";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["FUEL_OIL"] = 61] = "FUEL_OIL";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["SERVICES_MAINTENANCE"] = 62] = "SERVICES_MAINTENANCE";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["REGISTRATION"] = 63] = "REGISTRATION";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["LEASE_INTEREST_PAYMENTS"] = 64] = "LEASE_INTEREST_PAYMENTS";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["INSURANCE"] = 65] = "INSURANCE";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["TYRES_BATTERIES"] = 66] = "TYRES_BATTERIES";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["OTHER_EXPENSES"] = 67] = "OTHER_EXPENSES";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["DEPRECIATION_EXPENSES"] = 68] = "DEPRECIATION_EXPENSES";
     })(exports.ChartAccountsHeadingListEnum || (exports.ChartAccountsHeadingListEnum = {}));
 
     exports.ChartAccountsHeadingTaxableEnum = void 0;
@@ -11037,12 +11126,213 @@
     }(TaxExemptionMetadata$1));
 
     /**
-     * @Todo waiting for the Sole tank implementation
+     * Enum with type of business for My Tax report
+     * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/4644110466/Tax+Return+MyTax+-+Online+Form
+     * ("Business income or losses" section, "F. Type of business" field)
+     */
+    exports.BusinessTypeEnum = void 0;
+    (function (BusinessTypeEnum) {
+        BusinessTypeEnum[BusinessTypeEnum["PARTNERSHIP"] = 0] = "PARTNERSHIP";
+        BusinessTypeEnum[BusinessTypeEnum["SOLE_TRADER"] = 1] = "SOLE_TRADER";
+    })(exports.BusinessTypeEnum || (exports.BusinessTypeEnum = {}));
+
+    /**
+     * Enum with business loss types
+     * Values are related to SoleBusinessLossOffsetRule ids
+     * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/4644110466/Tax+Return+MyTax+-+Online+Form
+     * ("Business income or losses" section, "G. Type of loss" field)
      */
-    var MyTaxBusinessOrLosses = /** @class */ (function () {
-        function MyTaxBusinessOrLosses(transactions) {
+    exports.LossTypeEnum = void 0;
+    (function (LossTypeEnum) {
+        LossTypeEnum[LossTypeEnum["ASSESSABLE_INCOME_TEST"] = 2] = "ASSESSABLE_INCOME_TEST";
+        LossTypeEnum[LossTypeEnum["PROFIT_TEST"] = 3] = "PROFIT_TEST";
+        LossTypeEnum[LossTypeEnum["REAL_PROPERTY_TEST"] = 4] = "REAL_PROPERTY_TEST";
+        LossTypeEnum[LossTypeEnum["OTHER_ASSETS_TEST"] = 5] = "OTHER_ASSETS_TEST";
+        LossTypeEnum[LossTypeEnum["COMMISSIONERS_DISCRETION"] = 8] = "COMMISSIONERS_DISCRETION";
+        LossTypeEnum[LossTypeEnum["PRIMARY_PRODUCTION_AND_ARTS_BUSINESS"] = 7] = "PRIMARY_PRODUCTION_AND_ARTS_BUSINESS";
+    })(exports.LossTypeEnum || (exports.LossTypeEnum = {}));
+
+    /**
+     * Main information of Sole businesses
+     * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/4644110466/Tax+Return+MyTax+-+Online+Form (section "Business income or losses")
+     */
+    var MyTaxBusinessDetails = /** @class */ (function () {
+        function MyTaxBusinessDetails(vehicleClaimDetails, businesses, soleDetails, user) {
+            var _a;
+            this.businessActivities = uniqBy__default["default"](businesses.mapBy('activity'), 'id');
+            this.businessABN = soleDetails === null || soleDetails === void 0 ? void 0 : soleDetails.abn;
+            this.businessAddress = (_a = user.address) === null || _a === void 0 ? void 0 : _a.name;
+            this.vehicleClaimDetails = vehicleClaimDetails;
+        }
+        return MyTaxBusinessDetails;
+    }());
+
+    /**
+     * Const with the categories for my-tax 'Business income or losses' report.
+     * Grouped by ChartAccountsHeadingListEnum / ChartAccountsListEnum based on rules from documentation
+     * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/4644110466/Tax+Return+MyTax+-+Online+Form (section "Business income or losses")
+     */
+    var BUSINESS_INCOME_OR_LOSSES_CATEGORIES = {
+        psiIncomes: [
+            exports.ChartAccountsListEnum.PSI_VOLUNTARY_AGREEMENT,
+            exports.ChartAccountsListEnum.PSI_ABN_NOT_QUOTED,
+            exports.ChartAccountsListEnum.PSI_LABOUR_HIRE_OR_OTHER,
+            exports.ChartAccountsListEnum.PSI_OTHER,
+        ],
+        psiDeductions: [
+            exports.ChartAccountsListEnum.PSI_DEDUCTION_ASSOCIATES,
+            exports.ChartAccountsListEnum.PSI_DEDUCTION_OTHER
+        ],
+        otherBusinessIncome: [
+            exports.ChartAccountsListEnum.SALES,
+            exports.ChartAccountsListEnum.LABOUR,
+            exports.ChartAccountsListEnum.UBER_INCOME,
+            exports.ChartAccountsListEnum.COMMISSION,
+            exports.ChartAccountsListEnum.PARTS_CONSUMABLES,
+            exports.ChartAccountsListEnum.OTHER_BUSINESS_INCOME
+        ]
+    };
+
+    /**
+     * Sole business information related to income transactions
+     * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/4644110466/Tax+Return+MyTax+-+Online+Form (section "Business income or losses")
+     */
+    var MyTaxBusinessIncome = /** @class */ (function () {
+        function MyTaxBusinessIncome(psiIncome, soleIncome) {
+            this.psiIncomeAmount = psiIncome.filterBy('chartAccounts.heading.id', exports.ChartAccountsHeadingListEnum.PSI).amount;
+            this.psiVoluntaryAgreementAmount = psiIncome
+                .filterBy('chartAccounts.id', exports.ChartAccountsListEnum.PSI_VOLUNTARY_AGREEMENT)
+                .amount;
+            this.psiABNNotQuotedAmount = psiIncome
+                .filterBy('chartAccounts.id', exports.ChartAccountsListEnum.PSI_ABN_NOT_QUOTED)
+                .amount;
+            this.psiLabourHireOrOtherAmount = psiIncome
+                .filterBy('chartAccounts.id', exports.ChartAccountsListEnum.PSI_LABOUR_HIRE_OR_OTHER)
+                .amount;
+            this.psiOtherAmount = psiIncome
+                .filterBy('chartAccounts.id', exports.ChartAccountsListEnum.PSI_OTHER)
+                .amount;
+            this.psiDeductionAssociatesAmount = psiIncome
+                .filterBy('chartAccounts.id', exports.ChartAccountsListEnum.PSI_DEDUCTION_ASSOCIATES)
+                .amount;
+            this.psiDeductionOtherAmount = psiIncome
+                .filterBy('chartAccounts.id', exports.ChartAccountsListEnum.PSI_DEDUCTION_OTHER)
+                .amount;
+            this.netPSIAmount = psiIncome
+                .filterBy('chartAccounts.id', BUSINESS_INCOME_OR_LOSSES_CATEGORIES.psiIncomes)
+                .amount -
+                psiIncome
+                    .filterBy('chartAccounts.id', BUSINESS_INCOME_OR_LOSSES_CATEGORIES.psiDeductions)
+                    .amount;
+            this.psiVoluntaryAgreementTax = psiIncome
+                .filterBy('chartAccounts.id', exports.ChartAccountsListEnum.PSI_VOLUNTARY_AGREEMENT)
+                .sumBy('tax');
+            this.psiABNNotQuotedTax = psiIncome
+                .filterBy('chartAccounts.id', exports.ChartAccountsListEnum.PSI_ABN_NOT_QUOTED)
+                .sumBy('tax');
+            this.psiLabourHireOrOtherTax = psiIncome
+                .filterBy('chartAccounts.id', [exports.ChartAccountsListEnum.PSI_LABOUR_HIRE_OR_OTHER, exports.ChartAccountsListEnum.PSI_OTHER])
+                .sumBy('tax');
+            this.netPSITax = psiIncome
+                .filterBy('chartAccounts.id', BUSINESS_INCOME_OR_LOSSES_CATEGORIES.psiIncomes)
+                .sumBy('tax');
+            this.grossPaymentsNoAbsGivenAmount = soleIncome
+                .filterBy('chartAccounts.id', exports.ChartAccountsListEnum.GROSS_PAYMENTS_NO_ABN_GIVEN)
+                .amount;
+            this.grossPaymentsVoluntaryAgreementAmount = soleIncome
+                .filterBy('chartAccounts.id', exports.ChartAccountsListEnum.GROSS_PAYMENTS_VOLUNTARY_AGREEMENT)
+                .amount;
+            this.grossPaymentsLabourHireAmount = soleIncome
+                .filterBy('chartAccounts.id', exports.ChartAccountsListEnum.GROSS_PAYMENTS_LABOUR_HIRE_OR_OTHER_SPECIFIED_PAYMENTS)
+                .amount;
+            this.assessibleGovernmentPaymentsAmount = soleIncome
+                .filterBy('chartAccounts.id', exports.ChartAccountsListEnum.ASSESSIBLE_GOVERNMENT_PAYMENTS)
+                .amount;
+            this.otherBusinessIncomeAmount = soleIncome
+                .filterBy('chartAccounts.id', BUSINESS_INCOME_OR_LOSSES_CATEGORIES.otherBusinessIncome)
+                .amount;
+            this.nonPrimaryProductionTotalAmount = soleIncome
+                .filterBy('chartAccounts.category', exports.ChartAccountsCategoryEnum.SOLE_INCOME)
+                .amount;
+            this.grossPaymentsNoAbsGivenTax = soleIncome
+                .filterBy('chartAccounts.id', exports.ChartAccountsListEnum.GROSS_PAYMENTS_NO_ABN_GIVEN)
+                .sumBy('tax');
+            this.grossPaymentsVoluntaryAgreementTax = soleIncome
+                .filterBy('chartAccounts.id', exports.ChartAccountsListEnum.GROSS_PAYMENTS_VOLUNTARY_AGREEMENT)
+                .sumBy('tax');
+            this.grossPaymentsLabourHireTax = soleIncome
+                .filterBy('chartAccounts.id', exports.ChartAccountsListEnum.GROSS_PAYMENTS_LABOUR_HIRE_OR_OTHER_SPECIFIED_PAYMENTS)
+                .sumBy('tax');
         }
-        return MyTaxBusinessOrLosses;
+        return MyTaxBusinessIncome;
+    }());
+
+    /**
+     * Sole business information related to expense transactions (losses)
+     * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/4644110466/Tax+Return+MyTax+-+Online+Form (section "Business income or losses")
+     */
+    var MyTaxBusinessLosses = /** @class */ (function () {
+        function MyTaxBusinessLosses(transactions, depreciations, businessLosses, currentLoss) {
+            this.currentLoss = currentLoss;
+            this.purchasesAndOtherCostsAmount = Math.abs(transactions.getExpenseTransactions()
+                .filterBy('chartAccounts.id', exports.ChartAccountsListEnum.PURCHASES_STOCK_INVENTORY)
+                .sumBy('claimAmount'));
+            this.contractorsAndCommissionAmount = Math.abs(transactions.getExpenseTransactions()
+                .filterBy('chartAccounts.id', exports.ChartAccountsListEnum.CONTRACTORS_AND_COMMISSION)
+                .sumBy('claimAmount'));
+            this.superannuationAmount = Math.abs(transactions.getExpenseTransactions()
+                .filterBy('chartAccounts.id', exports.ChartAccountsListEnum.SUPERANNUATION)
+                .sumBy('claimAmount'));
+            this.badDebtAmount = Math.abs(transactions.getExpenseTransactions()
+                .filterBy('chartAccounts.id', exports.ChartAccountsListEnum.BAD_DEBT)
+                .sumBy('claimAmount'));
+            this.leaseExpensesCommercialAmount = Math.abs(transactions.getExpenseTransactions()
+                .filterBy('chartAccounts.id', exports.ChartAccountsListEnum.LEASE_EXPENSES_COMMERCIAL)
+                .sumBy('claimAmount'));
+            this.rentExpensesCommercialPremisesAmount = Math.abs(transactions.getExpenseTransactions()
+                .filterBy('chartAccounts.id', exports.ChartAccountsListEnum.RENT_EXPENSES_COMMERCIAL_PREMISES)
+                .sumBy('claimAmount'));
+            this.interestExpensesAustraliaAmount = Math.abs(transactions.getExpenseTransactions()
+                .filterBy('chartAccounts.id', exports.ChartAccountsListEnum.INTEREST_EXPENSES_AUSTRALIA)
+                .sumBy('claimAmount'));
+            this.interestExpensesOverseasAmount = Math.abs(transactions.getExpenseTransactions()
+                .filterBy('chartAccounts.id', exports.ChartAccountsListEnum.INTEREST_EXPENSES_OVERSEAS)
+                .sumBy('claimAmount'));
+            this.kmsTravelledExpensesAmount = Math.abs(transactions
+                .filterBy('chartAccounts.heading.id', [exports.ChartAccountsHeadingListEnum.WORK_RELATED_CAR_EXPENSES, exports.ChartAccountsHeadingListEnum.DEPRECIATION_VEHICLES])
+                .sumBy('claimAmount'));
+            this.otherExpensesAmount = Math.abs(transactions
+                .filterBy('chartAccounts.heading.id', exports.ChartAccountsHeadingListEnum.OTHER_EXPENSES)
+                .sumBy('claimAmount'));
+            this.totalNonPrimaryProductionExpensesAmount = Math.abs(transactions
+                .filterBy('chartAccounts.category', [exports.ChartAccountsCategoryEnum.SOLE_EXPENSE, exports.ChartAccountsCategoryEnum.SOLE_DEPRECIATION])
+                .sumBy('claimAmount'));
+            // depreciations
+            this.depreciationExpensesAmount = depreciations
+                .filterBy('chartAccounts.heading.id', exports.ChartAccountsHeadingListEnum.DEPRECIATION_EXPENSES)
+                .sumBy('claimAmount');
+            this.deductionsForCertainAssetsAmount = depreciations
+                .getWrittenOffDepreciations()
+                .sumBy('claimAmount');
+            this.deductionsForGeneralSmallBusinessPoolAmount = depreciations
+                .getSBPDepreciations()
+                .sumBy('claimAmount');
+            this.currentYearNetNonPrimaryIncomeOrLossesAmount = transactions.getIncomeTransactions()
+                .filterBy('chartAccounts.category', exports.ChartAccountsCategoryEnum.SOLE_INCOME)
+                .amount -
+                Math.abs(transactions
+                    .filterBy('chartAccounts.category', [exports.ChartAccountsCategoryEnum.SOLE_EXPENSE, exports.ChartAccountsCategoryEnum.SOLE_DEPRECIATION])
+                    .sumBy('claimAmount'));
+            this.priorYearsNonPrimaryLossesAmount = this.calculatePriorYearsOpenBalance(businessLosses);
+            this.netNonPrimaryIncomeOrLossesAmount = transactions.getIncomeTransactions()
+                .filterBy('chartAccounts.category', exports.ChartAccountsCategoryEnum.SOLE_INCOME)
+                .amount -
+                this.priorYearsNonPrimaryLossesAmount;
+        }
+        MyTaxBusinessLosses.prototype.calculatePriorYearsOpenBalance = function (businessLosses) {
+            return businessLosses ? businessLosses.sumBy('openBalance') : 0;
+        };
+        return MyTaxBusinessLosses;
     }());
 
     ;
@@ -11411,11 +11701,15 @@
     }());
 
     /**
-     * @Todo waiting for Sole tank implementation
+     * Sole business losses report
+     * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/4644110466/Tax+Return+MyTax+-+Online+Form ("Losses" section)
      */
     var MyTaxLosses = /** @class */ (function () {
-        function MyTaxLosses(transactions) {
-            this.transactions = transactions.filterBy('chartAccounts.id', exports.ChartAccountsListEnum.DIVIDENDS);
+        function MyTaxLosses(transactions, businessLosses) {
+            this.transactions = transactions;
+            this.businessLosses = businessLosses;
+            this.businessLossDeferred = businessLosses.sumBy('openBalance');
+            this.businessLossApplied = businessLosses.calculateBusinessLossApplied(transactions);
         }
         return MyTaxLosses;
     }());
@@ -18983,15 +19277,213 @@
         return PropertySaleExemptionsForm;
     }(AbstractForm));
 
+    var MyTaxBusinessDetailsForm = /** @class */ (function (_super) {
+        __extends(MyTaxBusinessDetailsForm, _super);
+        function MyTaxBusinessDetailsForm(businessDetails) {
+            var _this = this;
+            var _a, _b;
+            _this = _super.call(this, {
+                vehicleClaimMethod: new forms.FormControl({
+                    value: (_a = businessDetails.vehicleClaimDetails) === null || _a === void 0 ? void 0 : _a.method,
+                    disabled: true
+                }),
+                businessType: new forms.FormControl({ value: exports.BusinessTypeEnum.SOLE_TRADER, disabled: true }),
+                // business details
+                mainBusinessActivity: new forms.FormControl(businessDetails.businessActivities[0]),
+                mainBusinessName: new forms.FormControl({ value: (_b = businessDetails.businesses) === null || _b === void 0 ? void 0 : _b.first.name, disabled: true }),
+                mainBusinessABN: new forms.FormControl({ value: businessDetails.businessABN, disabled: true }),
+                mainBusinessAddress: new forms.FormControl({ value: businessDetails.businessAddress, disabled: true }),
+                // By default, we show it as 1, but user can change it
+                numberOfBusinessActivities: new forms.FormControl(1)
+            }) || this;
+            _this.businessDetails = businessDetails;
+            _this.listenEvents();
+            return _this;
+        }
+        MyTaxBusinessDetailsForm.prototype.listenEvents = function () {
+            this.listenMainBusinessActivityChanged();
+        };
+        MyTaxBusinessDetailsForm.prototype.listenMainBusinessActivityChanged = function () {
+            var _this = this;
+            this.get('mainBusinessActivity').valueChanges.subscribe(function (activity) {
+                _this.get('mainBusinessName').setValue(_this.businessDetails.businesses.findBy('activity.id', activity.id).name);
+            });
+        };
+        return MyTaxBusinessDetailsForm;
+    }(AbstractForm));
+
+    var MyTaxBusinessIncomeForm = /** @class */ (function (_super) {
+        __extends(MyTaxBusinessIncomeForm, _super);
+        function MyTaxBusinessIncomeForm(businessIncome) {
+            return _super.call(this, {
+                // Set in "false" if user has PSI income
+                // https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/4644110466/Tax+Return+MyTax+-+Online+Form
+                // ("Business income or losses" section, "P1. Did you satisfy the results test?" field)
+                isTestResultsSatisfied: new forms.FormControl(!businessIncome.psiIncomeAmount),
+                psiVoluntaryAgreementAmount: new forms.FormControl({
+                    value: businessIncome.psiVoluntaryAgreementAmount,
+                    disabled: true
+                }),
+                psiABNNotQuotedAmount: new forms.FormControl({
+                    value: businessIncome.psiABNNotQuotedAmount,
+                    disabled: true
+                }),
+                psiLabourHireOrOtherAmount: new forms.FormControl({
+                    value: businessIncome.psiLabourHireOrOtherAmount,
+                    disabled: true
+                }),
+                psiOtherAmount: new forms.FormControl({
+                    value: businessIncome.psiOtherAmount,
+                    disabled: true
+                }),
+                psiDeductionAssociatesAmount: new forms.FormControl({
+                    value: businessIncome.psiDeductionAssociatesAmount,
+                    disabled: true
+                }),
+                psiDeductionOtherAmount: new forms.FormControl({
+                    value: businessIncome.psiDeductionOtherAmount,
+                    disabled: true
+                }),
+                psiVoluntaryAgreementTax: new forms.FormControl({
+                    value: businessIncome.psiVoluntaryAgreementTax,
+                    disabled: true
+                }),
+                psiABNNotQuotedTax: new forms.FormControl({
+                    value: businessIncome.psiABNNotQuotedTax,
+                    disabled: true
+                }),
+                psiLabourHireOrOtherTax: new forms.FormControl({
+                    value: businessIncome.psiLabourHireOrOtherTax,
+                    disabled: true
+                }),
+                grossPaymentsNoAbsGivenAmount: new forms.FormControl({
+                    value: businessIncome.grossPaymentsNoAbsGivenAmount,
+                    disabled: true
+                }),
+                grossPaymentsVoluntaryAgreementAmount: new forms.FormControl({
+                    value: businessIncome.grossPaymentsVoluntaryAgreementAmount,
+                    disabled: true
+                }),
+                grossPaymentsLabourHireAmount: new forms.FormControl({
+                    value: businessIncome.grossPaymentsLabourHireAmount,
+                    disabled: true
+                }),
+                assessibleGovernmentPaymentsAmount: new forms.FormControl({
+                    value: businessIncome.assessibleGovernmentPaymentsAmount,
+                    disabled: true
+                }),
+                otherBusinessIncomeAmount: new forms.FormControl({
+                    value: businessIncome.otherBusinessIncomeAmount,
+                    disabled: true
+                }),
+                grossPaymentsNoAbsGivenTax: new forms.FormControl({
+                    value: businessIncome.grossPaymentsNoAbsGivenTax,
+                    disabled: true
+                }),
+                grossPaymentsVoluntaryAgreementTax: new forms.FormControl({
+                    value: businessIncome.grossPaymentsVoluntaryAgreementTax,
+                    disabled: true
+                }),
+                grossPaymentsLabourHireTax: new forms.FormControl({
+                    value: businessIncome.grossPaymentsLabourHireTax,
+                    disabled: true
+                }),
+            }) || this;
+        }
+        return MyTaxBusinessIncomeForm;
+    }(AbstractForm));
+
+    var MyTaxBusinessLossesForm = /** @class */ (function (_super) {
+        __extends(MyTaxBusinessLossesForm, _super);
+        function MyTaxBusinessLossesForm(businessLosses) {
+            var _this = this;
+            var _a, _b;
+            _this = _super.call(this, {
+                purchasesAndOtherCostsAmount: new forms.FormControl({
+                    value: businessLosses.purchasesAndOtherCostsAmount,
+                    disabled: true
+                }),
+                contractorsAndCommissionAmount: new forms.FormControl({
+                    value: businessLosses.contractorsAndCommissionAmount,
+                    disabled: true
+                }),
+                superannuationAmount: new forms.FormControl({
+                    value: businessLosses.superannuationAmount,
+                    disabled: true
+                }),
+                badDebtAmount: new forms.FormControl({
+                    value: businessLosses.badDebtAmount,
+                    disabled: true
+                }),
+                leaseExpensesCommercialAmount: new forms.FormControl({
+                    value: businessLosses.leaseExpensesCommercialAmount,
+                    disabled: true
+                }),
+                rentExpensesCommercialPremisesAmount: new forms.FormControl({
+                    value: businessLosses.rentExpensesCommercialPremisesAmount,
+                    disabled: true
+                }),
+                interestExpensesAustraliaAmount: new forms.FormControl({
+                    value: businessLosses.interestExpensesAustraliaAmount,
+                    disabled: true
+                }),
+                interestExpensesOverseasAmount: new forms.FormControl({
+                    value: businessLosses.interestExpensesOverseasAmount,
+                    disabled: true
+                }),
+                kmsTravelledExpensesAmount: new forms.FormControl({
+                    value: businessLosses.kmsTravelledExpensesAmount,
+                    disabled: true
+                }),
+                otherExpensesAmount: new forms.FormControl({
+                    value: businessLosses.otherExpensesAmount,
+                    disabled: true
+                }),
+                totalNonPrimaryProductionExpensesAmount: new forms.FormControl({
+                    value: businessLosses.totalNonPrimaryProductionExpensesAmount,
+                    disabled: true
+                }),
+                // depreciations
+                depreciationExpensesAmount: new forms.FormControl({
+                    value: businessLosses.depreciationExpensesAmount,
+                    disabled: true
+                }),
+                deductionsForCertainAssetsAmount: new forms.FormControl({
+                    value: businessLosses.deductionsForCertainAssetsAmount,
+                    disabled: true
+                }),
+                deductionsForGeneralSmallBusinessPoolAmount: new forms.FormControl({
+                    value: businessLosses.deductionsForGeneralSmallBusinessPoolAmount,
+                    disabled: true
+                }),
+                currentYearNetNonPrimaryIncomeOrLossesAmount: new forms.FormControl({
+                    value: businessLosses.currentYearNetNonPrimaryIncomeOrLossesAmount,
+                    disabled: true
+                }),
+                priorYearsNonPrimaryLossesAmount: new forms.FormControl({
+                    value: businessLosses.priorYearsNonPrimaryLossesAmount,
+                    disabled: true
+                }),
+                lossType: new forms.FormControl((_b = (_a = businessLosses.currentLoss) === null || _a === void 0 ? void 0 : _a.offsetRule) === null || _b === void 0 ? void 0 : _b.id, forms.Validators.required),
+            }) || this;
+            return _this;
+        }
+        return MyTaxBusinessLossesForm;
+    }(AbstractForm));
+
     /**
      * @Todo waiting for the Sole tank implementation
      */
-    var MyTaxBusinessOrLossesForm = /** @class */ (function (_super) {
-        __extends(MyTaxBusinessOrLossesForm, _super);
-        function MyTaxBusinessOrLossesForm(businessOrLosses) {
-            return _super.call(this, {}) || this;
+    var MyTaxBusinessIncomeOrLossesForm = /** @class */ (function (_super) {
+        __extends(MyTaxBusinessIncomeOrLossesForm, _super);
+        function MyTaxBusinessIncomeOrLossesForm(businessDetails, businessIncome, businessLosses) {
+            return _super.call(this, {
+                businessDetails: new MyTaxBusinessDetailsForm(businessDetails),
+                businessIncome: new MyTaxBusinessIncomeForm(businessIncome),
+                businessLosses: new MyTaxBusinessLossesForm(businessLosses),
+            }) || this;
         }
-        return MyTaxBusinessOrLossesForm;
+        return MyTaxBusinessIncomeOrLossesForm;
     }(AbstractForm));
 
     var MyTaxCgtForm = /** @class */ (function (_super) {
@@ -19254,13 +19746,13 @@
         return MyTaxInterestForm;
     }(AbstractForm));
 
-    /**
-     * @Todo waiting for Sole tank implementation
-     */
     var MyTaxLossesForm = /** @class */ (function (_super) {
         __extends(MyTaxLossesForm, _super);
         function MyTaxLossesForm(losses) {
-            return _super.call(this, {}) || this;
+            return _super.call(this, {
+                businessLossDeferred: new forms.FormControl(losses.businessLossDeferred),
+                businessLossApplied: new forms.FormControl(losses.businessLossApplied)
+            }) || this;
         }
         return MyTaxLossesForm;
     }(AbstractForm));
@@ -19683,8 +20175,13 @@
     exports.MessageDocumentService = MessageDocumentService;
     exports.MessageService = MessageService;
     exports.MyAccountHistory = MyAccountHistory;
-    exports.MyTaxBusinessOrLosses = MyTaxBusinessOrLosses;
-    exports.MyTaxBusinessOrLossesForm = MyTaxBusinessOrLossesForm;
+    exports.MyTaxBusinessDetails = MyTaxBusinessDetails;
+    exports.MyTaxBusinessDetailsForm = MyTaxBusinessDetailsForm;
+    exports.MyTaxBusinessIncome = MyTaxBusinessIncome;
+    exports.MyTaxBusinessIncomeForm = MyTaxBusinessIncomeForm;
+    exports.MyTaxBusinessIncomeOrLossesForm = MyTaxBusinessIncomeOrLossesForm;
+    exports.MyTaxBusinessLosses = MyTaxBusinessLosses;
+    exports.MyTaxBusinessLossesForm = MyTaxBusinessLossesForm;
     exports.MyTaxCgt = MyTaxCgt;
     exports.MyTaxCgtForm = MyTaxCgtForm;
     exports.MyTaxDeductions = MyTaxDeductions;
@@ -19789,6 +20286,7 @@
     exports.SoleBusinessLossOffsetRuleService = SoleBusinessLossOffsetRuleService;
     exports.SoleBusinessLossReport = SoleBusinessLossReport;
     exports.SoleBusinessLossService = SoleBusinessLossService;
+    exports.SoleBusinessLossesCollection = SoleBusinessLossesCollection;
     exports.SoleBusinessService = SoleBusinessService;
     exports.SoleContact = SoleContact;
     exports.SoleContactForm = SoleContactForm;