taxtank-core 0.31.35 → 0.31.37

package/fesm2020/taxtank-core.mjs

@@ -3348,6 +3348,9 @@ var SalaryForecastFrequencyEnum;
 })(SalaryForecastFrequencyEnum || (SalaryForecastFrequencyEnum = {}));
 
 class SalaryForecast extends SalaryForecast$1 {
+    get grossAmount() {
+        return this.netPay + this.tax;
+    }
     get taxWithheld() {
         return this.grossAmount - this.netPay;
     }
@@ -3370,10 +3373,6 @@ __decorate([
 __decorate([
     Type(() => Number)
 ], SalaryForecast.prototype, "netPay", void 0);
-__decorate([
-    Transform(({ obj }) => obj.netPay + obj.tax),
-    Expose()
-], SalaryForecast.prototype, "grossAmount", void 0);
 __decorate([
     Type(() => IncomeSource)
 ], SalaryForecast.prototype, "incomeSource", void 0);
@@ -3597,14 +3596,14 @@ class AllocationRuleTransaction extends AllocationRuleTransaction$1 {
      * If rule transaction has amount then split enabled. There is 0 when split disabled
      */
     isSplit() {
-        return !!this.amount;
+        return !!this.amountPercent;
     }
     /**
      * Create Transaction instance based on passed bank transaction and rule transaction
      */
     toTransaction(bankTransaction) {
         const transaction = merge(bankTransaction.toTransaction(this.isGST), {
-            amount: this.amount || bankTransaction.amount,
+            amount: bankTransaction.amount * (this.amountPercent ? (this.amountPercent / 100) : 1),
             tax: this.tax,
             claimPercent: this.claimPercent,
             chartAccounts: this.chartAccounts,
@@ -22780,7 +22779,8 @@ class AllocationRuleTransactionForm extends AbstractForm {
     // Flag to enable transaction GST field
     isGST) {
         super({
-            amount: new UntypedFormControl(transaction.amount, Validators.required),
+            amount: new UntypedFormControl(transaction.amount),
+            amountPercent: new UntypedFormControl(transaction.amountPercent, Validators.required),
             tax: new UntypedFormControl(transaction.tax, Validators.required),
             claimPercent: new UntypedFormControl(transaction.claimPercent, [Validators.required, Validators.min(0), Validators.max(100)]),
             chartAccounts: new UntypedFormControl(transaction.chartAccounts, Validators.required),
@@ -22809,7 +22809,7 @@ class AllocationRuleTransactionForm extends AbstractForm {
         return this.get('childTransactions');
     }
     get isSplit() {
-        return this.get('amount').enabled;
+        return this.get('amountPercent').enabled;
     }
     addChildTransactionForm() {
         this.childTransactionsArray.push(new UntypedFormGroup({
@@ -22920,7 +22920,7 @@ class AllocationRuleForm extends AbstractForm {
         }
         // Disable transaction amount field when transaction has no amount (non-split)
         if (!rule.transaction?.isSplit()) {
-            this.transactionFormGroup.get(['amount']).disable();
+            this.transactionFormGroup.get(['amountPercent']).disable();
         }
     }
     get conditionsArray() {
@@ -23008,8 +23008,8 @@ class AllocationRuleForm extends AbstractForm {
                 this.get('transferBankAccount').disable({ emitEvent: false });
                 // disable transaction amount field when value is empty
                 // disable manually because code above enables this field
-                if (!this.transactionFormGroup.get(['amount']).value) {
-                    this.transactionFormGroup.get(['amount']).disable();
+                if (!this.transactionFormGroup.get(['amountPercent']).value) {
+                    this.transactionFormGroup.get(['amountPercent']).disable();
                 }
                 break;
             case AllocationRuleTypeEnum.TRANSFER: