@silexpert/core 1.1.40 → 1.1.41

package/ts/utils/amount.ts

@@ -47,4 +47,175 @@ export function integerToFormattedAmountObject(
     ...result,
     formattedValue: `${result.sign !== MathematicalSign.EQUAL ? `${result.sign} ` : ''}${result.integerValue},${result.centValue}`,
   };
+}
+
+/**
+ *  Convertit jusqu'à  999 999 999 999 999 (billion) *
+ * @param nombre
+ * @returns {string}
+ */
+function getUnite(nombre: number):string {
+  let unite;
+  switch (nombre) {
+    // case 0: unite = 'zéro'; break;
+    case 1: unite = 'un'; break;
+    case 2: unite = 'deux'; break;
+    case 3: unite = 'trois'; break;
+    case 4: unite = 'quatre'; break;
+    case 5: unite = 'cinq'; break;
+    case 6: unite = 'six'; break;
+    case 7: unite = 'sept'; break;
+    case 8: unite = 'huit'; break;
+    case 9: unite = 'neuf'; break;
+    default: unite = 'zéro'; break;
+  }// fin switch
+  return unite;
+}
+
+function getDizaine(nombre: number):string {
+  let dizaine;
+  switch (nombre) {
+    // case 10: dizaine = 'dix'; break;
+    case 11: dizaine = 'onze'; break;
+    case 12: dizaine = 'douze'; break;
+    case 13: dizaine = 'treize'; break;
+    case 14: dizaine = 'quatorze'; break;
+    case 15: dizaine = 'quinze'; break;
+    case 16: dizaine = 'seize'; break;
+    case 17: dizaine = 'dix-sept'; break;
+    case 18: dizaine = 'dix-huit'; break;
+    case 19: dizaine = 'dix-neuf'; break;
+    case 20: dizaine = 'vingt'; break;
+    case 30: dizaine = 'trente'; break;
+    case 40: dizaine = 'quarante'; break;
+    case 50: dizaine = 'cinquante'; break;
+    case 60: dizaine = 'soixante'; break;
+    case 70: dizaine = 'soixante-dix'; break;
+    case 80: dizaine = 'quatre-vingt'; break;
+    case 90: dizaine = 'quatre-vingt-dix'; break;
+    default: dizaine = 'dix'; break;
+  }// fin switch
+  return dizaine;
+}//-----------------------------------------------------------------------
+
+export function convertNumberToLetter(nombre: number): string {
+  let quotient: number; let reste: number;
+  let numberToLetter = '';
+
+  if (nombre.toString().replace(/ /gi, '').length > 15) return 'dépassement de capacité';
+  if (Number.isNaN(nombre.toString().replace(/ /gi, ''))) return 'Nombre non valide';
+
+  const nb = parseFloat(nombre.toString().replace(/ /gi, ''));
+  if (Math.ceil(nb) !== nb) return 'Nombre avec virgule non géré.';
+
+  const n = nb.toString().length;
+  switch (n) {
+    // case 1: numberToLetter = getUnite(nb); break;
+    case 2: if (nb > 19) {
+      quotient = Math.floor(nb / 10);
+      reste = nb % 10;
+      if (nb < 71 || (nb > 79 && nb < 91)) {
+        if (reste === 0) numberToLetter = getDizaine(quotient * 10);
+        if (reste === 1) numberToLetter = `${getDizaine(quotient * 10)}-et-${getUnite(reste)}`;
+        if (reste > 1) numberToLetter = `${getDizaine(quotient * 10)}-${getUnite(reste)}`;
+      } else numberToLetter = `${getDizaine((quotient - 1) * 10)}-${getDizaine(10 + reste)}`;
+    } else numberToLetter = getDizaine(nb);
+      break;
+    case 3: quotient = Math.floor(nb / 100);
+      reste = nb % 100;
+      if (quotient === 1 && reste === 0) numberToLetter = 'cent';
+      if (quotient === 1 && reste !== 0) numberToLetter = `${'cent '}${convertNumberToLetter(reste)}`;
+      if (quotient > 1 && reste === 0) numberToLetter = `${getUnite(quotient)} cents`;
+      if (quotient > 1 && reste !== 0) numberToLetter = `${getUnite(quotient)} cent ${convertNumberToLetter(reste)}`;
+      break;
+    case 4: quotient = Math.floor(nb / 1000);
+      reste = nb - quotient * 1000;
+      if (quotient === 1 && reste === 0) numberToLetter = 'mille';
+      if (quotient === 1 && reste !== 0) numberToLetter = `${'mille '}${convertNumberToLetter(reste)}`;
+      if (quotient > 1 && reste === 0) numberToLetter = `${convertNumberToLetter(quotient)} mille`;
+      if (quotient > 1 && reste !== 0) numberToLetter = `${convertNumberToLetter(quotient)} mille ${convertNumberToLetter(reste)}`;
+      break;
+    case 5: quotient = Math.floor(nb / 1000);
+      reste = nb - quotient * 1000;
+      if (quotient === 1 && reste === 0) numberToLetter = 'mille';
+      if (quotient === 1 && reste !== 0) numberToLetter = `${'mille '}${convertNumberToLetter(reste)}`;
+      if (quotient > 1 && reste === 0) numberToLetter = `${convertNumberToLetter(quotient)} mille`;
+      if (quotient > 1 && reste !== 0) numberToLetter = `${convertNumberToLetter(quotient)} mille ${convertNumberToLetter(reste)}`;
+      break;
+    case 6: quotient = Math.floor(nb / 1000);
+      reste = nb - quotient * 1000;
+      if (quotient === 1 && reste === 0) numberToLetter = 'mille';
+      if (quotient === 1 && reste !== 0) numberToLetter = `${'mille '}${convertNumberToLetter(reste)}`;
+      if (quotient > 1 && reste === 0) numberToLetter = `${convertNumberToLetter(quotient)} mille`;
+      if (quotient > 1 && reste !== 0) numberToLetter = `${convertNumberToLetter(quotient)} mille ${convertNumberToLetter(reste)}`;
+      break;
+    case 7: quotient = Math.floor(nb / 1000000);
+      reste = nb % 1000000;
+      if (quotient === 1 && reste === 0) numberToLetter = 'un million';
+      if (quotient === 1 && reste !== 0) numberToLetter = `${'un million '}${convertNumberToLetter(reste)}`;
+      if (quotient > 1 && reste === 0) numberToLetter = `${convertNumberToLetter(quotient)} millions`;
+      if (quotient > 1 && reste !== 0) numberToLetter = `${convertNumberToLetter(quotient)} millions ${convertNumberToLetter(reste)}`;
+      break;
+    case 8: quotient = Math.floor(nb / 1000000);
+      reste = nb % 1000000;
+      if (quotient === 1 && reste === 0) numberToLetter = 'un million';
+      if (quotient === 1 && reste !== 0) numberToLetter = `${'un million '}${convertNumberToLetter(reste)}`;
+      if (quotient > 1 && reste === 0) numberToLetter = `${convertNumberToLetter(quotient)} millions`;
+      if (quotient > 1 && reste !== 0) numberToLetter = `${convertNumberToLetter(quotient)} millions ${convertNumberToLetter(reste)}`;
+      break;
+    case 9: quotient = Math.floor(nb / 1000000);
+      reste = nb % 1000000;
+      if (quotient === 1 && reste === 0) numberToLetter = 'un million';
+      if (quotient === 1 && reste !== 0) numberToLetter = `${'un million '}${convertNumberToLetter(reste)}`;
+      if (quotient > 1 && reste === 0) numberToLetter = `${convertNumberToLetter(quotient)} millions`;
+      if (quotient > 1 && reste !== 0) numberToLetter = `${convertNumberToLetter(quotient)} millions ${convertNumberToLetter(reste)}`;
+      break;
+    case 10: quotient = Math.floor(nb / 1000000000);
+      reste = nb - quotient * 1000000000;
+      if (quotient === 1 && reste === 0) numberToLetter = 'un milliard';
+      if (quotient === 1 && reste !== 0) numberToLetter = `${'un milliard '}${convertNumberToLetter(reste)}`;
+      if (quotient > 1 && reste === 0) numberToLetter = `${convertNumberToLetter(quotient)} milliards`;
+      if (quotient > 1 && reste !== 0) numberToLetter = `${convertNumberToLetter(quotient)} milliards ${convertNumberToLetter(reste)}`;
+      break;
+    case 11: quotient = Math.floor(nb / 1000000000);
+      reste = nb - quotient * 1000000000;
+      if (quotient === 1 && reste === 0) numberToLetter = 'un milliard';
+      if (quotient === 1 && reste !== 0) numberToLetter = `${'un milliard '}${convertNumberToLetter(reste)}`;
+      if (quotient > 1 && reste === 0) numberToLetter = `${convertNumberToLetter(quotient)} milliards`;
+      if (quotient > 1 && reste !== 0) numberToLetter = `${convertNumberToLetter(quotient)} milliards ${convertNumberToLetter(reste)}`;
+      break;
+    case 12: quotient = Math.floor(nb / 1000000000);
+      reste = nb - quotient * 1000000000;
+      if (quotient === 1 && reste === 0) numberToLetter = 'un milliard';
+      if (quotient === 1 && reste !== 0) numberToLetter = `${'un milliard '}${convertNumberToLetter(reste)}`;
+      if (quotient > 1 && reste === 0) numberToLetter = `${convertNumberToLetter(quotient)} milliards`;
+      if (quotient > 1 && reste !== 0) numberToLetter = `${convertNumberToLetter(quotient)} milliards ${convertNumberToLetter(reste)}`;
+      break;
+    case 13: quotient = Math.floor(nb / 1000000000000);
+      reste = nb - quotient * 1000000000000;
+      if (quotient === 1 && reste === 0) numberToLetter = 'un billion';
+      if (quotient === 1 && reste !== 0) numberToLetter = `${'un billion '}${convertNumberToLetter(reste)}`;
+      if (quotient > 1 && reste === 0) numberToLetter = `${convertNumberToLetter(quotient)} billions`;
+      if (quotient > 1 && reste !== 0) numberToLetter = `${convertNumberToLetter(quotient)} billions ${convertNumberToLetter(reste)}`;
+      break;
+    case 14: quotient = Math.floor(nb / 1000000000000);
+      reste = nb - quotient * 1000000000000;
+      if (quotient === 1 && reste === 0) numberToLetter = 'un billion';
+      if (quotient === 1 && reste !== 0) numberToLetter = `${'un billion '}${convertNumberToLetter(reste)}`;
+      if (quotient > 1 && reste === 0) numberToLetter = `${convertNumberToLetter(quotient)} billions`;
+      if (quotient > 1 && reste !== 0) numberToLetter = `${convertNumberToLetter(quotient)} billions ${convertNumberToLetter(reste)}`;
+      break;
+    case 15: quotient = Math.floor(nb / 1000000000000);
+      reste = nb - quotient * 1000000000000;
+      if (quotient === 1 && reste === 0) numberToLetter = 'un billion';
+      if (quotient === 1 && reste !== 0) numberToLetter = `${'un billion '}${convertNumberToLetter(reste)}`;
+      if (quotient > 1 && reste === 0) numberToLetter = `${convertNumberToLetter(quotient)} billions`;
+      if (quotient > 1 && reste !== 0) numberToLetter = `${convertNumberToLetter(quotient)} billions ${convertNumberToLetter(reste)}`;
+      break;
+    default: numberToLetter = getUnite(nb); break;
+  } // fin switch
+  /* respect de l'accord de quatre-vingt */
+  if (numberToLetter.substr(numberToLetter.length - 'quatre-vingt'.length, 'quatre-vingt'.length) === 'quatre-vingt') numberToLetter += 's';
+
+  return numberToLetter;
 }

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

