taxtank-core 1.0.56 → 1.0.58

package/fesm2022/taxtank-core.mjs

@@ -1393,6 +1393,7 @@ var TaxReturnCategoryListEnum;
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["tAX_OFFSET_MIDDLE"] = 62] = "tAX_OFFSET_MIDDLE";
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TAX_OFFSET_SOLE"] = 63] = "TAX_OFFSET_SOLE";
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["DEFERRED_BUSINESS_LOSSES_FROM_PRIOR_YEAR"] = 64] = "DEFERRED_BUSINESS_LOSSES_FROM_PRIOR_YEAR";
+    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["BUSINESS_LOSSES_APPLIED"] = 88] = "BUSINESS_LOSSES_APPLIED";
 })(TaxReturnCategoryListEnum || (TaxReturnCategoryListEnum = {}));
 
 var TaxReturnCategorySectionEnum;
@@ -3484,8 +3485,10 @@ class ChartAccounts extends ChartAccounts$1 {
             .includes(this.category);
     }
     isSoleExpense() {
-        return [ChartAccountsCategoryEnum.SOLE_EXPENSE, ChartAccountsCategoryEnum.SOLE_DEPRECIATION]
-            .includes(this.category);
+        return [ChartAccountsCategoryEnum.SOLE_EXPENSE, ChartAccountsCategoryEnum.SOLE_DEPRECIATION].includes(this.category);
+    }
+    isHoldingExpense() {
+        return [ChartAccountsCategoryEnum.HOLDING_EXPENSE].includes(this.category);
     }
     /**
      * Check if chart accounts is property expense
@@ -3541,7 +3544,7 @@ class ChartAccounts extends ChartAccounts$1 {
      * except when taxablePercent=0, but not ENTERTAINMENT
      */
     isClaimPercentEditable() {
-        return ((this.isWorkExpense() || this.isSoleExpense()) && !this.isVehicleExpense() && this.taxablePercent > 0)
+        return ((this.isWorkExpense() || this.isSoleExpense() || this.isHoldingExpense()) && !this.isVehicleExpense() && this.taxablePercent > 0)
             || this.id === BusinessChartAccountsEnum.ENTERTAINMENT;
     }
     /**
@@ -9137,7 +9140,8 @@ class BankAccountCollection extends Collection {
         return this.filterBy('type', TYPE_LOAN);
     }
     getLoanAndOffsetAccounts() {
-        return this.filterBy('type', [...TYPE_LOAN, BankAccountTypeEnum.OFFSET]);
+        // @TODO we have to add TRANSACTION/SAVINGS because basiq doesn't provide offset type
+        return this.filterBy('type', [...TYPE_LOAN, BankAccountTypeEnum.OFFSET, BankAccountTypeEnum.TRANSACTION, BankAccountTypeEnum.SAVINGS]);
     }
     getDebitAccounts() {
         return this.filter(bankAccount => ![...TYPE_LOAN, BankAccountTypeEnum.CREDIT_CARD].includes(bankAccount.type));
@@ -15656,12 +15660,25 @@ class TaxSummary {
         return this.getReportItems([this.work, this.property, this.sole, this.holdings]).sumByCategories([
             ...TAX_RETURN_CATEGORIES.work.expenses,
             ...TAX_RETURN_CATEGORIES.property.expenses,
+            TaxReturnCategoryListEnum.BORROWING_EXPENSES,
+            ...TAX_RETURN_CATEGORIES.property.interest,
+            ...TAX_RETURN_CATEGORIES.property.depreciation,
             ...TAX_RETURN_CATEGORIES.sole.expenses,
+            ...TAX_RETURN_CATEGORIES.sole.depreciation,
+            ...TAX_RETURN_CATEGORIES.sole.loss,
             ...TAX_RETURN_CATEGORIES.holdings.expenses,
         ]);
     }
+    get taxCredits() {
+        return this.summary.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.summary.taxCredits, TaxSummarySectionEnum.SUMMARY);
+    }
+    get depreciation() {
+        return this.sole.items.sumByCategories(TAX_RETURN_CATEGORIES.sole.depreciation)
+            + this.property.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.property.depreciation, TaxSummarySectionEnum.PROPERTY_TANK)
+            + this.workDepreciations;
+    }
     get netCash() {
-        return this.workNetCash + this.propertyNetCash + this.soleNetCash + this.holdingsNetCash;
+        return this.income + this.expense + this.taxCredits - this.depreciation;
     }
     get netTotal() {
         return this.workNetTotal + this.propertyNetTotal + this.soleNetTotal + this.holdingsNetTotal;
@@ -15727,20 +15744,19 @@ class TaxSummary {
      * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/217677990/Dashboard+Main
      */
     get soleNetCash() {
-        const depreciation = this.sole.items.sumByCategories(TAX_RETURN_CATEGORIES.sole.depreciation);
-        const loss = this.sole.items.sumByCategories(TAX_RETURN_CATEGORIES.sole.loss);
-        const lossCurrent = this.sole.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.sole.lossCurrent, TaxSummarySectionEnum.SOLE_TANK);
-        return this.soleNetTotal - depreciation - loss + lossCurrent;
+        const income = this.sole.items.sumByCategories(TAX_RETURN_CATEGORIES.sole.income);
+        const expense = this.sole.items.sumByCategories(TAX_RETURN_CATEGORIES.sole.expenses);
+        return income + expense + this.soleTaxCredits;
+    }
+    get soleLossesApplied() {
+        return this.sole.items.sumByCategories([TaxReturnCategoryListEnum.BUSINESS_LOSSES_APPLIED]);
     }
     /**
      * Sole Net Total = Gross income - expenses
      * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/217677990/Dashboard+Main
      */
     get soleNetTotal() {
-        // income + expenses + depreciation + loss
-        const profit = this.sole.items.sumByCategories([TaxReturnCategoryListEnum.BUSINESS_INCOME_OR_LOSS]);
-        const lossCurrent = this.sole.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.sole.lossCurrent, TaxSummarySectionEnum.SOLE_TANK);
-        return profit - lossCurrent;
+        return this.sole.netAmount;
     }
     getDeferredBusinessLoss(business) {
         return this.sole.items