@silexpert/core 1.1.289 → 1.1.291

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@silexpert/core",
-  "version": "1.1.289",
+  "version": "1.1.291",
   "description": "Silex Core perform HTTP Request and object binding. Silex core helps developers to retrieve and return formatted object",
   "homepage": "https://gitlab.compta-clementine.fr/dev/silex-api",
   "main": "dist/cjs/index.js",

package/ts/api/resources/Revision.ts

@@ -8,16 +8,36 @@ import {
   QueryRevisionPaginate,
   IAccountingTransaction,
   QueryRevisionApprobation,
-  QueryRevisionAccountComment, IAccountDetail, ICycle, QueryRevisionPendingPoint, ISupervisionPendingPoint, QueryRevisionGenericPendingPoint, CreateOrUpdateState, ISupervisionPendingPointReply, CreateReply, CreatePersonalNote, ISupervisionPersonalAccountantNote, UpdatePersonalNote, GetPersonalNoteForPeriod, ISupervision, QuerySupervision, CreateSupervisionNoteFile, GetNote, IGedFile, CreateSummaryDocument, QueryRevisionAccountControlFile, QueryRevisionExport, QueryRevisionMergeIntoThirdParty, ReadRevisionMergeIntoThirdParty,
+  QueryRevisionAccountComment, IAccountDetail, ICycle, QueryRevisionPendingPoint, ISupervisionPendingPoint, QueryRevisionGenericPendingPoint, CreateOrUpdateState, ISupervisionPendingPointReply, CreateReply, CreatePersonalNote, ISupervisionPersonalAccountantNote, UpdatePersonalNote, GetPersonalNoteForPeriod, ISupervision, QuerySupervision, CreateSupervisionNoteFile, GetNote, IGedFile, CreateSummaryDocument, QueryRevisionAccountControlFile, QueryRevisionExport, QueryRevisionThirdPartyPaginate, ReadAccrualRevision, QueryRevisionThirdParty, QueryRevisionMergeIntoThirdParty, ReadRevisionMergeIntoThirdParty,
 } from '../..';
 
 export class Revision extends Resource {
-  getAllByAccounts(params: QueryRevision): Promise<ReadRevision[]> {
-    return this.axios.$get('/revisions/accounts', { params });
+  getAllByAccounts(params: QueryRevision, signal?: AbortSignal): Promise<ReadRevision[]> {
+    return this.axios.$get('/revisions/accounts', { 
+      params,
+      ...(signal ? { signal } : {}),
+    });
+  }
+
+  getAllByThirdParties(params: QueryRevisionThirdParty, signal?: AbortSignal): Promise<ReadAccrualRevision[]> {
+    return this.axios.$get('/revisions/third-parties', { 
+      params,
+      ...(signal ? { signal } : {}),
+    });
   }
 
-  getPaginateByAccounts(params: QueryRevisionPaginate): Promise<BasePaginate<ReadRevision>> {
-    return this.axios.$get('/revisions/accounts/paginate', { params });
+  getPaginateByAccounts(params: QueryRevisionPaginate, signal?: AbortSignal): Promise<BasePaginate<ReadRevision>> {
+    return this.axios.$get('/revisions/accounts/paginate', { 
+      params,
+      ...(signal ? { signal } : {}),
+    });
+  }
+
+  getPaginatedByThirdParty(params: QueryRevisionThirdPartyPaginate, signal?: AbortSignal): Promise<BasePaginate<ReadAccrualRevision>> {
+    return this.axios.$get('/revisions/third-parties/paginate', { 
+      params,
+      ...(signal ? { signal } : {}),
+    });
   }
 
   getPaginateTransactionsByAccount(idAccount: number, params: QueryRevisionAccount, cancelToken?: CancelToken, signal?: AbortSignal): Promise<BasePaginate<ReadRevisionAccount>> {

package/ts/types/Enum/CommercialOfferType.ts

@@ -111,4 +111,14 @@ export const CommercialOfferTypeDetail = {
     isCatalog: null,
     isBack: true,
   },
+  BALANCE_SHEET_OFFERED_NO_EXPRESS : {
+    id: 9,
+    label: 'Bilan à 0 non express',
+    text: 'Bilan à %value% € par exercice non express sous réserve qu\'il y ai moins de 50 lignes sur le relevé bancaire',
+    amountType: CommercialOfferAmountType.MONEY,
+    idPrestationList: [],
+    isComptable: true,
+    isCatalog: null,
+    isBack: false,
+  },
 };

package/ts/types/Enum/TaskResponseType.ts

@@ -36,6 +36,7 @@ export enum RoleAvailableForTask {
   EXPERT_ACCOUNTANT = Role.EXPERT_ACCOUNTANT,
   REFERENT_CLIENT = Role.EXPERT_ACCOUNTANT,
   REFERENT_LITIGE = Role.EXPERT_ACCOUNTANT,
+  DATA_OFFICER = Role.DATA_OFFICER,
 }
 
 export const TaskResponseType = {

package/ts/types/Interface/api/revision/Query.ts

@@ -8,9 +8,10 @@ import {
   IsArray,
 } from 'class-validator';
 import { ApiProperty, ApiPropertyOptional, QueryPaginate } from '../../../..';
+import { RequiredQueryPaginate } from '../BasePaginate';
 import { ToBoolean } from '../../../../utils/transforms/boolean.transform';
 
-export class QueryRevision {
+export class QueryRevision extends RequiredQueryPaginate {
   @ApiProperty()
   @IsDate()
     startDate: Date;
@@ -33,15 +34,35 @@ export class QueryRevision {
   @ToBoolean()
   @IsOptional()
     descending?: boolean;
+}
 
-  // Interface paginate
-  @ApiProperty({ default: 25 })
-  @IsNumber()
-    limit?: number = 25;
+export class QueryRevisionThirdParty extends RequiredQueryPaginate {
+  @ApiProperty()
+  @IsDate()
+    startDate: Date;
 
-  @ApiProperty({ default: 1 })
+  @ApiProperty()
+  @IsDate()
+    endDate: Date;
+
+  @ApiProperty()
+  @IsInt()
+    idSociety: number;
+
+  @ApiProperty()
   @IsNumber()
-    page?: number = 1;
+    idThirdPartyType: number;
+
+  @ApiPropertyOptional()
+  @IsString()
+  @IsOptional()
+    orderBy?: 'designation' | 'amount' | 'number';
+
+  @ApiPropertyOptional()
+  @IsBoolean()
+  @ToBoolean()
+  @IsOptional()
+    descending?: boolean;
 }
 
 export class QueryRevisionAccount implements QueryPaginate {
@@ -217,6 +238,44 @@ export class QueryRevisionPaginate {
     page?: number = 1;
 }
 
+export class QueryRevisionThirdPartyPaginate {
+  @ApiProperty()
+  @IsNumber()
+    idThirdPartyType: number;
+
+  @ApiProperty()
+  @IsDate()
+    startDate: Date;
+  
+  @ApiProperty()
+  @IsDate()
+    endDate: Date;
+  
+  @ApiProperty()
+  @IsInt()
+    idSociety: number;
+  
+  @ApiPropertyOptional()
+  @IsString()
+  @IsOptional()
+    orderBy?: 'designation' | 'amount' | 'number';
+  
+  @ApiPropertyOptional()
+  @IsBoolean()
+  @ToBoolean()
+  @IsOptional()
+    descending?: boolean;
+  
+  // Interface paginate
+  @ApiProperty({ default: 25 })
+  @IsNumber()
+    limit?: number = 25;
+  
+  @ApiProperty({ default: 1 })
+  @IsNumber()
+    page?: number = 1;
+}
+
 export class QueryRevisionSearchEntries {
   // Mandatory
   @ApiProperty()

package/ts/types/Interface/api/revision/Read.ts

@@ -1,25 +1,39 @@
 import {
   IAccountDetail,
-  IAccountingFile, IAccountingJournal, ILettering, IUser,
+  IAccountingFile, IAccountingJournal, ILettering, IUser, ThirdPartyType,
 } from '../../..';
 import { IFile } from '../../..';
 import { ThirdParty } from '../../../../api/resources/ThirdParty';
 
-export interface ReadRevision {
+
+interface Revision {
   balance: number;
   balanceDebit: number;
   balanceCredit: number;
+  unlocked: number | null;
+  locked: number | null;
+  previousBalance: number;
+  nextBalance: number;
+}
+
+export type ReadRevision = Revision & {
   account: {
     id: number,
     name: string | null,
     number: number | null,
     accountDetails: Array<IAccountDetail>
   },
-  unlocked: number | null;
-  locked: number | null;
-  previousBalance: number;
-  nextBalance: number;
-}
+};
+
+export type ReadAccrualRevision = Revision & {
+  thirdParty: {
+    id: number,
+    name: string | null,
+    accountancyName: string | null,
+    idThirdPartyType: ThirdPartyType,
+    accountDetails: Array<IAccountDetail>
+  },
+};
 
 export interface ReadRevisionAccount {
   id: number;

package/ts/types/Interface/models/IAccountDetail.ts

@@ -14,7 +14,8 @@ export interface IAccountDetail {
   dateCheckAccountant: Date | null;
   checkByIdSupervisor: number | null;
   dateCheckSupervisor: Date | null;
-  idAccount: number;
+  idAccount: number | null;
+  idThirdParty: number | null;
   idFile?: number;
   idExercice?: number;
   idSociety: number;

package/ts/types/Interface/models/ICommercialOffer.ts

@@ -9,6 +9,7 @@ export interface ICommercialOffer {
   amount?: number,
   turnoverMax?: number,
   idComptaType?: number,
+  legalForm?: any,
   startDate: Date,
   endDate: Date,
   cumulative: boolean,

package/ts/utils/commercialOffer.ts

@@ -28,8 +28,13 @@ const disableCommercialOffer = (idCurrentOffer: number, idOfferSelected: number[
   else return false;
 };
 
-const getCommercialOfferList = (idCommercialOfferType: number, societyBrand: number, offerList: ICommercialOffer[], turnoverMax: number, idComptaType: number): ICommercialOffer[] => {
-  const commercialOfferList: ICommercialOffer[] = offerList.filter((offer) => offer.idCommercialOfferType === idCommercialOfferType && offer.brand.includes(societyBrand) && ((offer.turnoverMax && offer.turnoverMax === turnoverMax) || true) && ((offer.idComptaType && ((offer.idComptaType === ComptaType.ACCRUALS && idComptaType % 2 === 0) || (offer.idComptaType === ComptaType.CASH_BASED && !(idComptaType % 2 === 0)))) || true));
+const getCommercialOfferList = (idCommercialOfferType: number, societyBrand: number, offerList: ICommercialOffer[], turnoverMax: number, idComptaType: number, idLegalForm: number): ICommercialOffer[] => {
+  const commercialOfferList: ICommercialOffer[] = offerList.filter((offer) => 
+    offer.idCommercialOfferType === idCommercialOfferType && 
+    offer.brand.includes(societyBrand) && 
+    ((offer.turnoverMax && offer.turnoverMax === turnoverMax) || true) && 
+    ((offer.idComptaType && ((offer.idComptaType === ComptaType.ACCRUALS && idComptaType % 2 === 0) || (offer.idComptaType === ComptaType.CASH_BASED && !(idComptaType % 2 === 0)))) || true) && 
+    (!offer.legalForm || offer.legalForm.includes(idLegalForm)));
   return commercialOfferList.filter(offer => dayjs().isBetween(dayjs(offer.startDate), dayjs(offer.endDate), 'day', '[]'));
 };