taxtank-core 3.0.1 → 3.0.3

package/fesm2022/taxtank-core.mjs

@@ -609,6 +609,7 @@ var ChartAccountsListEnum;
     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["EV_HOME_CHARGING"] = 1057] = "EV_HOME_CHARGING";
 })(ChartAccountsListEnum || (ChartAccountsListEnum = {}));
 
 var BusinessChartAccountsEnum;
@@ -688,6 +689,7 @@ var BusinessChartAccountsEnum;
     BusinessChartAccountsEnum[BusinessChartAccountsEnum["CHILDCARE_FEES"] = 1010] = "CHILDCARE_FEES";
     BusinessChartAccountsEnum[BusinessChartAccountsEnum["GOVERNMENT_CHILDCARE_SUBSIDIES"] = 1011] = "GOVERNMENT_CHILDCARE_SUBSIDIES";
     BusinessChartAccountsEnum[BusinessChartAccountsEnum["ADDITIONAL_CHILDCARE_SERVICES"] = 1017] = "ADDITIONAL_CHILDCARE_SERVICES";
+    BusinessChartAccountsEnum[BusinessChartAccountsEnum["EV_HOME_CHARGING"] = 909] = "EV_HOME_CHARGING";
 })(BusinessChartAccountsEnum || (BusinessChartAccountsEnum = {}));
 
 var ChartAccountsMetaFieldListEnum;
@@ -707,6 +709,7 @@ var ChartAccountsMetaFieldListEnum;
     ChartAccountsMetaFieldListEnum[ChartAccountsMetaFieldListEnum["UNFRANKED"] = 27] = "UNFRANKED";
     ChartAccountsMetaFieldListEnum[ChartAccountsMetaFieldListEnum["TAX_OFFSETS_N_R_A_S"] = 29] = "TAX_OFFSETS_N_R_A_S";
     ChartAccountsMetaFieldListEnum[ChartAccountsMetaFieldListEnum["DISCOUNT_FROM_DEFERRED_SCHEMES"] = 32] = "DISCOUNT_FROM_DEFERRED_SCHEMES";
+    ChartAccountsMetaFieldListEnum[ChartAccountsMetaFieldListEnum["KWH"] = 33] = "KWH";
 })(ChartAccountsMetaFieldListEnum || (ChartAccountsMetaFieldListEnum = {}));
 
 var ChartAccountsMetaFieldTypeEnum;
@@ -3851,6 +3854,136 @@ var ChartAccountsValues = [
 		unitOfMeasure: "hours",
 		createdAt: "2026-06-27 00:00:00",
 		updatedAt: "2026-06-27 00:00:00"
+	},
+	{
+		id: 71,
+		chartAccounts: {
+			id: 909
+		},
+		financialYear: 2023,
+		startDate: null,
+		endDate: null,
+		value: 4.2,
+		unitOfMeasure: "kWh",
+		createdAt: "2026-06-27 00:00:00",
+		updatedAt: "2026-06-27 00:00:00"
+	},
+	{
+		id: 72,
+		chartAccounts: {
+			id: 909
+		},
+		financialYear: 2024,
+		startDate: null,
+		endDate: null,
+		value: 4.2,
+		unitOfMeasure: "kWh",
+		createdAt: "2026-06-27 00:00:00",
+		updatedAt: "2026-06-27 00:00:00"
+	},
+	{
+		id: 73,
+		chartAccounts: {
+			id: 909
+		},
+		financialYear: 2025,
+		startDate: null,
+		endDate: null,
+		value: 4.2,
+		unitOfMeasure: "kWh",
+		createdAt: "2026-06-27 00:00:00",
+		updatedAt: "2026-06-27 00:00:00"
+	},
+	{
+		id: 74,
+		chartAccounts: {
+			id: 909
+		},
+		financialYear: 2026,
+		startDate: null,
+		endDate: null,
+		value: 8.78,
+		unitOfMeasure: "kWh",
+		createdAt: "2026-06-27 00:00:00",
+		updatedAt: "2026-06-27 00:00:00"
+	},
+	{
+		id: 75,
+		chartAccounts: {
+			id: 909
+		},
+		financialYear: 2027,
+		startDate: null,
+		endDate: null,
+		value: 8.78,
+		unitOfMeasure: "kWh",
+		createdAt: "2026-06-27 00:00:00",
+		updatedAt: "2026-06-27 00:00:00"
+	},
+	{
+		id: 76,
+		chartAccounts: {
+			id: 1057
+		},
+		financialYear: 2023,
+		startDate: null,
+		endDate: null,
+		value: 4.2,
+		unitOfMeasure: "kWh",
+		createdAt: "2026-06-27 00:00:00",
+		updatedAt: "2026-06-27 00:00:00"
+	},
+	{
+		id: 77,
+		chartAccounts: {
+			id: 1057
+		},
+		financialYear: 2024,
+		startDate: null,
+		endDate: null,
+		value: 4.2,
+		unitOfMeasure: "kWh",
+		createdAt: "2026-06-27 00:00:00",
+		updatedAt: "2026-06-27 00:00:00"
+	},
+	{
+		id: 78,
+		chartAccounts: {
+			id: 1057
+		},
+		financialYear: 2025,
+		startDate: null,
+		endDate: null,
+		value: 4.2,
+		unitOfMeasure: "kWh",
+		createdAt: "2026-06-27 00:00:00",
+		updatedAt: "2026-06-27 00:00:00"
+	},
+	{
+		id: 79,
+		chartAccounts: {
+			id: 1057
+		},
+		financialYear: 2026,
+		startDate: null,
+		endDate: null,
+		value: 8.78,
+		unitOfMeasure: "kWh",
+		createdAt: "2026-06-27 00:00:00",
+		updatedAt: "2026-06-27 00:00:00"
+	},
+	{
+		id: 80,
+		chartAccounts: {
+			id: 1057
+		},
+		financialYear: 2027,
+		startDate: null,
+		endDate: null,
+		value: 8.78,
+		unitOfMeasure: "kWh",
+		createdAt: "2026-06-27 00:00:00",
+		updatedAt: "2026-06-27 00:00:00"
 	}
 ];
 
