taxtank-core 1.0.57 → 1.0.59

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;
@@ -15640,7 +15641,8 @@ class TaxSummary {
     get workTaxCredits() {
         const taxWithheld = this.summary.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.work.taxWithheld, TaxSummarySectionEnum.WORK_TANK);
         const taxInstallments = this.summary.items.sumByCategoriesAndSection([TaxReturnCategoryListEnum.WORK_TAX_INSTALMENTS], TaxSummarySectionEnum.SUMMARY);
-        return taxWithheld + taxInstallments;
+        const frankingCredits = this.summary.items.sumByCategoriesAndSection([TaxReturnCategoryListEnum.FRANKING_CREDITS], TaxSummarySectionEnum.WORK_TANK);
+        return taxWithheld + taxInstallments + frankingCredits;
     }
     get soleTaxCredits() {
         const taxOffsets = this.summary.items.sumByCategoriesAndSection([TaxReturnCategoryListEnum.TAX_OFFSETS_SOLE], TaxSummarySectionEnum.SOLE_TANK);
@@ -15664,9 +15666,8 @@ class TaxSummary {
             ...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,
-        ]);
+        ]) - this.soleLossesApplied;
     }
     get taxCredits() {
         return this.summary.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.summary.taxCredits, TaxSummarySectionEnum.SUMMARY);
@@ -15677,10 +15678,10 @@ class TaxSummary {
             + this.workDepreciations;
     }
     get netCash() {
-        return this.income + this.expense + this.taxCredits - this.depreciation;
+        return this.netTotal + this.taxCredits;
     }
     get netTotal() {
-        return this.workNetTotal + this.propertyNetTotal + this.soleNetTotal + this.holdingsNetTotal;
+        return this.income + this.expense;
     }
     /**
      * Work Net Total = Income - expenses - interest
@@ -15743,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