taxtank-core 0.30.49 → 0.30.52

package/lib/collections/income-source.collection.d.ts

@@ -1,8 +1,8 @@
 import { Collection } from './collection';
-import { IncomeSource } from '../models/income-source/income-source';
+import { IncomeSource } from '../models';
 import { TankTypeEnum } from '../db/Enums/tank-type.enum';
-import { IncomeSourceTypeEnum } from '../db/Enums/income-source-type.enum';
-import { IIncomeSourceForecast } from '../interfaces/income-source-forecast.interface';
+import { IncomeSourceTypeEnum } from '../db/Enums/income-source/income-source-type.enum';
+import { IIncomeSourceForecast } from '../interfaces';
 /**
  * Collection of income sources
  */

package/lib/db/Enums/chart-accounts/chart-accounts-category.enum.d.ts

@@ -14,5 +14,6 @@ export declare enum ChartAccountsCategoryEnum {
     SOLE_EXPENSE = 13,
     SOLE_DEPRECIATION = 14,
     HOLDING_INCOME = 15,
-    HOLDING_EXPENSE = 16
+    HOLDING_EXPENSE = 16,
+    HOLDING_UNTAXED_INCOME = 17
 }

package/lib/db/Enums/income-source/income-source-type-list-holding.enum.d.ts

@@ -0,0 +1,7 @@
+export declare enum IncomeSourceTypeListHoldingEnum {
+    DIVIDENDS = 3,
+    INTEREST = 4,
+    TRUSTS = 9,
+    OTHER_INCOME = 10,
+    PARTNERSHIPS = 12
+}

package/lib/db/Enums/{income-source-type-list-work.enum.d.ts → income-source/income-source-type-list-work.enum.d.ts}

