@silexpert/core 2.0.107 → 2.0.109

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/societyApproval.ts

@@ -120,7 +120,7 @@ export function buildApprovalTemplateData(existingApproval: ISocietyApproval, st
       ECOrderCity: brand?.companyInformation?.ECOrderCity,
     },
     owner: {
-      identity: `${existingApproval?.exercice?.society?.users?.[0]?.idCivility === 1 ? 'Monsieur' : 'Madame'} ${existingApproval?.exercice?.society?.users?.[0]?.firstname} ${existingApproval?.exercice?.society?.users?.[0]?.lastname} `,
+      identity: `${existingApproval?.exercice?.society?.users?.[0]?.idCivility === 1 ? 'Monsieur' : 'Madame'} ${existingApproval?.exercice?.society?.users?.[0]?.firstname} ${existingApproval?.exercice?.society?.users?.[0]?.lastname}`,
       quality: QualityList.find(
         (ql) => ql.id === existingApproval?.exercice?.society?.users?.[0]?.businessPartners?.[0]?.idQuality,
       )?.label,
@@ -129,6 +129,10 @@ export function buildApprovalTemplateData(existingApproval: ISocietyApproval, st
     ...existingApproval,
     generatingDatas: {
       ...existingApproval?.generatingDatas,
+      regulatedConventions:
+        existingApproval?.generatingDatas?.regulatedConventions ??
+        existingApproval?.generatingDatas?.conventionsList ??
+        [],
       ...(existingApproval?.generatingDatas?.approvalDate
         ? {
             approvalDate: dayjs(existingApproval?.generatingDatas?.approvalDate)

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);
+  });
 });