taxtank-core 1.0.55 → 1.0.57

package/fesm2022/taxtank-core.mjs

@@ -1326,11 +1326,11 @@ var TaxReturnCategoryListEnum;
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["WORK_DONATION"] = 73] = "WORK_DONATION";
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["WORK_TAX_AFFAIRS"] = 74] = "WORK_TAX_AFFAIRS";
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["WORK_OTHER_DEDUCTIONS"] = 76] = "WORK_OTHER_DEDUCTIONS";
+    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["WORK_SUPER_CONTRIBUTION"] = 81] = "WORK_SUPER_CONTRIBUTION";
     // holding expenses
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["HOLDING_INTEREST_DEDUCTIONS"] = 71] = "HOLDING_INTEREST_DEDUCTIONS";
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["HOLDING_DIVIDEND_DEDUCTION"] = 72] = "HOLDING_DIVIDEND_DEDUCTION";
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["HOLDING_UPP"] = 75] = "HOLDING_UPP";
-    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["HOLDING_SUPER_CONTRIBUTION"] = 81] = "HOLDING_SUPER_CONTRIBUTION";
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["HOLDING_INVESTMENT_SCHEME"] = 82] = "HOLDING_INVESTMENT_SCHEME";
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["HOLDING_INVESTMENT_SCHEME_DEDUCTION"] = 83] = "HOLDING_INVESTMENT_SCHEME_DEDUCTION";
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["HOLDING_OTHER_DEDUCTION"] = 84] = "HOLDING_OTHER_DEDUCTION";
@@ -1378,6 +1378,9 @@ var TaxReturnCategoryListEnum;
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TAX_CREDITS"] = 23] = "TAX_CREDITS";
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TAX_WITHHELD"] = 24] = "TAX_WITHHELD";
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TAX_INSTALMENTS"] = 25] = "TAX_INSTALMENTS";
+    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["WORK_TAX_INSTALMENTS"] = 85] = "WORK_TAX_INSTALMENTS";
+    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["HOLDINGS_TAX_INSTALMENTS"] = 86] = "HOLDINGS_TAX_INSTALMENTS";
+    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["SOLE_TAX_INSTALMENTS"] = 87] = "SOLE_TAX_INSTALMENTS";
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["FRANKING_CREDITS"] = 26] = "FRANKING_CREDITS";
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TAX_OFFSETS"] = 27] = "TAX_OFFSETS";
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TAX_OFFSETS_LOW"] = 61] = "TAX_OFFSETS_LOW";
@@ -3481,8 +3484,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
@@ -3538,7 +3543,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;
     }
     /**
@@ -6880,6 +6885,7 @@ class Depreciation extends Depreciation$1 {
             amount: -this.currentYearForecast?.amount || 0,
             claimAmount: -this.currentYearForecast?.claimAmount || 0,
             claimPercent: claimPercent,
+            date: this.currentYearForecast?.fromDate ?? this.date,
             sharedClaimPercent: claimPercent,
         }));
     }
@@ -7200,25 +7206,6 @@ class TransactionCollection extends TransactionBaseCollection {
     getTaxable() {
         return this.filter(transaction => transaction.claimPercent > 0);
     }
-    getWorkTaxCredits() {
-        const transactions = this.filter(transaction => transaction.isWorkTank() && !transaction.depreciation && transaction.claimAmount !== 0 && transaction.chartAccounts.id !== 571);
-        const metaFields = new Collection(transactions
-            .map(transaction => transaction.metaFields)
-            .flat()
-            .filter(metaField => [4].includes(metaField.chartAccountsMetaField.id)));
-        const instalments = this.filterBy('chartAccounts.id', 911).amount;
-        console.log(transactions.sumBy('claimableTax'), instalments);
-        return -transactions.sumBy('claimableTax') - metaFields.sumBy('value') + instalments;
-    }
-    getHoldingTaxCredits() {
-        const transactions = this.filter(transaction => transaction.isHoldingTank() && !transaction.depreciation && transaction.claimAmount !== 0 && transaction.chartAccounts.id !== 571);
-        const metaFields = new Collection(transactions
-            .map(transaction => transaction.metaFields)
-            .flat()
-            .filter(metaField => [4, 5].includes(metaField.chartAccountsMetaField.id)));
-        const instalments = this.filterBy('chartAccounts.id', 662).amount;
-        return -metaFields.sumBy('value') + instalments;
-    }
 }
 
 class TransactionAllocationCollection extends Collection {
@@ -8809,6 +8796,7 @@ const TAX_RETURN_CATEGORIES = {
             TaxReturnCategoryListEnum.WORK_DONATION,
             TaxReturnCategoryListEnum.WORK_TAX_AFFAIRS,
             TaxReturnCategoryListEnum.WORK_OTHER_DEDUCTIONS,
+            TaxReturnCategoryListEnum.WORK_SUPER_CONTRIBUTION,
         ],
         depreciation: [
             TaxReturnCategoryListEnum.WORK_RELATED_DEPRECIATION
@@ -8848,7 +8836,6 @@ const TAX_RETURN_CATEGORIES = {
             TaxReturnCategoryListEnum.HOLDING_INTEREST_DEDUCTIONS,
             TaxReturnCategoryListEnum.HOLDING_DIVIDEND_DEDUCTION,
             TaxReturnCategoryListEnum.HOLDING_UPP,
-            TaxReturnCategoryListEnum.HOLDING_SUPER_CONTRIBUTION,
             TaxReturnCategoryListEnum.HOLDING_INVESTMENT_SCHEME,
             TaxReturnCategoryListEnum.HOLDING_INVESTMENT_SCHEME_DEDUCTION,
             TaxReturnCategoryListEnum.HOLDING_OTHER_DEDUCTION,
@@ -8892,9 +8879,6 @@ const TAX_RETURN_CATEGORIES = {
         lossCurrent: [
             TaxReturnCategoryListEnum.DEFERRED_BUSINESS_LOSSES,
         ],
-        taxOffsets: [
-            TaxReturnCategoryListEnum.TAX_OFFSETS_SOLE
-        ],
     },
     summary: {
         income: [
@@ -9155,7 +9139,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));
@@ -15650,14 +15635,17 @@ class TaxSummary {
      * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/217677990/Dashboard+Main
      */
     get workNetCash() {
-        const taxWithheld = this.summary.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.work.taxWithheld, TaxSummarySectionEnum.WORK_TANK);
-        return this.workNetTotal - Math.abs(taxWithheld);
+        return this.workNetTotal + this.workTaxCredits;
     }
     get workTaxCredits() {
         const taxWithheld = this.summary.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.work.taxWithheld, TaxSummarySectionEnum.WORK_TANK);
