@silexpert/core 1.3.72 → 1.3.73

package/ts/types/Enum/PrestationType.ts

@@ -386,7 +386,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: null,
     signaturePage: null,
-    point: 0,
+    point: 100,
   },
   STATUTS: {
     id: 7,
@@ -405,7 +405,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: null,
     signaturePage: null,
-    point: 0,
+    point: 50,
   },
   PV_AG: {
     id: 8,
@@ -424,7 +424,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: null,
     signaturePage: null,
-    point: 0,
+    point: 100,
   },
   BILAN_INTERMEDIAIRE: {
     id: 9,
@@ -443,7 +443,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: null,
     signaturePage: null,
-    point: 50,
+    point: 100,
   },
   FRUCTUCOMPTA_ASSISTANCE_EXPRESS: {
     id: 10,
@@ -500,7 +500,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: '400,54,569,90',
     signaturePage: 5,
-    point: 125,
+    point: 150,
   },
   TELEDECLARATION: {
     id: 13,
@@ -519,7 +519,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: null,
     signaturePage: null,
-    point: 0,
+    point: 50,
   },
   CREATION_SOCIETE: {
     id: 15,
@@ -538,7 +538,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: '400,54,569,90',
     signaturePage: 6,
-    point: 125,
+    point: 100,
   },
   JURIDIQUE: {
     id: 16,
@@ -557,7 +557,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: null,
     signaturePage: null,
-    point: 0,
+    point: 50,
   },
   MYFRUCTUCOMPTA_STATUT_EXPRESS: {
     id: 17,
@@ -1032,7 +1032,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: '400,54,569,90',
     signaturePage: 5,
-    point: 75,
+    point: 100,
   },
   COMPTA_ASSISTANCE: {
     id: 45,
@@ -1089,7 +1089,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: null,
     signaturePage: null,
-    point: 0,
+    point: 50,
   },
   ASSISTANCE_RECOUVREMENT: {
     id: 48,
@@ -1108,6 +1108,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: null,
     signaturePage: null,
+    point: 50,
   },
   AUGMENTATION_CAPITAL: {
     id: 49,
@@ -1126,7 +1127,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: null,
     signaturePage: null,
-    point: 0,
+    point: 50,
   },
   BAIL_COMMERCIAL: {
     id: 50,
@@ -1240,7 +1241,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: null,
     signaturePage: null,
-    point: 0,
+    point: 50,
   },
   CONSTITUTION_SOCIETE: {
     id: 56,
@@ -1259,7 +1260,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: null,
     signaturePage: null,
-    point: 0,
+    point: 50,
   },
   CONVENTION_DE_MISE_A_DISPOSITION_A_TITRE_GRATUIT: {
     id: 57,
@@ -1392,7 +1393,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: null,
     signaturePage: null,
-    point: 125,
+    point: 100,
   },
   INTEGRATION_FISCALE: {
     id: 64,
@@ -1506,7 +1507,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: null,
     signaturePage: null,
-    point: 0,
+    point: 50,
   },
   REDUCTION_DU_CAPITAL: {
     id: 70,
@@ -1601,7 +1602,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: null,
     signaturePage: null,
-    point: 0,
+    point: 50,
   },
   TRANSFERT_SIEGE_SOCIAL_SASU_EURL: {
     id: 75,
@@ -1639,7 +1640,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: null,
     signaturePage: null,
-    point: 0,
+    point: 50,
   },
   TRANSMISSION_UNIVERSELLE_PATRIMOINE_ASSOCIE_UNIQUE_EURL_SASU: {
     id: 77,
@@ -1658,7 +1659,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: null,
     signaturePage: null,
-    point: 0,
+    point: 50,
   },
   BULLETIONS_SALAIRE: {
     id: 78,
@@ -1677,7 +1678,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: null,
     signaturePage: null,
-    point: 0,
+    point: 50,
   },
   DSN: {
     id: 79,
@@ -1696,7 +1697,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: null,
     signaturePage: null,
-    point: 0,
+    point: 50,
   },
   CREATION_DOSSIER_INFORMATIQUE_PAR_SALARIE: {
     id: 80,
@@ -1715,7 +1716,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: null,
     signaturePage: null,
-    point: 0,
+    point: 50,
   },
   ETABLISSEMENT_CONTRAT_TRAVAIL: {
     id: 81,
@@ -1734,7 +1735,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: null,
     signaturePage: null,
-    point: 0,
+    point: 50,
   },
   ATTESTATION_SALAIRE: {
     id: 82,
@@ -1753,7 +1754,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: null,
     signaturePage: null,
-    point: 0,
+    point: 50,
   },
   ADHESION_ORGANISMES_COTISATIONS_OBLIGATOIRES: {
     id: 83,
@@ -1772,7 +1773,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: null,
     signaturePage: null,
-    point: 0,
+    point: 50,
   },
   TAXE_APPRENTISSAGE_ET_FORMATION_CONTINUE: {
     id: 84,
@@ -1791,7 +1792,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: null,
     signaturePage: null,
-    point: 0,
+    point: 50,
   },
   DISSOLUTION_LIQUIDATION_HORS_DATE_CLOTURE: {
     id: 85,
@@ -1886,7 +1887,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: true,
     signaturePosition: null,
     signaturePage: null,
-    point: 75,
+    point: 50,
   },
   EVALUATION: {
     id: 90,
@@ -1981,7 +1982,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: null,
     signaturePage: null,
-    point: 0,
+    point: 50,
   },
   // FIXME: Doublon ?
   ATTESTATION_NON_REMUNERATION: {
@@ -2001,7 +2002,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: null,
     signaturePage: null,
-    point: 0,
+    point: 50,
   },
   ATTESTATION_CA: {
     id: 97,
@@ -2324,7 +2325,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: null,
     signaturePage: null,
-    point: 0,
+    point: 50,
   },
   DOCUMENTS_DE_SORTIE: {
     id: 117,
@@ -2343,7 +2344,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: null,
     signaturePage: null,
-    point: 0,
+    point: 50,
   },
   DPAE: {
     id: 118,
@@ -2362,7 +2363,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: null,
     signaturePage: null,
-    point: 0,
+    point: 50,
   },
   ADHESION_AUX_ORGANISMES_OBLIGATOIRES: {
     id: 119,
@@ -2381,7 +2382,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: null,
     signaturePage: null,
-    point: 0,
+    point: 50,
   },
   AVENANT_CONTRAT_DE_TRAVAIL: {
     id: 120,
@@ -2495,7 +2496,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: null,
     signaturePage: null,
-    point: 0,
+    point: 50,
   },
   TVS: {
     id: 126,
@@ -2799,7 +2800,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: null,
     signaturePage: null,
-    point: 0,
+    point: 50,
   },
   DOC_WORD: {
     id: 143,
@@ -2818,7 +2819,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: null,
     signaturePage: null,
-    point: 0,
+    point: 50,
   },
   ENVOI_POSTAL: {
     id: 144,
@@ -2837,7 +2838,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: null,
     signaturePage: null,
-    point: 0,
+    point: 50,
   },
   DECLARATION_SOCIALE_NOMINATIVE: {
     id: 145,
@@ -2856,7 +2857,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: null,
     signaturePage: null,
-    point: 0,
+    point: 50,
   },
   SOLDE_TOUT_COMPTE_ET_ATTESTATION_ASSEDIC_ET_ATTESTATION_EMPLOI_SALARIE: {
     id: 146,
@@ -2875,7 +2876,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: null,
     signaturePage: null,
-    point: 0,
+    point: 50,
   },
   ETABLISSEMENT_DECLARATION_PREALABLE_A_L_EMBAUCHE: {
     id: 147,
@@ -2894,7 +2895,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: null,
     signaturePage: null,
-    point: 0,
+    point: 50,
   },
   COMPTA_MICRO: {
     id: 185,
@@ -3008,7 +3009,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: null,
     signaturePage: null,
-    point: 0,
+    point: 50,
   },
   DEMANDE_CREATION_SOCIETE_SUPPLEMENTAIRE: {
     id: 191,
@@ -3027,7 +3028,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: null,
     signaturePage: null,
-    point: 0,
+    point: 50,
   },
   DISSOLUTION_LIQUIDATION: {
     id: 192,
@@ -3065,7 +3066,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: null,
     signaturePage: null,
-    point: 0,
+    point: 50,
   },
   COMPTA_STARTER_PRO: {
     id: 194,
@@ -3274,7 +3275,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: null,
     signaturePage: null,
-    point: 0,
+    point: 50,
   },
   COMPTA_POURCENTAGE_PREMIUM: {
     id: 205,
@@ -3312,7 +3313,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: '400,54,569,90',
     signaturePage: null,
-    point: 75,
+    point: 100,
   },
   COMPTA_POURCENTAGE_EXPRESS: {
     id: 207,
@@ -3369,7 +3370,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: '400,54,569,90',
     signaturePage: 7,
-    point: 0,
+    point: 50,
   },
   FRAIS_DE_GREFFE: {
     id: 210,
@@ -3388,7 +3389,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: '',
     signaturePage: 0,
-    point: 0,
+    point: 50,
   },
   ASSURANCE_CONTROLE_FISCAL: {
     id: 211,
@@ -3426,7 +3427,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: '',
     signaturePage: null,
-    point: 0,
+    point: 50,
   },
   STATUTS_OPTION_1: {
     id: PrestationType.STATUTS_OPTION_1,
@@ -3445,7 +3446,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: '',
     signaturePage: null,
-    point: 0,
+    point: 50,
   },
   STATUTS_OPTION_2: {
     id: PrestationType.STATUTS_OPTION_2,
@@ -3464,7 +3465,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: '',
     signaturePage: null,
-    point: 0,
+    point: 50,
   },
   STATUTS_OPTION_AE: {
     id: PrestationType.STATUTS_OPTION_AE,
@@ -3483,7 +3484,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: '',
     signaturePage: null,
-    point: 0,
+    point: 50,
   },
   COMPTA_MICRO_KLEMS: {
     id: PrestationType.COMPTA_MICRO_KLEMS,
@@ -3635,7 +3636,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: '400,54,569,90',
     signaturePage: null,
-    point: 0,
+    point: 100,
   },
   CONSULTING_HOUR: {
     id: PrestationType.CONSULTING_HOUR,
@@ -3654,7 +3655,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: '',
     signaturePage: null,
-    point: 0,
+    point: 50,
   },
   BILLING: {
     id: PrestationType.BILLING,
@@ -3673,8 +3674,9 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: '400,54,569,90',
     signaturePage: 7,
-    point: 0,
+    point: 200,
   },
