@silexpert/core 1.1.140 → 1.1.141

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

@@ -0,0 +1,105 @@
+import { IsBoolean, IsDate, IsNumber, IsOptional, IsString } from 'class-validator';
+import { ApiProperty, ApiPropertyOptional } from '../../../..';
+import { ToBoolean } from '../../../../utils/transforms/boolean.transform';
+
+export class SuperVisionPendingPointsPayload {
+  @ApiProperty()
+  @IsNumber()
+  @IsOptional()
+    idPendingPoint: number;
+
+  @ApiPropertyOptional()
+  @IsString()
+  @IsOptional()
+    value?: string;
+
+  @ApiPropertyOptional()
+  @IsBoolean()
+  @ToBoolean()
+  @IsOptional()
+    hasValueBeenUpdated?: boolean;
+
+  @ApiPropertyOptional()
+  @IsNumber()
+  @IsOptional()
+    createdBy?: number; 
+
+  @ApiPropertyOptional()
+  @IsBoolean()
+  @ToBoolean()
+  @IsOptional()
+    isCritical?: boolean;
+
+  @ApiProperty()
+  @IsBoolean()
+  @ToBoolean()
+  @IsOptional()
+    activated?: boolean;
+
+  @ApiPropertyOptional()
+  @IsString()
+  @IsOptional()
+    note?: string;
+
+  @ApiPropertyOptional()
+  @IsBoolean()
+  @ToBoolean()
+  @IsOptional()
+    hasNoteBeenUpdated?: boolean;
+	
+  @ApiPropertyOptional()
+  @IsNumber()
+  @IsOptional()
+    idUser?: number; 
+  
+  @ApiPropertyOptional()
+  @IsBoolean()
+  @ToBoolean()
+  @IsOptional()
+    isDone?: boolean;
+
+  @ApiPropertyOptional()
+  @IsNumber()
+  @IsOptional()
+    isDoneBy?: number; 
+  
+  @ApiPropertyOptional()
+  @IsBoolean()
+  @ToBoolean()
+  @IsOptional()
+    toBalanceSheetNote?: boolean;
+
+  @ApiPropertyOptional()
+  @IsBoolean()
+  @ToBoolean()
+  @IsOptional()
+    toSummaryNote?: boolean;
+
+}
+
+export class CreateOrUpdateState {
+  @ApiProperty()
+    pendingPoints: SuperVisionPendingPointsPayload[];
+  
+  @ApiProperty()
+  @IsNumber()
+    idSociety: number;
+
+  @ApiProperty()
+  @IsDate()
+    startDate: Date;
+
+  @ApiProperty()
+  @IsDate()
+    endDate: Date;
+}
+
+export class CreateReply {
+  @ApiProperty()
+  @IsString()
+    reply: string;
+
+  @ApiProperty()
+  @IsNumber()
+    idUser: number;
+}

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

@@ -277,3 +277,25 @@ export class QueryRevisionSearchEntries {
   @IsNumber()
     page?: number = 1;
 }
+
+export class QueryRevisionGenericPendingPoint {
+  // Mandatory
+  @ApiProperty()
+  @IsNumber()
+    idTypeLegalForm: number;
+}
+
+export class QueryRevisionPendingPoint {
+  // Mandatory
+  @ApiProperty()
+  @IsNumber()
+    idSociety: number;
+
+  @ApiProperty()
+  @IsDate()
+    startDate: Date;
+
+  @ApiProperty()
+  @IsDate()
+    endDate: Date;
+}

package/ts/types/Interface/api/vatControl/CreateVatControl.ts

@@ -0,0 +1,14 @@
+import { ArrayUnique, IsInt, IsPositive, IsString } from 'class-validator';
+import { ApiProperty } from '../../../..';
+
+export class CreateVatControl {
+  @ApiProperty()
+  @ArrayUnique()
+  @IsInt({ each: true })
+  @IsPositive({ each: true })
+    idRegistration: number[];
+
+  @ApiProperty()
+  @IsString()
+    payload: string;
+}

package/ts/types/Interface/api/vatControl/QueryVatControl.ts

@@ -0,0 +1,10 @@
+import { ArrayUnique, IsInt, IsPositive } from 'class-validator';
+import { ApiProperty } from '../../../../utils';
+
+export class QueryVatControl {
+  @ApiProperty()
+  @ArrayUnique()
+  @IsInt({ each: true })
+  @IsPositive({ each: true })
+    idRegistration: number[];
+}

