@silexpert/core 1.2.12 → 1.2.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@silexpert/core",
-  "version": "1.2.12",
+  "version": "1.2.16",
   "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/Checklist.ts

@@ -1,7 +1,7 @@
 import { CancelToken } from 'axios';
 import {
   BasePaginate,
-  IChecklist, IChecklistType, QueryChecklistStatistic, QueryChecklistUpdate, QueryChecklistWallet, QueryGenerateAdvice, QueryGetAllBlockingIssues, QueryGetAllDeadlines, QueryGetAllQuestions, ReadChecklistDeadline, ReadChecklistWallet, UpdateAnswer,
+  IChecklist, IChecklistType, QueryChecklistGetPaginated, QueryChecklistStatistic, QueryChecklistUpdate, QueryChecklistWallet, QueryGenerateAdvice, QueryGetAllBlockingIssues, QueryGetAllDeadlines, QueryGetAllQuestions, ReadChecklistDeadline, ReadChecklistWallet, UpdateAnswer,
 } from '../../types';
 import { getAllBlockingIssues } from '../../utils/checklist';
 import { Resource } from '../Resource';
@@ -39,6 +39,13 @@ export class Checklist extends Resource {
     });
   }
 
+  getPaginated(params: QueryChecklistGetPaginated, signal?: AbortSignal): Promise<BasePaginate<ReadChecklistWallet>> {
+    return this.axios.$get('/checklists/paginate', {
+      ...(signal ? { signal } : {}),
+      params,
+    });
+  }
+
   getStatisticsByAccountant(params: QueryChecklistStatistic, cancelToken?: CancelToken, signal?: AbortSignal): Promise<ReadChecklistWallet> {
     return this.axios.$get('/checklists/statistics', {
       ...(cancelToken ? { cancelToken } : {}),

package/ts/api/resources/FIle.ts

@@ -28,6 +28,10 @@ export class File extends Resource {
     return this.axios.$get(`societies/${idSociety}/files/${id}/buffer`, { responseType: 'blob' });
   }
 
+  getConfigBuffer(id: number): Promise<Buffer> {
+    return this.axios.$get(`/files/${id}/buffer`, { responseType: 'arraybuffer' });
+  }
+
   update(id: number, payload: Partial<IFile>): Promise<IFile> {
     return this.axios.$patch(`files/${id}`, payload);
   }

package/ts/api/resources/Society.ts

@@ -25,6 +25,8 @@ import {
   QueryExportSociety,
   QueryAccountingExport,
   GetSocietyState,
+  QueryUnpaidSociety,
+  ReadSocietyUnpaidStats,
 } from '../../types';
 import { CancelToken } from 'axios';
 
@@ -116,6 +118,18 @@ export class Society extends Resource {
     return this.axios.$get('/society/archived', { params: query });
   }
 
+  getUnpaids(query: QueryUnpaidSociety, signal?: AbortSignal): Promise<ISociety[]> {
+    return this.axios.$get('/society/unpaids', { 
+      ...(signal ? { signal } : {}),
+      params: query });
+  }
+
+  getUnpaidsStats(signal?: AbortSignal): Promise<ReadSocietyUnpaidStats> {
+    return this.axios.$get('/society/unpaids/stats', { 
+      ...(signal ? { signal } : {}),
+    });
+  }
+
   public getPaginatedNewJuridical(params: QueryPaginatedSociety, cancelToken?: CancelToken): Promise<BasePaginate<ISociety>> {
     return this.axios.$get('/society/paginated-juridical', {
       ...(cancelToken ? { cancelToken } : {}),

package/ts/api/resources/TimeRecorder.ts

@@ -1,15 +1,20 @@
 import { Resource } from '../Resource';
 import {
-  ReadAttendanceHours, QueryAttendance, QueryPaginatedDelays, ReadPaginatedDelays, BasePaginate, ReadUsersNotConnected, ITimeRecorder, UpdateRecorder, QueryTimeRecorderGetStats, ReadUsersAbsent, ReadPlaceToWork, QueryAttendanceForLastConnexion,
+  ReadAttendanceHours, QueryAttendance, QueryPaginatedDelays, ReadPaginatedDelays, BasePaginate, ReadUsersNotConnected, UpdateRecorder, QueryTimeRecorderGetStats, ReadUsersAbsent, ReadPlaceToWork, QueryAttendanceForLastConnexion,
+  CreateRecorder,
+  QueryGetTimeRecorder,
 } from '../../types';
 
 export class TimeRecorder extends Resource {
-  create(payload: ITimeRecorder): Promise<TimeRecorder> {
+  create(payload: CreateRecorder): Promise<TimeRecorder> {
     return this.axios.$post('/time-recorders', payload);
   }
   update(payload: UpdateRecorder): Promise<TimeRecorder> {
     return this.axios.$put('/time-recorders', payload);
   }
+  getCurrent(idUser: number, params: QueryGetTimeRecorder): Promise<TimeRecorder> {
+    return this.axios.$get(`/users/${idUser}/current`, { params });
+  }
   getAllPresenceHoursByUser(idUser: number, params: QueryAttendance): Promise<ReadAttendanceHours> {
     return this.axios.$get(`/users/${idUser}/attendances`,
       { params });

package/ts/api/resources/Wallet.ts

@@ -1,4 +1,4 @@
-import { CancelToken } from 'axios';
+import { AxiosResponse, CancelToken } from 'axios';
 import { Resource } from '../Resource';
 import { UpdateAttribution } from '../../types/Interface/api/wallet/UpdateAttribution';
 import {
@@ -16,6 +16,13 @@ export class Wallet extends Resource {
     });
   }
 
+  getAccountantCsv(idUser: number, cancelToken?: CancelToken, signal?: AbortSignal): Promise<AxiosResponse> {
+    return this.axios.$get(`/accountant-wallets/${idUser}/csv`, {
+      ...(cancelToken ? { cancelToken } : {}),
+      ...(signal ? { signal } : {}),
+    });
+  }
+
   update(idUser: number, payload: UpdateAttribution): Promise<{ message: string }> {
     return this.axios.$put(`/users/${idUser}/wallets`, payload);
   }

package/ts/types/Enum/BalanceSheet.ts

@@ -756,7 +756,6 @@ export const BALANCE_SHEET_LIST_PASSIVE: BalanceSheetList = [
         name: 'Autres dettes',
         key: 'OtherDebts',
         accounts: ['411', '418', '4196', '4197', '464', '467', '4686', '471', '472', '478', '509'],
-        accountsDeducted: ['4198'],
         accountsForceToDeduce: ['4198'],
         // PASSIF Autres = lorsque l'entreprise doit de l'argent au client = somme débit > crédit (modifié)
         idThirdPartyTypeToAdd: [ThirdPartyType.CUSTOMER, MathematicalSign.LESS],

package/ts/types/Enum/BrandClementine.ts

@@ -163,7 +163,7 @@ export const BrandClementine: Brand[] = [
     urlApp: 'https://app.compta-clementine.fr',
     urlApi1: 'https://api-legalstart.compta-clementine.fr',
     urlApi2: 'https://api-next-legalstart.compta-clementine.fr',
-    urlExpert: 'https://pro.comptalib.com',
+    urlExpert: 'https://expert.compta-clementine.fr',
     urlClient: 'https://www.compta-clementine.fr',
     bank: {
       IBAN: 'FR7616106840138646838239863',

package/ts/types/Enum/BrandLegalstart.ts

@@ -66,7 +66,7 @@ export const BrandLegalstart: Brand[] = [
     urlApp: 'https://gestion.legalstart.fr',
     urlApi1: 'https://api-legalstart.compta-clementine.fr',
     urlApi2: 'https://api-next-legalstart.compta-clementine.fr',
-    urlExpert: 'https://pro.comptalib.com',
+    urlExpert: 'https://pro.comptastartier.com',
     urlClient: 'https://clementine.fr',
     bank: {
       IBAN: 'FR7616106840138646838239863',

package/ts/types/Enum/Sepa.ts

@@ -0,0 +1,48 @@
+type ErrorCodeSepaType = {
+  refXml:string,
+  motifXml:string,
+};
+
+export const ErrorCodeSepa:ErrorCodeSepaType[] = [
+  { refXml: 'AC01', motifXml: 'Coordonnées bancaires inexploitables' },
+  { refXml: 'RC01', motifXml: 'Code BIC erroné' },
+  {
+    refXml: 'RR01',
+    motifXml: 'Motif réglementaire - Le compte ou identifiant débiteur est insuffisant ou manquant.',
+  },
+  {
+    refXml: 'RR02',
+    motifXml:
+        'Motif réglementaire - Les renseignements du nom ou de l’adresse du débiteur sont insuffisants ou manquants.',
+  },
+  { refXml: 'RR04', motifXml: 'Motif réglementaire - Autre' },
+  {
+    refXml: 'BE01',
+    motifXml: 'Le nom du débiteur ne correspond pas au nom du titulaire du compte',
+  },
+  { refXml: 'AM05', motifXml: 'Prélèvement en double' },
+  { refXml: 'BE05', motifXml: 'Identifiant créancier incorrect' },
+  { refXml: 'FF01', motifXml: 'Code de transaction incorrect ou format fichier invalide' },
+  { refXml: 'FF05', motifXml: 'Type de prélèvement incorrect' },
+  { refXml: 'MD02', motifXml: 'Données du mandat manquantes ou inexactes' },
+  {
+    refXml: 'RR03',
+    motifXml: 'Motif réglementaire - Le nom ou l\'adresse du créancier est incorrect ou manquant.',
+  },
+  { refXml: 'AG02', motifXml: 'Code de transaction incorrect ou erreur de séquence' },
+  { refXml: 'MD01', motifXml: 'Aucun mandat valide ou opération non autorisée' },
+  {
+    refXml: 'AG01',
+    motifXml: 'Prélèvements interdits sur ce compte pour des raisons législatives',
+  },
+  { refXml: 'AC04', motifXml: 'Compte fermé' },
+  { refXml: 'MD07', motifXml: 'Débiteur décédé' },
+  { refXml: 'AC06', motifXml: 'Compte bloqué pour les prélèvements SEPA par le débiteur' },
+  { refXml: 'SL01', motifXml: 'Service spécifique' },
+  { refXml: 'AC13', motifXml: 'Le compte débiteur est le compte d\'une personne physique' },
+  { refXml: 'AM04', motifXml: 'Fonds insuffisants' },
+  { refXml: 'MS02', motifXml: 'Prélèvement refusé par le débiteur' },
+  { refXml: 'MS03', motifXml: 'Raison non précisée' },
+  { refXml: 'MD06', motifXml: 'Opération autorisée contestée' },
+  { refXml: 'MD01', motifXml: 'Aucun mandat valide ou opération non autorisée' },
+];

package/ts/types/Enum/UnpaidReason.ts

@@ -0,0 +1,30 @@
+export enum UnpaidReason {
+  INSUFFICIENT_PROVISION = 1,
+  LITIGE = 2,
+  TRANSACTION_ERROR = 3,
+  INCORRECT_RIB = 4,
+  IMPORT_XML = 5,
+}
+
+export const UnpaidReasonList: Array<{ value: UnpaidReason; text: string }> = [
+  {
+    value: UnpaidReason.INSUFFICIENT_PROVISION,
+    text: 'Provision insuffisante',
+  },
+  {
+    value: UnpaidReason.LITIGE,
+    text: 'Litige',
+  },
+  {
+    value: UnpaidReason.TRANSACTION_ERROR,
+    text: 'Erreur transaction',
+  },
+  {
+    value: UnpaidReason.INCORRECT_RIB,
+    text: 'RIB incorrect',
+  },
+  {
+    value: UnpaidReason.IMPORT_XML,
+    text: 'Import XML',
+  },
+];

package/ts/types/Interface/api/PaymentRecovery/Create.ts

@@ -3,7 +3,7 @@ import { ApiProperty, ApiPropertyOptional } from '../../../../utils';
 import { IsE164PhoneNumber } from '../../../../utils/decorators/isE164PhoneNumber.decorator';
 
 type CaarlFilePayload =  {
-  bufferString: string;
+  buffer: Buffer;
   name: string;
 };
 

package/ts/types/Interface/api/cerfa/2035.ts

@@ -282,6 +282,7 @@ export interface Cerfa2035 {
   isPageENil: boolean;
   isPageFNil: boolean;
   isPageGNil: boolean;
+  isSuiteNil?: boolean;
   society: Cerfa2035Society;
   immobilizations: number;
   professionalRecipes: Cerfa2035ProfessionalRecipes;
@@ -643,6 +644,7 @@ export interface Cerfa2035_2024 {
   isPageENil: boolean;
   isPageFNil: boolean;
   isPageGNil: boolean;
+  isSuiteNil?: boolean;
   society: Cerfa2035Society;
   immobilizations: number;
   professionalRecipes: Cerfa2035ProfessionalRecipes;

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

@@ -1,6 +1,7 @@
 import {
   IsArray,
   IsBoolean,
+  IsDate,
   IsDateString, IsEnum, IsInt, IsNumber, IsOptional, IsPositive, IsString,
 } from 'class-validator';
 import { ApiProperty, ApiPropertyOptional } from '../../../../utils';
@@ -85,6 +86,31 @@ export class QueryChecklistWallet extends RequiredQueryPaginate {
     onlyChecklistPossible: boolean;
 }
 
+export class QueryChecklistGetPaginated extends RequiredQueryPaginate {
+  @ApiPropertyOptional()
+  @IsString()
+  @IsOptional()
+    search?: string;
+    
+  @ApiProperty()
+  @IsArray()
+    idUser: number[];
+
+  @ApiPropertyOptional()
+  @IsArray()
+  @IsOptional()
+    vatRegime?: number[];
+
+  @ApiPropertyOptional()
+  @IsNumber()
+  @IsOptional()
+    state?: number;
+
+  @ApiProperty()
+  @IsDate()
+    closingDate: Date;
+}
+
 export class QueryGetAllQuestions {
   @ApiPropertyOptional()
   @IsOptional()

package/ts/types/Interface/api/previsionalForm/CreatePrevisionalForm.ts

@@ -1,8 +1,8 @@
 import { LegalFormTypeEnum } from '../../../Enum/LegalForm';
 import { TaxSystem } from '../../../Enum/TaxSystem';
-import { NumberFiscalYears, PrevisionalFormActivity, PrevisionalFormPayload } from '../../..';
-import { ApiProperty } from '../../../../utils';
-import { IsNumber, IsBoolean, IsEnum, IsString } from 'class-validator';
+import { LoanInformation, NumberFiscalYears, OptionNumberFiscalYears, PrevisionalFormActivity, PrevisionalFormPayload } from '../../..';
+import { ApiProperty, ApiPropertyOptional } from '../../../../utils';
+import { IsNumber, IsBoolean, IsEnum, IsOptional, ValidateNested, IsArray } from 'class-validator';
 import { ToBoolean } from '../../../../utils/transforms/boolean.transform';
 
 export class NumberFiscalYearsValidation implements NumberFiscalYears {
@@ -17,6 +17,11 @@ export class NumberFiscalYearsValidation implements NumberFiscalYears {
   @ApiProperty()
   @IsNumber()
     n2: number;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsNumber()
+    vat?: number;
 }
 
 export class CreatePrevisionalFormData implements PrevisionalFormPayload {
@@ -37,113 +42,146 @@ export class CreatePrevisionalFormData implements PrevisionalFormPayload {
     idTaxSystem: TaxSystem;
 
   @ApiProperty()
-  @IsString()
+  @IsEnum(PrevisionalFormActivity)
     activity: PrevisionalFormActivity;
 
   /**
    * Investissement
    */
   @ApiProperty()
-    computerHardware: NumberFiscalYearsValidation;
+  @ValidateNested()
+    computerHardware: Required<NumberFiscalYearsValidation>;
+
+  @ApiProperty()
+  @ValidateNested()
+    utilityVehicle: Required<NumberFiscalYearsValidation>;
 
   @ApiProperty()
-    vehicle: NumberFiscalYearsValidation;
+  @ValidateNested()
+    personalVehicle: Required<NumberFiscalYearsValidation>;
 
   @ApiProperty()
-    toolsEquipment: NumberFiscalYearsValidation;
+  @ValidateNested()
+    toolsEquipment: Required<NumberFiscalYearsValidation>;
 
   @ApiProperty()
-    software: NumberFiscalYearsValidation;
+  @ValidateNested()
+    software: Required<NumberFiscalYearsValidation>;
 
   @ApiProperty()
-    website: NumberFiscalYearsValidation;
+  @ValidateNested()
+    website: Required<NumberFiscalYearsValidation>;
 
   @ApiProperty()
-    businessAssets: NumberFiscalYearsValidation;
+  @ValidateNested()
+    businessAssets: Required<NumberFiscalYearsValidation>;
 
   @ApiProperty()
-    immobilizedSecurities: NumberFiscalYearsValidation;
+  @ValidateNested()
+    immobilizedSecurities: Required<NumberFiscalYearsValidation>;
 
   @ApiProperty()
-    deposit: NumberFiscalYearsValidation;
+  @ValidateNested()
+    deposit: Required<NumberFiscalYearsValidation>;
 
   /**
    * Financement
    */
   @ApiProperty()
+  @ValidateNested()
     socialCapital: NumberFiscalYearsValidation;
 
   @ApiProperty()
+  @ValidateNested()
     accountContribution: NumberFiscalYearsValidation;
 
   @ApiProperty()
-    loan: NumberFiscalYearsValidation;
+  @IsArray()
+    loans: LoanInformation[];
 
   /**
    * Chiffres d’affaires et charge liées à l’activité
    */
   @ApiProperty()
-    turnover: NumberFiscalYearsValidation;
+  @ValidateNested()
+    turnover: Required<NumberFiscalYearsValidation>[];
 
   @ApiProperty()
-    outsourcing: NumberFiscalYearsValidation;
+  @ValidateNested()
+    outsourcing: Required<NumberFiscalYearsValidation>[];
 
   @ApiProperty()
-    merchandisePurchase: NumberFiscalYearsValidation;
+    merchandisePurchase: OptionNumberFiscalYears[];
 
   /**
    * Consommables
    */
   @ApiProperty()
-    packaging: NumberFiscalYearsValidation;
+  @ValidateNested()
+    packaging: Required<NumberFiscalYearsValidation>;
 
   @ApiProperty()
-    utilities: NumberFiscalYearsValidation;
+  @ValidateNested()
+    utilities: Required<NumberFiscalYearsValidation>;
 
   @ApiProperty()
-    fuel: NumberFiscalYearsValidation;
+  @ValidateNested()
+    fuel: Required<NumberFiscalYearsValidation>;
 
   @ApiProperty()
-    equipmentAndSupplies: NumberFiscalYearsValidation;
+  @ValidateNested()
+    equipmentAndSupplies: Required<NumberFiscalYearsValidation>;
 
   @ApiProperty()
-    administrativeSupplies: NumberFiscalYearsValidation;
+  @ValidateNested()
+    administrativeSupplies: Required<NumberFiscalYearsValidation>;
 
   /**
    * Autes charges liées à l’activité
    */
   @ApiProperty()
-    realEstateRental: NumberFiscalYearsValidation;
+  @ValidateNested()
+    realEstateRental: Required<NumberFiscalYearsValidation>;
 
   @ApiProperty()
-    otherRental: NumberFiscalYearsValidation;
+  @ValidateNested()
+    otherRental: Required<NumberFiscalYearsValidation>;
 
   @ApiProperty()
-    maintenanceAndRepair: NumberFiscalYearsValidation;
+  @ValidateNested()
+    maintenanceAndRepair: Required<NumberFiscalYearsValidation>;
 
   @ApiProperty()
-    insuranceAndProfessionalLiability: NumberFiscalYearsValidation;
+  @ValidateNested()
+    insuranceAndProfessionalLiability: Required<NumberFiscalYearsValidation>;
 
   @ApiProperty()
-    accountingFees: NumberFiscalYearsValidation;
+  @ValidateNested()
+    accountingFees: Required<NumberFiscalYearsValidation>;
 
   @ApiProperty()
-    otherFees: NumberFiscalYearsValidation;
+  @ValidateNested()
+    otherFees: Required<NumberFiscalYearsValidation>;
 
   @ApiProperty()
-    advertising: NumberFiscalYearsValidation;
+  @ValidateNested()
+    advertising: Required<NumberFiscalYearsValidation>;
 
   @ApiProperty()
-    kilometricAllowances: NumberFiscalYearsValidation;
+  @ValidateNested()
+    kilometricAllowances: Required<NumberFiscalYearsValidation>;
 
   @ApiProperty()
-    otherTravelExpenses: NumberFiscalYearsValidation;
+  @ValidateNested()
+    otherTravelExpenses: Required<NumberFiscalYearsValidation>;
 
   @ApiProperty()
-    telephonyInternetNetworks: NumberFiscalYearsValidation;
+  @ValidateNested()
+    telephonyInternetNetworks: Required<NumberFiscalYearsValidation>;
 
   @ApiProperty()
-    bankFees: NumberFiscalYearsValidation;
+  @ValidateNested()
+    bankFees: Required<NumberFiscalYearsValidation>;
 
   /**
    * Social et rémunération
@@ -152,19 +190,36 @@ export class CreatePrevisionalFormData implements PrevisionalFormPayload {
     isACREBeneficiary: boolean;
 
   @ApiProperty()
+  @ValidateNested()
     employee1GrossSalary: NumberFiscalYearsValidation;
 
   @ApiProperty()
+  @ValidateNested()
     employee2GrossSalary: NumberFiscalYearsValidation;
 
   @ApiProperty()
+  @ValidateNested()
     employee3GrossSalary: NumberFiscalYearsValidation;
 
   @ApiProperty()
+  @ValidateNested()
     remunerationPresident: NumberFiscalYearsValidation;
 
   @ApiProperty()
+  @ValidateNested()
     remunerationManager: NumberFiscalYearsValidation;
+
+  /**
+   * Impôts
+   */
+  @ApiProperty()
+    cfe: NumberFiscalYears | undefined;
+
+  @ApiProperty()
+    tvs: NumberFiscalYears | undefined;
+
+  @ApiProperty()
+    otherTaxes: NumberFiscalYears | undefined;
 }
 
 export class CreatePrevisionalForm {
@@ -173,5 +228,6 @@ export class CreatePrevisionalForm {
     idSociety: number;
 
   @ApiProperty()
+  @ValidateNested()
     payload: CreatePrevisionalFormData;
 }

package/ts/types/Interface/api/previsionalForm/PrevisionalFormPayload.ts

@@ -6,6 +6,20 @@ export interface NumberFiscalYears {
   n: number;
   n1: number;
   n2: number;
+  vat?: number;
+}
+
+export interface LoanInformation {
+  year: 'n' | 'n1' | 'n2';
+  amount: number;
+  duration: number;
+  rate: number;
+  payment: number;
+}
+
+
+export interface OptionNumberFiscalYears extends Required<NumberFiscalYears> {
+  isMarginRate?: boolean;
 }
 
 export interface CompanyDescription {
@@ -13,55 +27,61 @@ export interface CompanyDescription {
   idLegalForm: LegalFormTypeEnum; // Statut Juridique
   idTaxSystem: TaxSystem; // Régime d'imposition prévu
   activity: PrevisionalFormActivity; // Quelle est l'activité de la société ?
-  // + question "De combien est le capital initial apporté ?" socialCapital pour année N
 }
 
 export interface Investment {
-  computerHardware: NumberFiscalYears; // Matériel informatique
-  vehicle: NumberFiscalYears; // Véhicules
-  toolsEquipment: NumberFiscalYears; // Outillage, matériel
-  software: NumberFiscalYears; // Logiciel
-  website: NumberFiscalYears; // Site internet
-  businessAssets: NumberFiscalYears; // Fonds de commerce
-  immobilizedSecurities: NumberFiscalYears; // Titres immobilisés
-  deposit: NumberFiscalYears; // Caution
+  computerHardware: Required<NumberFiscalYears>; // Matériel informatique
+  utilityVehicle: Required<NumberFiscalYears>; // Véhicule utilitaire
+  personalVehicle: Required<NumberFiscalYears>; // Véhicule particulier
+  toolsEquipment: Required<NumberFiscalYears>; // Outillage, matériel
+  software: Required<NumberFiscalYears>; // Logiciel
+  website: Required<NumberFiscalYears>; // Site internet
+  businessAssets: Required<NumberFiscalYears>; // Fonds de commerce
+  immobilizedSecurities: Required<NumberFiscalYears>; // Titres immobilisés
+  deposit: Required<NumberFiscalYears>; // Caution
 }
 
 export interface Financing {
   socialCapital: NumberFiscalYears; // Augmentation social
   accountContribution: NumberFiscalYears; // Apport en compte courant d'associé
-  loan: NumberFiscalYears; // Emprunt bancaire
+  loans: LoanInformation[]; // Emprunt bancaire
 }
 
 export interface Turnover {
-  turnover: NumberFiscalYears; // Chiffre d'affaires prévu
+  turnover: Required<NumberFiscalYears>[]; // Ventes de marchandises / Ventes de matières premières / Ventes de prestations de services
+  merchandisePurchase: OptionNumberFiscalYears[]; // Achats de marchandises / matières premières
 }
 
 export interface Charges {
-  outsourcing: NumberFiscalYears; // Sous-traitance prévue
-  merchandisePurchase: NumberFiscalYears; // Achats de marchandises / matières premières
+  outsourcing: Required<NumberFiscalYears>[]; // Sous-traitance prévue
+}
+
+export interface Taxes {
+  cfe: NumberFiscalYears | undefined; // CFE
+  tvs: NumberFiscalYears | undefined; // TVS
+  otherTaxes: NumberFiscalYears | undefined; // Autres impôts
 }
 
 export interface Consumables {
-  packaging: NumberFiscalYears; // Emballages
-  utilities: NumberFiscalYears; // Eau, électricité, gaz
-  fuel: NumberFiscalYears; // Carburant
-  equipmentAndSupplies: NumberFiscalYears; // Petit équipement et matériel
-  administrativeSupplies: NumberFiscalYears; // Fournitures administratives
+  packaging: Required<NumberFiscalYears>; // Emballages
+  utilities: Required<NumberFiscalYears>; // Eau, électricité, gaz
+  fuel: Required<NumberFiscalYears>; // Carburant
+  equipmentAndSupplies: Required<NumberFiscalYears>; // Petit équipement et matériel
+  administrativeSupplies: Required<NumberFiscalYears>; // Fournitures administratives
 }
 
 export interface OtherCharges {
-  realEstateRental: NumberFiscalYears; // Location immobilière
-  otherRental: NumberFiscalYears; // Autres locations et crédit bail
-  maintenanceAndRepair: NumberFiscalYears; // Entretien et réparation
-  insuranceAndProfessionalLiability: NumberFiscalYears; // Assurances et RC Pro
-  accountingFees: NumberFiscalYears; // Honoraires comptables
-  otherFees: NumberFiscalYears; // Autres frais de gestion
-  advertising: NumberFiscalYears; // Publicité
-  kilometricAllowances: NumberFiscalYears; // Indemnités kilométriques
-  otherTravelExpenses: NumberFiscalYears; // Autres frais de déplacement
-  telephonyInternetNetworks: NumberFiscalYears; // Téléphonie, interne, réseaux
-  bankFees: NumberFiscalYears; // Frais bancaires
+  realEstateRental: Required<NumberFiscalYears>; // Location immobilière
+  otherRental: Required<NumberFiscalYears>; // Autres locations et crédit bail
+  maintenanceAndRepair: Required<NumberFiscalYears>; // Entretien et réparation
+  insuranceAndProfessionalLiability: Required<NumberFiscalYears>; // Assurances et RC Pro
+  accountingFees: Required<NumberFiscalYears>; // Honoraires comptables
+  otherFees: Required<NumberFiscalYears>; // Autres frais de gestion
+  advertising: Required<NumberFiscalYears>; // Publicité
+  kilometricAllowances: Required<NumberFiscalYears>; // Indemnités kilométriques
+  otherTravelExpenses: Required<NumberFiscalYears>; // Autres frais de déplacement
+  telephonyInternetNetworks: Required<NumberFiscalYears>; // Téléphonie, interne, réseaux
+  bankFees: Required<NumberFiscalYears>; // Frais bancaires
 }
 
 export interface SocialAndRemuneration {
@@ -73,4 +93,4 @@ export interface SocialAndRemuneration {
   remunerationManager: NumberFiscalYears; // Rémunération gérant
 }
 
-export interface PrevisionalFormPayload extends CompanyDescription, Investment, Financing, Turnover, Charges, Consumables, OtherCharges, SocialAndRemuneration {}
+export interface PrevisionalFormPayload extends CompanyDescription, Investment, Financing, Turnover, Charges, Taxes, Consumables, OtherCharges, SocialAndRemuneration {}