taxtank-core 2.1.94 → 2.1.96

package/fesm2022/taxtank-core.mjs

@@ -552,8 +552,6 @@ var ChartAccountsListEnum;
     ChartAccountsListEnum[ChartAccountsListEnum["VEHICLE_LOAN_INTEREST"] = 37] = "VEHICLE_LOAN_INTEREST";
     ChartAccountsListEnum[ChartAccountsListEnum["VEHICLE_LOAN_PRINCIPAL"] = 38] = "VEHICLE_LOAN_PRINCIPAL";
     ChartAccountsListEnum[ChartAccountsListEnum["HOME_OFFICE_HOURS"] = 103] = "HOME_OFFICE_HOURS";
-    ChartAccountsListEnum[ChartAccountsListEnum["PARTNERSHIP_EXPENSES"] = 156] = "PARTNERSHIP_EXPENSES";
-    ChartAccountsListEnum[ChartAccountsListEnum["TRUST_EXPENSES"] = 157] = "TRUST_EXPENSES";
     ChartAccountsListEnum[ChartAccountsListEnum["INTEREST_CHARGED_BY_ATO"] = 278] = "INTEREST_CHARGED_BY_ATO";
     ChartAccountsListEnum[ChartAccountsListEnum["LITIGATION_COSTS"] = 280] = "LITIGATION_COSTS";
     ChartAccountsListEnum[ChartAccountsListEnum["ACCOUNTANT_TAX_AGENT_FEES"] = 282] = "ACCOUNTANT_TAX_AGENT_FEES";
@@ -599,6 +597,18 @@ var ChartAccountsListEnum;
     ChartAccountsListEnum[ChartAccountsListEnum["ELECTRICITY_AND_GAS"] = 234] = "ELECTRICITY_AND_GAS";
     ChartAccountsListEnum[ChartAccountsListEnum["TELEPHONE"] = 255] = "TELEPHONE";
     ChartAccountsListEnum[ChartAccountsListEnum["HOME_OFFICE_CLEANING"] = 11871] = "HOME_OFFICE_CLEANING";
+    ChartAccountsListEnum[ChartAccountsListEnum["PARTNERSHIP_EXPENSES"] = 609] = "PARTNERSHIP_EXPENSES";
+    ChartAccountsListEnum[ChartAccountsListEnum["TRUST_EXPENSES"] = 610] = "TRUST_EXPENSES";
+    ChartAccountsListEnum[ChartAccountsListEnum["LANDCARE_EXPENSES"] = 1019] = "LANDCARE_EXPENSES";
+    ChartAccountsListEnum[ChartAccountsListEnum["OTHER_DEDUCTIONS"] = 1020] = "OTHER_DEDUCTIONS";
+    ChartAccountsListEnum[ChartAccountsListEnum["LANDCARE_WATER"] = 1023] = "LANDCARE_WATER";
+    ChartAccountsListEnum[ChartAccountsListEnum["OTHER_DEDUCTIONS_PRIMARY"] = 1024] = "OTHER_DEDUCTIONS_PRIMARY";
+    ChartAccountsListEnum[ChartAccountsListEnum["OVERSEAS_WORK_EXPENSES"] = 1034] = "OVERSEAS_WORK_EXPENSES";
+    ChartAccountsListEnum[ChartAccountsListEnum["FOREIGN_TAX_WITHHELD_WORK"] = 1035] = "FOREIGN_TAX_WITHHELD_WORK";
+    ChartAccountsListEnum[ChartAccountsListEnum["OTHER_OVERSEAS_EXPENSES"] = 1045] = "OTHER_OVERSEAS_EXPENSES";
+    ChartAccountsListEnum[ChartAccountsListEnum["FOREIGN_PENSION_EXPENSES"] = 1054] = "FOREIGN_PENSION_EXPENSES";
+    ChartAccountsListEnum[ChartAccountsListEnum["ANNUITY_PURCHASE_PRICE"] = 1055] = "ANNUITY_PURCHASE_PRICE";
+    ChartAccountsListEnum[ChartAccountsListEnum["FOREIGN_TAX_WITHHELD_PENSION"] = 1056] = "FOREIGN_TAX_WITHHELD_PENSION";
 })(ChartAccountsListEnum || (ChartAccountsListEnum = {}));
 
 var BusinessChartAccountsEnum;
