taxtank-core 0.33.51 → 0.33.52

package/fesm2022/taxtank-core.mjs

@@ -258,11 +258,11 @@ let DepreciationForecast$1 = class DepreciationForecast extends AbstractModel {
 
 var TankTypeEnum;
 (function (TankTypeEnum) {
-    TankTypeEnum[TankTypeEnum["PROPERTY"] = 1] = "PROPERTY";
-    TankTypeEnum[TankTypeEnum["WORK"] = 2] = "WORK";
-    TankTypeEnum[TankTypeEnum["OTHER"] = 3] = "OTHER";
-    TankTypeEnum[TankTypeEnum["SOLE"] = 4] = "SOLE";
-    TankTypeEnum[TankTypeEnum["HOLDING"] = 5] = "HOLDING";
+    TankTypeEnum[TankTypeEnum["PROPERTY_TANK"] = 1] = "PROPERTY_TANK";
+    TankTypeEnum[TankTypeEnum["WORK_TANK"] = 2] = "WORK_TANK";
+    TankTypeEnum[TankTypeEnum["OTHER_TANK"] = 3] = "OTHER_TANK";
+    TankTypeEnum[TankTypeEnum["SOLE_TANK"] = 4] = "SOLE_TANK";
+    TankTypeEnum[TankTypeEnum["HOLDING_TANK"] = 5] = "HOLDING_TANK";
     TankTypeEnum[TankTypeEnum["PERSONAL"] = 6] = "PERSONAL";
 })(TankTypeEnum || (TankTypeEnum = {}));
 
@@ -276,15 +276,15 @@ class TransactionBase extends ObservableModel {
     get tankType() {
         switch (true) {
             case this.isPropertyTank():
-                return TankTypeEnum.PROPERTY;
+                return TankTypeEnum.PROPERTY_TANK;
             case this.isWorkTank():
-                return TankTypeEnum.WORK;
+                return TankTypeEnum.WORK_TANK;
             case this.isSoleTank():
-                return TankTypeEnum.SOLE;
+                return TankTypeEnum.SOLE_TANK;
             case this.isHoldingTank():
-                return TankTypeEnum.HOLDING;
+                return TankTypeEnum.HOLDING_TANK;
             case this.isOtherTank():
-                return TankTypeEnum.OTHER;
+                return TankTypeEnum.OTHER_TANK;
             default:
                 return TankTypeEnum.PERSONAL;
         }
@@ -689,7 +689,7 @@ class AllocationGroup extends AbstractModel {
             operation: TransactionOperationEnum.ALLOCATE_INVOICE,
             description: invoice.reference,
             invoiceNumber: invoice.getNumber(),
-            tankType: TankTypeEnum.SOLE,
+            tankType: TankTypeEnum.SOLE_TANK,
             amount: invoice.grossPrice,
             allocations,
             bankTransactions
@@ -1129,6 +1129,9 @@ var ChartAccountsSalaryAdjustmentsListEnum;
     ChartAccountsSalaryAdjustmentsListEnum[ChartAccountsSalaryAdjustmentsListEnum["WORK_PLACE_GIVING"] = 653] = "WORK_PLACE_GIVING";
 })(ChartAccountsSalaryAdjustmentsListEnum || (ChartAccountsSalaryAdjustmentsListEnum = {}));
 
+/**
+ * list of child transactions included in parent amount
+ */
 var ChartAccountsAdjustmentIncludedListEnum;
 (function (ChartAccountsAdjustmentIncludedListEnum) {
     ChartAccountsAdjustmentIncludedListEnum[ChartAccountsAdjustmentIncludedListEnum["ALLOWANCE"] = 4] = "ALLOWANCE";
@@ -5023,11 +5026,11 @@ class VehicleLogbook extends VehicleLogbook$1 {
     get tankType() {
         switch (true) {
             case !!this.business:
-                return TankTypeEnum.SOLE;
+                return TankTypeEnum.SOLE_TANK;
             case this.isPersonal:
                 return TankTypeEnum.PERSONAL;
             default:
-                return TankTypeEnum.WORK;
+                return TankTypeEnum.WORK_TANK;
         }
     }
 }
@@ -5091,7 +5094,7 @@ class VehicleClaim extends VehicleClaim$1 {
         return !!this.business;
     }
     get tankType() {
-        return this.isSoleTank() ? TankTypeEnum.SOLE : TankTypeEnum.WORK;
+        return this.isSoleTank() ? TankTypeEnum.SOLE_TANK : TankTypeEnum.WORK_TANK;
     }
     /**
      * Claim amount for KMs method. Exists only for KMs method.
@@ -5413,16 +5416,16 @@ class User extends User$1 {
     getTankTypes() {
         const tankTypes = [];
         if (this.roles.includes(UserRolesEnum.WORK_TANK)) {
-            tankTypes.push(TankTypeEnum.WORK);
+            tankTypes.push(TankTypeEnum.WORK_TANK);
         }
         if (this.roles.includes(UserRolesEnum.PROPERTY_TANK)) {
-            tankTypes.push(TankTypeEnum.PROPERTY);
+            tankTypes.push(TankTypeEnum.PROPERTY_TANK);
         }
         if (this.roles.includes(UserRolesEnum.SOLE_TANK)) {
-            tankTypes.push(TankTypeEnum.SOLE);
+            tankTypes.push(TankTypeEnum.SOLE_TANK);
         }
         if (this.roles.includes(UserRolesEnum.HOLDING_TANK)) {
-            tankTypes.push(TankTypeEnum.HOLDING);
+            tankTypes.push(TankTypeEnum.HOLDING_TANK);
         }
         tankTypes.push(TankTypeEnum.PERSONAL);
         return tankTypes;
@@ -6412,8 +6415,7 @@ class Transaction extends Transaction$1 {
             return grossAmount;
         }
         // included transactions affect parent transaction amount and as a result grossAmount, skip to avoid double sum
-        const adjustments = new Collection(this.transactions)
-            .filter(transaction => !transaction.chartAccounts?.isAdjustmentIncluded());
+        const adjustments = new Collection(this.transactions).filter(transaction => ![ChartAccountsAdjustmentIncludedListEnum.FUNDS_OVER_ADJUSTMENT, ChartAccountsAdjustmentIncludedListEnum.LANDLORD_REIMBURSEMENT].includes(transaction.chartAccounts?.id));
         const income = adjustments.filter(transaction => transaction.isIncome()).sumBy('amount');
         const expense = adjustments.filter(transaction => transaction.isExpense()).sumBy('amount', true);
         // all adjustments except property income increase grossIncome
@@ -6536,13 +6538,13 @@ class AllocationRule extends AllocationRule$1 {
         return this.type === AllocationRuleTypeEnum.TRANSFER;
     }
     isPropertyTank() {
-        return this.transaction.tankType === TankTypeEnum.PROPERTY;
+        return this.transaction.tankType === TankTypeEnum.PROPERTY_TANK;
     }
     isWorkTank() {
-        return this.transaction.tankType === TankTypeEnum.WORK;
+        return this.transaction.tankType === TankTypeEnum.WORK_TANK;
     }
     isSoleTank() {
-        return this.transaction.tankType === TankTypeEnum.SOLE;
+        return this.transaction.tankType === TankTypeEnum.SOLE_TANK;
     }
     isPropertyIncome() {
         return this.isIncome() && this.isPropertyTank();
@@ -6935,7 +6937,7 @@ class TransactionCollection extends TransactionBaseCollection {
      * Get new collection of property transactions
      */
     getPropertyTransactions() {
-        return this.filterBy('tankType', TankTypeEnum.PROPERTY);
+        return this.filterBy('tankType', TankTypeEnum.PROPERTY_TANK);
     }
     getDebitTransactions() {
         return new TransactionCollection(this.items.filter((transaction) => transaction.isDebit()));
@@ -7004,7 +7006,7 @@ class TransactionCollection extends TransactionBaseCollection {
             // sole tank may have multiple vehicle claims, so we need to filter by business.id
             ? this.getVehicleTransactions().filterBy('business.id', vehicleClaim.business.id)
             // work tank may have only one vehicle claim, so we need to filter by tank type
-            : this.getVehicleTransactions().filterBy('tankType', TankTypeEnum.WORK);
+            : this.getVehicleTransactions().filterBy('tankType', TankTypeEnum.WORK_TANK);
     }
     /**
      * Get list of vehicle transactions except KMS transactions
@@ -7185,7 +7187,7 @@ class DepreciationCollection extends TransactionBaseCollection {
             // sole tank may have multiple vehicle claims, so we need to filter by business.id
             ? this.getVehicleDepreciations().filterBy('business.id', vehicleClaim.business.id)
             // work tank may have only one vehicle claim, so we need to filter by tank type
-            : this.getVehicleDepreciations().filterBy('tankType', TankTypeEnum.WORK);
+            : this.getVehicleDepreciations().filterBy('tankType', TankTypeEnum.WORK_TANK);
     }
     getExportBody(params) {
         return [];
@@ -7602,7 +7604,7 @@ class MyTaxDeductions {
         this.workRelatedSelfEducationType = this.workRelatedSelfEducationExpenses.length ?
             DeductionSelfEducationTypeEnum.IMPROVE_SKILLS_FOR_CURRENT_EARNINGS_K : null;
         this.workRelatedSelfEducationTotalAmount = this.calculateWorkRelatedSelfEducationTotalAmount();
-        this.lowValuePoolDeductionTotalAmount = this.depreciations.getByTankType(TankTypeEnum.WORK)
+        this.lowValuePoolDeductionTotalAmount = this.depreciations.getByTankType(TankTypeEnum.WORK_TANK)
             .getLVPDepreciations().sumBy('claimAmount');
         this.interestExpensesTotalAmount = this.transactions
             .filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.interestExpenses)
@@ -8694,7 +8696,7 @@ class VehicleLogbookCollection extends Collection {
             // sole tank may have multiple vehicle claims, so we need to filter by business.id
             ? this.filterBy('business.id', vehicleClaim.business.id)
             // work tank may have only one vehicle claim, so we need to filter by tank type
-            : this.filterBy('tankType', TankTypeEnum.WORK);
+            : this.filterBy('tankType', TankTypeEnum.WORK_TANK);
     }
     /**
      * get collection of logbooks with the biggest work usage for {@link BestVehicleLogbookCollection.periodDuration}
@@ -9273,7 +9275,7 @@ class IncomeSourceCollection extends Collection {
     filterByTank(tank) {
         return this.items.filter((incomeSource) => {
             switch (tank) {
-                case TankTypeEnum.OTHER:
+                case TankTypeEnum.OTHER_TANK:
                     return incomeSource.isOtherIncome();
                 default:
                     return incomeSource.isWorkIncome();
@@ -9811,16 +9813,6 @@ class BankAccount extends BankAccount$1 {
     isSoleTank() {
         return !!this.businessAllocations.length;
     }
-    get tankType() {
-        switch (true) {
-            case this.isPropertyTank():
-                return TankTypeEnum.PROPERTY;
-            case this.isSoleTank():
-                return TankTypeEnum.SOLE;
-            default:
-                return TankTypeEnum.WORK;
-        }
-    }
     /**
      * Get Bank account property by id
      * @param id Id of property
@@ -10006,7 +9998,7 @@ class BankTransaction extends BankTransaction$1 {
      * Get bank transaction allocated amount
      */
     getAllocatedAmount(allocations) {
-        return allocations.getByBankTransactionsIds([this.id]).amount;
+        return round(allocations.getByBankTransactionsIds([this.id]).amount, 2);
     }
     /**
      * Get bank transaction unallocated amount
@@ -21584,7 +21576,7 @@ class BankAccountPropertiesForm extends UntypedFormArray {
             property: new UntypedFormControl(bankAccountProperty?.property, Validators.required),
             percent: new UntypedFormControl(bankAccountProperty.percent, Validators.required)
         })), [
-            conditionalValidator((control) => control.get('tankType').value === TankTypeEnum.PROPERTY, Validators.required),
+            conditionalValidator((control) => control.get('tankType').value === TankTypeEnum.PROPERTY_TANK, Validators.required),
             fieldsSumValidator('percent', 100)
         ]);
     }
@@ -21708,7 +21700,7 @@ class SoleBusinessAllocationsForm extends UntypedFormArray {
             business: new UntypedFormControl(businessAllocation?.business, Validators.required),
             percent: new UntypedFormControl(businessAllocation.percent, Validators.required)
         })), [
-            conditionalValidator((control) => control.get('tankType').value === TankTypeEnum.SOLE, Validators.required),
+            conditionalValidator((control) => control.get('tankType').value === TankTypeEnum.SOLE_TANK, Validators.required),
             fieldsSumValidator('percent', 100)
         ]);
     }
@@ -22111,10 +22103,10 @@ class BankAccountAllocationForm extends AbstractForm {
             this.removeControl('bankAccountProperties');
             this.removeControl('businessAllocations');
             switch (tankType) {
-                case TankTypeEnum.PROPERTY:
+                case TankTypeEnum.PROPERTY_TANK:
                     this.addControl('bankAccountProperties', new BankAccountPropertiesForm(this.bankAccount?.bankAccountProperties));
                     break;
-                case TankTypeEnum.SOLE:
+                case TankTypeEnum.SOLE_TANK:
                     this.addControl('businessAllocations', new SoleBusinessAllocationsForm(this.bankAccount?.businessAllocations));
                     break;
             }
@@ -23772,13 +23764,13 @@ class AllocationRuleForm extends AbstractForm {
     }
     get tankTypeLabel() {
         switch (this.transactionFormGroup.get('tankType').value) {
-            case TankTypeEnum.WORK:
+            case TankTypeEnum.WORK_TANK:
                 return 'work';
-            case TankTypeEnum.PROPERTY:
+            case TankTypeEnum.PROPERTY_TANK:
                 return 'property';
-            case TankTypeEnum.SOLE:
+            case TankTypeEnum.SOLE_TANK:
                 return 'sole';
-            case TankTypeEnum.HOLDING:
+            case TankTypeEnum.HOLDING_TANK:
                 return 'holding';
             default:
                 return 'personal';
@@ -23808,13 +23800,13 @@ class AllocationRuleForm extends AbstractForm {
         this.transactionFormGroup.get('business').disable({ emitEvent: false });
         this.transactionFormGroup.get('incomeSource').disable({ emitEvent: false });
         switch (tankType) {
-            case TankTypeEnum.WORK:
+            case TankTypeEnum.WORK_TANK:
                 this.transactionFormGroup.get('incomeSource').enable({ emitEvent: false });
                 break;
-            case TankTypeEnum.PROPERTY:
+            case TankTypeEnum.PROPERTY_TANK:
                 this.transactionFormGroup.get('property').enable({ emitEvent: false });
                 break;
-            case TankTypeEnum.SOLE:
+            case TankTypeEnum.SOLE_TANK:
                 this.transactionFormGroup.get('business').enable({ emitEvent: false });
                 break;
         }
@@ -23829,13 +23821,13 @@ class AllocationRuleForm extends AbstractForm {
         return this.get('type').value === AllocationRuleTypeEnum.TRANSFER;
     }
     isPropertyTank() {
-        return this.get('transaction').get('tankType').value === TankTypeEnum.PROPERTY;
+        return this.get('transaction').get('tankType').value === TankTypeEnum.PROPERTY_TANK;
     }
     isWorkTank() {
-        return this.get('transaction').get('tankType').value === TankTypeEnum.WORK;
+        return this.get('transaction').get('tankType').value === TankTypeEnum.WORK_TANK;
     }
     isSoleTank() {
-        return this.get('transaction').get('tankType').value === TankTypeEnum.SOLE;
+        return this.get('transaction').get('tankType').value === TankTypeEnum.SOLE_TANK;
     }
     isPropertyIncome() {
         return this.isIncome() && this.isPropertyTank();
@@ -24059,15 +24051,17 @@ class WorkTransactionForm extends TransactionForm {
 
 class WorkIncomeForm extends WorkTransactionForm {
     constructor(transaction, registeredForGst, allocations) {
-        // for work income we need to show netAmount instead of amount (because some adjustments are included in amount)
-        transaction.amount = transaction.netAmount;
         super(transaction, registeredForGst, allocations, {
+            netAmount: new UntypedFormControl(transaction.netAmount, Validators.required),
             tax: new UntypedFormControl({
                 value: transaction.tax,
                 disabled: !transaction.chartAccounts || transaction.chartAccounts.isNRAS(),
             }, Validators.required),
             incomeSource: new UntypedFormControl(transaction.incomeSource, [Validators.required, autocompleteValidator()]),
         });
+        if (allocations.length) {
+            this.get('netAmount').disable();
+        }
         // forbid to edit some fields for allocated transaction
         if (allocations.length) {
             this.get('chartAccounts').disable();
@@ -24130,7 +24124,7 @@ class WorkIncomeForm extends WorkTransactionForm {
      * ie bankTransaction=1000$ with 900$ salary and 100$ tips will create 2 transactions with 900$ and 100$
      */
     getAmount() {
-        return this.get('amount').value - new Collection(this.currentValue.transactions)
+        return this.get('netAmount').value - new Collection(this.currentValue.transactions)
             .filter((t) => t.chartAccounts?.isAdjustmentIncluded())
             .sumBy('amount');
     }
@@ -24250,8 +24244,8 @@ class TransactionBaseFilterForm extends FormGroup {
     }
     listenEvents() {
         this.get('tankType').valueChanges.subscribe(tankType => {
-            tankType === TankTypeEnum.SOLE ? this.get('business').enable() : this.get('business').disable();
-            tankType === TankTypeEnum.PROPERTY ? this.get('properties').enable() : this.get('properties').disable();
+            tankType === TankTypeEnum.SOLE_TANK ? this.get('business').enable() : this.get('business').disable();
+            tankType === TankTypeEnum.PROPERTY_TANK ? this.get('properties').enable() : this.get('properties').disable();
         });
     }
     filter(collection) {