taxtank-core 0.21.9 → 0.21.12

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

@@ -12,6 +12,13 @@ export declare enum ChartAccountsHeadingListEnum {
     HOME_OFFICE_RUNNING = 17,
     TOOLS_EQUIPMENT = 18,
     HOME_OFFICE_OCCUPANCY = 19,
+    AWARD_OVERTIME_MEAL_ALLOWANCE_EXPENSE = 20,
+    NEWSPAPER = 21,
+    PRINTING_POSTAGE_STATIONERY = 22,
+    SEMINARS_ETC = 23,
+    TELEPHONE = 24,
+    UNION_FEES = 25,
+    OTHER = 26,
     DONATIONS = 27,
     PSI = 30,
     BONUSES = 34,

package/lib/db/Models/bank/bank-account.d.ts

@@ -1,12 +1,12 @@
 import { BankAccountStatusEnum } from '../../Enums/bank-account-status.enum';
 import { BankAccountTypeEnum } from '../../Enums/bank-account-type.enum';
-import { TankTypeEnum } from '../../Enums/tank-type.enum';
 import { BankConnection } from './bank-connection';
 import { BankAccountProperty } from './bank-account-property';
 import { BankTransaction } from './bank-transaction';
 import { BankAccountBalance } from './bank-account-balance';
 import { Loan } from '../loan/loan';
 import { AbstractModel } from '../abstract-model';
+import { SoleBusinessAllocation } from '../sole/sole-business-allocation';
 export declare class BankAccount extends AbstractModel {
     id?: number;
     status?: BankAccountStatusEnum;
@@ -15,7 +15,6 @@ export declare class BankAccount extends AbstractModel {
     accountName?: string;
     nickname?: string;
     accountNumber?: string;
-    tankType?: TankTypeEnum;
     currentBalance?: number;
     currency?: string;
     isManual?: boolean;
@@ -28,6 +27,7 @@ export declare class BankAccount extends AbstractModel {
     updatedAt?: Date;
     bankConnection?: BankConnection;
     bankAccountProperties?: BankAccountProperty[];
+    businessAllocations?: SoleBusinessAllocation[];
     bankTransactions?: BankTransaction[];
     balances?: BankAccountBalance[];
     loan?: Loan;

package/lib/db/Models/depreciation/depreciation.d.ts

@@ -10,6 +10,7 @@ import { DepreciationReceipt } from './depreciation-receipt';
 import { DepreciationForecast } from './depreciation-forecast';
 import { Loan } from '../loan/loan';
 import { TransactionBase } from '../transaction/transaction-base';
+import { SoleBusiness } from '../sole/sole-business';
 export declare class Depreciation extends TransactionBase {
     id?: number;
     createdAt?: Date;
@@ -39,4 +40,5 @@ export declare class Depreciation extends TransactionBase {
     loan?: Loan;
     createdBy?: User;
     updatedBy?: User;
+    business?: SoleBusiness;
 }

package/lib/db/Models/sole/sole-business-allocation.d.ts

@@ -0,0 +1,9 @@
+import { BankAccount } from '../bank/bank-account';
+import { SoleBusiness } from './sole-business';
+import { AbstractModel } from '../abstract-model';
+export declare class SoleBusinessAllocation extends AbstractModel {
+    percent?: number;
+    id?: number;
+    bankAccount?: BankAccount;
+    business?: SoleBusiness;
+}

package/lib/db/Models/sole/sole-business-loss.d.ts

@@ -0,0 +1,9 @@
+import { SoleBusiness } from './sole-business';
+import { AbstractModel } from '../abstract-model';
+export declare class SoleBusinessLoss extends AbstractModel {
+    financialYear?: number;
+    amount?: number;
+    id?: number;
+    deletedAt?: Date;
+    business?: SoleBusiness;
+}

package/lib/db/Models/sole/sole-business.d.ts

@@ -0,0 +1,26 @@
+import { User } from '../user/user';
+import { SoleBusinessAllocation } from './sole-business-allocation';
+import { SoleBusinessLoss } from './sole-business-loss';
+import { SoleInvoice } from './sole-invoice';
+import { SoleInvoiceTemplate } from './sole-invoice-template';
+import { VehicleClaim } from '../vehicle/vehicle-claim';
+import { Transaction } from '../transaction/transaction';
+import { Depreciation } from '../depreciation/depreciation';
+import { AbstractModel } from '../abstract-model';
+export declare class SoleBusiness extends AbstractModel {
+    name?: string;
+    code?: string;
+    description?: string;
+    website?: string;
+    logo?: string;
+    id?: number;
+    deletedAt?: Date;
+    user?: User;
+    allocations?: SoleBusinessAllocation[];
+    losses?: SoleBusinessLoss[];
+    invoices?: SoleInvoice[];
+    invoiceTemplates?: SoleInvoiceTemplate[];
+    vehicleClaims?: VehicleClaim[];
+    transactions?: Transaction[];
+    depreciations?: Depreciation[];
+}

package/lib/db/Models/sole/sole-contact.d.ts

@@ -0,0 +1,17 @@
+import { User } from '../user/user';
+import { Phone } from '../phone';
+import { Address } from '../address';
+import { SoleInvoice } from './sole-invoice';
+import { AbstractModel } from '../abstract-model';
+export declare class SoleContact extends AbstractModel {
+    name?: string;
+    abn?: number;
+    firstName?: string;
+    lastName?: string;
+    email?: string;
+    id?: number;
+    user?: User;
+    phone?: Phone;
+    address?: Address;
+    invoices?: SoleInvoice[];
+}

package/lib/db/Models/sole/sole-invoice-item.d.ts

@@ -0,0 +1,12 @@
+import { SoleInvoice } from './sole-invoice';
+import { ChartAccounts } from '../chart-accounts/chart-accounts';
+import { AbstractModel } from '../abstract-model';
+export declare class SoleInvoiceItem extends AbstractModel {
+    description?: string;
+    quantity?: number;
+    price?: number;
+    id?: number;
+    isGST?: boolean;
+    invoice?: SoleInvoice;
+    chartAccounts?: ChartAccounts;
+}

package/lib/db/Models/sole/sole-invoice-template.d.ts

@@ -0,0 +1,10 @@
+import { SoleBusiness } from './sole-business';
+import { BankAccount } from '../bank/bank-account';
+import { AbstractModel } from '../abstract-model';
+export declare class SoleInvoiceTemplate extends AbstractModel {
+    isTaxIncluded?: boolean;
+    term?: number;
+    id?: number;
+    business?: SoleBusiness;
+    bankAccount?: BankAccount;
+}

package/lib/db/Models/sole/sole-invoice.d.ts

@@ -0,0 +1,18 @@
+import { User } from '../user/user';
+import { SoleBusiness } from './sole-business';
+import { SoleInvoiceItem } from './sole-invoice-item';
+import { SoleContact } from './sole-contact';
+import { SoleInvoiceTemplate } from './sole-invoice-template';
+import { AbstractModel } from '../abstract-model';
+export declare class SoleInvoice extends AbstractModel {
+    number?: string;
+    dateFrom?: Date;
+    dateTo?: Date;
+    id?: number;
+    status?: number;
+    user?: User;
+    business?: SoleBusiness;
+    items?: SoleInvoiceItem[];
+    payer?: SoleContact;
+    template?: SoleInvoiceTemplate;
+}

package/lib/db/Models/transaction/transaction.d.ts

@@ -11,6 +11,7 @@ import { Loan } from '../loan/loan';
 import { TransactionBase } from './transaction-base';
 import { Property } from '../property/property';
 import { Depreciation } from '../depreciation/depreciation';
+import { SoleBusiness } from '../sole/sole-business';
 export declare class Transaction extends TransactionBase {
     id?: number;
     type?: TransactionTypeEnum;
@@ -40,4 +41,5 @@ export declare class Transaction extends TransactionBase {
     depreciation?: Depreciation;
     createdBy?: User;
     updatedBy?: User;
+    business?: SoleBusiness;
 }

package/lib/db/Models/vehicle/vehicle-claim.d.ts

@@ -1,7 +1,7 @@
 import { VehicleClaimMethodEnum } from '../../Enums/vehicle-claim-method.enum';
 import { User } from '../user/user';
-import { TankTypeEnum } from '../../Enums/tank-type.enum';
 import { AbstractModel } from '../abstract-model';
+import { SoleBusiness } from '../sole/sole-business';
 export declare class VehicleClaim extends AbstractModel {
     financialYear?: number;
     method?: VehicleClaimMethodEnum;
@@ -10,5 +10,5 @@ export declare class VehicleClaim extends AbstractModel {
     isManual?: boolean;
     id?: number;
     user?: User;
-    tankType?: TankTypeEnum;
+    business?: SoleBusiness;
 }

package/lib/db/Models/vehicle/vehicle.d.ts

@@ -1,11 +1,9 @@
 import { User } from '../user/user';
 import { VehicleLogbook } from './vehicle-logbook';
-import { TankTypeEnum } from '../../Enums/tank-type.enum';
 import { AbstractModel } from '../abstract-model';
 export declare class Vehicle extends AbstractModel {
     name?: string;
     id?: number;
     user?: User;
     logbook?: VehicleLogbook[];
-    tankType?: TankTypeEnum;
 }

package/lib/forms/abstract.form.d.ts

@@ -2,6 +2,7 @@ import { AbstractControl, AbstractControlOptions, AsyncValidatorFn, FormGroup, V
 import { EventEmitter, Type } from '@angular/core';
 /**
  * Abstract form class
+ * @TODO rename to AbstractFormGroup
  */
 export declare abstract class AbstractForm<Model> extends FormGroup {
     protected modelClass: Type<Model>;
@@ -17,5 +18,8 @@ export declare abstract class AbstractForm<Model> extends FormGroup {
      * @param data Additional data object which be merged to form value
      */
     submit(data?: object): Model;
+    addControl(name: string, control: AbstractControl, options?: {
+        emitEvent?: boolean;
+    }): this;
     private createModelInstance;
 }

package/lib/forms/bank/bank-account/bank-account-add-manual.form.d.ts

@@ -1,11 +1,11 @@
-import { AbstractForm } from '../../abstract.form';
 import { BankAccount } from '../../../models/bank/bank-account';
 import { BankConnection } from '../../../models/bank/bank-connection';
 import { IEventListener } from '../../../interfaces/event-listener.interface';
+import { BankAccountAllocationForm } from './bank-account-allocation.form';
 /**
  * Form is using for single manual bank account creation (not Basiq)
  */
-export declare class BankAccountAddManualForm extends AbstractForm<BankAccount> implements IEventListener {
+export declare class BankAccountAddManualForm extends BankAccountAllocationForm implements IEventListener {
     private connection;
     static accountNumberPattern: string;
     constructor(connection: BankConnection);
@@ -14,10 +14,6 @@ export declare class BankAccountAddManualForm extends AbstractForm<BankAccount>
      * Add/Remove loan form depends on selected bank account type
      */
     private listenTypeChanges;
-    /**
-     * Add/Remove bank account properties form depends on selected tank type
-     */
-    private listenTankTypeChanges;
     /**
      * Attach bank connection to manual bank account
      */

package/lib/forms/bank/bank-account/bank-account-allocation.form.d.ts

@@ -0,0 +1,7 @@
+import { AbstractForm } from '../../abstract.form';
+import { BankAccount } from '../../../models/bank/bank-account';
+export declare class BankAccountAllocationForm extends AbstractForm<BankAccount> {
+    private bankAccount?;
+    constructor(bankAccount?: BankAccount);
+    watchTankType(): void;
+}

package/lib/forms/bank/bank-account/bank-account-import.form.d.ts

@@ -1,15 +1,9 @@
-import { AbstractForm } from '../../abstract.form';
 import { BankAccount } from '../../../models/bank/bank-account';
-import { IEventListener } from '../../../interfaces/event-listener.interface';
+import { BankAccountAllocationForm } from './bank-account-allocation.form';
 /**
  * Form is using for import basiq bank accounts.
  * Basiq accounts has all data except tank type, properties and loan partially
  */
-export declare class BankAccountImportForm extends AbstractForm<BankAccount> implements IEventListener {
+export declare class BankAccountImportForm extends BankAccountAllocationForm {
     constructor(bankAccount: BankAccount);
-    listenEvents(): void;
-    /**
-     * Add/Remove bank account properties form depends on selected tank type
-     */
-    private listenTankTypeChanges;
 }

package/lib/forms/bank/bank-account/bank-account-properties.form.d.ts

@@ -2,6 +2,7 @@ import { FormArray } from '@angular/forms';
 import { BankAccountProperty } from '../../../models/bank/bank-account-property';
 /**
  * Form array with bank account properties
+ * @TODO create AbstractFormArray
  */
 export declare class BankAccountPropertiesForm extends FormArray {
     constructor(bankAccountProperties?: BankAccountProperty[]);

package/lib/forms/index.d.ts

@@ -1,4 +1,5 @@
 export * from './abstract.form';
+export * from './bank/bank-account/bank-account-allocation.form';
 export * from './bank/bank-account/bank-account-import.form';
 export * from './bank/bank-account/bank-account-loan.form';
 export * from './bank/bank-account/bank-account-add-manual.form';

package/lib/forms/report/my-tax/my-tax-deductions.form.d.ts

@@ -1,5 +1,5 @@
 import { AbstractForm } from '../../abstract.form';
-import { MyTaxDeductions } from '../../../models/report/my-tax/my-tax-deductions/my-tax-deductions';
+import { MyTaxDeductions } from '../../../models/report/my-tax';
 export declare class MyTaxDeductionsForm extends AbstractForm<MyTaxDeductions> {
     constructor(deductions: MyTaxDeductions);
 }

package/lib/models/bank/bank-account.d.ts

@@ -1,6 +1,7 @@
 import { BankAccount as BankAccountBase } from '../../db/Models/bank/bank-account';
 import { BankAccountTypeEnum } from '../../db/Enums/bank-account-type.enum';
 import { Loan } from '../loan/loan';
+import { TankTypeEnum } from '../../db/Enums/tank-type.enum';
 import { BankAccountBalance } from '../../db/Models/bank/bank-account-balance';
 import { BankAccountProperty } from './bank-account-property';
 import { BankConnection } from './bank-connection';
@@ -43,6 +44,7 @@ export declare class BankAccount extends BankAccountBase {
      * check if bank account related to sole tank
      */
     isSoleTank(): boolean;
+    get tankType(): TankTypeEnum;
     /**
      * Get Bank account property by id
      * @param id Id of property

package/lib/models/logbook/vehicle-claim.d.ts

@@ -18,6 +18,7 @@ export declare class VehicleClaim extends VehicleClaimBase {
     isKLMsMethod(): boolean;
     isWorkTank(): boolean;
     isSoleTank(): boolean;
+    get tankType(): TankTypeEnum;
     /**
      * Claim amount for KLMs method. Exists only for KLMs method.
      */

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

@@ -1,11 +1,21 @@
 import { TransactionCollection } from '../../../../collections/transaction/transaction.collection';
 import { DepreciationCollection } from '../../../../collections/depreciation.collection';
+import { TaxSummary } from '../../../tax-summary/tax-summary';
+import { TaxSummarySection } from '../../../tax-summary/tax-summary-section';
 export declare class MyTaxRent {
     propertyExpenses: TransactionCollection;
+    taxSummaryPropertySection: TaxSummarySection;
     grossRentAmount: number;
     interestDeductionsAmount: number;
     capitalWorksDeductionsAmount: number;
     otherRentalDeductionsAmount: number;
     netRent: number;
-    constructor(transactions: TransactionCollection, depreciations: DepreciationCollection);
+    constructor(transactions: TransactionCollection, depreciations: DepreciationCollection, taxSummary: TaxSummary);
+    /**
+     * @Todo Vik remove when TT-2009 will be implemented.
+     * We use tax summary data here because claim amount from depreciation is different
+     * from the claim amount that we get from tax summary (depreciation claim amount is not affected by property share,
+     * property contract date, e.t.c.). Details in the TT-2009 task
+     */
+    private calculateOtherRentalDeductionsAmount;
 }

package/lib/services/event/sse.service.d.ts

@@ -4,6 +4,7 @@ import { JwtService } from '../auth/jwt.service';
 import * as i0 from "@angular/core";
 /**
  * server sent events service
+ * https://symfony.com/doc/current/mercure.html
  */
 export declare class SseService {
     private zone;

package/lib/validators/fields-sum.validator.d.ts

@@ -0,0 +1,8 @@
+import { ValidatorFn } from '@angular/forms';
+/**
+ * Validator that check if sum amount of provided fields is greater than provided sum
+ * @param field to check in each formArray element
+ * @param summary to compare with fields sum
+ * @param fieldAlias to show it in error message
+ */
+export declare function fieldsSumValidator(field: string, summary?: number, fieldAlias?: string): ValidatorFn;

package/package.json

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