taxtank-core 0.28.23 → 0.28.26

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -5749,6 +5749,16 @@
5749
5749
  enumerable: false,
5750
5750
  configurable: true
5751
5751
  });
5752
+ Object.defineProperty(BankAccount.prototype, "partialAccountNumber", {
5753
+ /**
5754
+ * Get last digits of account number
5755
+ */
5756
+ get: function () {
5757
+ return "xxxx" + this.accountNumber.slice(-4, 0);
5758
+ },
5759
+ enumerable: false,
5760
+ configurable: true
5761
+ });
5752
5762
  /**
5753
5763
  * Get current opening balance amount
5754
5764
  */
@@ -8488,16 +8498,13 @@
8488
8498
  TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["ANNUITIES_SUPER_INCOME_STREAMS"] = 3] = "ANNUITIES_SUPER_INCOME_STREAMS";
8489
8499
  TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["SUPERANNUATION_LUMP_SUM_PAYMENTS"] = 34] = "SUPERANNUATION_LUMP_SUM_PAYMENTS";
8490
8500
  TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["ATTRIBUTED_PSI_INCOME"] = 4] = "ATTRIBUTED_PSI_INCOME";
8491
- TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["WORK_EXPENSES"] = 7] = "WORK_EXPENSES";
8492
- TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["GROSS_RENT"] = 8] = "GROSS_RENT";
8493
- TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["OTHER_RENTAL_DEDUCTIONS"] = 12] = "OTHER_RENTAL_DEDUCTIONS";
8494
- TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["INTEREST_DEDUCTIONS"] = 9] = "INTEREST_DEDUCTIONS";
8495
- TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["CAPITAL_WORKS"] = 10] = "CAPITAL_WORKS";
8496
- TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["DEPRECIATION"] = 11] = "DEPRECIATION";
8497
8501
  TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["GROSS_INTEREST"] = 5] = "GROSS_INTEREST";
8498
8502
  TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["DIVIDENDS"] = 6] = "DIVIDENDS";
8499
8503
  TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["SHARE_SCHEMES"] = 35] = "SHARE_SCHEMES";
8504
+ TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["GROSS_RENT"] = 8] = "GROSS_RENT";
8500
8505
  TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["PARTNERSHIPS_TRUSTS"] = 13] = "PARTNERSHIPS_TRUSTS";
8506
+ TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["PARTNERSHIPS"] = 36] = "PARTNERSHIPS";
8507
+ TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TRUSTS"] = 37] = "TRUSTS";
8501
8508
  TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["PSI_SBE_INCOME"] = 14] = "PSI_SBE_INCOME";
8502
8509
  TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["SOLE_TRADER_BUSINESS_INCOME"] = 38] = "SOLE_TRADER_BUSINESS_INCOME";
8503
8510
  TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["CAPITAL_GAINS"] = 15] = "CAPITAL_GAINS";
@@ -8505,17 +8512,38 @@
8505
8512
  TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["BONUSES_FROM_LIFE_INSURANCE"] = 17] = "BONUSES_FROM_LIFE_INSURANCE";
8506
8513
  TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["FORESTRY_MANAGED_INVESTMENT_SCHEMES"] = 39] = "FORESTRY_MANAGED_INVESTMENT_SCHEMES";
8507
8514
  TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["OTHER_INCOME"] = 40] = "OTHER_INCOME";
8508
- TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TAX_CREDITS"] = 23] = "TAX_CREDITS";
8509
- TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["OTHER_DEDUCTIONS"] = 18] = "OTHER_DEDUCTIONS";
8510
- TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TAX_OFFSETS"] = 27] = "TAX_OFFSETS";
8515
+ TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["GROSS_PAYMENTS_NO_ABN_GIVEN"] = 42] = "GROSS_PAYMENTS_NO_ABN_GIVEN";
8516
+ TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["GROSS_PAYMENTS_VOLUNTARY_AGREEMENT"] = 43] = "GROSS_PAYMENTS_VOLUNTARY_AGREEMENT";
8517
+ TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["GROSS_PAYMENTS_LABOUR_HIRE_OR_OTHER"] = 44] = "GROSS_PAYMENTS_LABOUR_HIRE_OR_OTHER";
8518
+ TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["ASSESSABLE_GOVERNMENT_PAYMENTS"] = 45] = "ASSESSABLE_GOVERNMENT_PAYMENTS";
8519
+ TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["OTHER_BUSINESS_INCOME"] = 46] = "OTHER_BUSINESS_INCOME";
8520
+ TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["WORK_EXPENSES"] = 7] = "WORK_EXPENSES";
8521
+ TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["INTEREST_DEDUCTIONS"] = 9] = "INTEREST_DEDUCTIONS";
8522
+ TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["CAPITAL_WORKS"] = 10] = "CAPITAL_WORKS";
8523
+ TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["PLANT_AND_EQUIPMENT"] = 11] = "PLANT_AND_EQUIPMENT";
8511
8524
  TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["BORROWING_EXPENSES"] = 29] = "BORROWING_EXPENSES";
8525
+ TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["OTHER_RENTAL_DEDUCTIONS"] = 12] = "OTHER_RENTAL_DEDUCTIONS";
8526
+ TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["OTHER_DEDUCTIONS"] = 18] = "OTHER_DEDUCTIONS";
8527
+ TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["PURCHASES_AND_OTHER_COSTS"] = 48] = "PURCHASES_AND_OTHER_COSTS";
8528
+ TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["CONTRACTORS_SUBCONTRACTORS_COMMISSION_EXPENSES"] = 49] = "CONTRACTORS_SUBCONTRACTORS_COMMISSION_EXPENSES";
8529
+ TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["SUPERANNUATION_EXPENSES"] = 50] = "SUPERANNUATION_EXPENSES";
8530
+ TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["BAD_DEBTS"] = 51] = "BAD_DEBTS";
8531
+ TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["LEASE_EXPENSES"] = 52] = "LEASE_EXPENSES";
8532
+ TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["RENT_EXPENSES"] = 53] = "RENT_EXPENSES";
8533
+ TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["INTEREST_EXPENSES_WITHIN_AUSTRALIA"] = 54] = "INTEREST_EXPENSES_WITHIN_AUSTRALIA";
8534
+ TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["INTEREST_EXPENSES_OVERSEAS"] = 55] = "INTEREST_EXPENSES_OVERSEAS";
8535
+ TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["DEPRECIATION_EXPENSES"] = 56] = "DEPRECIATION_EXPENSES";
8536
+ TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["MOTOR_VEHICLE_EXPENSES"] = 57] = "MOTOR_VEHICLE_EXPENSES";
8537
+ TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["ALL_OTHER_EXPENSES"] = 58] = "ALL_OTHER_EXPENSES";
8512
8538
  TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["GROSS_TAX_PAYABLE"] = 19] = "GROSS_TAX_PAYABLE";
8513
8539
  TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TAX_ON_TAXABLE_INCOME"] = 20] = "TAX_ON_TAXABLE_INCOME";
8514
8540
  TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["MEDICARE"] = 21] = "MEDICARE";
8515
8541
  TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["STUDENT_LOAN_REPAYMENT"] = 22] = "STUDENT_LOAN_REPAYMENT";
8542
+ TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TAX_CREDITS"] = 23] = "TAX_CREDITS";
8516
8543
  TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TAX_WITHHELD"] = 24] = "TAX_WITHHELD";
8517
8544
  TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TAX_INSTALMENTS"] = 25] = "TAX_INSTALMENTS";
8518
8545
  TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["FRANKING_CREDITS"] = 26] = "FRANKING_CREDITS";
8546
+ TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TAX_OFFSETS"] = 27] = "TAX_OFFSETS";
8519
8547
  TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TAX_PAYABLE"] = 28] = "TAX_PAYABLE";
