taxtank-core 0.28.100 → 0.28.102

package/lib/forms/report/my-tax/index.d.ts

@@ -5,7 +5,6 @@ export * from './my-tax-business-income-or-losses/my-tax-business-losses/my-tax-
 export * from './my-tax-cgt.form';
 export * from './my-tax-deductions.form';
 export * from './my-tax-dividends.form';
-export * from './my-tax-employee-share-schemes.form';
 export * from './my-tax-income-statements.form';
 export * from './my-tax-income-tests.form';
 export * from './my-tax-interest.form';

package/lib/models/report/my-tax/index.d.ts

@@ -13,7 +13,6 @@ export * from './my-tax-deductions/deduction-fields.const';
 export * from './my-tax-deductions/deduction-self-education-type.enum';
 export * from './my-tax-deductions/deduction-clothing-type.enum';
 export * from './my-tax-dividends/my-tax-dividends';
-export * from './my-tax-employee-share-schemes/my-tax-employee-share-schemes';
 export * from './my-tax-estimate/my-tax-estimate';
 export * from './my-tax-income-statements/my-tax-income-statements';
 export * from './my-tax-income-tests/my-tax-income-tests';

package/lib/models/report/my-tax/my-tax-deductions/my-tax-deductions.d.ts

@@ -4,6 +4,10 @@ import { DeductionClothingTypeEnum } from './deduction-clothing-type.enum';
 import { DeductionSelfEducationTypeEnum } from './deduction-self-education-type.enum';
 import { VehicleClaim, VehicleClaimDetails } from '../../../vehicle';
 export declare class MyTaxDeductions {
+    /**
+     * can't claim the first $250 of self-education expenses (Item code D4)
+     */
+    static selfEducationNotDeductibleAmount: number;
     transactions: TransactionCollection;
     depreciations: DepreciationCollection;
     vehicleClaim: VehicleClaim;
@@ -38,4 +42,5 @@ export declare class MyTaxDeductions {
      * Total amount from Other work related expenses and Tools & equipment depreciations
      */
     private setOtherWorkRelatedExpensesTotalAmount;
+    private calculateWorkRelatedSelfEducationTotalAmount;
 }

package/lib/models/report/my-tax/my-tax-other-income/my-tax-other-income.d.ts

@@ -1,6 +1,12 @@
 import { TransactionCollection } from '../../../../collections/transaction/transaction.collection';
 export declare class MyTaxOtherIncome {
     transactions: TransactionCollection;
+    employeeShareSchemesTransactions: TransactionCollection;
+    eligibleForReductionAmount: number;
+    notEligibleForReductionAmount: number;
+    discountFromDeferredSchemeAmount: number;
+    totalAssessableDiscountAmount: number;
+    shareSchemesTotalTax: number;
     lumpSumPaymentsInArrearsTransactions: TransactionCollection;
     bonusesTotalAmount: number;
     forestryManagedInvestmentSchemesIncomeTotalAmount: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "taxtank-core",
-  "version": "0.28.100",
+  "version": "0.28.102",
   "private": false,
   "peerDependencies": {
     "@angular/common": "^12.2.3 || ~13.0.0",

package/esm2015/lib/forms/report/my-tax/my-tax-employee-share-schemes.form.js

@@ -1,14 +0,0 @@
-import { AbstractForm } from '../../abstract.form';
-import { FormControl } from '@angular/forms';
-export class MyTaxEmployeeShareSchemesForm extends AbstractForm {
-    constructor(shareSchemes) {
-        super({
-            eligibleForReductionAmount: new FormControl(shareSchemes.eligibleForReductionAmount),
-            notEligibleForReductionAmount: new FormControl(shareSchemes.notEligibleForReductionAmount),
-            discountFromDeferredSchemeAmount: new FormControl(shareSchemes.discountFromDeferredSchemeAmount),
-            totalAssessableDiscountAmount: new FormControl(shareSchemes.totalAssessableDiscountAmount),
-            shareSchemesTotalTax: new FormControl(shareSchemes.shareSchemesTotalTax)
-        });
-    }
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibXktdGF4LWVtcGxveWVlLXNoYXJlLXNjaGVtZXMuZm9ybS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3R0LWNvcmUvc3JjL2xpYi9mb3Jtcy9yZXBvcnQvbXktdGF4L215LXRheC1lbXBsb3llZS1zaGFyZS1zY2hlbWVzLmZvcm0udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ25ELE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUs3QyxNQUFNLE9BQU8sNkJBQThCLFNBQVEsWUFBdUM7SUFDeEYsWUFDRSxZQUF1QztRQUV2QyxLQUFLLENBQUM7WUFDSiwwQkFBMEIsRUFBRSxJQUFJLFdBQVcsQ0FBQyxZQUFZLENBQUMsMEJBQTBCLENBQUM7WUFDcEYsNkJBQTZCLEVBQUUsSUFBSSxXQUFXLENBQUMsWUFBWSxDQUFDLDZCQUE2QixDQUFDO1lBQzFGLGdDQUFnQyxFQUFFLElBQUksV0FBVyxDQUFDLFlBQVksQ0FBQyxnQ0FBZ0MsQ0FBQztZQUNoRyw2QkFBNkIsRUFBRSxJQUFJLFdBQVcsQ0FBQyxZQUFZLENBQUMsNkJBQTZCLENBQUM7WUFDMUYsb0JBQW9CLEVBQUUsSUFBSSxXQUFXLENBQUMsWUFBWSxDQUFDLG9CQUFvQixDQUFDO1NBQ3pFLENBQUMsQ0FBQztJQUNMLENBQUM7Q0FDRiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEFic3RyYWN0Rm9ybSB9IGZyb20gJy4uLy4uL2Fic3RyYWN0LmZvcm0nO1xuaW1wb3J0IHsgRm9ybUNvbnRyb2wgfSBmcm9tICdAYW5ndWxhci9mb3Jtcyc7XG5pbXBvcnQge1xuICBNeVRheEVtcGxveWVlU2hhcmVTY2hlbWVzXG59IGZyb20gJy4uLy4uLy4uL21vZGVscy9yZXBvcnQvbXktdGF4L215LXRheC1lbXBsb3llZS1zaGFyZS1zY2hlbWVzL215LXRheC1lbXBsb3llZS1zaGFyZS1zY2hlbWVzJztcblxuZXhwb3J0IGNsYXNzIE15VGF4RW1wbG95ZWVTaGFyZVNjaGVtZXNGb3JtIGV4dGVuZHMgQWJzdHJhY3RGb3JtPE15VGF4RW1wbG95ZWVTaGFyZVNjaGVtZXM+IHtcbiAgY29uc3RydWN0b3IoXG4gICAgc2hhcmVTY2hlbWVzOiBNeVRheEVtcGxveWVlU2hhcmVTY2hlbWVzLFxuICApIHtcbiAgICBzdXBlcih7XG4gICAgICBlbGlnaWJsZUZvclJlZHVjdGlvbkFtb3VudDogbmV3IEZvcm1Db250cm9sKHNoYXJlU2NoZW1lcy5lbGlnaWJsZUZvclJlZHVjdGlvbkFtb3VudCksXG4gICAgICBub3RFbGlnaWJsZUZvclJlZHVjdGlvbkFtb3VudDogbmV3IEZvcm1Db250cm9sKHNoYXJlU2NoZW1lcy5ub3RFbGlnaWJsZUZvclJlZHVjdGlvbkFtb3VudCksXG4gICAgICBkaXNjb3VudEZyb21EZWZlcnJlZFNjaGVtZUFtb3VudDogbmV3IEZvcm1Db250cm9sKHNoYXJlU2NoZW1lcy5kaXNjb3VudEZyb21EZWZlcnJlZFNjaGVtZUFtb3VudCksXG4gICAgICB0b3RhbEFzc2Vzc2FibGVEaXNjb3VudEFtb3VudDogbmV3IEZvcm1Db250cm9sKHNoYXJlU2NoZW1lcy50b3RhbEFzc2Vzc2FibGVEaXNjb3VudEFtb3VudCksXG4gICAgICBzaGFyZVNjaGVtZXNUb3RhbFRheDogbmV3IEZvcm1Db250cm9sKHNoYXJlU2NoZW1lcy5zaGFyZVNjaGVtZXNUb3RhbFRheClcbiAgICB9KTtcbiAgfVxufVxuIl19

package/esm2015/lib/models/report/my-tax/my-tax-employee-share-schemes/my-tax-employee-share-schemes.js

@@ -1,24 +0,0 @@
-import { ChartAccountsListEnum } from '../../../../db/Enums/chart-accounts-list.enum';
-import { ChartAccountsMetadataListEnum } from '../../../../db/Enums/chart-accounts-metadata-list.enum';
-export class MyTaxEmployeeShareSchemes {
-    constructor(transactions) {
-        this.transactions = transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.EMPLOYEE_SHARE_SCHEME_INCOME);
-        this.eligibleForReductionAmount = this.transactions.getTransactionsMetadata()
-            .filterBy('chartAccountsMetadata.id', ChartAccountsMetadataListEnum.ELIGIBLE_FOR_REDUCTION)
-            .sumBy('value');
-        this.notEligibleForReductionAmount = this.transactions.getTransactionsMetadata()
-            .filterBy('chartAccountsMetadata.id', ChartAccountsMetadataListEnum.NOT_ELIGIBLE_FOR_DEDUCTION)
-            .sumBy('value');
-        this.discountFromDeferredSchemeAmount = this.transactions.getTransactionsMetadata()
-            .filterBy('chartAccountsMetadata.id', ChartAccountsMetadataListEnum.DISCOUNT_FROM_DEFERRED_SCHEMES)
-            .sumBy('value');
-        this.totalAssessableDiscountAmount = this.transactions.getTransactionsMetadata()
-            .filterBy('chartAccountsMetadata.id', ChartAccountsMetadataListEnum.NOT_ELIGIBLE_FOR_DEDUCTION)
-            .sumBy('value') +
-            this.transactions.getTransactionsMetadata()
-                .filterBy('chartAccountsMetadata.id', ChartAccountsMetadataListEnum.DISCOUNT_FROM_DEFERRED_SCHEMES)
-                .sumBy('value');
-        this.shareSchemesTotalTax = this.transactions.sumBy('tax');
-    }
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibXktdGF4LWVtcGxveWVlLXNoYXJlLXNjaGVtZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvbW9kZWxzL3JlcG9ydC9teS10YXgvbXktdGF4LWVtcGxveWVlLXNoYXJlLXNjaGVtZXMvbXktdGF4LWVtcGxveWVlLXNoYXJlLXNjaGVtZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sK0NBQStDLENBQUM7QUFDdEYsT0FBTyxFQUFFLDZCQUE2QixFQUFFLE1BQU0sd0RBQXdELENBQUM7QUFFdkcsTUFBTSxPQUFPLHlCQUF5QjtJQVFwQyxZQUNFLFlBQW1DO1FBRW5DLElBQUksQ0FBQyxZQUFZLEdBQUcsWUFBWSxDQUFDLFFBQVEsQ0FBQyxrQkFBa0IsRUFBRSxxQkFBcUIsQ0FBQyw0QkFBNEIsQ0FBQyxDQUFDO1FBQ2xILElBQUksQ0FBQywwQkFBMEIsR0FBRyxJQUFJLENBQUMsWUFBWSxDQUFDLHVCQUF1QixFQUFFO2FBQzFFLFFBQVEsQ0FBQywwQkFBMEIsRUFBRSw2QkFBNkIsQ0FBQyxzQkFBc0IsQ0FBQzthQUMxRixLQUFLLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDbEIsSUFBSSxDQUFDLDZCQUE2QixHQUFHLElBQUksQ0FBQyxZQUFZLENBQUMsdUJBQXVCLEVBQUU7YUFDN0UsUUFBUSxDQUFDLDBCQUEwQixFQUFFLDZCQUE2QixDQUFDLDBCQUEwQixDQUFDO2FBQzlGLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUNsQixJQUFJLENBQUMsZ0NBQWdDLEdBQUcsSUFBSSxDQUFDLFlBQVksQ0FBQyx1QkFBdUIsRUFBRTthQUNoRixRQUFRLENBQUMsMEJBQTBCLEVBQUUsNkJBQTZCLENBQUMsOEJBQThCLENBQUM7YUFDbEcsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ2xCLElBQUksQ0FBQyw2QkFBNkIsR0FBRyxJQUFJLENBQUMsWUFBWSxDQUFDLHVCQUF1QixFQUFFO2FBQzNFLFFBQVEsQ0FBQywwQkFBMEIsRUFBRSw2QkFBNkIsQ0FBQywwQkFBMEIsQ0FBQzthQUM5RixLQUFLLENBQUMsT0FBTyxDQUFDO1lBQ2pCLElBQUksQ0FBQyxZQUFZLENBQUMsdUJBQXVCLEVBQUU7aUJBQ3hDLFFBQVEsQ0FBQywwQkFBMEIsRUFBRSw2QkFBNkIsQ0FBQyw4QkFBOEIsQ0FBQztpQkFDbEcsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ3BCLElBQUksQ0FBQyxvQkFBb0IsR0FBRyxJQUFJLENBQUMsWUFBWSxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUM3RCxDQUFDO0NBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBUcmFuc2FjdGlvbkNvbGxlY3Rpb24gfSBmcm9tICcuLi8uLi8uLi8uLi9jb2xsZWN0aW9ucy90cmFuc2FjdGlvbi90cmFuc2FjdGlvbi5jb2xsZWN0aW9uJztcbmltcG9ydCB7IENoYXJ0QWNjb3VudHNMaXN0RW51bSB9IGZyb20gJy4uLy4uLy4uLy4uL2RiL0VudW1zL2NoYXJ0LWFjY291bnRzLWxpc3QuZW51bSc7XG5pbXBvcnQgeyBDaGFydEFjY291bnRzTWV0YWRhdGFMaXN0RW51bSB9IGZyb20gJy4uLy4uLy4uLy4uL2RiL0VudW1zL2NoYXJ0LWFjY291bnRzLW1ldGFkYXRhLWxpc3QuZW51bSc7XG5cbmV4cG9ydCBjbGFzcyBNeVRheEVtcGxveWVlU2hhcmVTY2hlbWVzIHtcbiAgdHJhbnNhY3Rpb25zOiBUcmFuc2FjdGlvbkNvbGxlY3Rpb247XG4gIGVsaWdpYmxlRm9yUmVkdWN0aW9uQW1vdW50OiBudW1iZXI7XG4gIG5vdEVsaWdpYmxlRm9yUmVkdWN0aW9uQW1vdW50OiBudW1iZXI7XG4gIGRpc2NvdW50RnJvbURlZmVycmVkU2NoZW1lQW1vdW50OiBudW1iZXI7XG4gIHRvdGFsQXNzZXNzYWJsZURpc2NvdW50QW1vdW50OiBudW1iZXI7XG4gIHNoYXJlU2NoZW1lc1RvdGFsVGF4OiBudW1iZXI7XG5cbiAgY29uc3RydWN0b3IoXG4gICAgdHJhbnNhY3Rpb25zOiBUcmFuc2FjdGlvbkNvbGxlY3Rpb24sXG4gICkge1xuICAgIHRoaXMudHJhbnNhY3Rpb25zID0gdHJhbnNhY3Rpb25zLmZpbHRlckJ5KCdjaGFydEFjY291bnRzLmlkJywgQ2hhcnRBY2NvdW50c0xpc3RFbnVtLkVNUExPWUVFX1NIQVJFX1NDSEVNRV9JTkNPTUUpO1xuICAgIHRoaXMuZWxpZ2libGVGb3JSZWR1Y3Rpb25BbW91bnQgPSB0aGlzLnRyYW5zYWN0aW9ucy5nZXRUcmFuc2FjdGlvbnNNZXRhZGF0YSgpXG4gICAgICAuZmlsdGVyQnkoJ2NoYXJ0QWNjb3VudHNNZXRhZGF0YS5pZCcsIENoYXJ0QWNjb3VudHNNZXRhZGF0YUxpc3RFbnVtLkVMSUdJQkxFX0ZPUl9SRURVQ1RJT04pXG4gICAgICAuc3VtQnkoJ3ZhbHVlJyk7XG4gICAgdGhpcy5ub3RFbGlnaWJsZUZvclJlZHVjdGlvbkFtb3VudCA9IHRoaXMudHJhbnNhY3Rpb25zLmdldFRyYW5zYWN0aW9uc01ldGFkYXRhKClcbiAgICAgIC5maWx0ZXJCeSgnY2hhcnRBY2NvdW50c01ldGFkYXRhLmlkJywgQ2hhcnRBY2NvdW50c01ldGFkYXRhTGlzdEVudW0uTk9UX0VMSUdJQkxFX0ZPUl9ERURVQ1RJT04pXG4gICAgICAuc3VtQnkoJ3ZhbHVlJyk7XG4gICAgdGhpcy5kaXNjb3VudEZyb21EZWZlcnJlZFNjaGVtZUFtb3VudCA9IHRoaXMudHJhbnNhY3Rpb25zLmdldFRyYW5zYWN0aW9uc01ldGFkYXRhKClcbiAgICAgIC5maWx0ZXJCeSgnY2hhcnRBY2NvdW50c01ldGFkYXRhLmlkJywgQ2hhcnRBY2NvdW50c01ldGFkYXRhTGlzdEVudW0uRElTQ09VTlRfRlJPTV9ERUZFUlJFRF9TQ0hFTUVTKVxuICAgICAgLnN1bUJ5KCd2YWx1ZScpO1xuICAgIHRoaXMudG90YWxBc3Nlc3NhYmxlRGlzY291bnRBbW91bnQgPSB0aGlzLnRyYW5zYWN0aW9ucy5nZXRUcmFuc2FjdGlvbnNNZXRhZGF0YSgpXG4gICAgICAgIC5maWx0ZXJCeSgnY2hhcnRBY2NvdW50c01ldGFkYXRhLmlkJywgQ2hhcnRBY2NvdW50c01ldGFkYXRhTGlzdEVudW0uTk9UX0VMSUdJQkxFX0ZPUl9ERURVQ1RJT04pXG4gICAgICAgIC5zdW1CeSgndmFsdWUnKSArXG4gICAgICB0aGlzLnRyYW5zYWN0aW9ucy5nZXRUcmFuc2FjdGlvbnNNZXRhZGF0YSgpXG4gICAgICAgIC5maWx0ZXJCeSgnY2hhcnRBY2NvdW50c01ldGFkYXRhLmlkJywgQ2hhcnRBY2NvdW50c01ldGFkYXRhTGlzdEVudW0uRElTQ09VTlRfRlJPTV9ERUZFUlJFRF9TQ0hFTUVTKVxuICAgICAgICAuc3VtQnkoJ3ZhbHVlJyk7XG4gICAgdGhpcy5zaGFyZVNjaGVtZXNUb3RhbFRheCA9IHRoaXMudHJhbnNhY3Rpb25zLnN1bUJ5KCd0YXgnKTtcbiAgfVxufVxuIl19

package/lib/forms/report/my-tax/my-tax-employee-share-schemes.form.d.ts

@@ -1,5 +0,0 @@
-import { AbstractForm } from '../../abstract.form';
-import { MyTaxEmployeeShareSchemes } from '../../../models/report/my-tax/my-tax-employee-share-schemes/my-tax-employee-share-schemes';
-export declare class MyTaxEmployeeShareSchemesForm extends AbstractForm<MyTaxEmployeeShareSchemes> {
-    constructor(shareSchemes: MyTaxEmployeeShareSchemes);
-}

package/lib/models/report/my-tax/my-tax-employee-share-schemes/my-tax-employee-share-schemes.d.ts

@@ -1,10 +0,0 @@
-import { TransactionCollection } from '../../../../collections/transaction/transaction.collection';
-export declare class MyTaxEmployeeShareSchemes {
-    transactions: TransactionCollection;
-    eligibleForReductionAmount: number;
-    notEligibleForReductionAmount: number;
-    discountFromDeferredSchemeAmount: number;
-    totalAssessableDiscountAmount: number;
-    shareSchemesTotalTax: number;
-    constructor(transactions: TransactionCollection);
-}