taxtank-core 1.0.53 → 1.0.56

package/fesm2022/taxtank-core.mjs

@@ -255,7 +255,8 @@ let ChartAccountsValue$1 = class ChartAccountsValue extends AbstractModel {
 let ChartAccounts$1 = class ChartAccounts extends AbstractModel {
 };
 
-let DepreciationCapitalProject$1 = class DepreciationCapitalProject extends AbstractModel {
+let DepreciationCapitalProject$1 = class DepreciationCapitalProject extends ObservableModel {
+    static { this.className = 'DepreciationCapitalProject'; }
 };
 
 let DepreciationForecast$1 = class DepreciationForecast extends AbstractModel {
@@ -1325,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";
@@ -1342,20 +1343,15 @@ var TaxReturnCategoryListEnum;
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["HOLDING_PARTNERSHIPS"] = 79] = "HOLDING_PARTNERSHIPS";
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["HOLDING_TRUSTS"] = 80] = "HOLDING_TRUSTS";
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["GROSS_RENT"] = 8] = "GROSS_RENT";
-    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["PSI_SBE_INCOME"] = 14] = "PSI_SBE_INCOME";
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["CAPITAL_GAINS"] = 15] = "CAPITAL_GAINS";
+    // sole income
+    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["PSI_SBE_INCOME"] = 14] = "PSI_SBE_INCOME";
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["GROSS_PAYMENTS_NO_ABN_GIVEN"] = 42] = "GROSS_PAYMENTS_NO_ABN_GIVEN";
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["GROSS_PAYMENTS_VOLUNTARY_AGREEMENT"] = 43] = "GROSS_PAYMENTS_VOLUNTARY_AGREEMENT";
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["GROSS_PAYMENTS_LABOUR_HIRE_OR_OTHER"] = 44] = "GROSS_PAYMENTS_LABOUR_HIRE_OR_OTHER";
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["ASSESSABLE_GOVERNMENT_PAYMENTS"] = 45] = "ASSESSABLE_GOVERNMENT_PAYMENTS";
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["OTHER_BUSINESS_INCOME"] = 46] = "OTHER_BUSINESS_INCOME";
-    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["WORK_EXPENSES"] = 7] = "WORK_EXPENSES";
-    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["INTEREST_DEDUCTIONS"] = 9] = "INTEREST_DEDUCTIONS";
-    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["CAPITAL_WORKS"] = 10] = "CAPITAL_WORKS";
-    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["PLANT_AND_EQUIPMENT"] = 11] = "PLANT_AND_EQUIPMENT";
-    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["BORROWING_EXPENSES"] = 29] = "BORROWING_EXPENSES";
-    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["OTHER_RENTAL_DEDUCTIONS"] = 12] = "OTHER_RENTAL_DEDUCTIONS";
-    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["OTHER_DEDUCTIONS"] = 18] = "OTHER_DEDUCTIONS";
+    // sole expenses
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["PURCHASES_AND_OTHER_COSTS"] = 48] = "PURCHASES_AND_OTHER_COSTS";
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["CONTRACTORS_SUBCONTRACTORS_COMMISSION_EXPENSES"] = 49] = "CONTRACTORS_SUBCONTRACTORS_COMMISSION_EXPENSES";
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["SUPERANNUATION_EXPENSES"] = 50] = "SUPERANNUATION_EXPENSES";
@@ -1364,9 +1360,16 @@ var TaxReturnCategoryListEnum;
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["RENT_EXPENSES"] = 53] = "RENT_EXPENSES";
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["INTEREST_EXPENSES_WITHIN_AUSTRALIA"] = 54] = "INTEREST_EXPENSES_WITHIN_AUSTRALIA";
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["INTEREST_EXPENSES_OVERSEAS"] = 55] = "INTEREST_EXPENSES_OVERSEAS";
-    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["DEPRECIATION_EXPENSES"] = 56] = "DEPRECIATION_EXPENSES";
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["MOTOR_VEHICLE_EXPENSES"] = 57] = "MOTOR_VEHICLE_EXPENSES";
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["ALL_OTHER_EXPENSES"] = 58] = "ALL_OTHER_EXPENSES";
+    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["WORK_EXPENSES"] = 7] = "WORK_EXPENSES";
+    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["INTEREST_DEDUCTIONS"] = 9] = "INTEREST_DEDUCTIONS";
+    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["CAPITAL_WORKS"] = 10] = "CAPITAL_WORKS";
+    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["PLANT_AND_EQUIPMENT"] = 11] = "PLANT_AND_EQUIPMENT";
+    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["BORROWING_EXPENSES"] = 29] = "BORROWING_EXPENSES";
+    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["OTHER_RENTAL_DEDUCTIONS"] = 12] = "OTHER_RENTAL_DEDUCTIONS";
+    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["OTHER_DEDUCTIONS"] = 18] = "OTHER_DEDUCTIONS";
+    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["DEPRECIATION_EXPENSES"] = 56] = "DEPRECIATION_EXPENSES";
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["WORK_RELATED_DEPRECIATION"] = 69] = "WORK_RELATED_DEPRECIATION";
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["GROSS_TAX_PAYABLE"] = 19] = "GROSS_TAX_PAYABLE";
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TAX_ON_TAXABLE_INCOME"] = 20] = "TAX_ON_TAXABLE_INCOME";
@@ -1375,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";
@@ -6877,6 +6883,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,
         }));
     }
@@ -7197,24 +7204,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;
-        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 {
@@ -8805,6 +8794,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
@@ -8812,7 +8802,7 @@ const TAX_RETURN_CATEGORIES = {
         interest: [],
         taxWithheld: [
             TaxReturnCategoryListEnum.TAX_WITHHELD
-        ]
+        ],
     },
     property: {
         income: [
@@ -8844,7 +8834,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,
@@ -8860,11 +8849,12 @@ const TAX_RETURN_CATEGORIES = {
     },
     sole: {
         income: [
+            TaxReturnCategoryListEnum.PSI_SBE_INCOME,
             TaxReturnCategoryListEnum.GROSS_PAYMENTS_NO_ABN_GIVEN,
             TaxReturnCategoryListEnum.GROSS_PAYMENTS_VOLUNTARY_AGREEMENT,
             TaxReturnCategoryListEnum.GROSS_PAYMENTS_LABOUR_HIRE_OR_OTHER,
             TaxReturnCategoryListEnum.ASSESSABLE_GOVERNMENT_PAYMENTS,
-            TaxReturnCategoryListEnum.OTHER_BUSINESS_INCOME
+            TaxReturnCategoryListEnum.OTHER_BUSINESS_INCOME,
         ],
         expenses: [
             TaxReturnCategoryListEnum.PURCHASES_AND_OTHER_COSTS,
@@ -8876,7 +8866,7 @@ const TAX_RETURN_CATEGORIES = {
             TaxReturnCategoryListEnum.INTEREST_EXPENSES_WITHIN_AUSTRALIA,
             TaxReturnCategoryListEnum.INTEREST_EXPENSES_OVERSEAS,
             TaxReturnCategoryListEnum.MOTOR_VEHICLE_EXPENSES,
-            TaxReturnCategoryListEnum.ALL_OTHER_EXPENSES
+            TaxReturnCategoryListEnum.ALL_OTHER_EXPENSES,
         ],
         depreciation: [
             TaxReturnCategoryListEnum.DEPRECIATION_EXPENSES,
@@ -8887,9 +8877,6 @@ const TAX_RETURN_CATEGORIES = {
         lossCurrent: [
             TaxReturnCategoryListEnum.DEFERRED_BUSINESS_LOSSES,
         ],
-        taxOffsets: [
-            TaxReturnCategoryListEnum.TAX_OFFSETS_SOLE
-        ],
     },
     summary: {
         income: [
@@ -12718,7 +12705,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.1.2", ngImpor
  * Service for work with messages
  */
 class MessageService extends RestService$1 {
-    // mercureTopic = 'messages';
     constructor(environment) {
         super(environment);
         this.environment = environment;
@@ -12726,6 +12712,7 @@ class MessageService extends RestService$1 {
         this.collectionClass = MessageCollection;
         this.endpointUri = 'messages';
         this.disabledMethods = ['postBatch', 'putBatch'];
+        this.mercureTopic = 'messages';
         this.listenEvents();
     }
     listenEvents() {
@@ -12841,6 +12828,7 @@ class DepreciationService extends RestService$1 {
         this.listenToUpdatedBankAccount();
         this.listenSoleDepreciationMethodChanges();
         this.listenPropertyDepreciationCalculationChanges();
+        this.listenCSE(DepreciationCapitalProject, this.refreshCache, ['put']);
     }
     getOpenBalance(depreciation) {
         return this.http.post(`${this.apiUrl}/opening-balance?financialYear=${new FinancialYear().year}`, depreciation)
@@ -13287,7 +13275,6 @@ var ClientInviteMessages;
 })(ClientInviteMessages || (ClientInviteMessages = {}));
 
 class ClientMovementService extends RestService$1 {
-    // mercureTopic = 'clientMovements';
     constructor(environment) {
         super(environment);
         this.environment = environment;
@@ -13295,6 +13282,7 @@ class ClientMovementService extends RestService$1 {
         this.collectionClass = ClientMovementCollection;
         this.modelClass = ClientMovement;
         this.disabledMethods = ['postBatch', 'delete', 'deleteBatch'];
+        this.mercureTopic = 'clientMovements';
         this.listenEvents();
     }
     listenEvents() {
@@ -15644,8 +15632,17 @@ class TaxSummary {
      * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/217677990/Dashboard+Main
      */
     get workNetCash() {
+        return this.workNetTotal + this.workTaxCredits;
+    }
+    get workTaxCredits() {
         const taxWithheld = this.summary.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.work.taxWithheld, TaxSummarySectionEnum.WORK_TANK);
-        return this.workNetTotal - Math.abs(taxWithheld);
+        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([
@@ -15720,9 +15717,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
@@ -16697,6 +16695,8 @@ class UserService extends RestService$1 {
             // @TODO vik use separated service to handle global user storage
             localStorage.setItem('userId', user.id.toString());
             localStorage.setItem('financialYear', user.financialYear.toString());
+            // for firm area (client roles updated in subscriptionService)
+            localStorage.setItem('roles', JSON.stringify(this.getCacheFirst().roles));
             return users;
         }));
     }