8520
8548
  })(exports.TaxReturnCategoryListEnum || (exports.TaxReturnCategoryListEnum = {}));
8521
8549
 
@@ -8554,7 +8582,8 @@
8554
8582
  ],
8555
8583
  depreciation: [
8556
8584
  exports.TaxReturnCategoryListEnum.CAPITAL_WORKS,
8557
- exports.TaxReturnCategoryListEnum.DEPRECIATION
8585
+ // @TODO Nik/Alex (it was TaxReturnCategoryListEnum.DEPRECIATION which doesn't exist)
8586
+ exports.TaxReturnCategoryListEnum.PLANT_AND_EQUIPMENT
8558
8587
  ]
8559
8588
  },
8560
8589
  other: {
@@ -8562,7 +8591,8 @@
8562
8591
  exports.TaxReturnCategoryListEnum.GROSS_INTEREST,
8563
8592
  exports.TaxReturnCategoryListEnum.DIVIDENDS,
8564
8593
  exports.TaxReturnCategoryListEnum.SHARE_SCHEMES,
8565
- exports.TaxReturnCategoryListEnum.PARTNERSHIPS_TRUSTS,
8594
+ exports.TaxReturnCategoryListEnum.PARTNERSHIPS,
8595
+ exports.TaxReturnCategoryListEnum.TRUSTS,
8566
8596
  exports.TaxReturnCategoryListEnum.PSI_SBE_INCOME,
8567
8597
  exports.TaxReturnCategoryListEnum.SOLE_TRADER_BUSINESS_INCOME,
8568
8598
  exports.TaxReturnCategoryListEnum.CAPITAL_GAINS,
@@ -8580,7 +8610,29 @@
8580
8610
  taxOffsets: [
8581
8611
  exports.TaxReturnCategoryListEnum.TAX_OFFSETS
8582
8612
  ]
8583
- }
8613
+ },
8614
+ sole: {
8615
+ income: [
8616
+ exports.TaxReturnCategoryListEnum.GROSS_PAYMENTS_NO_ABN_GIVEN,
8617
+ exports.TaxReturnCategoryListEnum.GROSS_PAYMENTS_VOLUNTARY_AGREEMENT,
8618
+ exports.TaxReturnCategoryListEnum.GROSS_PAYMENTS_LABOUR_HIRE_OR_OTHER,
8619
+ exports.TaxReturnCategoryListEnum.ASSESSABLE_GOVERNMENT_PAYMENTS,
8620
+ exports.TaxReturnCategoryListEnum.OTHER_BUSINESS_INCOME
8621
+ ],
8622
+ expenses: [
8623
+ exports.TaxReturnCategoryListEnum.PURCHASES_AND_OTHER_COSTS,
8624
+ exports.TaxReturnCategoryListEnum.CONTRACTORS_SUBCONTRACTORS_COMMISSION_EXPENSES,
8625
+ exports.TaxReturnCategoryListEnum.SUPERANNUATION_EXPENSES,
8626
+ exports.TaxReturnCategoryListEnum.BAD_DEBTS,
8627
+ exports.TaxReturnCategoryListEnum.LEASE_EXPENSES,
8628
+ exports.TaxReturnCategoryListEnum.RENT_EXPENSES,
8629
+ exports.TaxReturnCategoryListEnum.INTEREST_EXPENSES_WITHIN_AUSTRALIA,
8630
+ exports.TaxReturnCategoryListEnum.INTEREST_EXPENSES_OVERSEAS,
8631
+ exports.TaxReturnCategoryListEnum.DEPRECIATION_EXPENSES,
8632
+ exports.TaxReturnCategoryListEnum.MOTOR_VEHICLE_EXPENSES,
8633
+ exports.TaxReturnCategoryListEnum.ALL_OTHER_EXPENSES
8634
+ ]
8635
+ },
8584
8636
  };
8585
8637
 