@@ -3920,6 +3930,9 @@ class ChartAccounts extends ChartAccounts$1 {
     isHoldingExpense() {
         return [ChartAccountsCategoryEnum.HOLDING_EXPENSE].includes(this.category);
     }
+    isHoldingIncome() {
+        return [ChartAccountsCategoryEnum.HOLDING_INCOME].includes(this.category);
+    }
     /**
      * Check if chart accounts is property expense
      */
@@ -4078,6 +4091,22 @@ class ChartAccounts extends ChartAccounts$1 {
     isPersonalTank() {
         return CHART_ACCOUNTS_CATEGORIES.personal.includes(this.category);
     }
+    hasWorkExpensePayer() {
+        return [
+            ChartAccountsListEnum.PARTNERSHIP_EXPENSES,
+            ChartAccountsListEnum.TRUST_EXPENSES,
+            ChartAccountsListEnum.LANDCARE_EXPENSES,
+            ChartAccountsListEnum.OTHER_DEDUCTIONS,
+            ChartAccountsListEnum.LANDCARE_WATER,
+            ChartAccountsListEnum.OTHER_DEDUCTIONS_PRIMARY,
+            ChartAccountsListEnum.OVERSEAS_WORK_EXPENSES,
+            ChartAccountsListEnum.FOREIGN_TAX_WITHHELD_WORK,
+            ChartAccountsListEnum.OTHER_OVERSEAS_EXPENSES,
+            ChartAccountsListEnum.FOREIGN_PENSION_EXPENSES,
+            ChartAccountsListEnum.ANNUITY_PURCHASE_PRICE,
+            ChartAccountsListEnum.FOREIGN_TAX_WITHHELD_PENSION,
+        ].includes(this.id);
+    }
 }
 __decorate([
     Type(() => ChartAccountsHeading)
@@ -8764,14 +8793,14 @@ class MyTaxPartnershipsAndTrusts {
     constructor(transactions, incomeSources) {
         this.transactions = transactions;
         this.incomeSources = incomeSources;
-        this.partnershipsIncomes = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.PARTNERSHIP_INCOME);
-        this.partnershipsExpenses = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.PARTNERSHIP_EXPENSES);
-        this.trustsIncomes = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.TRUST_INCOME);
-        this.trustsExpenses = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.TRUST_EXPENSES);
-        this.partnershipsIncomeTotalAmount = this.partnershipsIncomes.sumBy('amount');
-        this.partnershipsExpenseTotalAmount = this.partnershipsExpenses.sumBy('amount');
-        this.trustsIncomeTotalAmount = this.trustsIncomes.sumBy('amount');
-        this.trustsExpenseTotalAmount = this.trustsExpenses.sumBy('amount');
+        const partnershipsIncomes = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.PARTNERSHIP_INCOME);
+        const partnershipsExpenses = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.PARTNERSHIP_EXPENSES);
+        const trustsIncomes = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.TRUST_INCOME);
+        const trustsExpenses = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.TRUST_EXPENSES);
+        this.partnershipsIncomeTotalAmount = partnershipsIncomes.sumBy('amount');
+        this.partnershipsExpenseTotalAmount = partnershipsExpenses.sumBy('amount');
+        this.trustsIncomeTotalAmount = trustsIncomes.sumBy('amount');
+        this.trustsExpenseTotalAmount = trustsExpenses.sumBy('amount');
         this.partnershipsNetNonPrimaryProductionAmount = this.partnershipsIncomeTotalAmount - this.partnershipsExpenseTotalAmount;
         this.trustsNetNonPrimaryProductionAmount = this.trustsIncomeTotalAmount - this.trustsExpenseTotalAmount;
         this.frankingCreditsTotal = this.transactions
@@ -8779,7 +8808,7 @@ class MyTaxPartnershipsAndTrusts {
             .getTransactionsMetaFields()
             .filterBy('chartAccountsMetaField.id', ChartAccountsMetaFieldListEnum.FRANKING_CREDIT)
             .sumBy('value');
-        this.trustsIncomeTotalTax = this.trustsIncomes.sumBy('tax');
+        this.trustsIncomeTotalTax = trustsIncomes.sumBy('tax');
         this.frankingCreditsTotal = this.transactions
             .filterBy('chartAccounts.heading.id', ChartAccountsHeadingTaxableEnum.PARTNERSHIPS_AND_TRUSTS_INCOME)
             .getTransactionsMetaFields()
@@ -29475,7 +29504,8 @@ class WorkTransactionForm extends TransactionForm {
             metaFields: new FormArray((transaction.metaFields || []).map((transactionMetaField) => new FormGroup({
                 value: new FormControl(transactionMetaField.value),
                 chartAccountsMetaField: new FormControl(transactionMetaField.chartAccountsMetaField)
-            })))
+            }))),
+            incomeSource: new FormControl(transaction.incomeSource, [Validators.required, autocompleteValidator()]),
         }));
         // forbid to edit chartAccounts if it's in edit mode
         // if (transaction.id) {
@@ -29596,9 +29626,12 @@ class WorkIncomeForm extends WorkTransactionForm {
 }
 
 class WorkExpenseForm extends WorkTransactionForm {
-    constructor(transaction, registeredForGst, allocations, homeOfficeClaim, controls = {}) {
-        super(transaction, registeredForGst, allocations, controls);
+    constructor(transaction, registeredForGst, allocations, homeOfficeClaim) {
+        super(transaction, registeredForGst, allocations);
         this.homeOfficeClaim = homeOfficeClaim;
+        if (!transaction.chartAccounts?.hasWorkExpensePayer()) {
+            this.get('incomeSource').disable();
+        }
         // amount set automatically for chartAccounts with hours meta field
         if (transaction.getMetaFieldValue(ChartAccountsMetaFieldListEnum.HOURS)) {
             this.get('amount').disable();
@@ -29628,12 +29661,17 @@ class WorkExpenseForm extends WorkTransactionForm {
     watchChartAccounts() {
         super.watchChartAccounts();
         this.get('chartAccounts').valueChanges.subscribe((chartAccounts) => {
-            if (!chartAccounts.isHomeOfficeExpense() || !this.homeOfficeClaim) {
-                return;
+            if (chartAccounts.hasWorkExpensePayer()) {
+                this.get('incomeSource').enable();
+            }
+            else {
+                this.get('incomeSource').disable();
+            }
+            if (chartAccounts.isHomeOfficeExpense() && this.homeOfficeClaim) {
+                const claims = this.homeOfficeClaim.getChartAccountsClaims();
+                this.get('claimPercent').patchValue(claims.get(chartAccounts.id));
+                this.get('claimPercent').disable();
             }
-            const claims = this.homeOfficeClaim.getChartAccountsClaims();
-            this.get('claimPercent').patchValue(claims.get(chartAccounts.id));
-            this.get('claimPercent').disable();
         });
     }
 }