-        const taxInstallments = this.summary.items.sumByCategoriesAndSection([TaxReturnCategoryListEnum.TAX_INSTALMENTS], TaxSummarySectionEnum.WORK_TANK);
-        console.log(taxWithheld, taxInstallments);
-        return 0;
+        const taxInstallments = this.summary.items.sumByCategoriesAndSection([TaxReturnCategoryListEnum.WORK_TAX_INSTALMENTS], TaxSummarySectionEnum.SUMMARY);
+        return taxWithheld + taxInstallments;
+    }
+    get soleTaxCredits() {
+        const taxOffsets = this.summary.items.sumByCategoriesAndSection([TaxReturnCategoryListEnum.TAX_OFFSETS_SOLE], TaxSummarySectionEnum.SOLE_TANK);
+        const taxInstallments = this.summary.items.sumByCategoriesAndSection([TaxReturnCategoryListEnum.SOLE_TAX_INSTALMENTS], TaxSummarySectionEnum.SUMMARY);
+        return taxOffsets + taxInstallments;
     }
     get income() {
         return this.getReportItems([this.work, this.property, this.sole, this.holdings]).sumByCategories([
@@ -15671,12 +15659,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;
@@ -15732,9 +15733,10 @@ class TaxSummary {
         return this.holdingsNetTotal + this.holdingsTaxCredits;
     }
     get holdingsTaxCredits() {
-        const taxInstallments = this.summary.items.sumByCategoriesAndSection([TaxReturnCategoryListEnum.TAX_INSTALMENTS], TaxSummarySectionEnum.HOLDINGS_TANK);
         const frankingCredits = this.summary.items.sumByCategoriesAndSection([TaxReturnCategoryListEnum.FRANKING_CREDITS], TaxSummarySectionEnum.HOLDINGS_TANK);
-        return taxInstallments + frankingCredits;
+        const taxWithheld = this.summary.items.sumByCategoriesAndSection([TaxReturnCategoryListEnum.TAX_WITHHELD], TaxSummarySectionEnum.HOLDINGS_TANK);
+        const taxInstallments = this.summary.items.sumByCategoriesAndSection([TaxReturnCategoryListEnum.HOLDINGS_TAX_INSTALMENTS], TaxSummarySectionEnum.SUMMARY);
+        return taxInstallments + frankingCredits + taxWithheld;
     }
     /**
      * Sole Net Cash = gross income – expenses