package/ts/types/Interface/models/ISupervisionPendingPoint.ts

@@ -1,4 +1,5 @@
 import { ISupervision } from './ISupervision';
+import { ISupervisionPendingPointReply } from './ISupervisionPendingPointReply';
 import { IUser } from './IUser';
 
 // supervisionsPendingPoints
@@ -7,15 +8,24 @@ export interface ISupervisionPendingPoint {
   idSupervision: number;
   idPendingPoint: number;
   isDone: boolean;
+  isDoneBy: number | null;
+  isDoneDate: Date | null;
   idUser: number | null;
+  replyDate: Date | null;
   createdBy: number | null;
+  createdByDate: Date | null;
   value: string | null;
   note: string | null;
+  isCritical: boolean;
+  toBalanceSheetNote: boolean;
+  toSummaryNote: boolean;
   createdAt?: Date | null;
   updatedAt?: Date | null;
 
   // Associations
+  pendingPointReplies: ISupervisionPendingPointReply[];
   supervision: ISupervision;
   user: IUser;
   ppIsCreatedBy: IUser;
+  isDoneUser: IUser;
 }

package/ts/types/Interface/models/ISupervisionPendingPointReply.ts

@@ -0,0 +1,16 @@
+import { ISupervisionPendingPoint } from './ISupervisionPendingPoint';
+import { IUser } from './IUser';
+
+// supervisionsPendingPoints
+export interface ISupervisionPendingPointReply {
+  id?: number;
+  reply: string;
+  idSupervisionPendingPoint: number;
+  idUser: number;
+  createdAt?: Date | null;
+  updatedAt?: Date | null;
+
+  // Associations
+  supervisionPendingPoint: ISupervisionPendingPoint;
+  user: IUser;
+}

package/ts/types/index.ts

@@ -202,6 +202,7 @@ export * from './Interface/models/IStatusSignature';
 export * from './Interface/models/IStripeEvent';
 export * from './Interface/models/ISupervision';
 export * from './Interface/models/ISupervisionPendingPoint';
+export * from './Interface/models/ISupervisionPendingPointReply';
 export * from './Interface/models/ISurvey';
 export * from './Interface/models/ITag';
 export * from './Interface/models/ITaxSystem';
@@ -489,6 +490,7 @@ export * from './Enum/FollowList';
 export * from './Enum/ClientOrProspect';
 export * from './Enum/MissionAcceptation';
 export * from './Enum/Bank';
+export * from './Enum/VatControl';
 
 // Interfaces API
 export * from './Interface/api/cerfa/das2';
@@ -635,6 +637,7 @@ export * from './Interface/api/revision/Query';
 export * from './Interface/api/revision/Read';
 export * from './Interface/api/revision/RevisionObject';
 export * from './Interface/api/revision/Revision';
+export * from './Interface/api/revision/Create';
 export * from './Interface/api/vatDeclaration/QueryVatDeclaration';
 export * from './Interface/api/vatDeclaration/ReadVatVariousOperations';
 export * from './Interface/api/vatDeclaration/ResultFormatToEntries';
@@ -820,6 +823,7 @@ export * from './Interface/api/journal/Journals';
 export * from './Interface/api/journal/QueryJournal';
 export * from './Interface/api/registration/DeclareRegistration';
 export * from './Interface/api/balanceSheet/ReadBalanceSheetTransaction';
+export * from './Interface/api/balanceSheet/VatControl';
 export * from './Interface/api/mealExpense/CreateMealExpense';
 export * from './Interface/api/mealExpense/ReadMealExpense';
 export * from './Interface/api/exerciceQuestion/QueryQuestion';
@@ -954,6 +958,8 @@ export * from './Interface/api/accountsSectors/Query';
 export * from './Interface/api/visualizedInformation/Query';
 export * from './Interface/api/visualizedInformation/Update';
 export * from './Interface/api/society/QueryArchived';
+export * from './Interface/api/vatControl/CreateVatControl';
+export * from './Interface/api/vatControl/QueryVatControl';
 // Enums types
 export * from './Interface/enum/Util';
 export * from './Interface/enum/Date';

package/ts/utils/phone.ts

