@silexpert/core 1.1.409 → 1.2.0

package/ts/types/Interface/api/thirdParty/UpdateThirdPartyForm.ts

@@ -1,5 +1,5 @@
 import { IsEnum, IsOptional } from 'class-validator';
-import { TermOfPayment, ThirdPartyType } from '../../..';
+import { ThirdPartyType } from '../../..';
 import { ApiPropertyOptional } from '../../../../utils';
 
 export class UpdateThirdPartyForm {
@@ -98,8 +98,4 @@ export class UpdateThirdPartyForm {
   @ApiPropertyOptional()
   @IsOptional()
     deliveryZipCode?: string | null;
-
-  @ApiPropertyOptional()
-  @IsOptional()
-    termOfPayment?: TermOfPayment | null;
 }

package/ts/types/Interface/api/vatDeclaration/QueryVatDeclaration.ts

@@ -54,4 +54,10 @@ export class QueryVatEntry {
   @IsString()
   @IsOptional()
     type?: 'collected' | 'deductible';
+}
+
+export class QueryCerfa {
+  @ApiProperty()
+  @IsString()
+    fileName: string;
 }

package/ts/types/Interface/api/vatDeclaration/ReadVatDeclaration.ts

@@ -1,4 +1,3 @@
-import { IUser } from '../../..';
 import { IAccountingEntry } from '../../models/IAccountingEntry';
 import { FormEntry } from '../accountingEntry/AnnotateAccountingTransaction';
 
@@ -23,10 +22,4 @@ export class ReadVatOnCollection {
     sales: { [k: string]: number };
     purchases: { [k: string]: number };
   };
-}
-
-export class ReadVatMailPreview {
-  recipient: IUser | null;
-  content: string;
-  subject: string;
 }

package/ts/types/Interface/models/IApiError.ts