@@ -1,7 +1,6 @@
 export declare enum IncomeSourceTypeListWorkEnum {
     BONUSES = 1,
     DIRECTOR_FEES = 2,
-    DIVIDENDS = 3,
     INTEREST = 4,
     PENSIONS_AND_ALLOWANCES = 5,
     SUPERANNUATION = 8,

package/lib/db/Enums/{income-source-type.enum.d.ts → income-source/income-source-type.enum.d.ts}

@@ -1,5 +1,6 @@
 export declare enum IncomeSourceTypeEnum {
     WORK = 1,
     SOLE = 2,
-    OTHER = 3
+    OTHER = 3,
+    HOLDING = 4
 }

package/lib/db/Enums/income-source/index.d.ts

@@ -0,0 +1,6 @@
+export * from './income-source-forecast-trust-type.enum';
+export * from './income-source-type.enum';
+export * from './income-source-type-list-other.enum';
+export * from './income-source-type-list-sole.enum';
+export * from './income-source-type-list-work.enum';
+export * from './income-source-type-list-holding.enum';

package/lib/db/Models/incomeSource/income-source-forecast.d.ts

@@ -1,4 +1,4 @@
-import { IncomeSourceForecastTrustTypeEnum } from '../../Enums/income-source-forecast-trust-type.enum';
+import { IncomeSourceForecastTrustTypeEnum } from '../../Enums/income-source/income-source-forecast-trust-type.enum';
 import { IncomeSource } from './income-source';
 import { IncomeSourceType } from './income-source-type';
 import { AbstractModel } from '../abstract-model';

package/lib/db/Models/incomeSource/income-source.d.ts

@@ -2,7 +2,7 @@ import { User } from '../user/user';
 import { SalaryForecast } from './salary-forecast';
 import { SoleForecast } from '../sole/sole-forecast';
 import { IncomeSourceForecast } from './income-source-forecast';
-import { IncomeSourceTypeEnum } from '../../Enums/income-source-type.enum';
+import { IncomeSourceTypeEnum } from '../../Enums/income-source/income-source-type.enum';
 import { AbstractModel } from '../abstract-model';
 export declare class IncomeSource extends AbstractModel {
     id?: number;

package/lib/db/Models/property/property-sale/property-sale.d.ts

@@ -8,7 +8,7 @@ export declare class PropertySale extends ObservableModel {
     structuralImprovementsWDV?: number;
     buildingAtCostClaimed?: number;
     settlementDate?: Date;
-    contractDate?: Date;
+    date?: Date;
     price?: number;
     commission?: number;
     legalFees?: number;

package/lib/forms/transaction/holding/holding-income.form.d.ts

@@ -0,0 +1,9 @@
+import { Transaction, TransactionAllocation } from '../../../models';
+import { IEventListener } from '../../../interfaces';
+import { WorkTransactionForm } from '../work/work-transaction.form';
+export declare class HoldingIncomeForm extends WorkTransactionForm implements IEventListener {
+    /**
+     * @TODO vik partial copyPast from workIncomeForm
+     */
+    constructor(transaction: Transaction, registeredForGst: boolean, allocations: TransactionAllocation[]);
+}

package/lib/forms/transaction/index.d.ts

@@ -3,3 +3,4 @@ export * from './transaction-base.form';
 export * from './transaction.form';
 export * from './work/work-income.form';
 export * from './work/work-expense.form';
+export * from './holding/holding-income.form';

package/lib/interfaces/income-source-forecast.interface.d.ts

@@ -1,5 +1,5 @@
-import { IncomeSource } from '../models/income-source/income-source';
-import { IncomeSourceForecastTrustTypeEnum } from '../db/Enums/income-source-forecast-trust-type.enum';
+import { IncomeSource } from '../models';
+import { IncomeSourceForecastTrustTypeEnum } from '../db/Enums/income-source/income-source-forecast-trust-type.enum';
 /**
  * Interface for income source forecasts
  */

package/lib/models/holding/holding-sale.d.ts

@@ -16,4 +16,11 @@ export declare class HoldingSale extends ObservableModel {
      * netCapitalGain is different from grossCapitalGain only when 1 year rule applied
      */
     isOneYearExemptionApplicable(): boolean;
+    getCostBase(holding: Holding): number;
+    /**
+     * Purchase price of sold items
+     */
+    getPurchasePrice(holding: Holding): number;
+    get netCost(): number;
+    get cost(): number;
 }

package/lib/models/holding/holding.d.ts

@@ -17,23 +17,25 @@ export declare class Holding extends AbstractModel {
     type: HoldingType;
     file: AppFile;
     sales: Collection<HoldingSale>;
+    /**
+     * @TODO Artem/Alex looks bad, come up with a better solution
+     * get current category, in holding we are interested in 3 main categories: stock/crypto/other
+     */
+    category: HoldingTypeCategoryEnum;
     /**
      * Get total purchasing price
      */
     get purchaseValue(): number;
     /**
      * Get current market price
+     * @TODO vik/alex no need to pass holdingType, should come from backend
      */
     getMarketValue(holdingType: HoldingType): number;
     /**
      * Get percent difference between current and buy price
+     * @TODO vik/alex no need to pass holdingType, should come from backend
      */
     getGrowthCoefficient(holdingType: HoldingType): number;
     heldMoreYear(): boolean;
-    /**
-     * @TODO Artem/Alex looks bad, come up with a better solution
-     * get current category, in holding we are interested in 3 main categories: stock/crypto/other
-     */
-    category: HoldingTypeCategoryEnum;
     isSold(): boolean;
 }

package/lib/models/income-source/income-source-forecast.d.ts

@@ -1,6 +1,6 @@
 import { IncomeSourceForecast as IncomeSourceForecastBase } from '../../db/Models/incomeSource/income-source-forecast';
 import { SalaryForecastFrequencyEnum } from '../../db/Enums/salary-forecast-frequency.enum';
-import { IIncomeSourceForecast } from '../../interfaces/income-source-forecast.interface';
+import { IIncomeSourceForecast } from '../../interfaces';
 import { IncomeSourceType } from './income-source-type';
 import { IncomeSource } from './income-source';
 export declare class IncomeSourceForecast extends IncomeSourceForecastBase implements IIncomeSourceForecast {

package/lib/models/income-source/income-source-type.d.ts

@@ -1,9 +1,8 @@
 import { IncomeSourceType as IncomeSourceTypeBase } from '../../db/Models/incomeSource/income-source-type';
-import { IncomeSourceTypeEnum } from '../../db/Enums/income-source-type.enum';
 export declare class IncomeSourceType extends IncomeSourceTypeBase {
     isBonuses(): boolean;
     isWork(): boolean;
     isOther(): boolean;
+    isHolding(): boolean;
     isSole(): boolean;
-    get type(): IncomeSourceTypeEnum;
 }

package/lib/models/income-source/income-source.d.ts

@@ -1,5 +1,5 @@
 import { IncomeSource as IncomeSourceBase } from '../../db/Models/incomeSource/income-source';
-import { IIncomeSourceForecast } from '../../interfaces/income-source-forecast.interface';
+import { IIncomeSourceForecast } from '../../interfaces';
 import { SalaryForecast } from './salary-forecast';
 import { SoleForecast } from './sole-forecast';
 import { IncomeSourceForecast } from './income-source-forecast';
@@ -9,10 +9,10 @@ export declare class IncomeSource extends IncomeSourceBase {
     incomeSourceForecasts: IncomeSourceForecast[];
     dateFrom: Date;
     dateTo: Date;
-    isSalaryIncome(): boolean;
     isSoleIncome(): boolean;
     isWorkIncome(): boolean;
     isOtherIncome(): boolean;
+    isHolding(): boolean;
     /**
      * Get salary and other income forecasts
      */

package/lib/models/income-source/index.d.ts

@@ -0,0 +1,6 @@
+export * from './income-source';
+export * from './income-source-chart-data';
+export * from './income-source-forecast';
+export * from './income-source-type';
+export * from './salary-forecast';
+export * from './sole-forecast';

package/lib/models/income-source/salary-forecast.d.ts

@@ -1,6 +1,6 @@
 import { SalaryForecast as SalaryForecastBase } from '../../db/Models/incomeSource/salary-forecast';
 import { IncomeSource } from './income-source';
-import { IIncomeSourceForecast } from '../../interfaces/income-source-forecast.interface';
+import { IIncomeSourceForecast } from '../../interfaces';
 export declare class SalaryForecast extends SalaryForecastBase implements IIncomeSourceForecast {
     grossAmount: number;
     incomeSource: IncomeSource;

package/lib/models/income-source/sole-forecast.d.ts

@@ -1,6 +1,6 @@
 import { IncomeSource } from './income-source';
 import { SoleForecast as SoleForecastBase } from '../../db/Models/sole/sole-forecast';
-import { IIncomeSourceForecast } from '../../interfaces/income-source-forecast.interface';
+import { IIncomeSourceForecast } from '../../interfaces';
 export declare class SoleForecast extends SoleForecastBase implements IIncomeSourceForecast {
     incomeSource: IncomeSource;
     get netPay(): number;

package/lib/models/index.d.ts

@@ -19,3 +19,4 @@ export * from './transaction';
 export * from './user';
 export * from './holding';
 export * from './client';
+export * from './income-source';

package/lib/models/property/property-sale/property-sale.d.ts

@@ -10,7 +10,7 @@ export declare class PropertySale extends BasePropertySale {
     legalFees: number;
     otherCost: number;
     settlementDate: Date;
-    contractDate: Date;
+    date: Date;
     taxExemption: TaxExemption;
     taxExemptionMetaFields: PropertySaleTaxExemptionMetaField[];
     get saleCostsTotalAmount(): number;

package/lib/services/http/income-source/income-source-forecast/income-source-forecast.service.d.ts

@@ -1,7 +1,7 @@
 import { IncomeSourceForecast as IncomeSourceForecastBase } from '../../../../db/Models/incomeSource/income-source-forecast';
 import { RestService } from '../../rest/rest-old.service';
-import { IncomeSourceForecast } from '../../../../models/income-source/income-source-forecast';
-import { IEventListener } from '../../../../interfaces/event-listener.interface';
+import { IncomeSourceForecast } from '../../../../models';
+import { IEventListener } from '../../../../interfaces';
 import * as i0 from "@angular/core";
 /**
  * Service to work with Other Income Forecasts

package/lib/services/http/income-source/income-source.service.d.ts

@@ -1,11 +1,9 @@
-import { Observable, ReplaySubject } from 'rxjs';
+import { Observable } from 'rxjs';
 import { IncomeSource as IncomeSourceBase } from '../../../db/Models/incomeSource/income-source';
 import { RestService } from '../rest/rest-old.service';
-import { IncomeSourceType } from '../../../models/income-source/income-source-type';
-import { SalaryForecast } from '../../../models/income-source/salary-forecast';
-import { IncomeSourceTypeEnum } from '../../../db/Enums/income-source-type.enum';
-import { IncomeSource } from '../../../models/income-source/income-source';
-import { IEventListener } from '../../../interfaces/event-listener.interface';
+import { SalaryForecast, IncomeSource } from '../../../models';
+import { IncomeSourceTypeEnum } from '../../../db/Enums/income-source/income-source-type.enum';
+import { IEventListener } from '../../../interfaces';
 import * as i0 from "@angular/core";
 /**
  * Service to work with income sources
@@ -13,8 +11,6 @@ import * as i0 from "@angular/core";
 export declare class IncomeSourceService extends RestService<IncomeSourceBase, IncomeSource> implements IEventListener {
     url: string;
     modelClass: typeof IncomeSource;
-    incomeSourceTypes: IncomeSourceType[];
-    incomeSourceTypeSubject: ReplaySubject<IncomeSourceType[]>;
     listenEvents(): void;
     /**
      * Get income sources tax calculation
@@ -35,10 +31,6 @@ export declare class IncomeSourceService extends RestService<IncomeSourceBase, I
      * @param types
      */
     getByTypes(types: IncomeSourceTypeEnum[]): Observable<IncomeSource[]>;
-    /**
-     * Get other incomes types
-     */
-    getIncomeSourceTypes(): Observable<IncomeSourceType[]>;
     /**
      * Sole businesses create together with income source
      */

package/lib/services/json/income-source/income-source-type.service.d.ts

@@ -0,0 +1,12 @@
+import { IncomeSourceType as IncomeSourceTypeBase } from '../../../db/Models';
+import { Collection } from '../../../collections';
+import { IncomeSourceType } from '../../../models';
+import { DataService } from '../../data.service';
+import * as i0 from "@angular/core";
+export declare class IncomeSourceTypeService extends DataService<IncomeSourceTypeBase, IncomeSourceType, Collection<IncomeSourceType>> {
+    modelClass: typeof IncomeSourceType;
+    collectionClass: typeof Collection;
+    constructor();
+    static ɵfac: i0.ɵɵFactoryDeclaration<IncomeSourceTypeService, never>;
+    static ɵprov: i0.ɵɵInjectableDeclaration<IncomeSourceTypeService>;
+}

package/lib/services/json/index.d.ts

@@ -1,2 +1,3 @@
 export * from './holding/holding-type-exchange.service';
 export * from './tax-exemption/tax-exemption.service';
+export * from './income-source/income-source-type.service';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "taxtank-core",
-  "version": "0.30.49",
+  "version": "0.30.52",
   "private": false,
   "peerDependencies": {
     "@angular/compiler": "^15.1.5",

package/public-api.d.ts

@@ -43,11 +43,7 @@ export * from './lib/db/Enums/depreciation-calculation-percent.enum';
 export * from './lib/db/Enums/depreciation-type.enum';
 export * from './lib/db/Enums/depreciation-write-off-amount.enum';
 export * from './lib/db/Enums/firm-type.enum';
-export * from './lib/db/Enums/income-source-forecast-trust-type.enum';
-export * from './lib/db/Enums/income-source-type.enum';
-export * from './lib/db/Enums/income-source-type-list-other.enum';
-export * from './lib/db/Enums/income-source-type-list-sole.enum';
-export * from './lib/db/Enums/income-source-type-list-work.enum';
+export * from './lib/db/Enums/income-source';
 export * from './lib/db/Enums/invite-status.enum';
 export * from './lib/db/Enums/loan-bank-type.enum';
 export * from './lib/db/Enums/loan-frequency.enum';
@@ -142,12 +138,6 @@ export * from './lib/models/financial-year/month-number.enum';
 export * from './lib/models/financial-year/months.const';
 export * from './lib/models/firm/firm';
 export * from './lib/models/income-position/income-position';
-export * from './lib/models/income-source/income-source';
-export * from './lib/models/income-source/income-source-chart-data';
-export * from './lib/models/income-source/income-source-forecast';
-export * from './lib/models/income-source/income-source-type';
-export * from './lib/models/income-source/salary-forecast';
-export * from './lib/models/income-source/sole-forecast';
 export * from './lib/models/notification/notification';
 export * from './lib/models/pdf/pdf-orientation.enum';
 export * from './lib/models/pdf/pdf-settings';

package/esm2020/lib/db/Enums/income-source-type-list-sole.enum.mjs

@@ -1,5 +0,0 @@
-export var IncomeSourceTypeListSoleEnum;
-(function (IncomeSourceTypeListSoleEnum) {
-    IncomeSourceTypeListSoleEnum[IncomeSourceTypeListSoleEnum["SOLE_TRADER"] = 7] = "SOLE_TRADER";
-})(IncomeSourceTypeListSoleEnum || (IncomeSourceTypeListSoleEnum = {}));
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5jb21lLXNvdXJjZS10eXBlLWxpc3Qtc29sZS5lbnVtLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdHQtY29yZS9zcmMvbGliL2RiL0VudW1zL2luY29tZS1zb3VyY2UtdHlwZS1saXN0LXNvbGUuZW51bS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxNQUFNLENBQU4sSUFBWSw0QkFFWDtBQUZELFdBQVksNEJBQTRCO0lBQ3RDLDZGQUFlLENBQUE7QUFDakIsQ0FBQyxFQUZXLDRCQUE0QixLQUE1Qiw0QkFBNEIsUUFFdkMiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgZW51bSBJbmNvbWVTb3VyY2VUeXBlTGlzdFNvbGVFbnVtIHtcbiAgU09MRV9UUkFERVIgPSA3LFxufVxuIl19

package/esm2020/lib/db/Enums/income-source-type.enum.mjs

@@ -1,7 +0,0 @@
-export var IncomeSourceTypeEnum;
-(function (IncomeSourceTypeEnum) {
-    IncomeSourceTypeEnum[IncomeSourceTypeEnum["WORK"] = 1] = "WORK";
-    IncomeSourceTypeEnum[IncomeSourceTypeEnum["SOLE"] = 2] = "SOLE";
-    IncomeSourceTypeEnum[IncomeSourceTypeEnum["OTHER"] = 3] = "OTHER";
-})(IncomeSourceTypeEnum || (IncomeSourceTypeEnum = {}));
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5jb21lLXNvdXJjZS10eXBlLmVudW0uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvZGIvRW51bXMvaW5jb21lLXNvdXJjZS10eXBlLmVudW0udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsTUFBTSxDQUFOLElBQVksb0JBSVg7QUFKRCxXQUFZLG9CQUFvQjtJQUM5QiwrREFBUSxDQUFBO0lBQ1IsK0RBQVEsQ0FBQTtJQUNSLGlFQUFTLENBQUE7QUFDWCxDQUFDLEVBSlcsb0JBQW9CLEtBQXBCLG9CQUFvQixRQUkvQiIsInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCBlbnVtIEluY29tZVNvdXJjZVR5cGVFbnVtIHtcbiAgV09SSyA9IDEsXG4gIFNPTEUgPSAyLFxuICBPVEhFUiA9IDMsXG59XG4iXX0=