+  //Software
   STEERING: {
     id: PrestationType.STEERING,
     name: 'Pilotage',
@@ -3694,6 +3696,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     signaturePage: 7,
     point: 200,
   },
+  //Software
   VAT: {
     id: PrestationType.VAT,
     name: 'TVA',
@@ -3713,6 +3716,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     signaturePage: 7,
     point: 200,
   },
+  //Software
   BALANCESHEET: {
     id: PrestationType.BALANCESHEET,
     name: 'Bilan',
@@ -3749,7 +3753,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: '400,54,569,90',
     signaturePage: 7, //???
-    point: 200, //???
+    point: 200,
   },
   SUPPORT: {
     id: PrestationType.SUPPORT,
@@ -3768,7 +3772,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: '400,54,569,90',
     signaturePage: 7, //???
-    point: 200, //???
+    point: 200,
   },
   PREMIUM: {
     id: PrestationType.PREMIUM,
@@ -3787,7 +3791,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: '400,54,569,90',
     signaturePage: 7, //???
-    point: 200, //???
+    point: 400,
   },
   CUSTOM_MADE: {
     id: PrestationType.CUSTOM_MADE,
@@ -3806,7 +3810,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: '400,54,569,90',
     signaturePage: 7, //???
-    point: 200, //???
+    point: 400,
   },
   EI: {
     id: PrestationType.EI,

package/ts/utils/prestation.ts

@@ -153,8 +153,9 @@ const isConsultingHour = (idPrestationList: number[]): boolean =>
   !!intersection(idPrestationList, [PrestationType.CONSULTING_HOUR]).length;
 
 const isSoftwarePrestation = (idPrestationList: number[]): boolean =>
-  !!intersection(idPrestationList, [PrestationType.STEERING, PrestationType.VAT, PrestationType.BALANCESHEET]).length/*  &&
-  idPrestationList.length === 1 */; // Commenté car si un client résilie un software pour un utre software, condition non prise en charge
+  !!intersection(idPrestationList, [PrestationType.STEERING, PrestationType.VAT, PrestationType.BALANCESHEET])
+    .length; /*  &&
+  idPrestationList.length === 1 */ // Commenté car si un client résilie un software pour un utre software, condition non prise en charge
 
 const calculateScoringOfPrestation = (
   idPrestationType: PrestationType,
@@ -173,6 +174,20 @@ const calculateScoringOfPrestation = (
     (el) => el.idPrestationList === idPrestationType && el.terminationList === null,
   );
 
+  // SPECIAL CASE:
+  // If current prestation is a software prestation
+  // and the current prestation is an annual payment, return 0 point
+  if (
+    isSoftwarePrestation([idPrestationType]) &&
+    currentPrestation?.exercices?.length &&
+    //@ts-expect-error
+    currentPrestation?.exercices[0].ExercicePrestation?.totalPrestation < 80 &&
+    //@ts-expect-error
+    currentPrestation?.exercices[0].ExercicePrestation?.monthNumber === 1
+  ) {
+    return 0;
+  }
+
   // Get the list of prestations that are half price
   const prestationHalfPriceList = Object.values(PrestationDetail).filter(
     (p) =>
@@ -187,18 +202,9 @@ const calculateScoringOfPrestation = (
   const prestaDetails = Object.values(PrestationDetail).find((prestaDetail) => prestaDetail.id === idPrestationType);
   let numberPoint = prestaDetails?.point || 0;
 
-  // If software prestation and annual payment then return 0 points
-  if (
-    [PrestationType.BALANCESHEET, PrestationType.VAT, PrestationType.STEERING].includes(idPrestationType) &&
-    currentPrestation?.exercices?.length &&
-    //@ts-expect-error
-    currentPrestation?.exercices[0].ExercicePrestation?.totalPrestation < 80
-  ) {
-    numberPoint = 0;
-  }
-
+  // For each back exercices, add 100 points
+  // -> for new prestations only
   if (
-    // If software prestation and annual payment then return 0 points
     [
       PrestationType.EXPERTISE,
       PrestationType.SUPPORT,
@@ -211,10 +217,11 @@ const calculateScoringOfPrestation = (
     currentPrestation?.exercices?.length &&
     currentPrestation?.exercices.find((el) => el.isBack)
   ) {
-    numberPoint += 100;
+    numberPoint += (currentPrestation?.exercices.filter((el) => el.isBack).length ?? 1) * 100;
   }
 
-  // Get list of prestations that are already done and check if one of them is in the list of prestations that are half price
+  // Get list of prestations that are already done
+  // and check if one of them is in the list of prestations that are half price
   const prestationsExistIds = prestationsSignedPaid.map((prestation) => prestation.idPrestationList);
   const prestationHalfPriceAlreadyDoneIds = prestationsExistIds.filter((id) => prestationHalfPriceIds.includes(id));
 

package/ts/utils/vat/registration.ts

@@ -2,9 +2,9 @@ import * as dayjs from 'dayjs';
 import { isDefined } from 'class-validator';
 import { reverse, sumBy } from 'lodash';
 import {
+  AnyCerfa3310_Century,
   Cerfa2571_2023,
   Cerfa2573_2024,
-  Cerfa3310_2023,
   Cerfa3514_2022,
   CerfaType,
   CustomerVatType,
@@ -17,7 +17,7 @@ import {
   RegistrationTickState,
   TaxType,
 } from '../../types';
-import { Cerfa3517_2023 } from '../../types/Interface/api/cerfa/3517';
+import { AnyCerfa3517Century } from '../../types/Interface/api/cerfa/3517';
 
 const waitingState: ReadRegistrationTick = {
   state: RegistrationTickState.IN_PROGRESS,
@@ -150,7 +150,7 @@ export function getTypeAndAmountFromRegistration(registration: IRegistration): {
   amountBase?: number;
 } {
   if (registration.idCerfaType === CerfaType.CERFA_3310) {
-    const payload = registration.payload.cerfa3310 as Cerfa3310_2023;
+    const payload = registration.payload.cerfa3310 as AnyCerfa3310_Century;
     const other = { collectable: payload.vat?.grossDue, deductible: payload.vat?.deductible.total };
     if (payload?.isNil) return { type: CustomerVatType.VAT_TO_NIL, amount: 0, ...other };
     if (payload?.toPay?.total > 0) return { type: CustomerVatType.VAT_TO_PAY, amount: payload.toPay.total, ...other };
@@ -170,7 +170,7 @@ export function getTypeAndAmountFromRegistration(registration: IRegistration): {
     return { type: CustomerVatType.VAT_TO_PAY, amount: 0, ...other };
   }
   if (registration.idCerfaType === CerfaType.CERFA_3517) {
-    const payload = registration.payload.cerfa3517 as Cerfa3517_2023;
+    const payload = registration.payload.cerfa3517 as AnyCerfa3517Century;
     const other = {
       collectable: payload.other.total,
       deductible: payload.deductible.total,