@@ -4110,6 +4243,9 @@ class ChartAccounts extends ChartAccounts$1 {
     isHomeOfficeExpense() {
         return ChartAccounts.homeOfficeList.includes(this.id);
     }
+    isEvHomeCharging() {
+        return [ChartAccountsListEnum.EV_HOME_CHARGING, BusinessChartAccountsEnum.EV_HOME_CHARGING].includes(this.id);
+    }
     isHomeOfficeWorkHours() {
         return this.id === ChartAccountsListEnum.HOME_OFFICE_HOURS;
     }
@@ -8953,9 +9089,6 @@ class PropertyReportItem extends AbstractModel {
         this.subCode = chartAccounts.taxReturnItem?.subCode;
         this.description = chartAccounts.name;
     }
-    get claimAmount() {
-        return round(this.amount * (this.claimPercent / 100), 2);
-    }
     get shareClaimAmount() {
         return this.claimAmount * (this.sharePercent / 100);
     }
@@ -8996,9 +9129,13 @@ class PropertyReportItemDepreciation extends PropertyReportItem {
 class PropertyReportItemTransaction extends PropertyReportItem {
     constructor(transactions, property, chartAccounts) {
         super(property, chartAccounts);
+        this.transactions = transactions;
         this.amount = Math.abs(transactions.sumBy('grossAmount'));
         this.description = chartAccounts.name;
     }
+    get claimAmount() {
+        return this.transactions.claimAmount / this.sharePercent * 100;
+    }
 }
 
 /**
@@ -11034,6 +11171,10 @@ class ChartAccountsValueCollection extends Collection {
         const chartAccountsId = isSole ? BusinessChartAccountsEnum.HOME_OFFICE_HOURS : ChartAccountsListEnum.HOME_OFFICE_HOURS;
         return this.find((ca) => ca.chartAccounts.id === chartAccountsId && new FinancialYear().year === ca.financialYear).value;
     }
+    getKwhRate(isSole) {
+        const chartAccountsId = isSole ? BusinessChartAccountsEnum.EV_HOME_CHARGING : ChartAccountsListEnum.EV_HOME_CHARGING;
+        return this.find((ca) => ca.chartAccounts.id === chartAccountsId && new FinancialYear().year === ca.financialYear).value;
+    }
 }
 
 class HomeOfficeClaimCollection extends Collection {
@@ -29781,18 +29922,22 @@ class WorkExpenseForm extends WorkTransactionForm {
     }
     watchChartAccountsMetaFields() {
         this.get('metaFields').valueChanges.subscribe((metaFields) => {
-            const hoursMetaField = new Collection(metaFields).findBy('chartAccountsMetaField.id', ChartAccountsMetaFieldListEnum.HOURS);
-            if (!hoursMetaField) {
-                return;
+            // fixed rate (ie amount per hour/kwh)
+            const rateMetaFields = [ChartAccountsMetaFieldListEnum.KWH, ChartAccountsMetaFieldListEnum.HOURS];
+            const rate = new Collection(metaFields).filterBy('chartAccountsMetaField.id', rateMetaFields).first?.value;
+            if (rate) {
+                const amount = +rate * this.get('chartAccounts').value.getCurrentYearValue().value;
+                this.get('amount').reset();
+                this.get('amount').disable();
+                this.get('amount').setValue(amount);
+                this.get('amountWithGST').reset();
+                this.get('amountWithGST').disable();
+                this.get('amountWithGST').setValue(amount);
+            }
+            else {
+                this.get('amount').enable();
+                this.get('amountWithGST').enable();
             }
-            // for home office hours expense amount is a fixed rate per hour
-            const amount = this.get('chartAccounts').value.getCurrentYearValue().value * +hoursMetaField.value;
-            this.get('amount').reset();
-            this.get('amount').disable();
-            this.get('amount').setValue(amount);
-            this.get('amountWithGST').reset();
-            this.get('amountWithGST').disable();
-            this.get('amountWithGST').setValue(amount);
         });
     }
     watchChartAccounts() {
@@ -29826,7 +29971,7 @@ class HoldingIncomeForm extends WorkTransactionForm {
         this.get('amount').setValidators([Validators.required, conditionalValidator(() => this.get('chartAccounts').value && this.get('chartAccounts').value.isDividends(), matchSumValidator(this.getAmountComponents, 'The Franked and Unfranked amounts entered do not equal the total Amount received. Please check and try again.'))]);
         // forbid to edit some fields for allocated transaction
         if (allocations.length) {
-            this.get('chartAccounts').disable();
+            this.get('chartAccounts').disable({ emitEvent: false });
         }
         this.get('transactions').disable();
         // amount changes are not available for transactions with allocations or during allocate process