taxtank-core 0.31.36 → 0.31.38

package/fesm2020/taxtank-core.mjs

@@ -3579,6 +3579,9 @@ class AllocationRuleTransaction extends AllocationRuleTransaction$1 {
         this.tax = 0;
         this.amount = null;
     }
+    get amountPercentCoefficient() {
+        return this.amountPercent ? this.amountPercent / 100 : 1;
+    }
     calculateClaimPercent() {
         if (!this.chartAccounts) {
             return null;
@@ -3596,14 +3599,13 @@ 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,
             tax: this.tax,
             claimPercent: this.claimPercent,
             chartAccounts: this.chartAccounts,
@@ -3616,6 +3618,13 @@ class AllocationRuleTransaction extends AllocationRuleTransaction$1 {
             business: this.business,
             operation: TransactionOperationEnum.ALLOCATE,
         });
+        // amount: bankTransaction.amount * (this.amountPercent ? (this.amountPercent / 100) : 1),
+        if (this.amount) {
+            transaction.amount = this.amount;
+        }
+        else if (this.amountPercent) {
+            transaction.amount *= this.amountPercentCoefficient;
+        }
         transaction.allocations = [TransactionAllocation.create(transaction.amountWithGst, bankTransaction)];
         return transaction;
     }
@@ -22779,7 +22788,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),
@@ -22808,7 +22818,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({
@@ -22919,7 +22929,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() {
@@ -22995,6 +23005,8 @@ class AllocationRuleForm extends AbstractForm {
                 return 'property';
             case TankTypeEnum.SOLE:
                 return 'sole';
+            case TankTypeEnum.HOLDING:
+                return 'holding';
             default:
                 return 'personal';
         }
@@ -23007,8 +23019,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: