@silexpert/core 2.0.120 → 2.0.122

package/ts/utils/commercialManagement/product.ts

@@ -3,7 +3,7 @@ import { IProductInvoice, ReadProductEditing } from '../../types/index.js';
 import { Unit } from '../../types/Enum/Unit.js';
 import { DiscountType, VatMarginCategyList } from '../../types/Enum/CommercialManagement.js';
 import { getById } from './vat.js';
-import { integerToFormattedAmountString } from '../amount.js';
+import { integerToFormattedAmountString, roundAmountToInteger } from '../amount.js';
 
 export function getDiscount(product: IProductInvoice): number {
   if (product.discount2 === null || product.discount2 === undefined || product.discount2 <= 0) return 0;
@@ -24,16 +24,20 @@ export function getTotalTaxExcluded(product: IProductInvoice): number {
 }
 
 export function productToReadProductEditing(payload: IProductInvoice): ReadProductEditing {
+  const totalTaxExcluded = getTotalTaxExcluded(payload);
+  const totalTaxExcludedRounded = roundAmountToInteger(totalTaxExcluded);
+
   return {
     ...payload,
-    totalTaxExcluded: getTotalTaxExcluded(payload),
+    totalTaxExcluded,
+    totalTaxExcludedRounded,
     unitFormatted: Object.values(Unit).find((unit) => unit.id === payload.unit)?.shortName ?? '',
     vatFormatted: getById(payload.idVat)?.saleName ?? '',
     priceTaxExcludedFormatted: isDefined(payload.priceTaxExcluded)
       ? integerToFormattedAmountString(payload.priceTaxExcluded)
       : null,
     totalTaxExcludedFormatted: isDefined(payload.priceTaxExcluded)
-      ? integerToFormattedAmountString(getTotalTaxExcluded(payload))
+      ? integerToFormattedAmountString(totalTaxExcludedRounded)
       : null,
     discountFormatted:
       payload.discount2 && payload.discount2 > 0 ? integerToFormattedAmountString(getDiscount(payload)) : null,

package/ts/utils/commercialManagement/vat.ts

@@ -1,6 +1,6 @@
 import { sumBy } from 'lodash-es';
 import { Vat, VatType } from '../../types/Enum/Vat.js';
-import { integerToFormattedAmountString } from '../amount.js';
+import { integerToFormattedAmountString, roundAmountToInteger } from '../amount.js';
 import { ReadProductEditing, ReadVatEditing } from '../../types/index.js';
 
 export function getAmount(amount: number | null, vatValue: number): number {
@@ -15,19 +15,17 @@ export function getById(id: number): VatType | undefined {
 
 export function vatToReadVatEditing(products: ReadProductEditing[]): ReadVatEditing {
   const { idVat } = products[0];
+  const base = sumBy(products, 'totalTaxExcludedRounded');
+  const amount = roundAmountToInteger(getAmount(base, getById(idVat)?.value ?? 0));
+
   return {
     id: idVat,
     name: getById(idVat)?.saleName ?? '',
-    amount: sumBy(products, (p) => getAmount(p.totalTaxExcluded, getById(idVat)?.value ?? 0)),
+    amount,
     value: getById(idVat)?.value ?? 0,
-    baseFormatted: integerToFormattedAmountString(
-      sumBy(products, (p) => (p.totalTaxExcluded ? +p.totalTaxExcluded : 0)),
-    ),
-    amountFormatted: integerToFormattedAmountString(
-      (sumBy(products, (p) => (p.totalTaxExcluded ? +p.totalTaxExcluded : 0)) * (getById(idVat)?.value ?? 0)) / 100,
-    ),
-    toPay:
-      (sumBy(products, (p) => (p.totalTaxExcluded ? +p.totalTaxExcluded : 0)) * (getById(idVat)?.value ?? 0)) / 100,
-    base: sumBy(products, (p) => (p.totalTaxExcluded ? +p.totalTaxExcluded : 0)),
+    baseFormatted: integerToFormattedAmountString(base),
+    amountFormatted: integerToFormattedAmountString(amount),
+    toPay: amount,
+    base,
   };
 }

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

@@ -2,6 +2,9 @@ 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';
+import { DiscountType } from '../../types/Enum/CommercialManagement.js';
+import { Unit } from '../../types/Enum/Unit.js';
+import { Vat } from '../../types/Enum/Vat.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`.
@@ -113,4 +116,96 @@ describe('generateCommercialDocument', () => {
 
     expect(result.body).not.toContain('<p>undefined</p>');
   });
+
+  test('should calculate VAT from rounded line totals after discounts and fractional quantities', () => {
+    const payload = {
+      ...payloadWithoutSellerAddress,
+      products: Array.from({ length: 6 }, (_, index) => ({
+        idVat: Vat.TX_20.id,
+        unit: Unit.ITEM.id,
+        itemSaleName: `Rounded line ${index + 1}`,
+        priceTaxExcluded: 101,
+        quantity: 1.0049,
+        discount2: 100,
+        discountType: DiscountType.PERCENT,
+        reorder: index,
+      })),
+    } as unknown as CreateInvoiceDocument;
+
+    const result = generateCommercialDocument(EstimateInvoiceType.FACTURE, payload);
+
+    expect(result.body).toContain('1,00€');
+    expect(result.data.vats).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({ base: 600, amount: 120, baseFormatted: '6,00', amountFormatted: '1,20' }),
+      ]),
+    );
+    expect(result.data.totalTaxExcluded).toBe(600);
+    expect(result.data.totalTaxIncluded).toBe(720);
+    expect(result.data.totalTaxIncludedFormatted).toBe('7,20');
+  });
+
+  test('should use the rounded half-cent line amount in the PDF and VAT recap', () => {
+    const payload = {
+      ...payloadWithoutSellerAddress,
+      products: [
+        {
+          idVat: Vat.TX_20.id,
+          unit: Unit.ITEM.id,
+          itemSaleName: 'Half-cent line',
+          priceTaxExcluded: 201,
+          quantity: 0.5,
+        },
+      ],
+    } as unknown as CreateInvoiceDocument;
+
+    const result = generateCommercialDocument(EstimateInvoiceType.FACTURE, payload);
+
+    expect(result.body).toContain('1,01€');
+    expect(result.data.products[0]).toMatchObject({
+      totalTaxExcluded: 100.5,
+      totalTaxExcludedRounded: 101,
+      totalTaxExcludedFormatted: '1,01',
+    });
+    expect(result.data.vats).toEqual(
+      expect.arrayContaining([expect.objectContaining({ base: 101, baseFormatted: '1,01' })]),
+    );
+    expect(result.data.totalTaxExcluded).toBe(101);
+    expect(result.data.totalTaxExcludedFormatted).toBe('1,01');
+  });
+
+  test('should round negative credit note lines symmetrically across VAT rates', () => {
+    const payload = {
+      ...payloadWithoutSellerAddress,
+      products: [
+        {
+          idVat: Vat.TX_5_5.id,
+          unit: Unit.ITEM.id,
+          itemSaleName: 'Half-cent VAT line',
+          priceTaxExcluded: -200,
+          quantity: 0.5,
+        },
+        {
+          idVat: Vat.TX_20.id,
+          unit: Unit.ITEM.id,
+          itemSaleName: 'Half-cent line',
+          priceTaxExcluded: -201,
+          quantity: 0.5,
+        },
+      ],
+    } as unknown as CreateInvoiceDocument;
+
+    const result = generateCommercialDocument(EstimateInvoiceType.AVOIR, payload);
+
+    expect(result.body).toContain('- 1,00€');
+    expect(result.body).toContain('- 1,01€');
+    expect(result.data.vats).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({ value: 5.5, base: -100, amount: -6, baseFormatted: '- 1,00' }),
+        expect.objectContaining({ value: 20, base: -101, amount: -20, baseFormatted: '- 1,01' }),
+      ]),
+    );
+    expect(result.data.totalTaxExcluded).toBe(-201);
+    expect(result.data.totalTaxIncluded).toBe(-227);
+  });
 });

package/ts/utils/tests/payment.spec.ts

@@ -13,7 +13,6 @@ describe('Payment', () => {
     const idSociety = 1;
     const yearlyAmountNonExpress = 1800;
     const nextYearlyAmountNonExpress = 1800;
-    const appCost = 14.9;
 
     const firstExerciceNonExpresssEndDate = dayjs().add(11, 'month').endOf('month').toDate();
     const prestationList = {
@@ -290,39 +289,6 @@ describe('Payment', () => {
     });
     // annual price increase
     // @ts-ignore
-    test('should apply annual price increase (2,75%) if signed before last 3 months of civil year', () => {
-      const mockedDate = dayjs('2024-08-15').toDate();
-      MockDate.set(mockedDate);
-
-      const newFirstExerciceNonExpresssEndDate = dayjs().add(11, 'month').endOf('month').toDate();
-
-      const payments = calculatePaymentsAuto({
-        idTypeBrand: 1,
-        firstExerciceNonExpresssEndDate: newFirstExerciceNonExpresssEndDate,
-        idPrestation,
-        prestationList,
-        idVat,
-        listPartialExercicePrestationExpress: [],
-        listRegulations: [
-          {
-            amount: 50,
-            amountUsed: 0,
-          } as IRegulation,
-        ],
-        yearlyAmountNonExpress,
-        nextYearlyAmountNonExpress,
-      });
-
-      const listNonExpressPayments = payments.filter(
-        (p) => dayjs(p.closingDate).diff(newFirstExerciceNonExpresssEndDate) === 0,
-      );
-      const firstPaymentWithTaxRateForced = listNonExpressPayments[1].amount * 1.0275;
-      // @ts-ignore
-      expect(firstPaymentWithTaxRateForced - listNonExpressPayments.splice(-2)[0].amount).toBeLessThanOrEqual(0.01); //Permet de gérer le pb d'arrondi
-
-      MockDate.reset();
-    });
-    // @ts-ignore
     test('should not apply annual price increase (2,75%) if signed in last 3 months of civil year', () => {
       const mockedDate = dayjs('2024-11-15').toDate();
       MockDate.set(mockedDate);
@@ -353,42 +319,6 @@ describe('Payment', () => {
       MockDate.reset();
     });
 
-    // @ts-ignore
-    test('should apply 14,9€ HT increase for the second exercice created (only offered on first exo) (no rules for 3 last months)', () => {
-      const mockedDate = dayjs('2024-06-15').toDate();
-      MockDate.set(mockedDate);
-
-      const newFirstExerciceNonExpresssEndDate = dayjs().add(12, 'month').endOf('month').toDate();
-
-      const payments = calculatePaymentsAuto({
-        idTypeBrand: 1,
-        firstExerciceNonExpresssEndDate: newFirstExerciceNonExpresssEndDate,
-        idPrestation,
-        prestationList,
-        idVat,
-        listPartialExercicePrestationExpress: [],
-        listRegulations: [
-          {
-            amount: 50,
-            amountUsed: 50,
-          } as IRegulation,
-        ],
-        yearlyAmountNonExpress,
-        nextYearlyAmountNonExpress,
-      });
-
-      const paymentsOfFirstExo =
-        payments.filter((p) => dayjs(p.datePayment).diff(dayjs('2025-06-01')) === 0)[0].amount ?? 0;
-      const paymentsOfSecondExo =
-        payments.filter((p) => dayjs(p.datePayment).diff(dayjs('2025-07-01')) === 0).splice(-1)[0].amount ?? 0;
-      // @ts-ignore
-      expect(
-        Math.round(100 * (paymentsOfFirstExo + getTaxesIncludedAmount(appCost, idVat) * 1.0275)) / 100,
-      ).toStrictEqual(paymentsOfSecondExo);
-
-      MockDate.reset();
-    });
-
     // misc
     // @ts-ignore
     test('should payments been generated sorted by exercices start date', () => {

package/ts/utils/validators/nestedArray.validator.ts

@@ -0,0 +1,42 @@
+import { plainToInstance } from 'class-transformer';
+import type { ClassConstructor } from 'class-transformer';
+import { registerDecorator, validateSync } from 'class-validator';
+import type { ValidationArguments, ValidationError, ValidationOptions } from 'class-validator';
+
+function getItemErrors<T extends object>(cls: ClassConstructor<T>, item: unknown): string[] {
+  if (typeof item !== 'object' || item === null) return ['must be an object'];
+
+  // Spread into a plain object: the API implicit conversion may have rebuilt the item as an Array instance
+  const errors: ValidationError[] = validateSync(plainToInstance(cls, { ...item }));
+  return errors.flatMap((error) =>
+    Object.values(error.constraints ?? {}).map((constraint) => `${error.property}: ${constraint}`),
+  );
+}
+
+// Validates each array item against `cls`. Replaces `@ValidateNested()` + `@Type()`: `@Type()` requires `reflect-metadata`
+// at runtime (breaks browser / SSR consumers), and without it the implicit conversion does not instantiate the items.
+export function ValidateNestedArrayOf<T extends object>(
+  cls: ClassConstructor<T>,
+  validationOptions?: ValidationOptions,
+) {
+  return function validator(object: object, propertyName: string) {
+    registerDecorator({
+      name: 'ValidateNestedArrayOf',
+      target: object.constructor,
+      propertyName,
+      options: validationOptions,
+      validator: {
+        validate(value: unknown) {
+          return Array.isArray(value) && value.every((item) => getItemErrors(cls, item).length === 0);
+        },
+        defaultMessage(args: ValidationArguments) {
+          if (!Array.isArray(args.value)) return `${propertyName} must be an array`;
+
+          return (args.value as unknown[])
+            .flatMap((item, index) => getItemErrors(cls, item).map((error) => `${propertyName}[${index}].${error}`))
+            .join(', ');
+        },
+      },
+    });
+  };
+}