@silexpert/core 1.3.160-3 → 1.3.160-4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@silexpert/core",
-  "version": "1.3.160-3",
+  "version": "1.3.160-4",
   "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/types/Interface/api/brevo/EmailSendOptions.dto.ts

@@ -1,4 +1,4 @@
-import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
+import { ApiProperty, ApiPropertyOptional } from '../../../../utils';
 import { IsString, IsEmail, IsOptional, IsNumber, IsObject, ValidateIf } from 'class-validator';
 
 export class EmailSendOptionsDto {

package/ts/types/Interface/api/revenueMovement.ts

@@ -1,6 +1,6 @@
 import { IsDate, IsInt, IsOptional, IsEnum, IsNumber, IsString, IsObject, IsArray } from 'class-validator';
 import { RevenueMovementType } from '../../Enum/Revenue';
-import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
+import { ApiProperty, ApiPropertyOptional } from '../../../utils';
 
 /**
  * DTO pour créer un mouvement de revenu

package/ts/types/Interface/api/revenueSnapshotGenerate.ts

@@ -1,5 +1,4 @@
-import { ApiPropertyOptional } from '@nestjs/swagger';
-import { ApiProperty } from '../../../utils';
+import { ApiProperty, ApiPropertyOptional } from '../../../utils';
 import { IsOptional, IsString, IsNumber, IsInt } from 'class-validator';
 
 export class GenerateSnapshot {
@@ -23,7 +22,7 @@ export class GenerateSnapshot {
 
   @ApiProperty({
     required: false,
-    description: "ID de l'exercice",
+    description: 'ID de l\'exercice',
     example: 123456,
   })
   @IsOptional()
@@ -53,7 +52,7 @@ export class ManageRetroactivity {
 
   @ApiPropertyOptional({
     required: false,
-    description: "ID de l'exercice (si non fourni, utilise l'exercice courant)",
+    description: 'ID de l\'exercice (si non fourni, utilise l\'exercice courant)',
     example: 123456,
   })
   @IsOptional()

package/ts/utils/prestation.ts

@@ -1,5 +1,6 @@
 import { IExercice, IPrestation, IPrestationList } from '../types';
 import { Vat } from '../types/Enum/Vat';
+import { ReasonTerminationType } from '../types/Enum/ReasonTerminationType';
 import { getTaxesIncludedAmount } from './vat/utils';
 import { intersection } from './noLodash';
 import {
@@ -166,7 +167,8 @@ const calculateScoringOfPrestation = (
     (prestation) =>
       prestation.paid &&
       prestation.signed &&
-      prestation.terminationList === null &&
+      (prestation.terminationList === null ||
+        prestation.terminationList?.idReasonTermination?.includes(ReasonTerminationType.CHANGES_NEW_OFFERS)) &&
       prestation.id !== currentIdPrestation,
   );