taxtank-core 0.30.110 → 0.30.111

package/fesm2020/taxtank-core.mjs

@@ -1122,12 +1122,14 @@ var ChartAccountsListEnum;
     ChartAccountsListEnum[ChartAccountsListEnum["REGISTRATION"] = 686] = "REGISTRATION";
     ChartAccountsListEnum[ChartAccountsListEnum["LEASE_INTEREST_PAYMENTS"] = 687] = "LEASE_INTEREST_PAYMENTS";
     ChartAccountsListEnum[ChartAccountsListEnum["SOLE_VEHICLE_LOAN_INTEREST"] = 688] = "SOLE_VEHICLE_LOAN_INTEREST";
+    ChartAccountsListEnum[ChartAccountsListEnum["SOLE_VEHICLE_LOAN_PRINCIPAL"] = 855] = "SOLE_VEHICLE_LOAN_PRINCIPAL";
     ChartAccountsListEnum[ChartAccountsListEnum["INSURANCE"] = 689] = "INSURANCE";
     ChartAccountsListEnum[ChartAccountsListEnum["TYRES"] = 690] = "TYRES";
     ChartAccountsListEnum[ChartAccountsListEnum["BATTERIES"] = 691] = "BATTERIES";
     ChartAccountsListEnum[ChartAccountsListEnum["CAR_WASH"] = 692] = "CAR_WASH";
     ChartAccountsListEnum[ChartAccountsListEnum["PARKING_TOLLS"] = 693] = "PARKING_TOLLS";
     ChartAccountsListEnum[ChartAccountsListEnum["OTHER_SOLE_EXPENSES"] = 694] = "OTHER_SOLE_EXPENSES";
+    ChartAccountsListEnum[ChartAccountsListEnum["SOLE_ENTERTAINMENT"] = 698] = "SOLE_ENTERTAINMENT";
     ChartAccountsListEnum[ChartAccountsListEnum["PERSONAL_EXPENSES"] = 628] = "PERSONAL_EXPENSES";
     ChartAccountsListEnum[ChartAccountsListEnum["PERSONAL_INCOME"] = 630] = "PERSONAL_INCOME";
     ChartAccountsListEnum[ChartAccountsListEnum["PLATFORM_FEES"] = 857] = "PLATFORM_FEES";
@@ -3288,7 +3290,13 @@ class ChartAccounts extends ChartAccounts$1 {
      * Check if transaction chart account is work related car expenses
      */
     isVehicleLoanExpense() {
-        return this.id === ChartAccountsListEnum.VEHICLE_LOAN_INTEREST || this.id === ChartAccountsListEnum.VEHICLE_LOAN_PRINCIPAL;
+        return this.isVehicleLoanInterest() || this.isVehicleLoanPrinciple();
+    }
+    isVehicleLoanPrinciple() {
+        return [ChartAccountsListEnum.VEHICLE_LOAN_PRINCIPAL, ChartAccountsListEnum.SOLE_VEHICLE_LOAN_PRINCIPAL].includes(this.id);
+    }
+    isVehicleLoanInterest() {
+        return [ChartAccountsListEnum.VEHICLE_LOAN_INTEREST, ChartAccountsListEnum.SOLE_VEHICLE_LOAN_INTEREST].includes(this.id);
     }
     /**
      * Get chart accounts value for current financial year
@@ -3304,10 +3312,12 @@ class ChartAccounts extends ChartAccounts$1 {
     }
     /**
      * no way to check how much used for work/sole, so we let user adjust it
-     * except vehicle expense, which is equal to vehicleClaim.workUsage and personal, which is equal to 0
+     * except vehicle expense, which is equal to vehicleClaim.workUsage
+     * except when taxablePercent=0, but not SOLE_ENTERTAINMENT
      */
     isClaimPercentEditable() {
-        return (this.isWorkExpense() || this.isSoleExpense()) && (!this.isVehicleExpense() && !this.isPersonalExpense());
+        return ((this.isWorkExpense() || this.isSoleExpense()) && !this.isVehicleExpense() && this.taxablePercent > 0)
+            || this.id === ChartAccountsListEnum.SOLE_ENTERTAINMENT;
     }
     /**
      * get label for transaction tax field depended on selected chart account.
@@ -20439,6 +20449,9 @@ class TransactionBaseForm extends AbstractForm {
         if (chartAccounts.isClaimPercentEditable()) {
             this.get('claimPercent').enable();
         }
+        else {
+            this.get('claimPercent').disable();
+        }
         // property claim (ownership% x shared%) for property expenses, taxable percent for others
         let claimPercent = chartAccounts.taxablePercent;
         if (chartAccounts.isPropertyExpense() && chartAccounts.id !== ChartAccountsListEnum.PLATFORM_FEES) {