@@ -43,7 +43,7 @@ export function getCerfa3310Century23Payload(accountingEntries: IAccountingEntry
   if (mxCollected < 0) { mxToSub += Math.abs(mxCollected); }
   if (mxDeducted > 0) { mxToSub += mxDeducted; }
 
-  // Opérations taxées
+  // 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));
@@ -54,12 +54,14 @@ 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 taxedIntracommunityAcquisitions = setZeroIfIsNegative(getAmountByAccountNumber(vatEntries.filter((ae) => intracomVat.includes(ae.idVat) && withTaxVat.includes(ae.idVat)), ['601', '602', '603', '605', '606', '607'], 0, true));
+
+  const intracommunityAccounts2 = ['601', '602', '603', '605', '606', '607'];
+  const taxedIntracommunityAcquisitions = setZeroIfIsNegative(getAmountByAccountNumber(vatEntries.filter((ae) => intracomVat.includes(ae.idVat) && withTaxVat.includes(ae.idVat)), intracommunityAccounts2, 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)), ['7'], 0, true));
   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)), ['601', '602', '603', '605', '606', '607'], 0, true));
+  const untaxedIntracomunity = setZeroIfIsNegative(getAmountByAccountNumber(vatEntries.filter((ae) => intracomVat.includes(ae.idVat) && withoutTaxVat.includes(ae.idVat)), intracommunityAccounts2, 0, true));
   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)
@@ -95,7 +97,7 @@ export function getCerfa3310Century23Payload(accountingEntries: IAccountingEntry
   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));
+  const intracommunityTax = setZeroIfIsNegative(getTaxAmountByAccountNumber(intracommunityServiceEntries, [...intracommunityServiceAccounts, ...intracommunityAccounts2]));
 
   // TVA Déductible
   const immobilizationTax = setZeroIfIsNegative(getTaxAmountByAccountNumber(vatEntries, ['2']));