taxtank-core 1.0.52 → 1.0.55

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 {
@@ -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";
@@ -7204,6 +7207,7 @@ class TransactionCollection extends TransactionBaseCollection {
             .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() {
@@ -7842,8 +7846,9 @@ class MyTaxDeductions {
     setOtherWorkRelatedExpensesTotalAmount() {
         const otherIncomeRelatedExpenses = this.transactions
             .filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.otherIncomeRelatedExpenses);
-        this.otherWorkRelatedExpensesTotalAmount = -Math.abs(otherIncomeRelatedExpenses.sumBy('claimAmount')) -
-            this.depreciations.filterBy('chartAccounts.heading.id', ChartAccountsHeadingListEnum.TOOLS_EQUIPMENT).sumBy('claimAmount');
+        this.otherWorkRelatedExpensesTotalAmount = -Math.abs(otherIncomeRelatedExpenses.sumBy('claimAmount'))
+            - this.depreciations.filterBy('chartAccounts.heading.id', ChartAccountsHeadingListEnum.TOOLS_EQUIPMENT).sumBy('claimAmount')
+            + this.depreciations.getByTankType(TankTypeEnum.WORK).getLVPDepreciations().sumBy('claimAmount');
     }
     calculateWorkRelatedSelfEducationTotalAmount() {
         return this.workRelatedSelfEducationExpenses ? this.workRelatedSelfEducationExpenses.sumBy('claimAmount') - MyTaxDeductions.selfEducationNotDeductibleAmount : 0;
@@ -8097,11 +8102,7 @@ class MyTaxRent {
     constructor(transactions, depreciations, taxSummary) {
         this.propertyExpenses = transactions.getPropertyTransactions().getExpenseTransactions();
         this.taxSummaryPropertySection = taxSummary.property;
-        this.grossRentAmount = transactions
-            .getPropertyTransactions()
-            .getIncomeTransactions()
-            .filterBy('chartAccounts.id', [ChartAccountsListEnum.RENTAL_INCOME, ChartAccountsListEnum.OTHER_RENTAL_INCOME])
-            .getGrossClaimAmountWithoutGst();
+        this.grossRentAmount = this.taxSummaryPropertySection.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.property.income, TaxSummarySectionEnum.PROPERTY_TANK);
         this.interestDeductionsAmount = transactions.getInterestTransactions().sumBy('claimAmount');
         this.capitalWorksDeductionsAmount = -depreciations.getCapitalDepreciations().sumBy('claimAmount');
         this.otherRentalDeductionsAmount = this.calculateOtherRentalDeductionsAmount();
@@ -8815,7 +8816,7 @@ const TAX_RETURN_CATEGORIES = {
         interest: [],
         taxWithheld: [
             TaxReturnCategoryListEnum.TAX_WITHHELD
-        ]
+        ],
     },
     property: {
         income: [
@@ -8863,11 +8864,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,
@@ -8879,7 +8881,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,
@@ -11979,6 +11981,7 @@ let RestService$1 = class RestService extends DataService {
             return;
         }
         this.sseService.on(this.mercureTopic).pipe(map((response) => {
+            console.log(response);
             let model = this.createModelInstance(response);
             let method;
             if (model.id) {
@@ -11991,6 +11994,7 @@ let RestService$1 = class RestService extends DataService {
             }
             return { method, model };
         })).subscribe((change) => {
+            console.log(change);
             this.handleResponse([change.model], change.method);
         });
     }
@@ -12842,6 +12846,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)
@@ -15648,6 +15653,12 @@ class TaxSummary {
         const taxWithheld = this.summary.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.work.taxWithheld, TaxSummarySectionEnum.WORK_TANK);
         return this.workNetTotal - Math.abs(taxWithheld);
     }
+    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;
+    }
     get income() {
         return this.getReportItems([this.work, this.property, this.sole, this.holdings]).sumByCategories([
             ...TAX_RETURN_CATEGORIES.work.income,
@@ -15682,8 +15693,8 @@ class TaxSummary {
     }
     get workDepreciations() {
         return this.work.items
-            .findByCategory(TaxReturnCategoryListEnum.WORK_OTHER_EXPENSES).details.items
-            .find(item => item.name === 'Depreciation')?.amount;
+            .findByCategory(TaxReturnCategoryListEnum.WORK_OTHER_EXPENSES)?.details?.items
+            .find(item => item.name === 'Depreciation')?.amount ?? 0;
     }
     /**
      * Property Net Cash (Cash Position) = Rental Income - expenses - interest
@@ -16698,6 +16709,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;
         }));
     }
@@ -24176,6 +24189,14 @@ class MyTaxIncomeStatementsForm extends AbstractForm {
                 value: incomeStatements.australianSpecialPaymentsTotalTax,
                 disabled: true
             }),
+            foreignIncome: new UntypedFormControl({
+                value: incomeStatements.foreignIncome,
+                disabled: true
+            }),
+            foreignTaxWithheld: new UntypedFormControl({
+                value: incomeStatements.foreignTaxWithheld,
+                disabled: true
+            }),
         });
         this.incomeStatements = incomeStatements;
     }