@silexpert/core 1.3.1 → 1.3.3

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

@@ -1,4 +1,4 @@
-import { IsArray, IsObject } from 'class-validator';
+import { IsArray, IsInt, IsObject, IsOptional } from 'class-validator';
 import { ApiProperty, ApiPropertyOptional } from '../../../../utils';
 import { ICommercialOffer } from '../../models/ICommercialOffer';
 import { IExercicePrestation } from '../../models/IExercicePrestation';
@@ -12,3 +12,25 @@ export class QueryCreateExercicePrestation {
   @IsArray()
   commercialOffers: ICommercialOffer[];
 }
+
+export class QueryGetExercicePrestation {
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt()
+  id?: number;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt()
+  idBalanceSheet?: number;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt()
+  idExercice?: number;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt()
+  idPrestation?: number;
+}

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

@@ -1,6 +1,7 @@
-import { IsString } from 'class-validator';
-import { ApiProperty } from '../../../../utils';
+import { IsBoolean, IsOptional, IsString } from 'class-validator';
+import { ApiProperty, ApiPropertyOptional } from '../../../../utils';
 import { TFile } from './TFile';
+import { ToBoolean } from '../../../../utils/transforms/boolean.transform';
 
 export class CreateFile {
   @ApiProperty()
@@ -13,6 +14,12 @@ export class CreateFile {
   @ApiProperty()
   @IsString()
   name: string;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsBoolean()
+  @ToBoolean()
+  convertImage?: boolean;
 }
 
 export type ResizeIfTooLargePayload = {

package/ts/types/Interface/api/marketing/NewLeadSheet.ts

@@ -0,0 +1,10 @@
+import { MarketingConversionName } from '../../../Enum/Marketing';
+
+export interface MarketingNewLeadSheet {
+  email: string;
+  prefix: string;
+  phone: string;
+  conversionName: MarketingConversionName;
+  conversionTime: Date;
+  conversionValue: number;
+}

package/ts/types/Interface/api/society/QueryUnpaid.ts

@@ -23,7 +23,13 @@ export class QueryUnpaidSociety {
   @IsOptional()
   @IsBoolean()
   @ToBoolean()
-  isRecoverable?: boolean;
+  isRecoverable?: boolean; 
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsBoolean()
+  @ToBoolean()
+  isRecovering?: boolean;
 
   @ApiPropertyOptional()
   @IsOptional()

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

@@ -61,13 +61,19 @@ export class QueryToDoBalanceSheetPaginated extends RequiredQueryPaginate {
 
   @ApiPropertyOptional()
   @IsOptional()
-  @IsInt()
-  balanceSheetState?: number;
+  @IsInt({ each: true })
+  balanceSheetState?: number[];
 
   @ApiPropertyOptional()
   @IsOptional()
-  @IsInt()
-  supervisionState?: number;
+  @IsInt({ each: true })
+  supervisionState?: number[];
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsBoolean()
+  @ToBoolean()
+  attributionState?: boolean;
 
   @ApiPropertyOptional()
   @IsOptional()
@@ -80,6 +86,17 @@ export class QueryToDoBalanceSheetPaginated extends RequiredQueryPaginate {
   @IsBoolean()
   @ToBoolean()
   balance?: boolean;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt({ each: true })
+  idComptaType?: number[];
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsBoolean()
+  @ToBoolean()
+  balanceSheetLate?: boolean;
 }
 
 export class QueryToDoBalanceSheetStats {
@@ -136,13 +153,19 @@ export class QueryToDoBalanceSheetStats {
 
   @ApiPropertyOptional()
   @IsOptional()
-  @IsInt()
-  balanceSheetState?: number;
+  @IsInt({ each: true })
+  balanceSheetState?: number[];
 
   @ApiPropertyOptional()
   @IsOptional()
-  @IsInt()
-  supervisionState?: number;
+  @IsInt({ each: true })
+  supervisionState?: number[];
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsBoolean()
+  @ToBoolean()
+  attributionState?: boolean;
 
   @ApiPropertyOptional()
   @IsOptional()
@@ -155,6 +178,17 @@ export class QueryToDoBalanceSheetStats {
   @IsBoolean()
   @ToBoolean()
   balance?: boolean;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt({ each: true })
+  idComptaType?: number[];
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsBoolean()
+  @ToBoolean()
+  balanceSheetLate?: boolean;
 }
 
 export class QueryToDoBalanceSheetGetExercicesSociety {
@@ -180,13 +214,19 @@ export class QueryToDoBalanceSheetGetExercicesSociety {
 
   @ApiPropertyOptional()
   @IsOptional()
-  @IsInt()
-  balanceSheetState?: number;
+  @IsInt({ each: true })
+  balanceSheetState?: number[];
 
   @ApiPropertyOptional()
   @IsOptional()
-  @IsInt()
-  supervisionState?: number;
+  @IsInt({ each: true })
+  supervisionState?: number[];
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsBoolean()
+  @ToBoolean()
+  attributionState?: boolean;
 
   @ApiPropertyOptional()
   @IsOptional()

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

@@ -2,6 +2,8 @@ import { IsArray, IsBoolean, IsIn, IsInt, IsNumber, IsOptional, IsString, Min }
 import { ApiProperty, ApiPropertyOptional } from '../../../../utils';
 import { ToBoolean } from '../../../../utils/transforms/boolean.transform';
 import { SubscriptionType } from '../../../Enum/SubscriptionType';
+import { WhereOptions } from 'sequelize';
+import { ISociety } from '../../models/ISociety';
 
 export class QueryConfirm {
   @ApiProperty()
@@ -83,11 +85,42 @@ export class QueryResendConfirmationLink {
   id: number;
 }
 
-export class QueryUserSociety {
+export class GetSocietyFromUser {
   @ApiPropertyOptional()
-  @IsNumber()
   @IsOptional()
+  @IsNumber()
   idSubscriptionType?: SubscriptionType;
+  
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsBoolean()
+  @ToBoolean()
+  displayArchived?: boolean;
+  
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsBoolean()
+  @ToBoolean()
+  onlyLabAccepted?: boolean;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString({each: true})
+  attributes?: Extract<keyof ISociety, string>[];
+
+  @ApiPropertyOptional({ 
+    default: ['societyConfig','brandType','societyGescom','oldExpertInfo','activity','follows','compta','subscriptionType','connector','permissions'] 
+  })
+  @IsOptional()
+  @IsString({
+    each: true,
+  })
+  @IsIn(['societyConfig','brandType','societyGescom','oldExpertInfo','activity','follows','compta','subscriptionType','connector','permissions','societyDetails'], { each: true })
+  include?: string[];
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  where?: WhereOptions<ISociety>;
 }
 
 export class QueryUpdatePassword {

package/ts/types/Interface/models/IInvoiceRecurrence.ts

@@ -8,7 +8,9 @@ export interface IInvoiceRecurrence {
   endDate: Date;
   lastSend: Date | null;
   isActive: boolean;
+  shouldSendEmailOnCreation: boolean;
   idEstimateInvoice: number;
+  idSaleEmail?: number | null;
   createdAt?: Date;
   updatedAt?: Date;
 

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

@@ -181,6 +181,7 @@ export interface ISociety {
   cancelCompleteCreationModal?: Date | null;
   isCreatedInApp?: boolean;
   passwordIsuite?: string | null;
+  unpaidState?: number | null;
 
   // Associations
   accounts?: IAccount[];

package/ts/types/Interface/models/ISupervision.ts

@@ -10,36 +10,36 @@ import { IUser } from './IUser';
 export interface ISupervision {
   id?: number;
   state: number | null;
-  sendToJedeclare: boolean | null;
-  dueDate: Date | null;
-  revisionDate: Date | null;
-  superviseurId: number | null;
-  expertId: number | null;
-  dateAssignmentSuperviseur: Date | null;
+  sendToJedeclare?: boolean | null;
+  dueDate?: Date | null;
+  revisionDate?: Date | null;
+  superviseurId?: number | null;
+  expertId?: number | null;
+  dateAssignmentSuperviseur?: Date | null;
   idExercice: number;
-  idAccountant: number | null;
-  idFile: number | null;
-  idLetter: number | null;
-  checkDateRecommandation: Date | null;
-  freeText: string | null;
-  freeTextDate: Date | null;
-  freeTextUserId: number | null;
-  idBalanceSheet: number | null;
-  idUserWhoValidate: number | null;
+  idAccountant?: number | null;
+  idFile?: number | null;
+  idLetter?: number | null;
+  checkDateRecommandation?: Date | null;
+  freeText?: string | null;
+  freeTextDate?: Date | null;
+  freeTextUserId?: number | null;
+  idBalanceSheet?: number | null;
+  idUserWhoValidate?: number | null;
   validateDate?: Date | null;
   createdAt?: Date | null;
   updatedAt?: Date | null;
 
   // Associations
-  exercice: IExercice;
-  supervisionUsers: IUser;
-  supervisionExpertUsers: IUser;
-  supervisionAccountant: IUser;
-  freeTextUser: IUser;
-  balanceSheet: IBalanceSheet;
-  file: IFile;
-  letter: ILetter;
-  supervisionPendingPoints: ISupervisionPendingPoint[];
-  pendingPoints: IPendingPoint[];
-  userWhoValidate: IUser;
+  exercice?: IExercice;
+  supervisionUsers?: IUser;
+  supervisionExpertUsers?: IUser;
+  supervisionAccountant?: IUser;
+  freeTextUser?: IUser;
+  balanceSheet?: IBalanceSheet;
+  file?: IFile;
+  letter?: ILetter;
+  supervisionPendingPoints?: ISupervisionPendingPoint[];
+  pendingPoints?: IPendingPoint[];
+  userWhoValidate?: IUser;
 }

package/ts/types/index.ts

@@ -569,6 +569,7 @@ export * from './Enum/ReasonCancelSignatureRequest';
 export * from './Enum/ReasonNotSubscribed';
 export * from './Enum/QualificationLead';
 export * from './Enum/Template';
+export * from './Enum/Marketing';
 
 // Interfaces API
 export * from './Interface/api/exercice/ReadExercice';
@@ -1179,3 +1180,4 @@ export * from './Interface/api/IntermediateManagementRebate';
 export * from './Interface/api/regulation/Query';
 export * from './Interface/api/regulation/Read';
 export * from './Interface/api/regulation/Create';
+export * from './Interface/api/marketing/NewLeadSheet';

package/ts/utils/brands.ts

@@ -43,7 +43,9 @@ export type Brand = {
     noreply?: string;
     qualite?: string;
     paiement?: string;
+    resiliation?: string;
     rh?: string;
+    satisfaction?: string;
     social?: string;
     support?: string;
     tva?: string;

package/ts/utils/commercialManagement/document.ts

@@ -21,7 +21,7 @@ import {
 } from '../../types';
 import { thirdPartyToReadThirdPartyEditing } from './thirdParty';
 import { getBrandConfig } from '../brands';
-import { internationalizationChoices } from './internationalization/choices';
+import { internationalizationChoices, internationalizationConsistency } from './internationalization/choices';
 
 import * as ejs from 'ejs';
 // eslint-disable-next-line @typescript-eslint/no-require-imports
@@ -77,10 +77,19 @@ export function generateCommercialDocument(
     paymentLink: payload.paymentLink ?? '#',
     idEstimateInvoiceType,
     title: payload.title ?? null,
-    penalties: payload.penalties ?? null,
-    compensation: payload.compensation ?? null,
-    discount: payload.discount ?? null,
-    vatMention: payload.vatMention ?? null,
+    penalties: payload.penalties
+      ? (internationalizationConsistency(locale, payload.penalties, 'penalties') ?? null)
+      : null,
+    termsOfPayment: payload.termsOfPayment
+      ? (internationalizationConsistency(locale, payload.termsOfPayment, 'termsOfPayment') ?? null)
+      : null,
+    compensation: payload.compensation
+      ? (internationalizationConsistency(locale, payload.compensation, 'recoveryCost') ?? null)
+      : null,
+    discount: payload.discount ? (internationalizationConsistency(locale, payload.discount, 'discount') ?? null) : null,
+    vatMention: payload.vatMention
+      ? (internationalizationConsistency(locale, payload.vatMention, 'vatMention') ?? null)
+      : null,
     phoneContact: payload.settings?.phoneContact ?? null,
     products,
     vats,
@@ -119,7 +128,9 @@ export function generateCommercialDocument(
     brandColors: getBrandConfig({ objectWaited: 'colors', nodeEnv }) as brandColorType,
     brandName: `${getBrandConfig({ objectWaited: 'name', nodeEnv }) as unknown as string}`,
     shouldHideBrandName,
-    paymentType: payload.paymentType,
+    paymentType: payload.paymentType
+      ? internationalizationConsistency(locale, payload.paymentType, 'paymentType')
+      : null,
     languageTemplate: languageOption,
   };
 

package/ts/utils/commercialManagement/internationalization/choices.ts

@@ -1,6 +1,14 @@
-import { AccountingCategoryId } from '../../../types/Enum/CommercialManagement';
+import { AccountingCategoryId, InvoiceLanguage } from '../../../types/Enum/CommercialManagement';
 import { InternationalizationChoicesType } from './type';
 
+type InternationalizationConsistencyKey =
+  | 'penalties'
+  | 'discount'
+  | 'vatMention'
+  | 'recoveryCost'
+  | 'paymentType'
+  | 'termsOfPayment';
+
 export const internationalizationChoices: InternationalizationChoicesType = {
   fr: {
     inputLists: {
@@ -228,7 +236,7 @@ export const internationalizationChoices: InternationalizationChoicesType = {
           'Specific regime - Works of art - article 297 A of the French General Tax Code (FGTC) and Community Directive 2006/112/EC',
           'Specific regime – Collectibles and antiques - article 297 A of the French General Tax Code (FGTC) and Community Directive 2006/112/EC',
           'Specific regime - Travel agencies - article 297 A of the French General Tax Code (FGTC) and Community Directive 2006/112/EC',
-          ' Invoice subject to VAT reverse charge system',
+          'Invoice subject to VAT reverse charge system',
         ],
         recoveryCost: ['Not applicable', '40€'],
         paymentType: ['Credit card', 'Check', 'Cash', 'Direct debit', 'Bank transfer'],
@@ -383,3 +391,117 @@ export const internationalizationChoices: InternationalizationChoicesType = {
     },
   },
 };
+
+const internationalizationMatching: { [key: string]: { fr: string; en: string }[] } = {
+  penalties: [
+    { fr: 'Non applicable', en: 'Not applicable' },
+    { fr: '3 fois le taux légal', en: '3 times the legal rate' },
+    { fr: 'Taux directeur de la BCE + 10 points', en: 'ECB key rate + 10 points' },
+  ],
+  discount: [
+    { fr: 'Non applicable', en: 'Not applicable' },
+    { fr: 'Aucun escompte en cas de paiement anticipé', en: 'No discount for early payment' },
+  ],
+  recoveryCost: [
+    { fr: 'Non applicable', en: 'Not applicable' },
+    { fr: '40€', en: '40€' },
+  ],
+  paymentType: [
+    { fr: 'Carte bancaire', en: 'Credit card' },
+    { fr: 'Chèque', en: 'Check' },
+    { fr: 'Espèces', en: 'Cash' },
+    { fr: 'Prélèvement', en: 'Direct debit' },
+    { fr: 'Virement bancaire', en: 'Bank transfer' },
+  ],
+  vatMention: [
+    { fr: 'Non concerné', en: 'Not affected' },
+    { fr: 'Non applicable', en: 'Not applicable' },
+    {
+      fr: 'TVA non applicable, art. 293 B du CGI',
+      en: 'VAT not applicable, art. 293 B of the French General Tax Code (FGTC)',
+    },
+    {
+      fr: 'TVA non applicable - Exportation hors UE - Art. 259-1 du CGI',
+      en: 'VAT not applicable - Exports outside the EU - Art. 259-1 of the French General Tax Code (FGTC)',
+    },
+    {
+      fr: "Non soumis à TVA selon l'article 261C du CGI",
+      en: 'Not subject to VAT according to article 261C of the French General Tax Code (FGTC)',
+    },
+    { fr: 'Article 261 D du code général des impôts (CGI)', en: 'Article 261D of the French General Tax Code (FGTC)' },
+    {
+      fr: 'Exonération de TVA, article 283-2 du Code général des impôts',
+      en: 'VAT exemption, article 283-2 of the French General Tax Code (FGTC)',
+    },
+    {
+      fr: 'Exonération de la TVA : Article 262 ter I du CGI',
+      en: 'VAT exemption: Article 262 ter I of the French General Tax Code (FGTC)',
+    },
+    { fr: 'Mention de TVA 261.4.4 1 du CGI', en: 'VAT notice 261.4.4 1 of the French General Tax Code (FGTC)' },
+    {
+      fr: "Régime particulier – Biens d'occasion - article 297 A du CGI et directive communautaire 2006/112/CE",
+      en: 'Specific regime - Second-hand goods - article 297 A of the French General Tax Code (FGTC) and Community Directive 2006/112/EC',
+    },
+    {
+      fr: "Régime particulier – Objets d'art - article 297 A du CGI et directive communautaire 2006/112/CE",
+      en: 'Specific regime - Works of art - article 297 A of the French General Tax Code (FGTC) and Community Directive 2006/112/EC',
+    },
+    {
+      fr: "Régime particulier – Objets de collection ou d'antiquité - article 297 A du CGI et directive communautaire 2006/112/CE",
+      en: 'Specific regime – Collectibles and antiques - article 297 A of the French General Tax Code (FGTC) and Community Directive 2006/112/EC',
+    },
+    {
+      fr: 'Régime particulier – Agences de voyage - article 297 A du CGI et directive communautaire 2006/112/CE',
+      en: 'Specific regime - Travel agencies - article 297 A of the French General Tax Code (FGTC) and Community Directive 2006/112/EC',
+    },
+    {
+      fr: 'Facture soumise au régime de l’auto-liquidation de la TVA',
+      en: 'Invoice subject to VAT reverse charge system',
+    },
+  ],
+  termsOfPayment: [
+    {
+      fr: 'À la livraison',
+      en: 'On delivery',
+    },
+    {
+      fr: 'À la command',
+      en: 'On order',
+    },
+    {
+      fr: 'À réception de la facture',
+      en: 'Upon receipt of invoice',
+    },
+    {
+      fr: 'Exigible sous 14 jours',
+      en: 'Due within 14 days',
+    },
+    {
+      fr: 'Exigible sous 30 jours',
+      en: 'Due within 30 days',
+    },
+    {
+      fr: '30 jours à réception de la facture',
+      en: '30 days upon receipt of invoice',
+    },
+    {
+      fr: '45 jours à réception de la facture',
+      en: '45 days upon receipt of invoice',
+    },
+    {
+      fr: '60 jours à réception de la facture',
+      en: '60 days upon receipt of invoice',
+    },
+  ],
+};
+
+export const internationalizationConsistency = (
+  language: InvoiceLanguage,
+  value: string,
+  key: InternationalizationConsistencyKey,
+): string | undefined => {
+  const keyObjectToMacht = internationalizationMatching[key];
+  return language === InvoiceLanguage.FR
+    ? keyObjectToMacht.find((obj) => obj.fr === value)?.fr
+    : keyObjectToMacht.find((obj) => obj.fr === value)?.en;
+};

package/ts/utils/commercialManagement/templates/common.ts

@@ -9,7 +9,7 @@ export class CommercialDocumentCommonHTML {
   <% } %>`;
 
   footer = `<div style="font-size: 8px !important; color: #838384; text-align: center; padding: 0 40px; display: block; width: 100%;">
-    <% if (freeText) { %><%- freeText %><br/><br/><% } %><% if (accountingCategoryFormatted) {%><%= accountingCategoryFormatted %> | <%}%><% if(marginVats.length > 0) { %><%= languageTemplate.template.common.footer.marginVat %> - <% marginVats.forEach(function(v, index) { %><%= v %> - <% }) %><%= languageTemplate.template.common.footer.legalVatMention %> | <% } %><% if(penalties || compensation || discount) { %><%= penalties ? languageTemplate.template.common.footer.penalties + ' : ' + penalties : ''%><%= penalties && compensation ? ' | ' : ''%><%= compensation ? languageTemplate.template.common.footer.recoveryCosts + ' : ' + compensation + ' ' : '' %><%= (compensation || penalties) && discount ? ' | ' : '' %><%= discount ? discount + ' ' : '' %><%= shouldPayTaxAfterDebit ? "| " + languageTemplate.template.common.footer.shouldPayTaxAfterDebit : '' %><% if(name || legalForm || capital || siren || rcs) {%><br/><br/><% } %><% } %><%= name %><%= name && (legalForm || capital || siren || rcs) ? ', ' : ''%><%= legalForm %><%= capital ? ' ' + languageTemplate.template.common.footer.capital + ' ' + capitalFormatted + ' €' : '' %><%= siren ? ' ' + languageTemplate.template.common.footer.siren + ' ' + siren : ''%><%= rcs ? '| RCS ' + rcs : ''%><% if (vatCode || nafCode) {%><br/><% } %><%= vatCode ? languageTemplate.template.common.footer.vatCode + ' ' +vatCode : ''%><% if(vatCode && nafCode){%>|<%}%><%= nafCode ? 'APE '+nafCode : '' %>
+    <% if (freeText) { %><%- freeText %><br/><br/><% } %><% if (accountingCategoryFormatted) {%><%= accountingCategoryFormatted %> | <%}%><% if(marginVats.length > 0) { %><%= languageTemplate.template.common.footer.marginVat %> - <% marginVats.forEach(function(v, index) { %><%= v %> - <% }) %><%= languageTemplate.template.common.footer.legalVatMention %> | <% } %><% if(penalties || compensation || discount) { %><%= penalties ? languageTemplate.template.common.footer.penalties + ' : ' + penalties : ''%><%= penalties && compensation ? ' | ' : ''%><%= compensation ? languageTemplate.template.common.footer.recoveryCosts + ' : ' + compensation + ' ' : '' %><%= (compensation || penalties) && discount ? ' | ' : '' %><%= discount ? languageTemplate.template.common.footer.discount + ' : ' + discount : '' %><%= shouldPayTaxAfterDebit ? "| " + languageTemplate.template.common.footer.shouldPayTaxAfterDebit : '' %><% if(name || legalForm || capital || siren || rcs) {%><br/><br/><% } %><% } %><%= name %><%= name && (legalForm || capital || siren || rcs) ? ', ' : ''%><%= legalForm %><%= capital ? ' ' + languageTemplate.template.common.footer.capital + ' ' + capitalFormatted + ' €' : '' %><%= siren ? ' ' + languageTemplate.template.common.footer.siren + ' ' + siren : ''%><%= rcs ? '| RCS ' + rcs : ''%><% if (vatCode || nafCode) {%><br/><% } %><%= vatCode ? languageTemplate.template.common.footer.vatCode + ' ' +vatCode : ''%><% if(vatCode && nafCode){%>|<%}%><%= nafCode ? 'APE '+nafCode : '' %>
     <% if (["Clementine", "Pourcentage", "Comptalib"].includes(brandName) && !shouldHideBrandName) { %>
     <div style="display: grid; place-items: center;"><div style="background-color: <%= brandColors.primary50 %>; color: <%= brandColors.primary500 %>; display: flex; gap: 3px; max-width: fit-content; border-radius: 4px; padding: 4px 8px; margin-top: 8px; align-items: center; font-size: 9px; line-height: 140%; font-family: 'circular std', sans serif; font-weight: 450;">
         <%= languageTemplate.template.common.footer.generate %>
@@ -29,9 +29,9 @@ export class CommercialDocumentCommonHTML {
   </div>`;
 
   company = `<div>
-    <% if (name) { %><p><%= name %><p><% } %>
-    <% if (number || street) {%><p><%}%><% if (number) { %><%= number + ' ' %><% } if (street) { %><%= street %><% } if (number || street) { %><% } %><% if (number || street) {%></p><%}%>
-    <% if (zipCode || city) {%><p><%}%><% if (zipCode) { %><%= zipCode + ' ' %><% } if (city) { %><%= city %><% } if (zipCode || city) { %></p><% } %>
+    <% if (name) { %><p><%= name %></p><% } %>
+    <% if (number || street) { %><p><% } %><% if (number) { %><%= number + ' ' %><% } if (street) { %><%= street %><% } if (number || street) { %></p><% } %>
+    <% if (zipCode || city) { %><p><% } %><% if (zipCode) { %><%= zipCode + ' ' %><% } if (city) { %><%= city %><% } if (zipCode || city) { %></p><% } %>
   </div>
   <% if (phoneContact) { %><p><%= phoneContact %><p><% } %>
   <% if (settings && settings.mailContact) { %><p><%= settings.mailContact %></p><% } %>`;

package/ts/utils/email.ts

@@ -34,9 +34,7 @@ function getRoleSignature(user: any) {
   // eslint-disable-next-line @typescript-eslint/no-unsafe-return
   const isOnBoarder = user.roles.map((r: any) => r.id).includes(Role.ON_BOARDER);
   // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-  const isTermination = user.roles.map((r: any) => r.id).includes(Role.TERMINATION);
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-  const isLitige = user.roles.map((r: any) => r.id).includes(Role.LITIGE);
+  const isSatisfaction = user.roles.map((r: any) => r.id).includes(Role.SATISFACTION);
   // eslint-disable-next-line @typescript-eslint/no-unsafe-return
   const isDataOfficer = user.roles.map((r: any) => r.id).includes(Role.DATA_OFFICER);
   // eslint-disable-next-line @typescript-eslint/no-unsafe-return
@@ -77,20 +75,13 @@ function getRoleSignature(user: any) {
     return `Chargé${user.idCivility === 2 ? 'e' : ''} accueil clients`;
   }
 
-  if (isTermination && isManager) {
+  if (isSatisfaction && isManager) {
     return `Responsable chargé${user.idCivility === 2 ? 'e' : ''} de la satisfaction clients`;
   }
-  if (isTermination) {
+  if (isSatisfaction) {
     return `Chargé${user.idCivility === 2 ? 'e' : ''} de la satisfaction clients`;
   }
 
-  if (isLitige && isManager) {
-    return `Responsable chargé${user.idCivility === 2 ? 'e' : ''} de la satisfaction clients (Litige)`;
-  }
-  if (isLitige) {
-    return `Chargé${user.idCivility === 2 ? 'e' : ''} de la satisfaction clients (Litige)`;
-  }
-
   if (isDataOfficer && isManager) {
     return 'Responsable aide comptable';
   }
@@ -275,6 +266,14 @@ export function generateSignature(params: any): string {
     ...(idTypeBrand ? { idTypeBrand } : {}),
     objectWaited: 'listMails.gestion',
   }) as unknown as string;
+  const satisfactionMail = getBrandConfig({
+    ...(idTypeBrand ? { idTypeBrand } : {}),
+    objectWaited: 'listMails.satisfaction',
+  }) as unknown as string;
+  const resiliationMail = getBrandConfig({
+    ...(idTypeBrand ? { idTypeBrand } : {}),
+    objectWaited: 'listMails.resiliation',
+  }) as unknown as string;
   const supportMail = getBrandConfig({
     ...(idTypeBrand ? { idTypeBrand } : {}),
     objectWaited: 'listMails.support',
@@ -338,6 +337,24 @@ export function generateSignature(params: any): string {
     };
     mailSignature = bonjourMail;
     roleSignature = '';
+  } else if (forceRole === 'satisfaction') {
+    // Signature satisfaction
+    user = {
+      firstname: 'Service satisfaction clients',
+      isAll: true,
+    };
+    mailSignature = satisfactionMail;
+    roleSignature = '';
+    phoneSignature = standardPhoneSignature;
+  } else if (forceRole === 'resiliation') {
+    // Signature resiliation
+    user = {
+      firstname: 'Service satisfaction clients',
+      isAll: true,
+    };
+    mailSignature = resiliationMail;
+    roleSignature = '';
+    phoneSignature = standardPhoneSignature;
   } else if (forceRole === 'social') {
     // Signature social
     user = {

package/ts/utils/task.ts

@@ -23,10 +23,8 @@ const getIdRoleUsedForTask = (listRoles: Role[]): Role => {
     idRole = Role.TECHNICAL_ADVISOR;
   } else if (listRoles.includes(Role.ON_BOARDER)) {
     idRole = Role.ON_BOARDER;
-  } else if (listRoles.includes(Role.TERMINATION)) {
-    idRole = Role.TERMINATION;
-  } else if (listRoles.includes(Role.LITIGE)) {
-    idRole = Role.LITIGE;
+  } else if (listRoles.includes(Role.SATISFACTION)) {
+    idRole = Role.SATISFACTION;
   } else if (listRoles.includes(Role.FRONT_OFFICE)) {
     idRole = Role.FRONT_OFFICE;
   } else if (listRoles.includes(Role.DATA_OFFICER)) {
@@ -66,8 +64,7 @@ const getListIdRolesUsedForTask = (listRoles: Role[]): Role[] => {
     Role.CUSTOMER_SUCCESS, 
     Role.TECHNICAL_ADVISOR, 
     Role.ON_BOARDER, 
-    Role.TERMINATION, 
-    Role.LITIGE,
+    Role.SATISFACTION,
     Role.FRONT_OFFICE,
     Role.DATA_OFFICER,
   ].includes(r));