taxtank-core 0.31.18 → 0.31.20

package/fesm2020/taxtank-core.mjs

@@ -403,6 +403,7 @@ var TankTypeEnum;
     TankTypeEnum[TankTypeEnum["OTHER"] = 3] = "OTHER";
     TankTypeEnum[TankTypeEnum["SOLE"] = 4] = "SOLE";
     TankTypeEnum[TankTypeEnum["HOLDING"] = 5] = "HOLDING";
+    TankTypeEnum[TankTypeEnum["PERSONAL"] = 6] = "PERSONAL";
 })(TankTypeEnum || (TankTypeEnum = {}));
 
 class TransactionBase extends ObservableModel {
@@ -419,8 +420,10 @@ class TransactionBase extends ObservableModel {
                 return TankTypeEnum.SOLE;
             case this.isHoldingTank():
                 return TankTypeEnum.HOLDING;
-            default:
+            case this.isOtherTank():
                 return TankTypeEnum.OTHER;
+            default:
+                return TankTypeEnum.PERSONAL;
         }
     }
     /**
@@ -465,6 +468,13 @@ class TransactionBase extends ObservableModel {
         // @TODO Alex we need another way to distinguish work/holding
         return !this.isPropertyTank() && !this.isSoleTank();
     }
+    isOtherTank() {
+        // chart accounts may be empty for new instances
+        if (!this.chartAccounts) {
+            return false;
+        }
+        return CHART_ACCOUNTS_CATEGORIES.other.includes(this.chartAccounts?.category);
+    }
     isPersonalTank() {
         if (!this.chartAccounts) {
             return false;
@@ -2366,6 +2376,10 @@ const CHART_ACCOUNTS_CATEGORIES = {
         ChartAccountsCategoryEnum.HOLDING_EXPENSE,
         ChartAccountsCategoryEnum.HOLDING_INCOME,
     ],
+    other: [
+        ChartAccountsCategoryEnum.OTHER_INCOME,
+        ChartAccountsCategoryEnum.OTHER_EXPENSE,
+    ],
     personal: [
         ChartAccountsCategoryEnum.PERSONAL_EXPENSE,
         ChartAccountsCategoryEnum.PERSONAL_INCOME
@@ -3143,6 +3157,9 @@ class ChartAccounts extends ChartAccounts$1 {
     isDepreciation() {
         return CHART_ACCOUNTS_CATEGORIES.depreciation.includes(this.category);
     }
+    isSoleIncome() {
+        return CHART_ACCOUNTS_CATEGORIES.soleIncome.includes(this.category);
+    }
     /**
      * Check if transaction chart account is work related car expenses
      */
@@ -22681,7 +22698,7 @@ class AllocationRuleForm extends AbstractForm {
                 .map((condition) => new AllocationRuleConditionForm(condition))),
             transaction: new AllocationRuleTransactionForm(rule.transaction || plainToClass(AllocationRuleTransaction, {}), isGST),
             transferBankAccount: new UntypedFormControl(rule.transferBankAccount, Validators.required),
-            autoAllocate: new UntypedFormControl(rule.autoAllocate || false, Validators.required)
+            autoAllocate: new UntypedFormControl(rule.autoAllocate || false, Validators.required),
         }, rule);
         this.isGST = isGST;
         this.listenEvents();
@@ -22890,7 +22907,7 @@ class TransactionBaseForm extends AbstractForm {
         // property claim (ownership% x shared%) for property expenses, taxable percent for others
         let claimPercent = chartAccounts.taxablePercent;
         if (chartAccounts.isPropertyExpense() && chartAccounts.id !== ChartAccountsListEnum.PLATFORM_FEES) {
-            claimPercent *= this.value.property?.claimCoefficient;
+            claimPercent *= this.get('property').value.claimCoefficient;
         }
         this.get('claimPercent').setValue(claimPercent);
     }