taxtank-core 0.30.110 → 0.30.112

package/fesm2020/taxtank-core.mjs

@@ -21,7 +21,7 @@ import moment from 'moment';
 import { DateRange } from 'moment-range';
 import intersection from 'lodash/intersection';
 import range from 'lodash/range';
-import { Validators, UntypedFormGroup, UntypedFormControl, UntypedFormArray, FormArray, FormGroup, FormControl } from '@angular/forms';
+import { Validators, UntypedFormGroup, UntypedFormControl, UntypedFormArray, FormControl, FormArray, FormGroup } from '@angular/forms';
 import compact from 'lodash/compact';
 import concat from 'lodash/concat';
 import cloneDeep$1 from 'lodash/cloneDeep';
@@ -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.
@@ -4646,46 +4656,6 @@ class DepreciationReceipt extends DepreciationReceipt$1 {
     }
 }
 
-class SoleBusinessAllocation extends SoleBusinessAllocation$1 {
-}
-__decorate([
-    Type(() => BankAccount)
-], SoleBusinessAllocation.prototype, "bankAccount", void 0);
-__decorate([
-    Type(() => SoleBusiness)
-], SoleBusinessAllocation.prototype, "business", void 0);
-__decorate([
-    Transform(({ value }) => value || 100),
-    Expose()
-], SoleBusinessAllocation.prototype, "percent", void 0);
-
-class SoleBusinessLossOffsetRule extends SoleBusinessLossOffsetRule$1 {
-}
-__decorate([
-    Type(() => SoleBusinessLossOffsetRule)
-], SoleBusinessLossOffsetRule.prototype, "parent", void 0);
-
-/**
- * If a sole trader business makes a tax loss in a current year, you can generally carry forward that loss and offset profit in future years.
- * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/4641357930/Rules+when+a+business+makes+a+loss+Tax+Summary#Offsetting-current-year-business-losses
- */
-class SoleBusinessLoss extends SoleBusinessLoss$1 {
-    constructor() {
-        super(...arguments);
-        this.openBalance = 0;
-        this.financialYear = new FinancialYear().year;
-    }
-    get hasOffset() {
-        return !!this.offsetRule;
-    }
-}
-__decorate([
-    Type(() => SoleBusiness)
-], SoleBusinessLoss.prototype, "business", void 0);
-__decorate([
-    Type(() => SoleBusinessLossOffsetRule)
-], SoleBusinessLoss.prototype, "offsetRule", void 0);
-
 var MyAccountHistoryInitiatedByEnum;
 (function (MyAccountHistoryInitiatedByEnum) {
     MyAccountHistoryInitiatedByEnum[MyAccountHistoryInitiatedByEnum["OWNER"] = 0] = "OWNER";
@@ -4735,6 +4705,46 @@ const USER_ROLES = {
 class UserToRegister {
 }
 
+class SoleBusinessAllocation extends SoleBusinessAllocation$1 {
+}
+__decorate([
+    Type(() => BankAccount)
+], SoleBusinessAllocation.prototype, "bankAccount", void 0);
+__decorate([
+    Type(() => SoleBusiness)
+], SoleBusinessAllocation.prototype, "business", void 0);
+__decorate([
+    Transform(({ value }) => value || 100),
+    Expose()
+], SoleBusinessAllocation.prototype, "percent", void 0);
+
+class SoleBusinessLossOffsetRule extends SoleBusinessLossOffsetRule$1 {
+}
+__decorate([
+    Type(() => SoleBusinessLossOffsetRule)
+], SoleBusinessLossOffsetRule.prototype, "parent", void 0);
+
+/**
+ * If a sole trader business makes a tax loss in a current year, you can generally carry forward that loss and offset profit in future years.
+ * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/4641357930/Rules+when+a+business+makes+a+loss+Tax+Summary#Offsetting-current-year-business-losses
+ */
+class SoleBusinessLoss extends SoleBusinessLoss$1 {
+    constructor() {
+        super(...arguments);
+        this.openBalance = 0;
+        this.financialYear = new FinancialYear().year;
+    }
+    get hasOffset() {
+        return !!this.offsetRule;
+    }
+}
+__decorate([
+    Type(() => SoleBusiness)
+], SoleBusinessLoss.prototype, "business", void 0);
+__decorate([
+    Type(() => SoleBusinessLossOffsetRule)
+], SoleBusinessLoss.prototype, "offsetRule", void 0);
+
 class SoleInvoiceItem extends SoleInvoiceItem$1 {
     constructor() {
         super(...arguments);
@@ -5145,6 +5155,9 @@ __decorate([
 __decorate([
     Type(() => IncomeSource)
 ], SoleBusiness.prototype, "incomeSource", void 0);
+__decorate([
+    Transform(({ value }) => value || false)
+], SoleBusiness.prototype, "isPrimaryProduction", void 0);
 
 class SoleBusinessActivity extends SoleBusinessActivity$1 {
 }
@@ -18456,7 +18469,8 @@ class SoleBusinessForm extends AbstractForm {
             name: new UntypedFormControl(business.name, Validators.required),
             activity: new UntypedFormControl(business.activity, Validators.required),
             description: new UntypedFormControl(business.description),
-            website: new UntypedFormControl(business.website)
+            website: new UntypedFormControl(business.website),
+            isPrimaryProduction: new FormControl(business.isPrimaryProduction),
         }, business);
         this.business = business;
         // User have to create income source with new business.
@@ -20439,6 +20453,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) {