8586
8638
  /**
@@ -9050,7 +9102,8 @@
9050
9102
  TaxReturnCategorySectionEnum[TaxReturnCategorySectionEnum["WORK_TANK"] = 1] = "WORK_TANK";
9051
9103
  TaxReturnCategorySectionEnum[TaxReturnCategorySectionEnum["PROPERTY_TANK"] = 2] = "PROPERTY_TANK";
9052
9104
  TaxReturnCategorySectionEnum[TaxReturnCategorySectionEnum["OTHER_INCOME"] = 3] = "OTHER_INCOME";
9053
- TaxReturnCategorySectionEnum[TaxReturnCategorySectionEnum["SUMMARY"] = 4] = "SUMMARY";
9105
+ TaxReturnCategorySectionEnum[TaxReturnCategorySectionEnum["SOLE_TANK"] = 4] = "SOLE_TANK";
9106
+ TaxReturnCategorySectionEnum[TaxReturnCategorySectionEnum["SUMMARY"] = 5] = "SUMMARY";
9054
9107
  })(exports.TaxReturnCategorySectionEnum || (exports.TaxReturnCategorySectionEnum = {}));
9055
9108
 
9056
9109
  exports.TaxReviewStatusEnum = void 0;
@@ -9087,8 +9140,9 @@
9087
9140
  (function (TaxSummarySectionEnum) {
9088
9141
  TaxSummarySectionEnum[TaxSummarySectionEnum["WORK_TANK"] = 1] = "WORK_TANK";
9089
9142
  TaxSummarySectionEnum[TaxSummarySectionEnum["PROPERTY_TANK"] = 2] = "PROPERTY_TANK";
9090
- TaxSummarySectionEnum[TaxSummarySectionEnum["OTHER_INCOME"] = 3] = "OTHER_INCOME";
9091
- TaxSummarySectionEnum[TaxSummarySectionEnum["SUMMARY"] = 4] = "SUMMARY";
9143
+ TaxSummarySectionEnum[TaxSummarySectionEnum["OTHER_TANK"] = 3] = "OTHER_TANK";
9144
+ TaxSummarySectionEnum[TaxSummarySectionEnum["SOLE_TANK"] = 4] = "SOLE_TANK";
9145
+ TaxSummarySectionEnum[TaxSummarySectionEnum["SUMMARY"] = 5] = "SUMMARY";
9092
9146
  })(exports.TaxSummarySectionEnum || (exports.TaxSummarySectionEnum = {}));
9093
9147
 
9094
9148
  exports.TaxSummaryTaxSummaryEnum = void 0;
@@ -11227,7 +11281,7 @@
11227
11281
  MyTaxRent.prototype.calculateOtherRentalDeductionsAmount = function () {
11228
11282
  var _a, _b, _c;
11229
11283
  var plantAndEquipmentAmount = Math.abs(((_a = this.taxSummaryPropertySection.items
11230
- .findBy('taxReturnCategory.id', exports.TaxReturnCategoryListEnum.DEPRECIATION)) === null || _a === void 0 ? void 0 : _a.amount) || 0);
11284
+ .findBy('taxReturnCategory.id', exports.TaxReturnCategoryListEnum.PLANT_AND_EQUIPMENT)) === null || _a === void 0 ? void 0 : _a.amount) || 0);
11231
11285
  var borrowingExpensesAmount = Math.abs(((_b = this.taxSummaryPropertySection.items
11232
11286
  .findBy('taxReturnCategory.id', exports.TaxReturnCategoryListEnum.BORROWING_EXPENSES)) === null || _b === void 0 ? void 0 : _b.amount) || 0);
11233
11287
  var otherRentalDeductionsAmount = Math.abs(((_c = this.taxSummaryPropertySection.items
@@ -11470,8 +11524,10 @@
11470
11524
  return 'taxSummaryWorkTank';
11471
11525
  case exports.TaxSummarySectionEnum.PROPERTY_TANK:
11472
11526
  return 'taxSummaryPropertyTank';
11473
- case exports.TaxSummarySectionEnum.OTHER_INCOME:
11527
+ case exports.TaxSummarySectionEnum.OTHER_TANK:
11474
11528
  return 'taxSummaryOtherIncome';
11529
+ case exports.TaxSummarySectionEnum.SOLE_TANK:
11530
+ return 'taxSummarySoleTank';
11475
11531
  default:
11476
11532
  return 'taxSummaryTotal';
11477
11533
  }
@@ -11487,7 +11543,7 @@
11487
11543
  }
11488
11544
  Object.defineProperty(TaxSummary.prototype, "sections", {
11489
11545
  get: function () {
11490
- return [this.work, this.property, this.otherIncome, this.summary];
11546
+ return [this.work, this.property, this.other, this.sole, this.summary];
11491
11547
  },
11492
11548
  enumerable: false,
11493
11549
  configurable: true
@@ -11522,7 +11578,7 @@
11522
11578
  */
