@silexpert/core 2.0.108 → 2.0.110

package/ts/types/Interface/models/ISocietyFinancialProjection.ts

@@ -0,0 +1,12 @@
+// societyFinancialProjections
+export class ISocietyFinancialProjection {
+  id?: number;
+  monthYear: string; // MM-YYYY
+  revenuesAmount: number | null;
+  expensesAmount: number | null;
+  details: string | null; // JSON string containing categories
+  isProjected: boolean;
+  idSociety: number;
+  createdAt?: Date | null;
+  updatedAt?: Date | null;
+}

package/ts/types/index.ts

@@ -146,6 +146,7 @@ export * from './Interface/models/ISocietyProceding.js';
 export * from './Interface/models/ISocietySocial.js';
 export * from './Interface/models/ISocietySoftware.js';
 export * from './Interface/models/ISocietyStat.js';
+export * from './Interface/models/ISocietyFinancialProjection.js';
 export * from './Interface/models/ISocietyVehicle.js';
 export * from './Interface/models/ISoftwareCompta.js';
 export * from './Interface/models/ISource.js';
@@ -544,6 +545,7 @@ export * from './Enum/Kyc.js';
 export * from './Interface/api/accountingTransaction/Create.js';
 export * from './Interface/api/acd/Vat.js';
 export * from './Interface/api/acd/Create.js';
+export * from './Interface/api/acd/DeduplicateAccounts.js';
 export * from './Interface/api/authentification/AuthenticationResponse.js';
 export * from './Interface/api/exercice/ReadExercice.js';
 export * from './Interface/api/authentification/AuthenticationResponse.js';

package/ts/utils/acdVat.ts

@@ -1,17 +1,49 @@
-import { Vat } from '../types/Enum/Vat.js';
-import { AcdVatCode } from '../types/Interface/api/acd/Vat.js';
+import { Vat, type VatType } from '../types/Enum/Vat.js';
+import { AcdVatCode, type AcdVatAccount } from '../types/Interface/api/acd/Vat.js';
 
-export function idVatToAcdVatCode(idVat?: number | null): AcdVatCode | null {
+export function idVatToAcdVatCode(
+  idVat?: number | null,
+  acdVatAccounts?: Array<Pick<AcdVatAccount, 'code' | 'rate'>> | null,
+): AcdVatCode | string | null {
   if (!idVat) {
     return null;
   }
 
-  const vat = Object.values(Vat).find((currentVat) => currentVat.id === idVat);
+  const vatList = Object.values(Vat) as VatType[];
+  const vat = vatList.find((currentVat) => currentVat.id === idVat);
 
   if (!vat) {
     return AcdVatCode.NON_AFFECTE;
   }
 
+  if (acdVatAccounts && acdVatAccounts.length > 0) {
+    if (vat.isVatIntracom) {
+      const intracomEntry = acdVatAccounts.find((vatAccount) => vatAccount.code === AcdVatCode.INTRACOM);
+      if (intracomEntry) {
+        return intracomEntry.code as AcdVatCode;
+      }
+      return AcdVatCode.INTRACOM;
+    }
+
+    if (vat.isVatImportation) {
+      const autolEntry = acdVatAccounts.find((vatAccount) => vatAccount.code === AcdVatCode.AUTOL);
+      if (autolEntry) {
+        return autolEntry.code as AcdVatCode;
+      }
+      return AcdVatCode.AUTOL;
+    }
+
+    const matchingRateEntry = acdVatAccounts.find(
+      (vatAccount) =>
+        vatAccount.rate === vat.value &&
+        ![AcdVatCode.INTRACOM, AcdVatCode.AUTOL, AcdVatCode.NON_AFFECTE].includes(vatAccount.code as AcdVatCode),
+    );
+
+    if (matchingRateEntry) {
+      return matchingRateEntry.code as AcdVatCode;
+    }
+  }
+
   if (vat.isVatIntracom) {
     return AcdVatCode.INTRACOM;
   }
@@ -36,7 +68,51 @@ export function idVatToAcdVatCode(idVat?: number | null): AcdVatCode | null {
   }
 }
 
-export function acdVatCodeToIdVat(acdVatCode?: AcdVatCode | null): number | null {
+export function acdVatCodeToIdVat(
+  acdVatCode?: AcdVatCode | string | null,
+  acdVatAccounts?: Array<Pick<AcdVatAccount, 'code' | 'rate'>> | null,
+): number | null {
+  if (!acdVatCode) {
+    return null;
+  }
+
+  const vatList = Object.values(Vat) as VatType[];
+
+  if (acdVatAccounts && acdVatAccounts.length > 0) {
+    const matchingVat = acdVatAccounts.find((vatAccount) => vatAccount.code === acdVatCode);
+
+    if (matchingVat && typeof matchingVat.rate === 'number') {
+      const rate = matchingVat.rate;
+
+      if (acdVatCode === AcdVatCode.INTRACOM) {
+        const intracomVat = vatList.find((v) => v.isVatIntracom && v.value === rate);
+        return intracomVat ? Number(intracomVat.id) : Number(Vat.INTRACOM_WITHOUT_TAXE.id);
+      }
+
+      if (acdVatCode === AcdVatCode.AUTOL) {
+        const autolVat = vatList.find((v) => v.isVatImportation && v.value === rate);
+        return autolVat ? Number(autolVat.id) : Number(Vat.IMPORTATION_WITHOUT_TAXE.id);
+      }
+
+      if (acdVatCode === AcdVatCode.NON_AFFECTE) {
+        return null;
+      }
+
+      const standardVat = vatList.find(
+        (v) =>
+          !v.isVatIntracom &&
+          !v.isVatImportation &&
+          v.id !== Vat.MARGE.id &&
+          v.id !== Vat.MANUAL.id &&
+          v.value === rate,
+      );
+
+      if (standardVat) {
+        return Number(standardVat.id);
+      }
+    }
+  }
+
   switch (acdVatCode) {
     case AcdVatCode.NORMAL:
       return Vat.TX_20.id;
@@ -58,6 +134,7 @@ export function acdVatCodeToIdVat(acdVatCode?: AcdVatCode | null): number | null
     case AcdVatCode.SPECIAL:
     case null:
     case undefined:
+    default:
       return null;
   }
 }

package/ts/utils/commercialManagement/document.ts

@@ -89,6 +89,19 @@ export function generateCommercialDocument(
     paymentLink: payload.paymentLink ?? '#',
     idEstimateInvoiceType,
     title: payload.title ?? null,
+    // EJS `with` blocks throw a ReferenceError when a variable key is entirely absent from the data object, so seller
+    // identity/address fields must always be defined even when the payload omits them.
+    name: payload.name ?? null,
+    number: payload.number ?? null,
+    street: payload.street ?? null,
+    zipCode: payload.zipCode ?? null,
+    city: payload.city ?? null,
+    legalForm: payload.legalForm ?? null,
+    capital: payload.capital ?? null,
+    siren: payload.siren ?? null,
+    rcs: payload.rcs ?? null,
+    vatCode: payload.vatCode ?? null,
+    nafCode: payload.nafCode ?? null,
     penalties: payload.penalties
       ? (internationalizationConsistency(locale, payload.penalties, 'penalties') ?? payload.penalties)
       : null,

package/ts/utils/tests/acdVat.spec.ts

@@ -23,4 +23,45 @@ describe('acdVat utils', () => {
     expect(acdVatCodeToIdVat(AcdVatCode.AUTOL)).toBe(Vat.IMPORTATION_WITHOUT_TAXE.id);
     expect(acdVatCodeToIdVat(AcdVatCode.NON_AFFECTE)).toBeNull();
   });
+
+  test('should map ACD VAT codes with custom society VAT rates (e.g. DOM-TOM)', () => {
+    const domTomVatAccounts = [
+      { code: 'NON_AFFECTE', rate: 0 },
+      { code: 'TN', rate: 8.5 },
+      { code: 'TR1', rate: 2.1 },
+    ];
+
+    expect(acdVatCodeToIdVat('TN', domTomVatAccounts)).toBe(Vat.TX_8_5.id);
+    expect(acdVatCodeToIdVat('TR1', domTomVatAccounts)).toBe(Vat.TX_2_1.id);
+    expect(acdVatCodeToIdVat('NON_AFFECTE', domTomVatAccounts)).toBeNull();
+
+    expect(idVatToAcdVatCode(Vat.TX_8_5.id, domTomVatAccounts)).toBe('TN');
+    expect(idVatToAcdVatCode(Vat.TX_2_1.id, domTomVatAccounts)).toBe('TR1');
+    expect(idVatToAcdVatCode(Vat.WITHOUT_TAXE.id, domTomVatAccounts)).toBeNull();
+  });
+
+  test('should correctly handle 0% VAT codes (e.g. exoneration, intracom 0%, importation 0%)', () => {
+    const vatAccountsWithZeroRates = [
+      { code: 'NON_AFFECTE', rate: 0 },
+      { code: 'EXO', rate: 0 },
+      { code: 'INTRACOM', rate: 0 },
+      { code: 'AUTOL', rate: 0 },
+      { code: 'TN', rate: 20 },
+    ];
+
+    // Non affecté returns null
+    expect(acdVatCodeToIdVat('NON_AFFECTE', vatAccountsWithZeroRates)).toBeNull();
+
+    // Custom 0% code (e.g. EXO) maps to WITHOUT_TAXE
+    expect(acdVatCodeToIdVat('EXO', vatAccountsWithZeroRates)).toBe(Vat.WITHOUT_TAXE.id);
+    expect(idVatToAcdVatCode(Vat.WITHOUT_TAXE.id, vatAccountsWithZeroRates)).toBe('EXO');
+
+    // Intracom at 0%
+    expect(acdVatCodeToIdVat('INTRACOM', vatAccountsWithZeroRates)).toBe(Vat.INTRACOM_WITHOUT_TAXE.id);
+    expect(idVatToAcdVatCode(Vat.INTRACOM_WITHOUT_TAXE.id, vatAccountsWithZeroRates)).toBe(AcdVatCode.INTRACOM);
+
+    // Importation at 0%
+    expect(acdVatCodeToIdVat('AUTOL', vatAccountsWithZeroRates)).toBe(Vat.IMPORTATION_WITHOUT_TAXE.id);
+    expect(idVatToAcdVatCode(Vat.IMPORTATION_WITHOUT_TAXE.id, vatAccountsWithZeroRates)).toBe(AcdVatCode.AUTOL);
+  });
 });

package/ts/utils/tests/document.spec.ts

@@ -0,0 +1,75 @@
+import { describe, expect, test } from 'vitest';
+import { generateCommercialDocument } from '../commercialManagement/document.js';
+import { EstimateInvoiceType } from '../../types/Enum/EstimateInvoice.js';
+import { CreateInvoiceDocument } from '../../types/Interface/api/commercialManagement/Create.js';
+
+// Payload reproducing a real-world case where the seller address fields (`name`, `street`,
+// `number`, `zipCode`, `city`) are entirely absent from the object, not just `null`.
+// Since EJS `with` blocks throw a ReferenceError for keys missing from the data object,
+// this used to crash `generateCommercialDocument` instead of falling back gracefully.
+const payloadWithoutSellerAddress = {
+  penalties: '3 fois le taux légal',
+  discount: 'Aucun escompte en cas de paiement anticipé',
+  accountingCategory: 2,
+  recoveryCost: '40€',
+  vatMention: 'TVA: Non concerné',
+  expirationDate: null,
+  shouldPayTaxAfterDebit: false,
+  isStripeAllowed: false,
+  vatCode: null,
+  paymentType: '',
+  reference: '202609/94',
+  capital: 0,
+  isDraft: false,
+  cgv: '<p><br></p>',
+  logoUrl: null,
+  disableVat: false,
+  nafCode: null,
+  legalForm: null,
+  siren: null,
+  products: [
+    {
+      id: 16979,
+      idVat: 4,
+      unit: 2,
+      itemSaleName: "main d'oeuvre extèrieur",
+      priceTaxExcluded: 7000,
+      quantity: 1,
+      discountType: 1,
+      discount2: 0,
+      comment: 'Déblocage NORIA, dépose NORIA.',
+      reorder: 1,
+    },
+  ],
+  termsOfPayment: 'Exigible sous 30 jours',
+  dueDate: '2026-10-22',
+  settings: {},
+  language: 'fr',
+  idSaleDocumentTemplate: 14,
+  emissionDate: '2026-09-22',
+  thirdParty: {
+    id: 156708,
+    company: 'S.A.S EMBRUSCALLES',
+    idCountry: 66,
+  },
+  comment: null,
+  generalDiscount2: 0,
+  title: 'NORIA BLOQUER',
+  deposit: 0,
+  transmissionType: 'none',
+  idEstimateInvoiceType: EstimateInvoiceType.FACTURE,
+  idCountry: 66,
+  // Seller address fields are intentionally omitted here: `name`, `number`, `street`, `zipCode`, `city`.
+} as unknown as CreateInvoiceDocument;
+
+describe('generateCommercialDocument', () => {
+  test('should not throw when seller address fields are missing from the payload', () => {
+    expect(() => generateCommercialDocument(EstimateInvoiceType.FACTURE, payloadWithoutSellerAddress)).not.toThrow();
+  });
+
+  test('should render an empty seller block when address fields are missing', () => {
+    const result = generateCommercialDocument(EstimateInvoiceType.FACTURE, payloadWithoutSellerAddress);
+
+    expect(result.body).not.toContain('<p>undefined</p>');
+  });
+});