@silexpert/core 1.1.29 → 1.1.30

package/ts/types/Enum/AdjustmentType.ts

@@ -34,9 +34,4 @@ export const AdjustmentTypeList: Array<{ id:AdjustmentTypeId; label: string; cen
     key: 'vat.deductible.toImpute',
     inputKey: 'adjustment.notEnoughDeducted',
   },
-];
-
-export const VatDeclarationMxAdjustment: Array<{ key: string; label: string; }> = [
-  { key: 'mx.collected', label: 'Opérations modifiées M-X (collecté)' },
-  { key: 'mx.deducted', label: 'Opérations modifiées M-X (déductible)' },
 ];

package/ts/types/Interface/api/cerfa/3310.ts

@@ -175,7 +175,7 @@ export interface Cerfa3310_2023 {
     ticgn?: Tic,
     ticc?: Tic,
     total?: Tic,
-  }
+  },
 }
 
 export type PayloadCerfa3310_2023 = {
@@ -187,10 +187,6 @@ export type PayloadCerfa3310_2023 = {
   isNil: boolean;
   previousVatDeclaration: Cerfa3310_2023 | null;
   sie: ServiceOfTax | null;
-  mx: {
-    collected: number;
-    deducted: number;
-  };
   comment?: string;
   taxedOperations?: {
     withdrawSuspensiveRegime?: number;

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

@@ -1,13 +1,14 @@
 import * as dayjs from 'dayjs';
 import { isDefined } from 'class-validator';
-import { round as _round } from 'lodash';
+import { round as _round, flatten } from 'lodash';
 import { IAccountingEntry } from '../../../types/Interface/models/IAccountingEntry';
 import { Cerfa3310_2023, PayloadCerfa3310_2023 } from '../../../types/Interface/api/cerfa/3310';
 import { Vat } from '../../../types/Enum/Vat';
 import { getAmountByAccountNumber, getTaxAmountByAccountNumber, textFormatting } from '../utils';
 import { AsponeFormFields, CerfaPayloadForm } from '../../../types/Interface/api/cerfa/ReadCerfa';
+import { ReadVatDeclarationUpdatedEntry } from '../../../types/Interface/api/vatDeclaration/ReadVatDeclaration';
 
-export function getCerfa3310Century23Payload(accountingEntries: IAccountingEntry[], payload: PayloadCerfa3310_2023): Cerfa3310_2023 {
+export function getCerfa3310Century23Payload(accountingEntries: IAccountingEntry[], payload: PayloadCerfa3310_2023, updatedEntries: ReadVatDeclarationUpdatedEntry[] = []): Cerfa3310_2023 {
   const shouldHaveVatCode = isDefined(payload.setting?.tvaCode) && isDefined(payload.society.siret);
   const vats = Object.values(Vat);
 
@@ -19,6 +20,27 @@ export function getCerfa3310Century23Payload(accountingEntries: IAccountingEntry
 
   const vatEntries = accountingEntries.filter((ae) => typeof ae.idVat === 'number') as Array<IAccountingEntry & { idVat: number }>;
 
+  const oldEntries = flatten(updatedEntries?.map((u) => u.old.entries));
+  const newEntries = flatten(updatedEntries?.map((u) => u.new.entries));
+
+  const collectedOldAmount = getAmountByAccountNumber(oldEntries, ['4457'], 0);
+  const collectedNewAmount = getAmountByAccountNumber(newEntries, ['4457'], 0);
+
+  const deductedOldAmount = getAmountByAccountNumber(oldEntries, ['4456'], 0);
+  const deductedNewAmount = getAmountByAccountNumber(newEntries, ['4456'], 0);
+
+  const mxCollected = collectedNewAmount - collectedOldAmount;
+  const mxDeducted = deductedNewAmount - deductedOldAmount;
+
+  let mxToAdd = 0;
+  let mxToSub = 0;
+
+  if (mxCollected > 0) { mxToAdd += mxCollected; }
+  if (mxDeducted < 0) { mxToAdd += Math.abs(mxDeducted); }
+
+  if (mxCollected < 0) { mxToSub += Math.abs(mxCollected); }
+  if (mxDeducted > 0) { mxToSub += mxDeducted; }
+
   // 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'];
@@ -82,7 +104,7 @@ export function getCerfa3310Century23Payload(accountingEntries: IAccountingEntry
   const isNil = payload.isNil === true;
   const isHolidayDeposit = payload.isHolidayDeposit === true;
 
-  const sumToAdd = isNil ? 0 : isHolidayDeposit ? (_round((payload.previousVatDeclaration?.toPay?.total ?? 0) * 0.8, 2)) : (_round(payload.vat?.sumToAdd ?? 0) + _round(payload.mx?.collected ?? 0));
+  const sumToAdd = isNil ? 0 : isHolidayDeposit ? (_round((payload.previousVatDeclaration?.toPay?.total ?? 0) * 0.8, 2)) : (_round(payload.vat?.sumToAdd ?? 0) + mxToAdd);
   const comment = isHolidayDeposit ? `ACOMPTE CONGES ${payload.comment ?? ''}` : (payload.comment ?? null);
 
   const initialPayload: Cerfa3310_2023 = {
@@ -249,7 +271,7 @@ export function getCerfa3310Century23Payload(accountingEntries: IAccountingEntry
           total: isNil || isHolidayDeposit ? 0 : otherDeductibles,
         },
         report,
-        toImpute: isNil || isHolidayDeposit ? 0 : (_round(payload.vat?.deductible?.toImpute ?? 0) + _round(payload.mx?.deducted ?? 0)),
+        toImpute: isNil || isHolidayDeposit ? 0 : (_round(payload.vat?.deductible?.toImpute ?? 0) + mxToSub),
         total: 0, // Calculé plus bas
         onImportOtherThanOilProducts: isNil || isHolidayDeposit ? 0 : otherDeductibles,
         coefficient: isNil || isHolidayDeposit ? 100 : coefficient,