11523
11579
  get: function () {
11524
11580
  var income = this.work.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.work.income, exports.TaxSummarySectionEnum.WORK_TANK);
11525
- var expenses = this.summary.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.work.expenses, exports.TaxSummarySectionEnum.WORK_TANK);
11581
+ var expenses = this.work.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.work.expenses, exports.TaxSummarySectionEnum.WORK_TANK);
11526
11582
  var interest = this.summary.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.work.interest, exports.TaxSummarySectionEnum.WORK_TANK);
11527
11583
  return income - Math.abs(expenses) - Math.abs(interest);
11528
11584
  },
@@ -11561,10 +11617,10 @@
11561
11617
  * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/217677990/Dashboard+Main
11562
11618
  */
11563
11619
  get: function () {
11564
- var income = this.otherIncome.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.other.income, exports.TaxSummarySectionEnum.OTHER_INCOME);
11565
- var expenses = this.summary.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.other.expenses, exports.TaxSummarySectionEnum.OTHER_INCOME);
11566
- var taxWithheld = this.summary.items.sumByCategoriesAndSection([exports.TaxReturnCategoryListEnum.TAX_WITHHELD], exports.TaxSummarySectionEnum.OTHER_INCOME);
11567
- var taxInstalments = this.summary.items.sumByCategoriesAndSection([exports.TaxReturnCategoryListEnum.TAX_INSTALMENTS], exports.TaxSummarySectionEnum.OTHER_INCOME);
11620
+ var income = this.other.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.other.income, exports.TaxSummarySectionEnum.OTHER_TANK);
11621
+ var expenses = this.other.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.other.expenses, exports.TaxSummarySectionEnum.OTHER_TANK);
11622
+ var taxWithheld = this.summary.items.sumByCategoriesAndSection([exports.TaxReturnCategoryListEnum.TAX_WITHHELD], exports.TaxSummarySectionEnum.OTHER_TANK);
11623
+ var taxInstalments = this.summary.items.sumByCategoriesAndSection([exports.TaxReturnCategoryListEnum.TAX_INSTALMENTS], exports.TaxSummarySectionEnum.OTHER_TANK);
11568
11624
  return income - Math.abs(expenses) - Math.abs(taxWithheld) - Math.abs(taxInstalments);
11569
11625
  },
11570
11626
  enumerable: false,
@@ -11576,16 +11632,44 @@
11576
11632
  * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/217677990/Dashboard+Main
11577
11633
  */
11578
11634
  get: function () {
11579
- var income = this.otherIncome.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.other.income, exports.TaxSummarySectionEnum.OTHER_INCOME);
11580
- var expenses = this.summary.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.other.expenses, exports.TaxSummarySectionEnum.OTHER_INCOME);
11635
+ var income = this.other.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.other.income, exports.TaxSummarySectionEnum.OTHER_TANK);
11636
+ var expenses = this.other.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.other.expenses, exports.TaxSummarySectionEnum.OTHER_TANK);
11581
11637
  var taxOffsets = this.summary.items.sumByCategoriesAndSection([exports.TaxReturnCategoryListEnum.TAX_OFFSETS], exports.TaxSummarySectionEnum.SUMMARY);