@@ -5,7 +5,7 @@ import { RoleDetail } from '../types/Enum/RoleDetail';
 
 export function formatPhoneNumberToE164(phoneNumber: string | null, prefix = '+33'): string | null {
   if (!phoneNumber) return null;
-  if (phoneNumber.charAt(0) !== '+' && phoneNumber.charAt(0) === '0') {
+  if (phoneNumber.charAt(0) !== '+') {
     const numberInt = phoneNumber.replace(/\D/g, '');
     if (prefix) {
       if (numberInt.length === 10 && numberInt.charAt(0) === '0') {

package/ts/utils/vat/3310/century23.ts

@@ -49,8 +49,8 @@ export function getCerfa3310Century23Payload(accountingEntries: IAccountingEntry
   // Opérations taxées -
   const taxedServicesEntries = vatEntries.filter((ae) => frenchVat.includes(ae.idVat) && withTaxVat.includes(ae.idVat));
   const servicesAccounts = ['701', '702', '703', '704', '705', '706', '707', '708', '472'];
-  const taxedServicesFromFrance = setZeroIfIsNegative(getAmountByAccountNumber(taxedServicesEntries, servicesAccounts, 0, true));
-  const taxedOther = setZeroIfIsNegative(getAmountByAccountNumber(vatEntries.filter((ae) => withTaxVat.includes(ae.idVat)), ['775'], 0, true));
+  const taxedServicesFromFrance = setZeroIfIsNegative(getAmountByAccountNumber(taxedServicesEntries, servicesAccounts, 0, true)) + (payload?.vatControl?.france?.base20 ?? 0) + (payload?.vatControl?.france?.base10 ?? 0) + (payload?.vatControl?.france?.base8Dot5 ?? 0) + (payload?.vatControl?.france?.base5Dot5 ?? 0) + (payload?.vatControl?.france?.base2Dot1 ?? 0);
+  const taxedOther = setZeroIfIsNegative(getAmountByAccountNumber(vatEntries.filter((ae) => withTaxVat.includes(ae.idVat)), ['775'], 0, true)) + (payload?.vatControl?.other?.base20 ?? 0) + (payload?.vatControl?.other?.base10 ?? 0) + (payload?.vatControl?.other?.base5Dot5 ?? 0) + (payload?.vatControl?.other?.base2Dot1 ?? 0);
   const intracommunityServiceAccounts = ['604', '611', '612', '613', '614', '615', '616', '617', '618', '619', '62'];
   const intracommunityServiceEntries = vatEntries.filter((ae) => withTaxVat.includes(ae.idVat) && intracomVat.includes(ae.idVat));
 
@@ -59,64 +59,64 @@ export function getCerfa3310Century23Payload(accountingEntries: IAccountingEntry
 
   const taxedImportEntries = vatEntries.filter((ae) => importationVat.includes(ae.idVat) && withTaxVat.includes(ae.idVat));
   const taxedImportAccounts = ['6'];
-  const taxedImport = setZeroIfIsNegative(getAmountByAccountNumber(taxedImportEntries, taxedImportAccounts, 0, true));
+  const taxedImport = setZeroIfIsNegative(getAmountByAccountNumber(taxedImportEntries, taxedImportAccounts, 0, true)) + (payload?.vatControl?.importations?.base20 ?? 0) + (payload?.vatControl?.importations?.base10 ?? 0) + (payload?.vatControl?.importations?.base8Dot5 ?? 0) + (payload?.vatControl?.importations?.base5Dot5 ?? 0) + (payload?.vatControl?.importations?.base2Dot1 ?? 0);
 
   const intracommunityAccounts2 = ['601', '602', '603', '605', '606', '607', '651'];
   const taxedIntracommunityAcquisitions = getAmountByAccountNumber(vatEntries.filter((ae) => intracomVat.includes(ae.idVat) && withTaxVat.includes(ae.idVat)), [...intracommunityAccounts2, ...intracommunityServiceAccounts], 0, true);
 
   // Opérations non taxées
-  const untaxedExportationNotInEurope = setZeroIfIsNegative(getAmountByAccountNumber(vatEntries.filter((ae) => importationVat.includes(ae.idVat) && withoutTaxVat.includes(ae.idVat)), servicesAccounts, 0, true));
-  const untaxedOther = setZeroIfIsNegative(getAmountByAccountNumber(vatEntries.filter((ae) => frenchVat.includes(ae.idVat) && withoutTaxVat.includes(ae.idVat)), ['70', '71', '72', '73', '75', '77', '78', '790', '792', '793', '794', '795', '796', '797', '798', '799'], 0, true)); // 02/08/23 - ne plus prendre en compte les comptes 76,74,791 - Chloé R.
-  const untaxedImport = setZeroIfIsNegative(getAmountByAccountNumber(vatEntries.filter((ae) => importationVat.includes(ae.idVat) && withoutTaxVat.includes(ae.idVat)), ['6'], 0, true));
-  const untaxedIntracomunity = setZeroIfIsNegative(getAmountByAccountNumber(vatEntries.filter((ae) => intracomVat.includes(ae.idVat) && withoutTaxVat.includes(ae.idVat)), intracommunityAccounts2, 0, true));
+  const untaxedExportationNotInEurope = setZeroIfIsNegative(getAmountByAccountNumber(vatEntries.filter((ae) => importationVat.includes(ae.idVat) && withoutTaxVat.includes(ae.idVat)), servicesAccounts, 0, true)) + (payload?.vatControl?.untaxed?.exportation ?? 0);
+  const untaxedOther = setZeroIfIsNegative(getAmountByAccountNumber(vatEntries.filter((ae) => frenchVat.includes(ae.idVat) && withoutTaxVat.includes(ae.idVat)), ['70', '71', '72', '73', '75', '77', '78', '790', '792', '793', '794', '795', '796', '797', '798', '799'], 0, true)) + (payload?.vatControl?.untaxed?.other ?? 0);// 02/08/23 - ne plus prendre en compte les comptes 76,74,791 - Chloé R.
+  const untaxedImport = setZeroIfIsNegative(getAmountByAccountNumber(vatEntries.filter((ae) => importationVat.includes(ae.idVat) && withoutTaxVat.includes(ae.idVat)), ['6'], 0, true)) + (payload?.vatControl?.untaxed?.importation ?? 0);
+  const untaxedIntracomunity = setZeroIfIsNegative(getAmountByAccountNumber(vatEntries.filter((ae) => intracomVat.includes(ae.idVat) && withoutTaxVat.includes(ae.idVat)), intracommunityAccounts2, 0, true)) + (payload?.vatControl?.untaxed?.intracomunity ?? 0);
   const untaxedIntracommunityDelivery = setZeroIfIsNegative(getAmountByAccountNumber(vatEntries.filter((ae) => withoutTaxVat.includes(ae.idVat) && intracomVat.includes(ae.idVat)), ['701', '707'], 0, true));
   // TVA brute
   const normalRate = setZeroIfIsNegative(getAmountByAccountNumber(taxedServicesEntries.filter((e) => vats.filter((v) => v.value === 20).map((v) => v.id).includes(e.idVat)), servicesAccounts, 0, true)
-  + getAmountByAccountNumber(intracommunityServiceEntries.filter((e) => vats.filter((v) => v.value === 20).map((v) => v.id).includes(e.idVat)), ['6'], 0, true));
+  + getAmountByAccountNumber(intracommunityServiceEntries.filter((e) => vats.filter((v) => v.value === 20).map((v) => v.id).includes(e.idVat)), ['6'], 0, true)) + (payload?.vatControl?.france?.base20 ?? 0);
 
   const normalRateTax = _round(normalRate * 0.2);
 
   const reducedRate5Dot5 = setZeroIfIsNegative(getAmountByAccountNumber(taxedServicesEntries.filter((e) => vats.filter((v) => v.value === 5.5).map((v) => v.id).includes(e.idVat)), servicesAccounts, 0, true)
-  + getAmountByAccountNumber(intracommunityServiceEntries.filter((e) => vats.filter((v) => v.value === 5.5).map((v) => v.id).includes(e.idVat)), ['6'], 0, true));
+  + getAmountByAccountNumber(intracommunityServiceEntries.filter((e) => vats.filter((v) => v.value === 5.5).map((v) => v.id).includes(e.idVat)), ['6'], 0, true)) + (payload?.vatControl?.france?.base5Dot5 ?? 0);
   const reducedRate5Dot5Tax = _round(reducedRate5Dot5 * 0.055);
 
   const reducedRate10 = setZeroIfIsNegative(getAmountByAccountNumber(taxedServicesEntries.filter((e) => vats.filter((v) => v.value === 10).map((v) => v.id).includes(e.idVat)), servicesAccounts, 0, true)
-  + getAmountByAccountNumber(intracommunityServiceEntries.filter((e) => vats.filter((v) => v.value === 10).map((v) => v.id).includes(e.idVat)), ['6'], 0, true));
+  + getAmountByAccountNumber(intracommunityServiceEntries.filter((e) => vats.filter((v) => v.value === 10).map((v) => v.id).includes(e.idVat)), ['6'], 0, true)) + (payload?.vatControl?.france?.base10 ?? 0);
   const reducedRate10Tax = _round(reducedRate10 * 0.1);
 
   const reducedRate8Dot5 = setZeroIfIsNegative(getAmountByAccountNumber(taxedServicesEntries.filter((e) => vats.filter((v) => v.value === 8.5).map((v) => v.id).includes(e.idVat)), servicesAccounts, 0, true)
-  + getAmountByAccountNumber(intracommunityServiceEntries.filter((e) => vats.filter((v) => v.value === 8.5).map((v) => v.id).includes(e.idVat)), ['6'], 0, true));
+  + getAmountByAccountNumber(intracommunityServiceEntries.filter((e) => vats.filter((v) => v.value === 8.5).map((v) => v.id).includes(e.idVat)), ['6'], 0, true)) + (payload?.vatControl?.france?.base8Dot5 ?? 0);
   const reducedRate8Dot5Tax = _round(reducedRate8Dot5 * 0.085);
 
   const reducedRate2Dot1 = setZeroIfIsNegative(getAmountByAccountNumber(taxedServicesEntries.filter((e) => vats.filter((v) => v.value === 2.1).map((v) => v.id).includes(e.idVat)), servicesAccounts, 0, true)
-  + getAmountByAccountNumber(intracommunityServiceEntries.filter((e) => vats.filter((v) => v.value === 2.1).map((v) => v.id).includes(e.idVat)), ['6'], 0, true));
+  + getAmountByAccountNumber(intracommunityServiceEntries.filter((e) => vats.filter((v) => v.value === 2.1).map((v) => v.id).includes(e.idVat)), ['6'], 0, true)) + (payload?.vatControl?.france?.base2Dot1 ?? 0);
   const reducedRate2Dot1Tax = _round(reducedRate2Dot1 * 0.021);
 
-  const importNormalRate = setZeroIfIsNegative(getAmountByAccountNumber(taxedImportEntries.filter((e) => vats.filter((v) => v.value === 20).map((v) => v.id).includes(e.idVat)), taxedImportAccounts, 0, true));
+  const importNormalRate = setZeroIfIsNegative(getAmountByAccountNumber(taxedImportEntries.filter((e) => vats.filter((v) => v.value === 20).map((v) => v.id).includes(e.idVat)), taxedImportAccounts, 0, true)) + (payload?.vatControl?.importations?.base20 ?? 0);
   const importNormalRateTax = _round(importNormalRate * 0.2);
-  const importReducedRate10 = setZeroIfIsNegative(getAmountByAccountNumber(taxedImportEntries.filter((e) => vats.filter((v) => v.value === 10).map((v) => v.id).includes(e.idVat)), taxedImportAccounts, 0, true));
+  const importReducedRate10 = setZeroIfIsNegative(getAmountByAccountNumber(taxedImportEntries.filter((e) => vats.filter((v) => v.value === 10).map((v) => v.id).includes(e.idVat)), taxedImportAccounts, 0, true)) + (payload?.vatControl?.importations?.base10 ?? 0);
   const importReducedRate10Tax = _round(importReducedRate10 * 0.1);
-  const importReducedRate8Dot5 = setZeroIfIsNegative(getAmountByAccountNumber(taxedImportEntries.filter((e) => vats.filter((v) => v.value === 8.5).map((v) => v.id).includes(e.idVat)), taxedImportAccounts, 0, true));
+  const importReducedRate8Dot5 = setZeroIfIsNegative(getAmountByAccountNumber(taxedImportEntries.filter((e) => vats.filter((v) => v.value === 8.5).map((v) => v.id).includes(e.idVat)), taxedImportAccounts, 0, true)) + (payload?.vatControl?.importations?.base8Dot5 ?? 0);
   const importReducedRate8Dot5Tax = _round(importReducedRate8Dot5 * 0.085);
-  const importReducedRate5Dot5 = setZeroIfIsNegative(getAmountByAccountNumber(taxedImportEntries.filter((e) => vats.filter((v) => v.value === 5.5).map((v) => v.id).includes(e.idVat)), taxedImportAccounts, 0, true));
+  const importReducedRate5Dot5 = setZeroIfIsNegative(getAmountByAccountNumber(taxedImportEntries.filter((e) => vats.filter((v) => v.value === 5.5).map((v) => v.id).includes(e.idVat)), taxedImportAccounts, 0, true)) + (payload?.vatControl?.importations?.base5Dot5 ?? 0);
   const importReducedRate5Dot5Tax = _round(importReducedRate8Dot5 * 0.055);
-  const importReducedRate2Dot1 = setZeroIfIsNegative(getAmountByAccountNumber(taxedImportEntries.filter((e) => vats.filter((v) => v.value === 2.1).map((v) => v.id).includes(e.idVat)), taxedImportAccounts, 0, true));
+  const importReducedRate2Dot1 = setZeroIfIsNegative(getAmountByAccountNumber(taxedImportEntries.filter((e) => vats.filter((v) => v.value === 2.1).map((v) => v.id).includes(e.idVat)), taxedImportAccounts, 0, true)) + (payload?.vatControl?.importations?.base2Dot1 ?? 0);
   const importReducedRate2Dot1Tax = _round(importReducedRate2Dot1 * 0.021);
   const importReducedRate1Dot05 = setZeroIfIsNegative(getAmountByAccountNumber(taxedImportEntries.filter((e) => vats.filter((v) => v.value === 1.05).map((v) => v.id).includes(e.idVat)), taxedImportAccounts, 0, true));
   const importReducedRate1Dot05Tax = _round(importReducedRate1Dot05 * 0.0105);
   const intracommunityTax = setZeroIfIsNegative(getTaxAmountByAccountNumber(intracommunityServiceEntries, [...intracommunityServiceAccounts, ...intracommunityAccounts2], 0));
 
   // TVA Déductible
-  const immobilizationTax = setZeroIfIsNegative(getTaxAmountByAccountNumber(vatEntries, ['2']));
-  const otherGoodsAndServices = setZeroIfIsNegative(getTaxAmountByAccountNumber(vatEntries.filter((e) => vats.filter((v) => !v.isVatImportation).map((v) => v.id).includes(e.idVat)), ['6']));
-  const otherDeductibles = setZeroIfIsNegative(getTaxAmountByAccountNumber(vatEntries.filter((e) => vats.filter((v) => v.isVatImportation).map((v) => v.id).includes(e.idVat)), ['6']));
-  const report = payload.vat?.deductible?.toReport && payload.vat?.deductible?.toReport > 0 ? _round(payload.vat?.deductible?.toReport ?? 0) : payload.previousVatDeclaration?.credit?.toReport ?? 0;
+  const immobilizationTax = setZeroIfIsNegative(getTaxAmountByAccountNumber(vatEntries, ['2'])) + (payload?.vatControl?.deducted?.immobilization ?? 0);
+  const otherGoodsAndServices = setZeroIfIsNegative(getTaxAmountByAccountNumber(vatEntries.filter((e) => vats.filter((v) => !v.isVatImportation).map((v) => v.id).includes(e.idVat)), ['6'])) + (payload?.vatControl?.deducted?.abs ?? 0);
+  const otherDeductibles = setZeroIfIsNegative(getTaxAmountByAccountNumber(vatEntries.filter((e) => vats.filter((v) => v.isVatImportation).map((v) => v.id).includes(e.idVat)), ['6'])) + (payload?.vatControl?.deducted?.other ?? 0);
+  const report = (payload.vat?.deductible?.toReport && payload.vat?.deductible?.toReport > 0 ? _round(payload.vat?.deductible?.toReport ?? 0) : payload.previousVatDeclaration?.credit?.toReport ?? 0) + (payload?.vatControl?.deducted?.reported ?? 0);
 
   const coefficient = _round(payload.vat?.deductible?.coefficient ?? 100, 2);
   const isNil = payload.isNil === true;
   const isHolidayDeposit = payload.isHolidayDeposit === true;
 
-  const sumToAdd = setZeroIfIsNegative(isNil ? 0 : isHolidayDeposit ? (_round((payload.previousVatDeclaration?.toPay?.total ?? 0) * 0.8)) : (_round(payload.vat?.sumToAdd ?? 0) + mxToAdd));
+  const sumToAdd = setZeroIfIsNegative(isNil ? 0 : isHolidayDeposit ? (_round((payload.previousVatDeclaration?.toPay?.total ?? 0) * 0.8)) : (_round(payload.vat?.sumToAdd ?? 0) + mxToAdd)) + (payload?.vatControl?.regularisations?.case5B ?? 0);
   const comment = isHolidayDeposit ? `ACOMPTE CONGES ${payload.comment ?? ''}` : (payload.comment ?? null);
 
   const initialPayload: Cerfa3310_2023 = {
@@ -184,7 +184,7 @@ export function getCerfa3310Century23Payload(accountingEntries: IAccountingEntry
       intracommunityAcquisitions: isNil || isHolidayDeposit ? 0 : taxedIntracommunityAcquisitions,
       energyDelivery: isNil || isHolidayDeposit ? 0 : _round(payload.taxedOperations?.energyDelivery ?? 0),
       purchaseOfServicesNotInFrance: isNil || isHolidayDeposit ? 0 : _round(payload.taxedOperations?.purchaseOfServicesNotInFrance ?? 0),
-      regularizations: isNil || isHolidayDeposit ? 0 : _round(payload.taxedOperations?.regularizations ?? 0),
+      regularizations: isNil || isHolidayDeposit ? 0 : _round(payload.taxedOperations?.regularizations ?? 0) + (payload?.vatControl?.regularisations?.base20 ?? 0) + (payload?.vatControl?.regularisations?.base10 ?? 0) + (payload?.vatControl?.regularisations?.base5Dot5 ?? 0) + (payload?.vatControl?.regularisations?.base2Dot1 ?? 0),
     },
     untaxedOperations: {
       exportationNotInEurope: isNil || isHolidayDeposit ? 0 : untaxedExportationNotInEurope,
@@ -200,7 +200,7 @@ export function getCerfa3310Century23Payload(accountingEntries: IAccountingEntry
       importPetrolInSuspensiveSystem: isNil || isHolidayDeposit ? 0 : _round(payload.untaxedOperations?.importPetrolInSuspensiveSystem ?? 0),
       purchaseInFranchise: isNil || isHolidayDeposit ? 0 : _round(payload.untaxedOperations?.purchaseInFranchise ?? 0),
       saleOfServicesNotInFrance: isNil || isHolidayDeposit ? 0 : _round(payload.untaxedOperations?.saleOfServicesNotInFrance ?? 0),
-      regularizations: isNil || isHolidayDeposit ? 0 : _round(payload.untaxedOperations?.regularizations ?? 0),
+      regularizations: isNil || isHolidayDeposit ? 0 : _round(payload.untaxedOperations?.regularizations ?? 0) + (payload?.vatControl?.untaxed?.regularisation ?? 0),
       internalUniq: isNil || isHolidayDeposit ? 0 : _round(payload.untaxedOperations?.internalUniq ?? 0),
     },
     vat: {
@@ -283,7 +283,7 @@ export function getCerfa3310Century23Payload(accountingEntries: IAccountingEntry
           total: isNil || isHolidayDeposit ? 0 : otherDeductibles,
         },
         report,
-        toImpute: isNil || isHolidayDeposit ? 0 : (_round(payload.vat?.deductible?.toImpute ?? 0) + mxToSub),
+        toImpute: isNil || isHolidayDeposit ? 0 : (_round(payload.vat?.deductible?.toImpute ?? 0) + mxToSub) + (payload?.vatControl?.deducted?.case2C ?? 0),
         total: 0, // Calculé plus bas
         onImportOtherThanOilProducts: isNil || isHolidayDeposit ? 0 : otherDeductibles,
         coefficient: isNil || isHolidayDeposit ? 100 : coefficient,
@@ -326,7 +326,7 @@ export function getCerfa3310Century23Payload(accountingEntries: IAccountingEntry
     },
     credit: {
       amount: 0, // Calculé plus bas
-      refundAsked: isNil || isHolidayDeposit ? 0 : _round(payload.credit?.refundAsked ?? 0),
+      refundAsked: isNil || isHolidayDeposit ? 0 : _round(payload.credit?.refundAsked ?? 0) + (payload?.vatControl?.refundAsked ?? 0),
       transferedToSocietyHeadOfGroup: isNil || isHolidayDeposit ? 0 : _round(payload.credit?.transferedToSocietyHeadOfGroup ?? 0),
       assimiledTaxes: isNil || isHolidayDeposit ? 0 : _round(payload.credit?.assimiledTaxes ?? 0),
       toReport: 0, // Calculé plus bas