@@ -9,7 +9,6 @@ export enum Code {
   tokenFailure = 'token_authentication_failure',
   authenticationFailure = 'authentication_credentials_failure',
   notFound = 'resource_not_found',
-  forbidden = 'forbidden',
   fileNotFound = 'file_not_found',
   validationError = 'resource_validation_error',
   constraintError = 'resource_constraint_error',

package/ts/types/Interface/models/IAutomaticRegistration.ts

@@ -8,7 +8,7 @@ export interface IAutomaticRegistration {
   state: AutomaticRegistrationType;
   details: any;
   idSociety: number;
-  idRegistration?: number | null;
+  idRegistration: number;
 
   registrations?: IRegistration | null;
   society?: ISociety | null;

package/ts/types/Interface/models/IBankAccount.ts

@@ -7,7 +7,6 @@ import { IBalanceBankAccount } from './IBalanceBankAccount';
 import { ISimulation } from './ISimulation';
 import { IUpToDateBankAccount } from './IUpToDateBankAccount';
 import { StateSynchro } from '../../Enum/StateSynchro';
-import { BankAccountSubType } from '../../Enum/BankAccountType';
 
 // bankAccounts
 export interface IBankAccount {
@@ -28,9 +27,9 @@ export interface IBankAccount {
   disabledAt?: Date | null;
   inProgressImport: Date | null;
   amountStart: number | null;
+  isGlobalFetched: boolean;
   dateStart: Date | null;
   errorCode: string | null;
-  subType?: BankAccountSubType | null;
   idPartnerType: number | null;
   idAccount: number | null;
   idBankList: number | null;

package/ts/types/Interface/models/IChecklist.ts

@@ -10,8 +10,6 @@ export interface IChecklist {
   id?: number;
   idUserFront: number | null;
   revisionDate?: Date | null;
-  idUserWhoValidate?: number | null;
-  validateDate?: Date | null;
   isConfirmed: boolean;
   date: Date | null;
   type: ChecklistTypeEnum;
@@ -30,5 +28,4 @@ export interface IChecklist {
   exercice?: IExercice;
   checklistHasOneCustomerVat?: ICustomerVat;
   mailRelation?: IMailRelation[];
-  userWhoValidate?: IUser;
 }

package/ts/types/Interface/models/IEstimateInvoice.ts

@@ -8,7 +8,7 @@ import { IInvoiceReminder } from './IInvoiceReminder';
 import { IFile } from './IFile';
 import { IInvoiceRecurrence } from './IInvoiceRecurrence';
 import { ReadEstimateInvoiceStatus } from '../api/commercialManagement/Read';
-import { AccountingCategoryId, InvoiceLanguage } from '../../Enum/CommercialManagement';
+import { AccountingCategoryId } from '../../Enum/CommercialManagement';
 
 // estimatesInvoices
 export interface IEstimateInvoice {
@@ -44,7 +44,6 @@ export interface IEstimateInvoice {
   status?: ReadEstimateInvoiceStatus;
   accountingCategory: AccountingCategoryId;
   shouldPayTaxAfterDebit: boolean;
-  language: InvoiceLanguage;
   idFile?: number | null;
   idRelatedInvoice: number | null;
   idEstimateInvoiceType: number | number[];

package/ts/types/Interface/models/IExercice.ts

@@ -13,7 +13,6 @@ import { IExerciceDetail } from './IExerciceDetail';
 import { IBalanceSheetModule } from './IBalanceSheetModule';
 import { IRegistration } from './IRegistration';
 import { IComment } from './IComment';
-import { IPayment } from './IPayment';
 
 // exercices
 export interface IExercice {
@@ -63,7 +62,6 @@ export interface IExercice {
   society?: ISociety;
   exerciceDetail?: IExerciceDetail;
   exerciceBalanceSheetModule?: IBalanceSheetModule;
-  exercicePayments?: IPayment[];
   registrations: IRegistration[];
   comments?: IComment[];
 }

package/ts/types/Interface/models/IFile.ts

@@ -1,8 +1,7 @@
 import { IAttachmentFile } from './IAttachmentFile';
 import { IFolderFile } from './IFolderFile';
 import { IFileType } from './IFileType';
-import { ICommercialMail, IEstimateInvoice, IMail, IMailAttachment } from '../..';
-import { IPaymentRecovery } from './IPaymentRecovery';
+import { ICommercialMail, IMail, IMailAttachment } from '../..';
 
 // files
 export interface IFile {
@@ -22,6 +21,4 @@ export interface IFile {
   commercialMails?: ICommercialMail[];
   mails?: IMail[];
   mailAttachment?: IMailAttachment | null;
-  paymentRecovery?: IPaymentRecovery | null;
-  estimateInvoice?: IEstimateInvoice | null;
 }

package/ts/types/Interface/models/IRefund.ts

@@ -9,7 +9,6 @@ export interface IRefund {
   comment: string | null;
   refundDate: Date | null;
   processed: boolean;
-  isAmountChecked?: boolean;
   idRefundMotif: number;
   idSociety: number;
   idUserDemand: number;

package/ts/types/Interface/models/ISocietyGescom.ts

@@ -1,5 +1,4 @@
 import { AccountingCategoryId, FontIds, LogoAlignment } from '../../Enum/CommercialManagement';
-import { IFile } from './IFile';
 
 // societyGescom
 export interface ISocietyGescom {
@@ -49,21 +48,8 @@ export interface ISocietyGescom {
   idFont?: FontIds | null;
   idSociety?: number | null;
   idTvaMargin?: number | null;
-  shouldHideBrandName?: boolean;
-  shouldHideEmailHeader?: boolean;
-  customerBlockBorderThickness?: number | null;
-  customerBlockBorderColor?: string | null;
-  lineSeparationThickness?: number | null;
-  lineSeparationType?: string | null;
-  lineSeparationColor?: string | null;
-  columnSeparationThickness?: number | null;
-  columnSeparationType?: string | null;
-  columnSeparationColor?: string | null;
-  externalBorderThickness?: number | null;
-  externalBorderType?: string | null;
-  externalBorderColor?: string | null;
-  idRibFile?: number | null;
-  ribFile?: IFile | null;
   createdAt?: Date | null;
   updatedAt?: Date | null;
+  shouldHideBrandName?: boolean;
+  shouldHideEmailHeader?: boolean;
 }

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

@@ -3,7 +3,6 @@ import { IExercice } from './IExercice';
 import { IFile } from './IFile';
 import { ILetter } from './ILetter';
 import { IPendingPoint } from './IPendingPoint';
-import { ISupervisionPendingPoint } from './ISupervisionPendingPoint';
 import { IUser } from './IUser';
 
 // supervisions
@@ -39,7 +38,6 @@ export interface ISupervision {
   balanceSheet: IBalanceSheet;
   file: IFile;
   letter: ILetter;
-  supervisionPendingPoints: ISupervisionPendingPoint[];
   pendingPoints: IPendingPoint[];
   userWhoValidate: IUser;
 }

package/ts/types/Interface/models/IThirdParty.ts

@@ -3,7 +3,6 @@ import { IAccount } from './IAccount';
 import { ICountry } from './ICountry';
 import { IThirdPartyType } from './IThirdPartyType';
 import { ThirdPartyType } from '../../Enum/ThirdPartyType';
-import { TermOfPayment } from '../../Enum/EstimateInvoice';
 
 // ThirdParty
 export interface IThirdParty {
@@ -19,7 +18,6 @@ export interface IThirdParty {
   email?: string | null;
   nSiret?: string | null;
   legalForm?: number | null;
-  termOfPayment?: TermOfPayment | null;
   nTva?: string | null;
   soldeInit: number;
   state?: boolean | null;

package/ts/types/index.ts

@@ -133,7 +133,6 @@ export * from './Interface/models/IPhoneNumber';
 export * from './Interface/models/IPhonePrefix';
 export * from './Interface/models/IPhonePrefixChild';
 export * from './Interface/models/IPrestationHistory';
-export * from './Interface/models/IPrestationComplementaryHistory';
 export * from './Interface/models/IPrestation';
 export * from './Interface/models/IPrestationComplementary';
 export * from './Interface/models/IPrestationList';
@@ -335,7 +334,6 @@ export * from './Interface/models/IUserTimeSlot';
 export * from './Interface/models/ICompanyCreationForm';
 export * from './Interface/models/IAnnotation';
 export * from './Interface/models/ILoanEarlyRepayment';
-export * from './Interface/models/IPrevisionalForm';
 
 
 // Schemas
@@ -376,7 +374,6 @@ export * from './Enum/CityOfGreffe';
 export * from './Enum/StatutsSection';
 export * from './Enum/Contribution';
 export * from './Enum/PrestationOption';
-export * from './Enum/PrestationState';
 export * from './Enum/TimeCounterType';
 export * from './Enum/CustomerSignature';
 export * from './Enum/MailAuto';
@@ -551,8 +548,6 @@ export * from './Enum/LetterResponseType';
 export * from './Enum/StatusRating';
 export * from './Enum/TypeSupportForNotation';
 export * from './Enum/ToRecallRating';
-export * from './Enum/PrevisionalForm';
-export * from './Enum/PaymentRecovery';
 
 // Interfaces API
 export * from './Interface/api/exercice/ReadExercice';
@@ -908,7 +903,6 @@ export * from './Interface/api/registration/UpdateRegistration';
 export * from './Interface/api/registration/CreateRegistration';
 export * from './Interface/api/journal/Journals';
 export * from './Interface/api/journal/QueryJournal';
-export * from './Interface/api/juridicalMission/Query';
 export * from './Interface/api/registration/DeclareRegistration';
 export * from './Interface/api/balanceSheet/ReadBalanceSheetTransaction';
 export * from './Interface/api/balanceSheet/VatControl';
@@ -1021,7 +1015,6 @@ export * from './Interface/api/legalNotice/UpdateLegalNotice';
 export * from './Interface/api/wallet/QueryWallet';
 export * from './Interface/api/terminationList/QueryTerminationList';
 export * from './Interface/api/terminationList/DestroyTerminationList';
-export * from './Interface/api/terminationList/TerminationList';
 export * from './Interface/api/terminationList/CreateTerminationList';
 export * from './Interface/api/pdf/ReadPdfizer';
 export * from './Interface/api/gedFile/updateGedFile';
@@ -1103,14 +1096,6 @@ export * from './Interface/api/companyCreationForm/CreateCompanyCreationForm';
 export * from './Interface/api/companyCreationForm/UpdateCompanyCreationForm';
 export * from './Interface/api/companyCreationForm/CompanyCreationFormPayload';
 export * from './Interface/api/sellsy/CreateInvoicesSellsy';
-export * from './Interface/api/PaymentRecovery/Create';
-export * from './Interface/api/PaymentRecovery/Caarl';
-export * from './Interface/api/PaymentRecovery/Read';
-export * from './Interface/api/PaymentRecovery/Query';
-export * from './Interface/api/previsionalForm/PrevisionalFormPayload';
-export * from './Interface/api/previsionalForm/CreatePrevisionalForm';
-export * from './Interface/api/toDoExpress/Query';
-export * from './Interface/api/toDoExpress/Read';
 
 
 // Enums types

package/ts/utils/brands.ts

@@ -48,7 +48,6 @@ export type Brand = {
     support?: string;
     tva?: string;
     wb?: string;
-    recovery?: string;
   },
   listPhones?: {
     contact: string;

package/ts/utils/commercialManagement/document.ts

@@ -1,11 +1,10 @@
 import {
-  orderBy as _orderBy, groupBy as _groupBy, sumBy as _sumBy, uniq as _uniq, round as _round,
+  orderBy as _orderBy, groupBy as _groupBy, sumBy as _sumBy, uniq as _uniq,
 } from 'lodash';
 import * as dayjs from 'dayjs';
 import { ReadCommercialDocumentTemplate, ReadDocumentEditing, ReadVatEditing } from '../../types/Interface/api/commercialManagement/Read';
 import {
   AccountingCategoryList, FontIds, fontList,
-  InvoiceLanguage,
 } from '../../types/Enum/CommercialManagement';
 import { EstimateInvoiceType } from '../../types/Enum/EstimateInvoice';
 import { Vat } from '../../types/Enum/Vat';
@@ -19,7 +18,6 @@ import {
 } from '../../types';
 import { thirdPartyToReadThirdPartyEditing } from './thirdParty';
 import { getBrandConfig } from '../brands';
-import { internationalizationChoices } from './internationalization/choices';
 
 const ejs = require('ejs');
 require('dayjs/locale/fr');
@@ -54,12 +52,6 @@ export function generateCommercialDocument(idEstimateInvoiceType: EstimateInvoic
     });
   }
 
-  const totalTaxIncluded = _sumBy(products, 'totalTaxExcluded') + _sumBy(vats, 'amount');
-
-  const locale = payload.language ?? InvoiceLanguage.FR;
-  const languageOption = internationalizationChoices[locale];
-
-
   const data: ReadDocumentEditing & { brandColors: brandColorType, brandName: string, shouldHideBrandName: boolean } = {
     ...payload,
     thirdParty,
@@ -74,13 +66,13 @@ export function generateCommercialDocument(idEstimateInvoiceType: EstimateInvoic
     products,
     vats,
     totalTaxExcluded: _sumBy(products, 'totalTaxExcluded'),
-    totalTaxIncluded:_round(totalTaxIncluded),
-    totalTaxAndDiscountIncluded: _round(totalTaxIncluded),
+    totalTaxIncluded: _sumBy(products, 'totalTaxExcluded') + _sumBy(vats, 'amount'),
+    totalTaxAndDiscountIncluded: _sumBy(products, 'totalTaxExcluded') + _sumBy(vats, 'amount'),
     generalDiscountFormatted: payload.generalDiscount2 ? integerToFormattedAmountString(payload.generalDiscount2) : null,
     depositFormatted: payload.deposit ? integerToFormattedAmountString(payload.deposit) : null,
     totalTaxExcludedFormatted: integerToFormattedAmountString(_sumBy(products, 'totalTaxExcluded')),
-    totalTaxIncludedFormatted: integerToFormattedAmountString(totalTaxIncluded),
-    totalTaxAndDiscountIncludedFormatted: integerToFormattedAmountString(totalTaxIncluded - (payload.generalDiscount2 ?? 0) - (payload.deposit ?? 0)),
+    totalTaxIncludedFormatted: integerToFormattedAmountString(_sumBy(products, 'totalTaxExcluded') + _sumBy(vats, 'amount')),
+    totalTaxAndDiscountIncludedFormatted: integerToFormattedAmountString(_sumBy(products, 'totalTaxExcluded') + _sumBy(vats, 'amount') - (payload.generalDiscount2 ?? 0) - (payload.deposit ?? 0)),
     totalVatAmountFormatted: integerToFormattedAmountString(_sumBy(vats, 'amount')),
     font: {
       id: payload.settings?.idFont ?? FontIds.CIRCULAR_STD,
@@ -112,7 +104,6 @@ export function generateCommercialDocument(idEstimateInvoiceType: EstimateInvoic
     brandName: `${getBrandConfig({ objectWaited: 'name', nodeEnv })}`,
     shouldHideBrandName,
     paymentType: payload.paymentType,
-    languageTemplate: languageOption,
   };
 
   const commonTemplate = new CommercialDocumentCommonHTML();
@@ -149,8 +140,6 @@ export function generateCommercialDocument(idEstimateInvoiceType: EstimateInvoic
 }
 
 export function generateMailHeader(params: CreateMailHeader, shouldHideBrandName = false, nodeEnv: string | undefined = undefined): ReadCommercialMailTemplate {
-  const locale = params.payload.language ?? InvoiceLanguage.FR;
-  const languageOption = internationalizationChoices[locale];
   dayjs.locale('fr');
   const data = {
     ...params.payload,
@@ -166,7 +155,6 @@ export function generateMailHeader(params: CreateMailHeader, shouldHideBrandName
     // @ts-ignore
     brandColors: getBrandConfig({ objectWaited: 'colors', nodeEnv }) as brandColorType,
     shouldHideBrandName,
-    languageMail: languageOption,
   };
 
   const mailTemplate = new CommercialDocumentMailHTML();

package/ts/utils/commercialManagement/templates/body.ts

@@ -19,34 +19,34 @@ const headOfDocument = `<div class="row space-between">
     <div style="width: 45%; margin-top: auto;">
       <span class="document-reference">
       <% if (idEstimateInvoiceType === ${EstimateInvoiceType.BON}) { %>
-        <%= languageTemplate.template.orderForm.headers.title %>
+        Bon de commande
       <% } else if (idEstimateInvoiceType === ${EstimateInvoiceType.DEVIS}) { %>
-        <%= languageTemplate.template.estimate.headers.title %>
+        Devis
       <% } else if (idEstimateInvoiceType === ${EstimateInvoiceType.FACTURE}) { %>
-        <%= languageTemplate.template.invoice.headers.title %>
+        Facture
       <% } else if (idEstimateInvoiceType === ${EstimateInvoiceType.AVOIR}) { %>
-        <%= languageTemplate.template.asset.headers.title %>
+        Avoir
       <% } else if (idEstimateInvoiceType === ${EstimateInvoiceType.RESTE}) { %>
-        <%= languageTemplate.template.remainder.headers.title %>
+        Facture de solde
       <% } else if (idEstimateInvoiceType === ${EstimateInvoiceType.ACOMPTE}) { %>
-        <%= languageTemplate.template.deposit.headers.title %>
+        Facture d'acompte
       <% } %>
       <%= reference %></span><br/>
-      <% if(emissionDate) {%><span class="document-emission-date"> <%= languageTemplate.template.common.headers.emissionDate %> : <%= emissionDateFormatted %></span><br/><% } %>
+      <% if(emissionDate) {%><span class="document-emission-date">Date d’émission : <%= emissionDateFormatted %></span><br/><% } %>
       <% if(dueDate && idEstimateInvoiceType !== ${EstimateInvoiceType.ACOMPTE}) {%>
         <span class="document-due-date">
           <% if ([${EstimateInvoiceType.BON}, ${EstimateInvoiceType.DEVIS}].includes(idEstimateInvoiceType)) {%>
-            <%= languageTemplate.template.estimate.headers.dueDate %> :
+            Valide jusqu'au :
           <% } else { %>
-            <%= languageTemplate.template.invoice.headers.dueDate %> :
+            Date d'échéance :
           <% } %>
           <%= dueDateFormatted %></span>
       <% } %>
       <% if (expirationDate && idEstimateInvoiceType === ${EstimateInvoiceType.ACOMPTE}) {%>
-        <span class="document-due-date"><%= languageTemplate.template.deposit.headers.expirationDate %> : : <%= expirationDateFormatted %></span>
+        <span class="document-due-date">Date d'expiration : <%= expirationDateFormatted %></span>
       <% } %>
       <% if(termsOfPayment) { %>
-       <br/><p style="margin-bottom: 0px;"><%= [${EstimateInvoiceType.BON}, ${EstimateInvoiceType.DEVIS}].includes(idEstimateInvoiceType) ? languageTemplate.template.estimate.headers.termsOfPayment : languageTemplate.template.invoice.headers.termsOfPayment %> : <%= termsOfPayment %></p>
+        <br/><p style="margin-bottom: 0px;"><%= [${EstimateInvoiceType.BON}, ${EstimateInvoiceType.DEVIS}].includes(idEstimateInvoiceType) ? 'Conditions de règlement' : 'Date limite de règlement' %> : <%= termsOfPayment %></p>
       <% } %>
     </div>
     <div style="width: 40%; margin-top: auto;">
@@ -84,7 +84,7 @@ export const bodyTemplate = `<html class="pdf-content">
         <% } %>
         <% if (vatMention) { %><div class="vat-mention <%= disableVat !== true ? 'mt-20' : ''%>"><%= vatMention %></div><% } %>
         <% if (comment) { %>
-          <p class="mt-20"><%= languageTemplate.template.common.options.comment %> :<br/>
+          <p class="mt-20">Commentaire :<br/>
           <%- comment %>
         <% } %>
       </div>
@@ -103,8 +103,8 @@ export const bodyTemplate = `<html class="pdf-content">
       <div class="row mt-30 space-between" style="page-break-inside: avoid !important;">
         <div>
           <% if ((settings && (settings.iban || settings.bic || settings.bank)) || paymentType) { %>
-            <% if(paymentType) { %><%= languageTemplate.template.common.options.paymentType %> : <%= paymentType %><br/><% } %>
-            <% if(settings.bank) { %><%= languageTemplate.template.common.options.bank %> : <%= settings.bank %><br/><% } %>
+            <% if(paymentType) { %>Mode de paiement : <%= paymentType %><br/><% } %>
+            <% if(settings.bank) { %>BANQUE : <%= settings.bank %><br/><% } %>
             <% if(settings.iban) { %>IBAN : <%= settings.iban %><br/><% } %>
             <% if(settings.bic) { %>BIC : <%= settings.bic %><% } %>
           <% } %>
@@ -112,7 +112,7 @@ export const bodyTemplate = `<html class="pdf-content">
       </div>
     <% } %>
     <% if (settings && settings.bonPour && (idEstimateInvoiceType === ${EstimateInvoiceType.DEVIS} || idEstimateInvoiceType === ${EstimateInvoiceType.BON})) { %>
-      <br/><%= languageTemplate.template.common.options.approval %> : <br/><br/><br/><br/>
+      <br/>Bon pour accord : <br/><br/><br/><br/>
     <% } %>
 
     <% if (cgv && ((settings && settings.invoiceCgv) || idEstimateInvoiceType === ${EstimateInvoiceType.DEVIS} || idEstimateInvoiceType === ${EstimateInvoiceType.BON})) { %>