11582
- var taxInstallments = this.summary.items.sumByCategoriesAndSection([exports.TaxReturnCategoryListEnum.TAX_INSTALMENTS], exports.TaxSummarySectionEnum.OTHER_INCOME);
11583
- var frankingCredits = this.summary.items.sumByCategoriesAndSection([exports.TaxReturnCategoryListEnum.FRANKING_CREDITS], exports.TaxSummarySectionEnum.OTHER_INCOME);
11638
+ var taxInstallments = this.summary.items.sumByCategoriesAndSection([exports.TaxReturnCategoryListEnum.TAX_INSTALMENTS], exports.TaxSummarySectionEnum.OTHER_TANK);
11639
+ var frankingCredits = this.summary.items.sumByCategoriesAndSection([exports.TaxReturnCategoryListEnum.FRANKING_CREDITS], exports.TaxSummarySectionEnum.OTHER_TANK);
11584
11640
  return income - Math.abs(expenses) + Math.abs(taxOffsets) + Math.abs(taxInstallments) + Math.abs(frankingCredits);
11585
11641
  },
11586
11642
  enumerable: false,
11587
11643
  configurable: true
11588
11644
  });
11645
+ Object.defineProperty(TaxSummary.prototype, "soleNetCash", {
11646
+ /**
11647
+ * @TODO Nicole update documentation + check calculations
11648
+ * Sole Net Cash = gross income – expenses
11649
+ * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/217677990/Dashboard+Main
11650
+ */
11651
+ get: function () {
11652
+ var income = this.sole.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.sole.income, exports.TaxSummarySectionEnum.SOLE_TANK);
11653
+ var expenses = this.sole.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.sole.expenses, exports.TaxSummarySectionEnum.SOLE_TANK);
11654
+ return income - Math.abs(expenses);
11655
+ },
11656
+ enumerable: false,
11657
+ configurable: true
11658
+ });
11659
+ Object.defineProperty(TaxSummary.prototype, "soleNetTotal", {
11660
+ /**
11661
+ * @TODO Nicole update documentation + check calculations
11662
+ * Sole Net Total = Gross income - expenses
11663
+ * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/217677990/Dashboard+Main
11664
+ */
11665
+ get: function () {
11666
+ var income = this.sole.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.sole.income, exports.TaxSummarySectionEnum.SOLE_TANK);
11667
+ var expenses = this.sole.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.sole.expenses, exports.TaxSummarySectionEnum.SOLE_TANK);
11668
+ return income - Math.abs(expenses);
11669
+ },
11670
+ enumerable: false,
11671
+ configurable: true
11672
+ });
11589
11673
  return TaxSummary;
11590
11674
  }());
11591
11675
  __decorate([
@@ -11596,7 +11680,10 @@
11596
11680
  ], TaxSummary.prototype, "property", void 0);
11597
11681
  __decorate([
11598
11682
  classTransformer.Type(function () { return TaxSummarySection; })
11599
- ], TaxSummary.prototype, "otherIncome", void 0);
11683
+ ], TaxSummary.prototype, "other", void 0);
11684
+ __decorate([
11685
+ classTransformer.Type(function () { return TaxSummarySection; })
11686
+ ], TaxSummary.prototype, "sole", void 0);
11600
11687
  __decorate([
11601
11688
  classTransformer.Type(function () { return TaxSummarySection; })
11602
11689
  ], TaxSummary.prototype, "summary", void 0);
@@ -17932,6 +18019,8 @@
17932
18019
  var loan = classTransformer.plainToClass(Loan, Object.assign(bankAccount.loan, { bankAccount: { accountId: bankAccount.accountId } }));
17933
18020
  _this.addControl('loan', new LoanForm(loan));
17934
18021
  }
18022
+ // don't preselect tank type by default
18023
+ _this.get('tankType').setValue(null);
17935
18024
  // basiq account import form should be disabled (unchecked) by default
17936
18025
  _this.disable();
17937
18026
  return _this;