taxtank-core 3.0.2 → 3.0.3

package/fesm2022/taxtank-core.mjs

@@ -9089,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);
     }
@@ -9132,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;
+    }
 }
 
 /**
@@ -29906,7 +29907,14 @@ class WorkExpenseForm extends WorkTransactionForm {
     constructor(transaction, registeredForGst, allocations, homeOfficeClaim) {
         super(transaction, registeredForGst, allocations);
         this.homeOfficeClaim = homeOfficeClaim;
-        this.emitValues();
+        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();
+            this.get('amountWithGST').disable();
+        }
     }
     listenEvents() {
         this.watchChartAccountsMetaFields();
@@ -29963,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