@silexpert/core 1.3.142 → 1.3.144-2

package/ts/types/Interface/models/IGedFile.ts

@@ -8,21 +8,18 @@ import { ICustomerSignature } from './ICustomerSignature';
 import { IBalanceSheet } from './IBalanceSheet';
 import { IBusinessPartner } from './IBusinessPartner';
 import { IBankAccount } from './IBankAccount';
-import { TypeFile } from '../../Enum/Ged';
-import { IDocumentRequest } from './IDocumentRequest';
 
 // gedFile
 export interface IGedFile {
   id?: number;
   emissionDate?: Date | null;
   statutFile?: number | null;
-  /** @deprecated Use typeFile field instead with TypeFile enum */
   idTypeGedFile?: number | null;
   idUser?: number | null;
   idGedFolder: number;
   idSociety: number;
   idFile: number;
-  typeFile?: TypeFile | null;
+  typeFile?: number | null;
   startDate?: Date | null;
   endDate?: Date | null;
   idExercice?: number | null;
@@ -30,7 +27,6 @@ export interface IGedFile {
   idUserBP?: number | null; // Attention: lorsqu'on ajoute un fichier dans la modale "Documents manquants", on stock ici l'idUser associé au BP
   idBusinessPartner?: number | null;
   idBankAccount?: number | null;
-  idDocumentRequest?: number | null;
   createdAt?: Date | null;
   updatedAt?: Date | null;
 
@@ -46,5 +42,4 @@ export interface IGedFile {
   userBP?: IUser;
   customerSignature?: ICustomerSignature;
   bankAccount?: IBankAccount;
-  documentRequest?: IDocumentRequest;
 }

package/ts/types/Interface/models/IPaymentExpectation.ts

@@ -1,7 +1,6 @@
 import { ISociety } from './ISociety';
 import { IRegulation } from './IRegulation';
 import { PaymentReason } from '../../Enum/PaymentReason';
-import { IPrestation } from './IPrestation';
 
 // paymentsExpectations
 export interface IPaymentExpectation {
@@ -25,5 +24,4 @@ export interface IPaymentExpectation {
   // Associations
   society?: ISociety;
   regulation?: IRegulation;
-  prestation?: IPrestation | null;
 }

package/ts/types/Interface/models/IPrestation.ts

@@ -32,7 +32,6 @@ export interface IPrestation {
   goToFacturation?: Date | null;
   dateLeavingFacturation?: Date | null;
   scoring: number | null;
-  // @deprecated Application fees are not charged anymore
   isWithApplicationFees?: boolean;
   state: boolean;
   commentPdf: string | null;

package/ts/types/Interface/models/ISociety.ts

@@ -97,7 +97,6 @@ export interface ISociety {
   archive?: boolean;
   archiveDate?: Date | null;
   isBlocked?: boolean | null;
-  isEndorsementSigned?: boolean | null;
   autoAnnotate?: boolean;
   managementSoftware?: boolean | null;
   cashbook?: boolean | null;

package/ts/types/index.ts

@@ -324,7 +324,6 @@ export * from './Interface/models/IStateBankAccount';
 export * from './Interface/models/IAIQuestion';
 export * from './Interface/models/IAIConversation';
 export * from './Interface/models/IPaymentAttempt';
-export * from './Interface/models/IDocumentRequest';
 
 // Schemas
 export * from './Interface/schemas/IRegistrationDetail';
@@ -344,7 +343,6 @@ export * from './Enum/VisualizedInformation';
 export * from './Enum/NafCode';
 export * from './Enum/Acceptance';
 export * from './Enum/FolderFile';
-export * from './Enum/DashboardBlock';
 export * from './Enum/CommercialGrade';
 export * from './Enum/CommercialOfferType';
 export * from './Enum/CommercialManagement';
@@ -773,7 +771,6 @@ export * from './Interface/api/inpi/inpi';
 export * from './Interface/api/team/QueryCreate';
 export * from './Interface/api/team/QueryGetAllWithIncludes';
 export * from './Interface/api/team/QueryUpdate';
-export * from './Interface/api/team/UpdateTeamsForUser';
 export * from './Interface/api/constitutionHistory/QueryPaginatedConstitutionHistory';
 export * from './Interface/api/userSpecialDay/BodyUserSpecialDay';
 export * from './Interface/api/userSpecialDay/QueryUserSpecialDay';
@@ -830,7 +827,6 @@ export * from './Interface/api/pappers/CreatePappers';
 export * from './Interface/api/bankAccount/Query';
 export * from './Interface/api/bankAccount/Update';
 export * from './Interface/api/stripe/QueryStripe';
-export * from './Interface/api/balanceSheetReport/Query';
 export * from './Interface/api/supervision/Query';
 export * from './Interface/api/supervision/Read';
 export * from './Interface/api/salariesFile/ReadSalariesFile';
@@ -937,7 +933,6 @@ export * from './Interface/api/thirdParty/CreateThirdPartyForm';
 export * from './Interface/api/thirdParty/UpdateThirdPartyForm';
 export * from './Interface/api/thirdParty/QueryThirdParty';
 export * from './Interface/api/bankAccount/Read';
-export * from './Interface/api/DashboardLayout';
 export * from './Interface/api/sheetMonthSchedule/QuerySheetMonthSchedule';
 export * from './Interface/api/calendarEvent/createCalendarEvent';
 export * from './Interface/api/calendarEvent/createCalendarEventForUsers';
@@ -1140,8 +1135,6 @@ export * from './Interface/api/absenceRequest/CreateAbsenceRequest';
 export * from './Interface/api/absenceRequest/ReadAbsenceRequest';
 export * from './Interface/api/recurrence/Query';
 export * from './Interface/api/recurrence/Read';
-export * from './Interface/api/documentRequest/Query';
-export * from './Interface/api/documentRequest/Create';
 
 // Enums types
 export * from './Interface/enum/Util';

package/ts/utils/payment.ts

@@ -10,7 +10,7 @@ import {
 } from '../types';
 import * as dayjs from 'dayjs';
 import { PartialExercicePrestationExpress } from '../types/Interface/api/payment/Util';
-import { /* getApplicationFeesAmount,  */ getPriceGrid } from './prestation';
+import { getApplicationFeesAmount, getPriceGrid } from './prestation';
 
 export interface PaymentsWithList extends IPayment {
   type?: 'isComptable' | 'isJuridique' | 'isSocial' | 'isOther';
@@ -85,23 +85,23 @@ const groupPaymentsByServiceType = (
   return societyPayment;
 };
 
-// const calculateFees = (amount: number, paymentDate: Date): number => {
-//   const yearlyPriceIncreasing = 1.0275;
+const calculateFees = (amount: number, paymentDate: Date): number => {
+  const yearlyPriceIncreasing = 1.0275;
 
-//   // Commenté car en fin d'année, pour appliquer le taux d'inflation annuel,
-//   // un script enlève les 2,75€ appliqués pour appliquer le bon taux
-//   // const oneYearLessIfIn3LastMonthsOfYear = dayjs(goToClient).month() >= 9 ? 1 : 0;
+  // Commenté car en fin d'année, pour appliquer le taux d'inflation annuel,
+  // un script enlève les 2,75€ appliqués pour appliquer le bon taux
+  // const oneYearLessIfIn3LastMonthsOfYear = dayjs(goToClient).month() >= 9 ? 1 : 0;
 
-//   if (dayjs(paymentDate).year() - dayjs().year() > 0) {
-//     const nbYearsMore = dayjs(paymentDate).year() - dayjs().year(); /*  - oneYearLessIfIn3LastMonthsOfYear */
-//     // on applique X fois l'augmentation
-//     // ex. : si on lance l'appel en 2024, et qu'on génére un paiement pour 2026, on applique 2 fois l'augmentation
-//     // soit amount * yearlyPriceIncreasing * yearlyPriceIncreasing
-//     // soit amount * yearlyPriceIncreasing ^ nbYearsMore
-//     amount = amount * Math.pow(yearlyPriceIncreasing, nbYearsMore);
-//   }
-//   return amount;
-// };
+  if (dayjs(paymentDate).year() - dayjs().year() > 0) {
+    const nbYearsMore = dayjs(paymentDate).year() - dayjs().year(); /*  - oneYearLessIfIn3LastMonthsOfYear */
+    // on applique X fois l'augmentation
+    // ex. : si on lance l'appel en 2024, et qu'on génére un paiement pour 2026, on applique 2 fois l'augmentation
+    // soit amount * yearlyPriceIncreasing * yearlyPriceIncreasing
+    // soit amount * yearlyPriceIncreasing ^ nbYearsMore
+    amount = amount * Math.pow(yearlyPriceIncreasing, nbYearsMore);
+  }
+  return amount;
+};
 
 /**
 //  * @param {number} firstPaymentAmount - amount of the first payment (first regulation of the customer)
@@ -121,10 +121,10 @@ const groupPaymentsByServiceType = (
 const calculatePaymentsAuto = (params: ParamsForPaymentsAuto): PaymentAuto[] => {
   const {
     idTypeBrand,
-    // isWithApplicationFees,
+    isWithApplicationFees,
     firstExerciceNonExpresssEndDate,
     idPrestation,
-    // idLegalForm,
+    idLegalForm,
     prestationList,
     idVat,
     yearlyAmountNonExpress,
@@ -157,10 +157,10 @@ const calculatePaymentsAuto = (params: ParamsForPaymentsAuto): PaymentAuto[] =>
   if (!prestationList.id) throw new Error('idPrestationList manquant');
   const priceGrid = getPriceGrid(idTypeBrand, prestationList.id);
   if (!priceGrid) throw new Error('Impossible de trouver la grille tarifaire correspondante');
-  const { /* applicationCost,  */ priceWithTaxesIncluded } = priceGrid;
-  // const applicationCostTotalTTC =
-  //   (priceWithTaxesIncluded ? applicationCost : getTaxesIncludedAmount(applicationCost, idVat)) * 12;
-  // const applicationFeesAmountTTC = getApplicationFeesAmount(idLegalForm, idVat);
+  const { applicationCost, priceWithTaxesIncluded } = priceGrid;
+  const applicationCostTotalTTC =
+    (priceWithTaxesIncluded ? applicationCost : getTaxesIncludedAmount(applicationCost, idVat)) * 12;
+  const applicationFeesAmountTTC = getApplicationFeesAmount(idLegalForm, idVat);
 
   if (prestationList?.isCatalog || !prestationList?.isComptable)
     throw new Error('Ce type de prestation ne correspond pas aux conditions attendues.');
@@ -170,10 +170,10 @@ const calculatePaymentsAuto = (params: ParamsForPaymentsAuto): PaymentAuto[] =>
   )
     throw new Error('Start date of some exercice are missing');
 
-  // let yearlyAmountNonExpressClone = yearlyAmountNonExpress;
-  // if (isWithApplicationFees) {
-  //   yearlyAmountNonExpressClone -= getApplicationFeesAmount(idLegalForm); //HT
-  // }
+  let yearlyAmountNonExpressClone = yearlyAmountNonExpress;
+  if (isWithApplicationFees) {
+    yearlyAmountNonExpressClone -= getApplicationFeesAmount(idLegalForm); //HT
+  }
 
   const nbExoExpress = listPartialExercicePrestationExpress.length;
   const listPayments: PaymentAuto[] = [];
@@ -212,20 +212,20 @@ const calculatePaymentsAuto = (params: ParamsForPaymentsAuto): PaymentAuto[] =>
   });
 
   // Si les frais de dossiers sont facturés, on ajoute un paiement sur le mois en cours
-  // if (isWithApplicationFees) {
-  //   listPayments.push({
-  //     amount: applicationFeesAmountTTC, //TTC
-  //     isPaid: true,
-  //     datePayment: dayjs().toDate(),
-  //     idPrestation,
-  //     idPaymentMethod: listRegulations[0]?.idPaymentMethod ?? PaymentMethod.DIRECT_DEBIT.id,
-  //     closingDate: listPartialExercicePrestationExpress?.length
-  //       ? listPartialExercicePrestationExpress[0].endDate
-  //       : firstExerciceNonExpresssEndDate,
-  //     comment: 'Frais de dossier',
-  //   });
-  //   remainingAmount += applicationFeesAmountTTC;
-  // }
+  if (isWithApplicationFees) {
+    listPayments.push({
+      amount: applicationFeesAmountTTC, //TTC
+      isPaid: true,
+      datePayment: dayjs().toDate(),
+      idPrestation,
+      idPaymentMethod: listRegulations[0]?.idPaymentMethod ?? PaymentMethod.DIRECT_DEBIT.id,
+      closingDate: listPartialExercicePrestationExpress?.length
+        ? listPartialExercicePrestationExpress[0].endDate
+        : firstExerciceNonExpresssEndDate,
+      comment: 'Frais de dossier',
+    });
+    remainingAmount += applicationFeesAmountTTC;
+  }
 
   // =========================
   //          EXPRESS
@@ -324,7 +324,7 @@ const calculatePaymentsAuto = (params: ParamsForPaymentsAuto): PaymentAuto[] =>
       continue;
     }
 
-    const exoAmount = isFirstNonExpress ? yearlyAmountNonExpress : nextYearlyAmountNonExpress;
+    const exoAmount = isFirstNonExpress ? yearlyAmountNonExpressClone : nextYearlyAmountNonExpress;
     const remainingBeforeThisExo = remainingAmount;
     remainingAmount += priceWithTaxesIncluded ? exoAmount : getTaxesIncludedAmount(exoAmount, idVat);
 
@@ -356,17 +356,17 @@ const calculatePaymentsAuto = (params: ParamsForPaymentsAuto): PaymentAuto[] =>
     let remainingAmountByExercicePrestation = remainingAmount;
 
     // - frais d'application dès les second exo non express
-    // if (!isFirstNonExpress) remainingAmountByExercicePrestation += applicationCostTotalTTC;
+    if (!isFirstNonExpress) remainingAmountByExercicePrestation += applicationCostTotalTTC;
 
     const monthlyAmount = remainingAmountByExercicePrestation / countMonthsBeforeExerciceEnd; //TTC
 
     if (monthlyAmount > 0) {
       for (let index = 1; index <= countMonthsBeforeExerciceEnd; index++) {
-        const amount = index < countMonthsBeforeExerciceEnd ? monthlyAmount : remainingAmountByExercicePrestation;
+        let amount = index < countMonthsBeforeExerciceEnd ? monthlyAmount : remainingAmountByExercicePrestation;
 
         // Si besoin, on applique les frais nécessaires :
         // - 2,75% d'augmentation chaque année, sauf si souscriptiuon dans les 3 derniers mois de l'année civile)
-        // amount = calculateFees(amount, paymentDate);
+        amount = calculateFees(amount, paymentDate);
 
         listPayments.push({
           amount: Math.round(100 * amount) / 100,
@@ -396,13 +396,13 @@ const calculatePaymentsAuto = (params: ParamsForPaymentsAuto): PaymentAuto[] =>
     ? nextYearlyAmountNonExpress
     : getTaxesIncludedAmount(nextYearlyAmountNonExpress, idVat);
 
-  const remainingAmountByExercicePrestation = remainingAmount;
+  let remainingAmountByExercicePrestation = remainingAmount;
   //On compte le nb de mois restants entre la date à laquelle le paiement va être créé et la date de fin d'exercice
   let countMonthsBeforeExerciceEnd = Math.ceil(dayjs(exerciceEndDate).diff(paymentDate, 'months', true));
   if (countMonthsBeforeExerciceEnd < 3) countMonthsBeforeExerciceEnd = 3;
 
   // - frais d'application dès les second exo non express
-  // remainingAmountByExercicePrestation += applicationCostTotalTTC;
+  remainingAmountByExercicePrestation += applicationCostTotalTTC;
 
   const monthlyAmount = remainingAmountByExercicePrestation / countMonthsBeforeExerciceEnd;
 
@@ -410,15 +410,15 @@ const calculatePaymentsAuto = (params: ParamsForPaymentsAuto): PaymentAuto[] =>
   if (!listPayments.length) return [];
 
   while (dayjs(listPayments.slice(-1)[0].datePayment).month() < 11) {
-    // const amount = monthlyAmount;
+    let amount = monthlyAmount;
 
     // Si besoin, on applique les frais nécessaires :
     // - 2,75% d'augmentation chaque année, sauf si souscriptiuon dans les 3 derniers mois de l'année civile)
     // - frais d'application dès les second exo non express
-    // amount = calculateFees(amount, paymentDate);
+    amount = calculateFees(amount, paymentDate);
 
     listPayments.push({
-      amount: Math.round(100 * monthlyAmount) / 100,
+      amount: Math.round(100 * amount) / 100,
       datePayment: paymentDate,
       idPrestation,
       idPaymentMethod: PaymentMethod.DIRECT_DEBIT.id,

package/ts/utils/prestation.ts

@@ -429,7 +429,6 @@ const calculatePrestationPriceWithPrestationList = (prestationList: IPrestationL
  * @param idLegalForm
  * @param idVat
  * @returns amount of application fees, without taxes included
- * @deprecated Application fees are not charged anymore
  */
 const getApplicationFeesAmount = (idLegalForm: number, idVat?: number) => {
   let applicationFeesAmount = 50;

package/ts/utils/tests/payment.spec.ts

@@ -1,5 +1,5 @@
 import * as dayjs from 'dayjs';
-import { IRegulation, Vat, PaymentMethod, getTaxesIncludedAmount } from '../../types';
+import { IRegulation, Vat, PaymentMethod, LegalFormTypeEnum, getTaxesIncludedAmount } from '../../types';
 import MockDate from 'mockdate';
 
 import { calculatePaymentsAuto } from '../payment';
@@ -77,7 +77,7 @@ describe('Payment', () => {
     // =====================
     // errors handling
     // =====================
-    test("should return error if prestationList doesn't correspond (!hidden, isCatalog, isComptable)", () => {
+    test('should return error if prestationList doesn\'t correspond (!hidden, isCatalog, isComptable)', () => {
       expect.assertions(2);
       try {
         prestationList.hidden = true;
@@ -85,8 +85,8 @@ describe('Payment', () => {
           idTypeBrand: 1,
           firstExerciceNonExpresssEndDate,
           idPrestation,
-          // isWithApplicationFees: true,
-          // idLegalForm: LegalFormTypeEnum.SARL,
+          isWithApplicationFees: true,
+          idLegalForm: LegalFormTypeEnum.SARL,
           prestationList: {
             ...prestationList,
             isCatalog: true,
@@ -113,8 +113,8 @@ describe('Payment', () => {
         idTypeBrand: 1,
         firstExerciceNonExpresssEndDate,
         idPrestation,
-        // isWithApplicationFees: true,
-        // idLegalForm: LegalFormTypeEnum.SARL,
+        isWithApplicationFees: true,
+        idLegalForm: LegalFormTypeEnum.SARL,
         prestationList,
         idVat,
         listPartialExercicePrestationExpress: [listPartialExercicePrestationExpress[0]],
@@ -136,8 +136,8 @@ describe('Payment', () => {
         idTypeBrand: 1,
         firstExerciceNonExpresssEndDate,
         idPrestation,
-        // isWithApplicationFees: true,
-        // idLegalForm: LegalFormTypeEnum.SARL,
+        isWithApplicationFees: true,
+        idLegalForm: LegalFormTypeEnum.SARL,
         prestationList,
         idVat,
         listPartialExercicePrestationExpress,
@@ -166,8 +166,8 @@ describe('Payment', () => {
         idTypeBrand: 1,
         firstExerciceNonExpresssEndDate: newFirstExerciceNonExpresssEndDate,
         idPrestation,
-        // isWithApplicationFees: true,
-        // idLegalForm: LegalFormTypeEnum.SARL,
+        isWithApplicationFees: true,
+        idLegalForm: LegalFormTypeEnum.SARL,
         prestationList,
         idVat,
         listPartialExercicePrestationExpress: [],
@@ -197,8 +197,8 @@ describe('Payment', () => {
         idTypeBrand: 1,
         firstExerciceNonExpresssEndDate: newFirstExerciceNonExpresssEndDate,
         idPrestation,
-        // isWithApplicationFees: true,
-        // idLegalForm: LegalFormTypeEnum.SARL,
+        isWithApplicationFees: true,
+        idLegalForm: LegalFormTypeEnum.SARL,
         prestationList,
         idVat,
         listPartialExercicePrestationExpress: [],
@@ -233,8 +233,8 @@ describe('Payment', () => {
         idTypeBrand: 1,
         firstExerciceNonExpresssEndDate: newFirstExerciceNonExpresssEndDate,
         idPrestation,
-        // isWithApplicationFees: false,
-        // idLegalForm: LegalFormTypeEnum.SARL,
+        isWithApplicationFees: false,
+        idLegalForm: LegalFormTypeEnum.SARL,
         prestationList,
         idVat,
         listPartialExercicePrestationExpress: [],
@@ -265,8 +265,8 @@ describe('Payment', () => {
         idTypeBrand: 1,
         firstExerciceNonExpresssEndDate: newFirstExerciceNonExpresssEndDate,
         idPrestation,
-        // isWithApplicationFees: false,
-        // idLegalForm: LegalFormTypeEnum.SARL,
+        isWithApplicationFees: false,
+        idLegalForm: LegalFormTypeEnum.SARL,
         prestationList,
         idVat,
         listPartialExercicePrestationExpress: [],
@@ -293,8 +293,8 @@ describe('Payment', () => {
         idTypeBrand: 1,
         firstExerciceNonExpresssEndDate: newFirstExerciceNonExpresssEndDate,
         idPrestation,
-        // isWithApplicationFees: true,
-        // idLegalForm: LegalFormTypeEnum.SARL,
+        isWithApplicationFees: true,
+        idLegalForm: LegalFormTypeEnum.SARL,
         prestationList,
         idVat,
         listPartialExercicePrestationExpress: [],
@@ -326,8 +326,8 @@ describe('Payment', () => {
         idTypeBrand: 1,
         firstExerciceNonExpresssEndDate: newFirstExerciceNonExpresssEndDate,
         idPrestation,
-        // isWithApplicationFees: true,
-        // idLegalForm: LegalFormTypeEnum.SARL,
+        isWithApplicationFees: true,
+        idLegalForm: LegalFormTypeEnum.SARL,
         prestationList,
         idVat,
         listPartialExercicePrestationExpress: [],
@@ -357,8 +357,8 @@ describe('Payment', () => {
         idTypeBrand: 1,
         firstExerciceNonExpresssEndDate: newFirstExerciceNonExpresssEndDate,
         idPrestation,
-        // isWithApplicationFees: false,
-        // idLegalForm: LegalFormTypeEnum.SARL,
+        isWithApplicationFees: false,
+        idLegalForm: LegalFormTypeEnum.SARL,
         prestationList,
         idVat,
         listPartialExercicePrestationExpress: [],
@@ -398,8 +398,8 @@ describe('Payment', () => {
         idTypeBrand: 1,
         firstExerciceNonExpresssEndDate,
         idPrestation,
-        // isWithApplicationFees: true,
-        // idLegalForm: LegalFormTypeEnum.SARL,
+        isWithApplicationFees: true,
+        idLegalForm: LegalFormTypeEnum.SARL,
         prestationList,
         idVat,
         listPartialExercicePrestationExpress: listPartialExercicePrestationExpressCloned,
@@ -420,8 +420,8 @@ describe('Payment', () => {
         idTypeBrand: 1,
         firstExerciceNonExpresssEndDate,
         idPrestation,
-        // isWithApplicationFees: false,
-        // idLegalForm: LegalFormTypeEnum.SARL,
+        isWithApplicationFees: false,
+        idLegalForm: LegalFormTypeEnum.SARL,
         prestationList,
         idVat,
         listPartialExercicePrestationExpress,
@@ -459,8 +459,8 @@ describe('Payment', () => {
         idTypeBrand: 1,
         firstExerciceNonExpresssEndDate,
         idPrestation,
-        // isWithApplicationFees: false,
-        // idLegalForm: LegalFormTypeEnum.SARL,
+        isWithApplicationFees: false,
+        idLegalForm: LegalFormTypeEnum.SARL,
         prestationList,
         idVat,
         listPartialExercicePrestationExpress,
@@ -480,8 +480,8 @@ describe('Payment', () => {
         idTypeBrand: 1,
         firstExerciceNonExpresssEndDate,
         idPrestation,
-        // isWithApplicationFees: true,
-        // idLegalForm: LegalFormTypeEnum.SARL,
+        isWithApplicationFees: true,
+        idLegalForm: LegalFormTypeEnum.SARL,
         prestationList,
         idVat,
         listPartialExercicePrestationExpress,
@@ -497,8 +497,8 @@ describe('Payment', () => {
         idTypeBrand: 1,
         firstExerciceNonExpresssEndDate,
         idPrestation,
-        // isWithApplicationFees: true,
-        // idLegalForm: LegalFormTypeEnum.SARL,
+        isWithApplicationFees: true,
+        idLegalForm: LegalFormTypeEnum.SARL,
         prestationList,
         idVat,
         listPartialExercicePrestationExpress: [],
@@ -515,8 +515,8 @@ describe('Payment', () => {
         idTypeBrand: 1,
         firstExerciceNonExpresssEndDate: dayjs('2024-12-31').toDate(),
         idPrestation,
-        // isWithApplicationFees: true,
-        // idLegalForm: LegalFormTypeEnum.SARL,
+        isWithApplicationFees: true,
+        idLegalForm: LegalFormTypeEnum.SARL,
         prestationList,
         idVat: Vat.TX_20.id,
         listPartialExercicePrestationExpress: [],

package/ts/utils/vat/3310/century25.ts

@@ -1,3 +1,4 @@
+ 
 import * as dayjs from 'dayjs';
 import { isDefined } from 'class-validator';
 import { round as _round, flatten, uniqBy, maxBy } from 'lodash';
@@ -481,7 +482,6 @@ export function getCerfa3310Century25Payload(
 
   const initialPayload: Cerfa3310_2025 = {
     isNil,
-    isHolidayDeposit,
     isDGE: false,
     isUniq: false,
     declaration: {
@@ -963,18 +963,14 @@ export function getCerfa3310Century25RegistrationFields(data: Cerfa3310_2025): A
       name: '3310CA3',
       fields: [
         {
-          key: 'AA',
-          tag: 'Valeur',
-          isMultiple: false,
-          description: 'Acompte congés payés',
-          value: data.isHolidayDeposit ? 'X' : null,
-        },
-        {
-          key: 'AC',
-          tag: 'Valeur',
+          key: 'BA',
+          value: null,
           isMultiple: false,
-          description: 'Autres',
-          value: comment && comment?.length > 0 && !data.isHolidayDeposit ? 'X' : null,
+          tags: [1, 2, 3, 4, 5].map((i) => ({
+            tag: `TexteLibre${i}` as 'TexteLibre1',
+            description: `FTX Commentaires type ${i}`,
+            value: textFormatting(comment, 512, 512 * (i - 1)) || null,
+          })),
         },
         {
           key: 'BB',
@@ -990,16 +986,6 @@ export function getCerfa3310Century25RegistrationFields(data: Cerfa3310_2025): A
           description: 'CCITBX Mention expresse Table TBX avec X pour sélectionné, CCI/7037 = CAV/1131 =',
           value: comment && comment?.length > 0 ? 'X' : null,
         },
-        {
-          key: 'BA',
-          value: null,
-          isMultiple: false,
-          tags: [1, 2, 3, 4, 5].map((i) => ({
-            tag: `TexteLibre${i}` as 'TexteLibre1',
-            description: `FTX Commentaires type ${i}`,
-            value: textFormatting(comment, 512, 512 * (i - 1)) || null,
-          })),
-        },
         {
           key: 'BE',
           tag: 'Valeur',