npm - @silexpert/core - Versions diffs - 1.1.311 → 1.1.313 - Mend

@silexpert/core 1.1.311 → 1.1.313

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (1885) hide show

package/dist/cjs/utils/vat/3310/century23.js CHANGED Viewed

@@ -7,8 +7,7 @@ const lodash_1 = require("lodash");
 const Vat_1 = require("../../../types/Enum/Vat");
 const utils_1 = require("../utils");
 function getCerfa3310Century23Payload(accountingEntries, payload, updatedEntries = []) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, _61, _62, _63, _64, _65, _66, _67, _68, _69, _70, _71, _72, _73, _74, _75, _76, _77, _78, _79, _80, _81, _82, _83, _84, _85, _86, _87, _88, _89, _90, _91, _92, _93, _94, _95, _96, _97, _98, _99, _100, _101, _102, _103, _104, _105, _106, _107, _108, _109, _110, _111, _112, _113, _114, _115, _116, _117, _118, _119, _120, _121, _122, _123, _124, _125, _126, _127, _128, _129, _130, _131, _132, _133, _134, _135, _136, _137, _138, _139, _140, _141, _142, _143, _144, _145, _146, _147, _148, _149, _150, _151, _152, _153, _154, _155, _156, _157, _158, _159, _160, _161, _162, _163, _164, _165, _166, _167, _168, _169, _170, _171, _172, _173, _174, _175, _176, _177, _178, _179, _180, _181, _182, _183, _184, _185, _186, _187, _188, _189, _190, _191, _192, _193, _194, _195, _196, _197, _198, _199, _200, _201, _202, _203, _204, _205, _206, _207, _208, _209, _210, _211, _212, _213, _214, _215, _216, _217, _218, _219, _220, _221, _222, _223, _224, _225, _226, _227, _228, _229, _230, _231, _232, _233, _234, _235, _236, _237;
-    const shouldHaveVatCode = (0, class_validator_1.isDefined)((_a = payload.setting) === null || _a === void 0 ? void 0 : _a.tvaCode) && (0, class_validator_1.isDefined)(payload.society.siret);
+    const shouldHaveVatCode = (0, class_validator_1.isDefined)(payload.setting?.tvaCode) && (0, class_validator_1.isDefined)(payload.society.siret);
     const vats = Object.values(Vat_1.Vat);
     const frenchVat = vats.filter((v) => !v.isVatImportation && !v.isVatIntracom).map((v) => v.id);
     const withTaxVat = vats.filter((v) => v.value > 0).map((v) => v.id);
@@ -16,8 +15,8 @@ function getCerfa3310Century23Payload(accountingEntries, payload, updatedEntries
     const withoutTaxVat = vats.filter((v) => v.value === 0).map((v) => v.id);
     const importationVat = vats.filter((v) => v.isVatImportation && !v.isVatIntracom).map((v) => v.id);
     const vatEntries = (0, lodash_1.uniqBy)(accountingEntries.filter((ae) => typeof ae.idVat === 'number'), 'id');
-    const oldEntries = (0, lodash_1.flatten)(updatedEntries === null || updatedEntries === void 0 ? void 0 : updatedEntries.map((u) => u.old));
-    const newEntries = (0, lodash_1.flatten)(updatedEntries === null || updatedEntries === void 0 ? void 0 : updatedEntries.map((u) => u.new));
+    const oldEntries = (0, lodash_1.flatten)(updatedEntries?.map((u) => u.old));
+    const newEntries = (0, lodash_1.flatten)(updatedEntries?.map((u) => u.new));
     const collectedOldAmount = (0, utils_1.getAmountByAccountNumber)(oldEntries, ['4457'], 0, true);
     const collectedNewAmount = (0, utils_1.getAmountByAccountNumber)(newEntries, ['4457'], 0, true);
     const deductedOldAmount = (0, utils_1.getAmountByAccountNumber)(oldEntries, ['4456'], 0);
@@ -41,62 +40,62 @@ function getCerfa3310Century23Payload(accountingEntries, payload, updatedEntries
     // 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 = (0, utils_1.setZeroIfIsNegative)((0, utils_1.getAmountByAccountNumber)(taxedServicesEntries, servicesAccounts, 0, true)) + ((_d = (_c = (_b = payload === null || payload === void 0 ? void 0 : payload.vatControl) === null || _b === void 0 ? void 0 : _b.france) === null || _c === void 0 ? void 0 : _c.base20) !== null && _d !== void 0 ? _d : 0) + ((_g = (_f = (_e = payload === null || payload === void 0 ? void 0 : payload.vatControl) === null || _e === void 0 ? void 0 : _e.france) === null || _f === void 0 ? void 0 : _f.base10) !== null && _g !== void 0 ? _g : 0) + ((_k = (_j = (_h = payload === null || payload === void 0 ? void 0 : payload.vatControl) === null || _h === void 0 ? void 0 : _h.france) === null || _j === void 0 ? void 0 : _j.base8Dot5) !== null && _k !== void 0 ? _k : 0) + ((_o = (_m = (_l = payload === null || payload === void 0 ? void 0 : payload.vatControl) === null || _l === void 0 ? void 0 : _l.france) === null || _m === void 0 ? void 0 : _m.base5Dot5) !== null && _o !== void 0 ? _o : 0) + ((_r = (_q = (_p = payload === null || payload === void 0 ? void 0 : payload.vatControl) === null || _p === void 0 ? void 0 : _p.france) === null || _q === void 0 ? void 0 : _q.base2Dot1) !== null && _r !== void 0 ? _r : 0);
-    const taxedOther = (0, utils_1.setZeroIfIsNegative)((0, utils_1.getAmountByAccountNumber)(vatEntries.filter((ae) => withTaxVat.includes(ae.idVat)), ['775'], 0, true)) + ((_u = (_t = (_s = payload === null || payload === void 0 ? void 0 : payload.vatControl) === null || _s === void 0 ? void 0 : _s.other) === null || _t === void 0 ? void 0 : _t.base20) !== null && _u !== void 0 ? _u : 0) + ((_x = (_w = (_v = payload === null || payload === void 0 ? void 0 : payload.vatControl) === null || _v === void 0 ? void 0 : _v.other) === null || _w === void 0 ? void 0 : _w.base10) !== null && _x !== void 0 ? _x : 0) + ((_0 = (_z = (_y = payload === null || payload === void 0 ? void 0 : payload.vatControl) === null || _y === void 0 ? void 0 : _y.other) === null || _z === void 0 ? void 0 : _z.base5Dot5) !== null && _0 !== void 0 ? _0 : 0) + ((_3 = (_2 = (_1 = payload === null || payload === void 0 ? void 0 : payload.vatControl) === null || _1 === void 0 ? void 0 : _1.other) === null || _2 === void 0 ? void 0 : _2.base2Dot1) !== null && _3 !== void 0 ? _3 : 0);
+    const taxedServicesFromFrance = (0, utils_1.setZeroIfIsNegative)((0, utils_1.getAmountByAccountNumber)(taxedServicesEntries, servicesAccounts, 0, true)) + (payload?.vatControl?.france?.base20 ?? 0) + (payload?.vatControl?.france?.base10 ?? 0) + (payload?.vatControl?.france?.base8Dot5 ?? 0) + (payload?.vatControl?.france?.base5Dot5 ?? 0) + (payload?.vatControl?.france?.base2Dot1 ?? 0);
+    const taxedOther = (0, utils_1.setZeroIfIsNegative)((0, utils_1.getAmountByAccountNumber)(vatEntries.filter((ae) => withTaxVat.includes(ae.idVat)), ['775'], 0, true)) + (payload?.vatControl?.other?.base20 ?? 0) + (payload?.vatControl?.other?.base10 ?? 0) + (payload?.vatControl?.other?.base5Dot5 ?? 0) + (payload?.vatControl?.other?.base2Dot1 ?? 0);
     const intracommunityServiceAccounts = ['604', '611', '612', '613', '614', '615', '616', '617', '618', '619', '62'];
     const intracommunityServiceEntries = vatEntries.filter((ae) => withTaxVat.includes(ae.idVat) && intracomVat.includes(ae.idVat));
     // Case A3
     const taxedPurchaseOfIntracommunityService = 0; /* setZeroIfIsNegative(getAmountByAccountNumber(intracommunityServiceEntries, intracommunityServiceAccounts, 0, true)); */
     const taxedImportEntries = vatEntries.filter((ae) => importationVat.includes(ae.idVat) && withTaxVat.includes(ae.idVat));
     const taxedImportAccounts = ['6'];
-    const taxedImport = (0, utils_1.setZeroIfIsNegative)((0, utils_1.getAmountByAccountNumber)(taxedImportEntries, taxedImportAccounts, 0, true)) + ((_6 = (_5 = (_4 = payload === null || payload === void 0 ? void 0 : payload.vatControl) === null || _4 === void 0 ? void 0 : _4.importations) === null || _5 === void 0 ? void 0 : _5.base20) !== null && _6 !== void 0 ? _6 : 0) + ((_9 = (_8 = (_7 = payload === null || payload === void 0 ? void 0 : payload.vatControl) === null || _7 === void 0 ? void 0 : _7.importations) === null || _8 === void 0 ? void 0 : _8.base10) !== null && _9 !== void 0 ? _9 : 0) + ((_12 = (_11 = (_10 = payload === null || payload === void 0 ? void 0 : payload.vatControl) === null || _10 === void 0 ? void 0 : _10.importations) === null || _11 === void 0 ? void 0 : _11.base8Dot5) !== null && _12 !== void 0 ? _12 : 0) + ((_15 = (_14 = (_13 = payload === null || payload === void 0 ? void 0 : payload.vatControl) === null || _13 === void 0 ? void 0 : _13.importations) === null || _14 === void 0 ? void 0 : _14.base5Dot5) !== null && _15 !== void 0 ? _15 : 0) + ((_18 = (_17 = (_16 = payload === null || payload === void 0 ? void 0 : payload.vatControl) === null || _16 === void 0 ? void 0 : _16.importations) === null || _17 === void 0 ? void 0 : _17.base2Dot1) !== null && _18 !== void 0 ? _18 : 0);
+    const taxedImport = (0, utils_1.setZeroIfIsNegative)((0, utils_1.getAmountByAccountNumber)(taxedImportEntries, taxedImportAccounts, 0, true)) + (payload?.vatControl?.importations?.base20 ?? 0) + (payload?.vatControl?.importations?.base10 ?? 0) + (payload?.vatControl?.importations?.base8Dot5 ?? 0) + (payload?.vatControl?.importations?.base5Dot5 ?? 0) + (payload?.vatControl?.importations?.base2Dot1 ?? 0);
     const intracommunityAccounts2 = ['601', '602', '603', '605', '606', '607', '651'];
     const taxedIntracommunityAcquisitions = (0, utils_1.getAmountByAccountNumber)(vatEntries.filter((ae) => intracomVat.includes(ae.idVat) && withTaxVat.includes(ae.idVat)), [...intracommunityAccounts2, ...intracommunityServiceAccounts], 0, true);
     // Opérations non taxées
-    const untaxedExportationNotInEurope = (0, utils_1.setZeroIfIsNegative)((0, utils_1.getAmountByAccountNumber)(vatEntries.filter((ae) => importationVat.includes(ae.idVat) && withoutTaxVat.includes(ae.idVat)), servicesAccounts, 0, true)) + ((_21 = (_20 = (_19 = payload === null || payload === void 0 ? void 0 : payload.vatControl) === null || _19 === void 0 ? void 0 : _19.untaxed) === null || _20 === void 0 ? void 0 : _20.exportation) !== null && _21 !== void 0 ? _21 : 0);
-    const untaxedOther = (0, utils_1.setZeroIfIsNegative)((0, utils_1.getAmountByAccountNumber)(vatEntries.filter((ae) => frenchVat.includes(ae.idVat) && withoutTaxVat.includes(ae.idVat)), ['70', '71', '72', '73', '75', '77', '78', '790', '792', '793', '794', '795', '796', '797', '798', '799'], 0, true)) + ((_24 = (_23 = (_22 = payload === null || payload === void 0 ? void 0 : payload.vatControl) === null || _22 === void 0 ? void 0 : _22.untaxed) === null || _23 === void 0 ? void 0 : _23.other) !== null && _24 !== void 0 ? _24 : 0); // 02/08/23 - ne plus prendre en compte les comptes 76,74,791 - Chloé R.
-    const untaxedImport = (0, utils_1.setZeroIfIsNegative)((0, utils_1.getAmountByAccountNumber)(vatEntries.filter((ae) => importationVat.includes(ae.idVat) && withoutTaxVat.includes(ae.idVat)), ['6'], 0, true)) + ((_27 = (_26 = (_25 = payload === null || payload === void 0 ? void 0 : payload.vatControl) === null || _25 === void 0 ? void 0 : _25.untaxed) === null || _26 === void 0 ? void 0 : _26.importation) !== null && _27 !== void 0 ? _27 : 0);
-    const untaxedIntracomunity = (0, utils_1.setZeroIfIsNegative)((0, utils_1.getAmountByAccountNumber)(vatEntries.filter((ae) => intracomVat.includes(ae.idVat) && withoutTaxVat.includes(ae.idVat)), intracommunityAccounts2, 0, true)) + ((_30 = (_29 = (_28 = payload === null || payload === void 0 ? void 0 : payload.vatControl) === null || _28 === void 0 ? void 0 : _28.untaxed) === null || _29 === void 0 ? void 0 : _29.intracomunity) !== null && _30 !== void 0 ? _30 : 0);
+    const untaxedExportationNotInEurope = (0, utils_1.setZeroIfIsNegative)((0, utils_1.getAmountByAccountNumber)(vatEntries.filter((ae) => importationVat.includes(ae.idVat) && withoutTaxVat.includes(ae.idVat)), servicesAccounts, 0, true)) + (payload?.vatControl?.untaxed?.exportation ?? 0);
+    const untaxedOther = (0, utils_1.setZeroIfIsNegative)((0, utils_1.getAmountByAccountNumber)(vatEntries.filter((ae) => frenchVat.includes(ae.idVat) && withoutTaxVat.includes(ae.idVat)), ['70', '71', '72', '73', '75', '77', '78', '790', '792', '793', '794', '795', '796', '797', '798', '799'], 0, true)) + (payload?.vatControl?.untaxed?.other ?? 0); // 02/08/23 - ne plus prendre en compte les comptes 76,74,791 - Chloé R.
+    const untaxedImport = (0, utils_1.setZeroIfIsNegative)((0, utils_1.getAmountByAccountNumber)(vatEntries.filter((ae) => importationVat.includes(ae.idVat) && withoutTaxVat.includes(ae.idVat)), ['6'], 0, true)) + (payload?.vatControl?.untaxed?.importation ?? 0);
+    const untaxedIntracomunity = (0, utils_1.setZeroIfIsNegative)((0, utils_1.getAmountByAccountNumber)(vatEntries.filter((ae) => intracomVat.includes(ae.idVat) && withoutTaxVat.includes(ae.idVat)), intracommunityAccounts2, 0, true)) + (payload?.vatControl?.untaxed?.intracomunity ?? 0);
     const untaxedIntracommunityDelivery = (0, utils_1.setZeroIfIsNegative)((0, utils_1.getAmountByAccountNumber)(vatEntries.filter((ae) => withoutTaxVat.includes(ae.idVat) && intracomVat.includes(ae.idVat)), ['701', '707'], 0, true));
     // TVA brute
     const normalRate = (0, utils_1.setZeroIfIsNegative)((0, utils_1.getAmountByAccountNumber)(taxedServicesEntries.filter((e) => vats.filter((v) => v.value === 20).map((v) => v.id).includes(e.idVat)), servicesAccounts, 0, true)
-        + (0, utils_1.getAmountByAccountNumber)(intracommunityServiceEntries.filter((e) => vats.filter((v) => v.value === 20).map((v) => v.id).includes(e.idVat)), ['6'], 0, true)) + ((_33 = (_32 = (_31 = payload === null || payload === void 0 ? void 0 : payload.vatControl) === null || _31 === void 0 ? void 0 : _31.france) === null || _32 === void 0 ? void 0 : _32.base20) !== null && _33 !== void 0 ? _33 : 0) + ((_36 = (_35 = (_34 = payload === null || payload === void 0 ? void 0 : payload.vatControl) === null || _34 === void 0 ? void 0 : _34.other) === null || _35 === void 0 ? void 0 : _35.base20) !== null && _36 !== void 0 ? _36 : 0);
+        + (0, utils_1.getAmountByAccountNumber)(intracommunityServiceEntries.filter((e) => vats.filter((v) => v.value === 20).map((v) => v.id).includes(e.idVat)), ['6'], 0, true)) + (payload?.vatControl?.france?.base20 ?? 0) + (payload?.vatControl?.other?.base20 ?? 0);
     const normalRateTax = (0, lodash_1.round)(normalRate * 0.2);
     const reducedRate5Dot5 = (0, utils_1.setZeroIfIsNegative)((0, utils_1.getAmountByAccountNumber)(taxedServicesEntries.filter((e) => vats.filter((v) => v.value === 5.5).map((v) => v.id).includes(e.idVat)), servicesAccounts, 0, true)
-        + (0, utils_1.getAmountByAccountNumber)(intracommunityServiceEntries.filter((e) => vats.filter((v) => v.value === 5.5).map((v) => v.id).includes(e.idVat)), ['6'], 0, true)) + ((_39 = (_38 = (_37 = payload === null || payload === void 0 ? void 0 : payload.vatControl) === null || _37 === void 0 ? void 0 : _37.france) === null || _38 === void 0 ? void 0 : _38.base5Dot5) !== null && _39 !== void 0 ? _39 : 0) + ((_42 = (_41 = (_40 = payload === null || payload === void 0 ? void 0 : payload.vatControl) === null || _40 === void 0 ? void 0 : _40.other) === null || _41 === void 0 ? void 0 : _41.base5Dot5) !== null && _42 !== void 0 ? _42 : 0);
+        + (0, utils_1.getAmountByAccountNumber)(intracommunityServiceEntries.filter((e) => vats.filter((v) => v.value === 5.5).map((v) => v.id).includes(e.idVat)), ['6'], 0, true)) + (payload?.vatControl?.france?.base5Dot5 ?? 0) + (payload?.vatControl?.other?.base5Dot5 ?? 0);
     const reducedRate5Dot5Tax = (0, lodash_1.round)(reducedRate5Dot5 * 0.055);
     const reducedRate10 = (0, utils_1.setZeroIfIsNegative)((0, utils_1.getAmountByAccountNumber)(taxedServicesEntries.filter((e) => vats.filter((v) => v.value === 10).map((v) => v.id).includes(e.idVat)), servicesAccounts, 0, true)
-        + (0, utils_1.getAmountByAccountNumber)(intracommunityServiceEntries.filter((e) => vats.filter((v) => v.value === 10).map((v) => v.id).includes(e.idVat)), ['6'], 0, true)) + ((_45 = (_44 = (_43 = payload === null || payload === void 0 ? void 0 : payload.vatControl) === null || _43 === void 0 ? void 0 : _43.france) === null || _44 === void 0 ? void 0 : _44.base10) !== null && _45 !== void 0 ? _45 : 0) + ((_48 = (_47 = (_46 = payload === null || payload === void 0 ? void 0 : payload.vatControl) === null || _46 === void 0 ? void 0 : _46.other) === null || _47 === void 0 ? void 0 : _47.base10) !== null && _48 !== void 0 ? _48 : 0);
+        + (0, utils_1.getAmountByAccountNumber)(intracommunityServiceEntries.filter((e) => vats.filter((v) => v.value === 10).map((v) => v.id).includes(e.idVat)), ['6'], 0, true)) + (payload?.vatControl?.france?.base10 ?? 0) + (payload?.vatControl?.other?.base10 ?? 0);
     const reducedRate10Tax = (0, lodash_1.round)(reducedRate10 * 0.1);
     const reducedRate8Dot5 = (0, utils_1.setZeroIfIsNegative)((0, utils_1.getAmountByAccountNumber)(taxedServicesEntries.filter((e) => vats.filter((v) => v.value === 8.5).map((v) => v.id).includes(e.idVat)), servicesAccounts, 0, true)
-        + (0, utils_1.getAmountByAccountNumber)(intracommunityServiceEntries.filter((e) => vats.filter((v) => v.value === 8.5).map((v) => v.id).includes(e.idVat)), ['6'], 0, true)) + ((_51 = (_50 = (_49 = payload === null || payload === void 0 ? void 0 : payload.vatControl) === null || _49 === void 0 ? void 0 : _49.france) === null || _50 === void 0 ? void 0 : _50.base8Dot5) !== null && _51 !== void 0 ? _51 : 0) + ((_54 = (_53 = (_52 = payload === null || payload === void 0 ? void 0 : payload.vatControl) === null || _52 === void 0 ? void 0 : _52.other) === null || _53 === void 0 ? void 0 : _53.base5Dot5) !== null && _54 !== void 0 ? _54 : 0);
+        + (0, utils_1.getAmountByAccountNumber)(intracommunityServiceEntries.filter((e) => vats.filter((v) => v.value === 8.5).map((v) => v.id).includes(e.idVat)), ['6'], 0, true)) + (payload?.vatControl?.france?.base8Dot5 ?? 0) + (payload?.vatControl?.other?.base5Dot5 ?? 0);
     const reducedRate8Dot5Tax = (0, lodash_1.round)(reducedRate8Dot5 * 0.085);
     const reducedRate2Dot1 = (0, utils_1.setZeroIfIsNegative)((0, utils_1.getAmountByAccountNumber)(taxedServicesEntries.filter((e) => vats.filter((v) => v.value === 2.1).map((v) => v.id).includes(e.idVat)), servicesAccounts, 0, true)
-        + (0, utils_1.getAmountByAccountNumber)(intracommunityServiceEntries.filter((e) => vats.filter((v) => v.value === 2.1).map((v) => v.id).includes(e.idVat)), ['6'], 0, true)) + ((_57 = (_56 = (_55 = payload === null || payload === void 0 ? void 0 : payload.vatControl) === null || _55 === void 0 ? void 0 : _55.france) === null || _56 === void 0 ? void 0 : _56.base2Dot1) !== null && _57 !== void 0 ? _57 : 0) + ((_60 = (_59 = (_58 = payload === null || payload === void 0 ? void 0 : payload.vatControl) === null || _58 === void 0 ? void 0 : _58.other) === null || _59 === void 0 ? void 0 : _59.base2Dot1) !== null && _60 !== void 0 ? _60 : 0);
+        + (0, utils_1.getAmountByAccountNumber)(intracommunityServiceEntries.filter((e) => vats.filter((v) => v.value === 2.1).map((v) => v.id).includes(e.idVat)), ['6'], 0, true)) + (payload?.vatControl?.france?.base2Dot1 ?? 0) + (payload?.vatControl?.other?.base2Dot1 ?? 0);
     const reducedRate2Dot1Tax = (0, lodash_1.round)(reducedRate2Dot1 * 0.021);
-    const importNormalRate = (0, utils_1.setZeroIfIsNegative)((0, utils_1.getAmountByAccountNumber)(taxedImportEntries.filter((e) => vats.filter((v) => v.value === 20).map((v) => v.id).includes(e.idVat)), taxedImportAccounts, 0, true)) + ((_63 = (_62 = (_61 = payload === null || payload === void 0 ? void 0 : payload.vatControl) === null || _61 === void 0 ? void 0 : _61.importations) === null || _62 === void 0 ? void 0 : _62.base20) !== null && _63 !== void 0 ? _63 : 0);
+    const importNormalRate = (0, utils_1.setZeroIfIsNegative)((0, utils_1.getAmountByAccountNumber)(taxedImportEntries.filter((e) => vats.filter((v) => v.value === 20).map((v) => v.id).includes(e.idVat)), taxedImportAccounts, 0, true)) + (payload?.vatControl?.importations?.base20 ?? 0);
     const importNormalRateTax = (0, lodash_1.round)(importNormalRate * 0.2);
-    const importReducedRate10 = (0, utils_1.setZeroIfIsNegative)((0, utils_1.getAmountByAccountNumber)(taxedImportEntries.filter((e) => vats.filter((v) => v.value === 10).map((v) => v.id).includes(e.idVat)), taxedImportAccounts, 0, true)) + ((_66 = (_65 = (_64 = payload === null || payload === void 0 ? void 0 : payload.vatControl) === null || _64 === void 0 ? void 0 : _64.importations) === null || _65 === void 0 ? void 0 : _65.base10) !== null && _66 !== void 0 ? _66 : 0);
+    const importReducedRate10 = (0, utils_1.setZeroIfIsNegative)((0, utils_1.getAmountByAccountNumber)(taxedImportEntries.filter((e) => vats.filter((v) => v.value === 10).map((v) => v.id).includes(e.idVat)), taxedImportAccounts, 0, true)) + (payload?.vatControl?.importations?.base10 ?? 0);
     const importReducedRate10Tax = (0, lodash_1.round)(importReducedRate10 * 0.1);
-    const importReducedRate8Dot5 = (0, utils_1.setZeroIfIsNegative)((0, utils_1.getAmountByAccountNumber)(taxedImportEntries.filter((e) => vats.filter((v) => v.value === 8.5).map((v) => v.id).includes(e.idVat)), taxedImportAccounts, 0, true)) + ((_69 = (_68 = (_67 = payload === null || payload === void 0 ? void 0 : payload.vatControl) === null || _67 === void 0 ? void 0 : _67.importations) === null || _68 === void 0 ? void 0 : _68.base8Dot5) !== null && _69 !== void 0 ? _69 : 0);
+    const importReducedRate8Dot5 = (0, utils_1.setZeroIfIsNegative)((0, utils_1.getAmountByAccountNumber)(taxedImportEntries.filter((e) => vats.filter((v) => v.value === 8.5).map((v) => v.id).includes(e.idVat)), taxedImportAccounts, 0, true)) + (payload?.vatControl?.importations?.base8Dot5 ?? 0);
     const importReducedRate8Dot5Tax = (0, lodash_1.round)(importReducedRate8Dot5 * 0.085);
-    const importReducedRate5Dot5 = (0, utils_1.setZeroIfIsNegative)((0, utils_1.getAmountByAccountNumber)(taxedImportEntries.filter((e) => vats.filter((v) => v.value === 5.5).map((v) => v.id).includes(e.idVat)), taxedImportAccounts, 0, true)) + ((_72 = (_71 = (_70 = payload === null || payload === void 0 ? void 0 : payload.vatControl) === null || _70 === void 0 ? void 0 : _70.importations) === null || _71 === void 0 ? void 0 : _71.base5Dot5) !== null && _72 !== void 0 ? _72 : 0);
+    const importReducedRate5Dot5 = (0, utils_1.setZeroIfIsNegative)((0, utils_1.getAmountByAccountNumber)(taxedImportEntries.filter((e) => vats.filter((v) => v.value === 5.5).map((v) => v.id).includes(e.idVat)), taxedImportAccounts, 0, true)) + (payload?.vatControl?.importations?.base5Dot5 ?? 0);
     const importReducedRate5Dot5Tax = (0, lodash_1.round)(importReducedRate8Dot5 * 0.055);
-    const importReducedRate2Dot1 = (0, utils_1.setZeroIfIsNegative)((0, utils_1.getAmountByAccountNumber)(taxedImportEntries.filter((e) => vats.filter((v) => v.value === 2.1).map((v) => v.id).includes(e.idVat)), taxedImportAccounts, 0, true)) + ((_75 = (_74 = (_73 = payload === null || payload === void 0 ? void 0 : payload.vatControl) === null || _73 === void 0 ? void 0 : _73.importations) === null || _74 === void 0 ? void 0 : _74.base2Dot1) !== null && _75 !== void 0 ? _75 : 0);
+    const importReducedRate2Dot1 = (0, utils_1.setZeroIfIsNegative)((0, utils_1.getAmountByAccountNumber)(taxedImportEntries.filter((e) => vats.filter((v) => v.value === 2.1).map((v) => v.id).includes(e.idVat)), taxedImportAccounts, 0, true)) + (payload?.vatControl?.importations?.base2Dot1 ?? 0);
     const importReducedRate2Dot1Tax = (0, lodash_1.round)(importReducedRate2Dot1 * 0.021);
     const importReducedRate1Dot05 = (0, utils_1.setZeroIfIsNegative)((0, utils_1.getAmountByAccountNumber)(taxedImportEntries.filter((e) => vats.filter((v) => v.value === 1.05).map((v) => v.id).includes(e.idVat)), taxedImportAccounts, 0, true));
     const importReducedRate1Dot05Tax = (0, lodash_1.round)(importReducedRate1Dot05 * 0.0105);
     const intracommunityTax = (0, utils_1.setZeroIfIsNegative)((0, utils_1.getTaxAmountByAccountNumber)(intracommunityServiceEntries, [...intracommunityServiceAccounts, ...intracommunityAccounts2], 0));
     // TVA Déductible
-    const immobilizationTax = (0, utils_1.setZeroIfIsNegative)((0, utils_1.getTaxAmountByAccountNumber)(vatEntries, ['2'])) + ((_78 = (_77 = (_76 = payload === null || payload === void 0 ? void 0 : payload.vatControl) === null || _76 === void 0 ? void 0 : _76.deducted) === null || _77 === void 0 ? void 0 : _77.immobilization) !== null && _78 !== void 0 ? _78 : 0);
-    const otherGoodsAndServices = (0, utils_1.setZeroIfIsNegative)((0, utils_1.getTaxAmountByAccountNumber)(vatEntries.filter((e) => vats.filter((v) => !v.isVatImportation).map((v) => v.id).includes(e.idVat)), ['6'])) + ((_81 = (_80 = (_79 = payload === null || payload === void 0 ? void 0 : payload.vatControl) === null || _79 === void 0 ? void 0 : _79.deducted) === null || _80 === void 0 ? void 0 : _80.abs) !== null && _81 !== void 0 ? _81 : 0);
-    const otherDeductibles = (0, utils_1.setZeroIfIsNegative)((0, utils_1.getTaxAmountByAccountNumber)(vatEntries.filter((e) => vats.filter((v) => v.isVatImportation).map((v) => v.id).includes(e.idVat)), ['6'])) + ((_84 = (_83 = (_82 = payload === null || payload === void 0 ? void 0 : payload.vatControl) === null || _82 === void 0 ? void 0 : _82.deducted) === null || _83 === void 0 ? void 0 : _83.other) !== null && _84 !== void 0 ? _84 : 0);
-    const report = (((_86 = (_85 = payload.vat) === null || _85 === void 0 ? void 0 : _85.deductible) === null || _86 === void 0 ? void 0 : _86.toReport) && ((_88 = (_87 = payload.vat) === null || _87 === void 0 ? void 0 : _87.deductible) === null || _88 === void 0 ? void 0 : _88.toReport) > 0 ? (0, lodash_1.round)((_91 = (_90 = (_89 = payload.vat) === null || _89 === void 0 ? void 0 : _89.deductible) === null || _90 === void 0 ? void 0 : _90.toReport) !== null && _91 !== void 0 ? _91 : 0) : (_94 = (_93 = (_92 = payload.previousVatDeclaration) === null || _92 === void 0 ? void 0 : _92.credit) === null || _93 === void 0 ? void 0 : _93.toReport) !== null && _94 !== void 0 ? _94 : 0) + ((_97 = (_96 = (_95 = payload === null || payload === void 0 ? void 0 : payload.vatControl) === null || _95 === void 0 ? void 0 : _95.deducted) === null || _96 === void 0 ? void 0 : _96.reported) !== null && _97 !== void 0 ? _97 : 0);
-    const coefficient = (0, lodash_1.round)((_100 = (_99 = (_98 = payload.vat) === null || _98 === void 0 ? void 0 : _98.deductible) === null || _99 === void 0 ? void 0 : _99.coefficient) !== null && _100 !== void 0 ? _100 : 100, 2);
+    const immobilizationTax = (0, utils_1.setZeroIfIsNegative)((0, utils_1.getTaxAmountByAccountNumber)(vatEntries, ['2'])) + (payload?.vatControl?.deducted?.immobilization ?? 0);
+    const otherGoodsAndServices = (0, utils_1.setZeroIfIsNegative)((0, utils_1.getTaxAmountByAccountNumber)(vatEntries.filter((e) => vats.filter((v) => !v.isVatImportation).map((v) => v.id).includes(e.idVat)), ['6'])) + (payload?.vatControl?.deducted?.abs ?? 0);
+    const otherDeductibles = (0, utils_1.setZeroIfIsNegative)((0, utils_1.getTaxAmountByAccountNumber)(vatEntries.filter((e) => vats.filter((v) => v.isVatImportation).map((v) => v.id).includes(e.idVat)), ['6'])) + (payload?.vatControl?.deducted?.other ?? 0);
+    const report = (payload.vat?.deductible?.toReport && payload.vat?.deductible?.toReport > 0 ? (0, lodash_1.round)(payload.vat?.deductible?.toReport ?? 0) : payload.previousVatDeclaration?.credit?.toReport ?? 0) + (payload?.vatControl?.deducted?.reported ?? 0);
+    const coefficient = (0, lodash_1.round)(payload.vat?.deductible?.coefficient ?? 100, 2);
     const isNil = payload.isNil === true;
     const isHolidayDeposit = payload.isHolidayDeposit === true;
-    const sumToAdd = (0, utils_1.setZeroIfIsNegative)(isNil ? 0 : isHolidayDeposit ? ((0, lodash_1.round)(((_103 = (_102 = (_101 = payload.previousVatDeclaration) === null || _101 === void 0 ? void 0 : _101.toPay) === null || _102 === void 0 ? void 0 : _102.total) !== null && _103 !== void 0 ? _103 : 0) * 0.8)) : ((0, lodash_1.round)((_105 = (_104 = payload.vat) === null || _104 === void 0 ? void 0 : _104.sumToAdd) !== null && _105 !== void 0 ? _105 : 0) + mxToAdd)) + ((_108 = (_107 = (_106 = payload === null || payload === void 0 ? void 0 : payload.vatControl) === null || _106 === void 0 ? void 0 : _106.regularisations) === null || _107 === void 0 ? void 0 : _107.case5B) !== null && _108 !== void 0 ? _108 : 0);
-    const comment = isHolidayDeposit ? `ACOMPTE CONGES ${(_109 = payload.comment) !== null && _109 !== void 0 ? _109 : ''}` : ((_110 = payload.comment) !== null && _110 !== void 0 ? _110 : null);
+    const sumToAdd = (0, utils_1.setZeroIfIsNegative)(isNil ? 0 : isHolidayDeposit ? ((0, lodash_1.round)((payload.previousVatDeclaration?.toPay?.total ?? 0) * 0.8)) : ((0, lodash_1.round)(payload.vat?.sumToAdd ?? 0) + mxToAdd)) + (payload?.vatControl?.regularisations?.case5B ?? 0);
+    const comment = isHolidayDeposit ? `ACOMPTE CONGES ${payload.comment ?? ''}` : (payload.comment ?? null);
     const initialPayload = {
         isNil,
         isDGE: false,
@@ -109,7 +108,7 @@ function getCerfa3310Century23Payload(accountingEntries, payload, updatedEntries
                     full: `${payload.society.address}\n${payload.society.zipCode} ${payload.society.city}`,
                 },
                 numbers: {
-                    SIE: (_112 = (_111 = payload.sie) === null || _111 === void 0 ? void 0 : _111.sages) !== null && _112 !== void 0 ? _112 : null,
+                    SIE: payload.sie?.sages ?? null,
                     folder: null,
                     key: null,
                     period: null,
@@ -121,7 +120,7 @@ function getCerfa3310Century23Payload(accountingEntries, payload, updatedEntries
             },
             service: {
                 address: {
-                    full: (0, class_validator_1.isDefined)((_114 = (_113 = payload.sie) === null || _113 === void 0 ? void 0 : _113.address) === null || _114 === void 0 ? void 0 : _114.address1) ? `${(_115 = payload.sie) === null || _115 === void 0 ? void 0 : _115.address.address1}\n${(_116 = payload.sie) === null || _116 === void 0 ? void 0 : _116.address.address2}\n${(_117 = payload.sie) === null || _117 === void 0 ? void 0 : _117.address.address3}\n${(_118 = payload.sie) === null || _118 === void 0 ? void 0 : _118.address.address4}\n${(_119 = payload.sie) === null || _119 === void 0 ? void 0 : _119.address.address5}` : null,
+                    full: (0, class_validator_1.isDefined)(payload.sie?.address?.address1) ? `${payload.sie?.address.address1}\n${payload.sie?.address.address2}\n${payload.sie?.address.address3}\n${payload.sie?.address.address4}\n${payload.sie?.address.address5}` : null,
                 },
             },
             period: {
@@ -137,13 +136,13 @@ function getCerfa3310Century23Payload(accountingEntries, payload, updatedEntries
                 },
             },
             siret: {
-                first: (0, class_validator_1.isDefined)(payload.society.siret) ? ((_121 = (_120 = payload.society.siret) === null || _120 === void 0 ? void 0 : _120.slice(0, 9)) !== null && _121 !== void 0 ? _121 : null) : null,
-                second: (0, class_validator_1.isDefined)(payload.society.siret) ? ((_123 = (_122 = payload.society.siret) === null || _122 === void 0 ? void 0 : _122.slice(-5)) !== null && _123 !== void 0 ? _123 : null) : null,
+                first: (0, class_validator_1.isDefined)(payload.society.siret) ? (payload.society.siret?.slice(0, 9) ?? null) : null,
+                second: (0, class_validator_1.isDefined)(payload.society.siret) ? (payload.society.siret?.slice(-5) ?? null) : null,
             },
             intracommunityVat: {
-                first: shouldHaveVatCode ? ((_126 = (_125 = (_124 = payload.setting) === null || _124 === void 0 ? void 0 : _124.tvaCode) === null || _125 === void 0 ? void 0 : _125.slice(0, 2)) !== null && _126 !== void 0 ? _126 : null) : null,
-                second: shouldHaveVatCode ? ((_129 = (_128 = (_127 = payload.setting) === null || _127 === void 0 ? void 0 : _127.tvaCode) === null || _128 === void 0 ? void 0 : _128.slice(2, 4)) !== null && _129 !== void 0 ? _129 : null) : null,
-                third: shouldHaveVatCode ? ((_131 = (_130 = payload.society.siret) === null || _130 === void 0 ? void 0 : _130.slice(0, 9)) !== null && _131 !== void 0 ? _131 : null) : null,
+                first: shouldHaveVatCode ? (payload.setting?.tvaCode?.slice(0, 2) ?? null) : null,
+                second: shouldHaveVatCode ? (payload.setting?.tvaCode?.slice(2, 4) ?? null) : null,
+                third: shouldHaveVatCode ? (payload.society.siret?.slice(0, 9) ?? null) : null,
             },
             payment: {
                 date: dayjs().format('YYYY-MM-DD'),
@@ -157,29 +156,29 @@ function getCerfa3310Century23Payload(accountingEntries, payload, updatedEntries
             other: isNil || isHolidayDeposit ? 0 : taxedOther,
             purchaseOfIntracommunityServiceProvision: isNil || isHolidayDeposit ? 0 : taxedPurchaseOfIntracommunityService,
             import: isNil || isHolidayDeposit ? 0 : taxedImport,
-            withdrawSuspensiveRegime: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)((_133 = (_132 = payload.taxedOperations) === null || _132 === void 0 ? void 0 : _132.withdrawSuspensiveRegime) !== null && _133 !== void 0 ? _133 : 0),
-            releaseFromConsumption: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)((_135 = (_134 = payload.taxedOperations) === null || _134 === void 0 ? void 0 : _134.releaseFromConsumption) !== null && _135 !== void 0 ? _135 : 0),
+            withdrawSuspensiveRegime: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)(payload.taxedOperations?.withdrawSuspensiveRegime ?? 0),
+            releaseFromConsumption: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)(payload.taxedOperations?.releaseFromConsumption ?? 0),
             intracommunityAcquisitions: isNil || isHolidayDeposit ? 0 : taxedIntracommunityAcquisitions,
-            energyDelivery: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)((_137 = (_136 = payload.taxedOperations) === null || _136 === void 0 ? void 0 : _136.energyDelivery) !== null && _137 !== void 0 ? _137 : 0),
-            purchaseOfServicesNotInFrance: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)((_139 = (_138 = payload.taxedOperations) === null || _138 === void 0 ? void 0 : _138.purchaseOfServicesNotInFrance) !== null && _139 !== void 0 ? _139 : 0),
-            regularizations: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)((_141 = (_140 = payload.taxedOperations) === null || _140 === void 0 ? void 0 : _140.regularizations) !== null && _141 !== void 0 ? _141 : 0) + ((_144 = (_143 = (_142 = payload === null || payload === void 0 ? void 0 : payload.vatControl) === null || _142 === void 0 ? void 0 : _142.regularisations) === null || _143 === void 0 ? void 0 : _143.base20) !== null && _144 !== void 0 ? _144 : 0) + ((_147 = (_146 = (_145 = payload === null || payload === void 0 ? void 0 : payload.vatControl) === null || _145 === void 0 ? void 0 : _145.regularisations) === null || _146 === void 0 ? void 0 : _146.base10) !== null && _147 !== void 0 ? _147 : 0) + ((_150 = (_149 = (_148 = payload === null || payload === void 0 ? void 0 : payload.vatControl) === null || _148 === void 0 ? void 0 : _148.regularisations) === null || _149 === void 0 ? void 0 : _149.base5Dot5) !== null && _150 !== void 0 ? _150 : 0) + ((_153 = (_152 = (_151 = payload === null || payload === void 0 ? void 0 : payload.vatControl) === null || _151 === void 0 ? void 0 : _151.regularisations) === null || _152 === void 0 ? void 0 : _152.base2Dot1) !== null && _153 !== void 0 ? _153 : 0),
+            energyDelivery: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)(payload.taxedOperations?.energyDelivery ?? 0),
+            purchaseOfServicesNotInFrance: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)(payload.taxedOperations?.purchaseOfServicesNotInFrance ?? 0),
+            regularizations: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)(payload.taxedOperations?.regularizations ?? 0) + (payload?.vatControl?.regularisations?.base20 ?? 0) + (payload?.vatControl?.regularisations?.base10 ?? 0) + (payload?.vatControl?.regularisations?.base5Dot5 ?? 0) + (payload?.vatControl?.regularisations?.base2Dot1 ?? 0),
         },
         untaxedOperations: {
             exportationNotInEurope: isNil || isHolidayDeposit ? 0 : untaxedExportationNotInEurope,
             other: isNil || isHolidayDeposit ? 0 : untaxedOther,
-            distanceSelling: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)((_155 = (_154 = payload.untaxedOperations) === null || _154 === void 0 ? void 0 : _154.distanceSelling) !== null && _155 !== void 0 ? _155 : 0),
+            distanceSelling: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)(payload.untaxedOperations?.distanceSelling ?? 0),
             import: isNil || isHolidayDeposit ? 0 : untaxedImport,
-            withdrawSuspensiveRegime: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)((_157 = (_156 = payload.untaxedOperations) === null || _156 === void 0 ? void 0 : _156.withdrawSuspensiveRegime) !== null && _157 !== void 0 ? _157 : 0),
-            importInSuspensiveSystem: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)((_159 = (_158 = payload.untaxedOperations) === null || _158 === void 0 ? void 0 : _158.importInSuspensiveSystem) !== null && _159 !== void 0 ? _159 : 0),
+            withdrawSuspensiveRegime: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)(payload.untaxedOperations?.withdrawSuspensiveRegime ?? 0),
+            importInSuspensiveSystem: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)(payload.untaxedOperations?.importInSuspensiveSystem ?? 0),
             intracommunityAcquisitions: isNil || isHolidayDeposit ? 0 : untaxedIntracomunity,
             intracommunityDelivery: isNil || isHolidayDeposit ? 0 : untaxedIntracommunityDelivery,
-            energyDelivery: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)((_161 = (_160 = payload.untaxedOperations) === null || _160 === void 0 ? void 0 : _160.energyDelivery) !== null && _161 !== void 0 ? _161 : 0),
-            oilProductsConsumption: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)((_163 = (_162 = payload.untaxedOperations) === null || _162 === void 0 ? void 0 : _162.oilProductsConsumption) !== null && _163 !== void 0 ? _163 : 0),
-            importPetrolInSuspensiveSystem: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)((_165 = (_164 = payload.untaxedOperations) === null || _164 === void 0 ? void 0 : _164.importPetrolInSuspensiveSystem) !== null && _165 !== void 0 ? _165 : 0),
-            purchaseInFranchise: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)((_167 = (_166 = payload.untaxedOperations) === null || _166 === void 0 ? void 0 : _166.purchaseInFranchise) !== null && _167 !== void 0 ? _167 : 0),
-            saleOfServicesNotInFrance: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)((_169 = (_168 = payload.untaxedOperations) === null || _168 === void 0 ? void 0 : _168.saleOfServicesNotInFrance) !== null && _169 !== void 0 ? _169 : 0),
-            regularizations: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)((_171 = (_170 = payload.untaxedOperations) === null || _170 === void 0 ? void 0 : _170.regularizations) !== null && _171 !== void 0 ? _171 : 0) + ((_174 = (_173 = (_172 = payload === null || payload === void 0 ? void 0 : payload.vatControl) === null || _172 === void 0 ? void 0 : _172.untaxed) === null || _173 === void 0 ? void 0 : _173.regularisation) !== null && _174 !== void 0 ? _174 : 0),
-            internalUniq: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)((_176 = (_175 = payload.untaxedOperations) === null || _175 === void 0 ? void 0 : _175.internalUniq) !== null && _176 !== void 0 ? _176 : 0),
+            energyDelivery: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)(payload.untaxedOperations?.energyDelivery ?? 0),
+            oilProductsConsumption: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)(payload.untaxedOperations?.oilProductsConsumption ?? 0),
+            importPetrolInSuspensiveSystem: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)(payload.untaxedOperations?.importPetrolInSuspensiveSystem ?? 0),
+            purchaseInFranchise: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)(payload.untaxedOperations?.purchaseInFranchise ?? 0),
+            saleOfServicesNotInFrance: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)(payload.untaxedOperations?.saleOfServicesNotInFrance ?? 0),
+            regularizations: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)(payload.untaxedOperations?.regularizations ?? 0) + (payload?.vatControl?.untaxed?.regularisation ?? 0),
+            internalUniq: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)(payload.untaxedOperations?.internalUniq ?? 0),
         },
         vat: {
             carrieredOutInFrance: {
@@ -208,12 +207,12 @@ function getCerfa3310Century23Payload(accountingEntries, payload, updatedEntries
             },
             oilProducts: {
                 normalRate20: {
-                    base: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)((_180 = (_179 = (_178 = (_177 = payload.vat) === null || _177 === void 0 ? void 0 : _177.oilProducts) === null || _178 === void 0 ? void 0 : _178.normalRate20) === null || _179 === void 0 ? void 0 : _179.base) !== null && _180 !== void 0 ? _180 : 0),
-                    tax: isNil || isHolidayDeposit ? 0 : ((0, lodash_1.round)((_184 = (_183 = (_182 = (_181 = payload.vat) === null || _181 === void 0 ? void 0 : _181.oilProducts) === null || _182 === void 0 ? void 0 : _182.normalRate20) === null || _183 === void 0 ? void 0 : _183.base) !== null && _184 !== void 0 ? _184 : 0) * 0.02),
+                    base: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)(payload.vat?.oilProducts?.normalRate20?.base ?? 0),
+                    tax: isNil || isHolidayDeposit ? 0 : ((0, lodash_1.round)(payload.vat?.oilProducts?.normalRate20?.base ?? 0) * 0.02),
                 },
                 reduceRate13: {
-                    base: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)((_188 = (_187 = (_186 = (_185 = payload.vat) === null || _185 === void 0 ? void 0 : _185.oilProducts) === null || _186 === void 0 ? void 0 : _186.reduceRate13) === null || _187 === void 0 ? void 0 : _187.base) !== null && _188 !== void 0 ? _188 : 0),
-                    tax: isNil || isHolidayDeposit ? 0 : ((0, lodash_1.round)((_192 = (_191 = (_190 = (_189 = payload.vat) === null || _189 === void 0 ? void 0 : _189.oilProducts) === null || _190 === void 0 ? void 0 : _190.reduceRate13) === null || _191 === void 0 ? void 0 : _191.base) !== null && _192 !== void 0 ? _192 : 0) * 0.013),
+                    base: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)(payload.vat?.oilProducts?.reduceRate13?.base ?? 0),
+                    tax: isNil || isHolidayDeposit ? 0 : ((0, lodash_1.round)(payload.vat?.oilProducts?.reduceRate13?.base ?? 0) * 0.013),
                 },
             },
             importations: {
@@ -243,34 +242,34 @@ function getCerfa3310Century23Payload(accountingEntries, payload, updatedEntries
                 },
             },
             previouslyDeductedToBeReturned: {
-                onOilProducts: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)((_195 = (_194 = (_193 = payload.vat) === null || _193 === void 0 ? void 0 : _193.previouslyDeductedToBeReturned) === null || _194 === void 0 ? void 0 : _194.onOilProducts) !== null && _195 !== void 0 ? _195 : 0),
-                otherThanOilProducts: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)((_198 = (_197 = (_196 = payload.vat) === null || _196 === void 0 ? void 0 : _196.previouslyDeductedToBeReturned) === null || _197 === void 0 ? void 0 : _197.otherThanOilProducts) !== null && _198 !== void 0 ? _198 : 0),
-                total: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)((_201 = (_200 = (_199 = payload.vat) === null || _199 === void 0 ? void 0 : _199.previouslyDeductedToBeReturned) === null || _200 === void 0 ? void 0 : _200.total) !== null && _201 !== void 0 ? _201 : 0),
+                onOilProducts: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)(payload.vat?.previouslyDeductedToBeReturned?.onOilProducts ?? 0),
+                otherThanOilProducts: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)(payload.vat?.previouslyDeductedToBeReturned?.otherThanOilProducts ?? 0),
+                total: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)(payload.vat?.previouslyDeductedToBeReturned?.total ?? 0),
             },
             sumToAdd,
-            grossDue: 0,
+            grossDue: 0, // Calculé plus bas
             onIntracommunityAcquisition: isNil || isHolidayDeposit ? 0 : intracommunityTax,
-            toMonaco: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)((_203 = (_202 = payload.vat) === null || _202 === void 0 ? void 0 : _202.toMonaco) !== null && _203 !== void 0 ? _203 : 0),
+            toMonaco: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)(payload.vat?.toMonaco ?? 0),
             deductible: {
-                immobilizations: isNil || isHolidayDeposit ? 0 : (immobilizationTax !== null && immobilizationTax !== void 0 ? immobilizationTax : 0),
-                otherGoodsAndServices: isNil || isHolidayDeposit ? 0 : (otherGoodsAndServices !== null && otherGoodsAndServices !== void 0 ? otherGoodsAndServices : 0),
+                immobilizations: isNil || isHolidayDeposit ? 0 : (immobilizationTax ?? 0),
+                otherGoodsAndServices: isNil || isHolidayDeposit ? 0 : (otherGoodsAndServices ?? 0),
                 other: {
-                    oil: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)((_207 = (_206 = (_205 = (_204 = payload.vat) === null || _204 === void 0 ? void 0 : _204.deductible) === null || _205 === void 0 ? void 0 : _205.other) === null || _206 === void 0 ? void 0 : _206.oil) !== null && _207 !== void 0 ? _207 : 0),
+                    oil: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)(payload.vat?.deductible?.other?.oil ?? 0),
                     thanOilProducts: 0,
                     collected: 0,
                     total: isNil || isHolidayDeposit ? 0 : otherDeductibles,
                 },
                 report,
-                toImpute: isNil || isHolidayDeposit ? 0 : ((0, lodash_1.round)((_210 = (_209 = (_208 = payload.vat) === null || _208 === void 0 ? void 0 : _208.deductible) === null || _209 === void 0 ? void 0 : _209.toImpute) !== null && _210 !== void 0 ? _210 : 0) + mxToSub) + ((_213 = (_212 = (_211 = payload === null || payload === void 0 ? void 0 : payload.vatControl) === null || _211 === void 0 ? void 0 : _211.deducted) === null || _212 === void 0 ? void 0 : _212.case2C) !== null && _213 !== void 0 ? _213 : 0),
-                total: 0,
+                toImpute: isNil || isHolidayDeposit ? 0 : ((0, lodash_1.round)(payload.vat?.deductible?.toImpute ?? 0) + mxToSub) + (payload?.vatControl?.deducted?.case2C ?? 0),
+                total: 0, // Calculé plus bas
                 onImportOtherThanOilProducts: isNil || isHolidayDeposit ? 0 : otherDeductibles,
                 coefficient: isNil || isHolidayDeposit ? 100 : coefficient,
-                onOilProducts: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)((_216 = (_215 = (_214 = payload.vat) === null || _214 === void 0 ? void 0 : _214.deductible) === null || _215 === void 0 ? void 0 : _215.onOilProducts) !== null && _216 !== void 0 ? _216 : 0),
+                onOilProducts: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)(payload.vat?.deductible?.onOilProducts ?? 0),
             },
             otherRate: {
                 oldRate: {
-                    base: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)((_220 = (_219 = (_218 = (_217 = payload.vat) === null || _217 === void 0 ? void 0 : _217.otherRate) === null || _218 === void 0 ? void 0 : _218.oldRate) === null || _219 === void 0 ? void 0 : _219.base) !== null && _220 !== void 0 ? _220 : 0),
-                    tax: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)((_224 = (_223 = (_222 = (_221 = payload.vat) === null || _221 === void 0 ? void 0 : _221.otherRate) === null || _222 === void 0 ? void 0 : _222.oldRate) === null || _223 === void 0 ? void 0 : _223.tax) !== null && _224 !== void 0 ? _224 : 0),
+                    base: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)(payload.vat?.otherRate?.oldRate?.base ?? 0),
+                    tax: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)(payload.vat?.otherRate?.oldRate?.tax ?? 0),
                 },
                 at1Dot75: {
                     base: 0,
@@ -303,17 +302,17 @@ function getCerfa3310Century23Payload(accountingEntries, payload, updatedEntries
             },
         },
         credit: {
-            amount: 0,
-            refundAsked: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)((_226 = (_225 = payload.credit) === null || _225 === void 0 ? void 0 : _225.refundAsked) !== null && _226 !== void 0 ? _226 : 0) + ((_228 = (_227 = payload === null || payload === void 0 ? void 0 : payload.vatControl) === null || _227 === void 0 ? void 0 : _227.refundAsked) !== null && _228 !== void 0 ? _228 : 0),
-            transferedToSocietyHeadOfGroup: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)((_230 = (_229 = payload.credit) === null || _229 === void 0 ? void 0 : _229.transferedToSocietyHeadOfGroup) !== null && _230 !== void 0 ? _230 : 0),
-            assimiledTaxes: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)((_232 = (_231 = payload.credit) === null || _231 === void 0 ? void 0 : _231.assimiledTaxes) !== null && _232 !== void 0 ? _232 : 0),
-            toReport: 0,
+            amount: 0, // Calculé plus bas
+            refundAsked: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)(payload.credit?.refundAsked ?? 0) + (payload?.vatControl?.refundAsked ?? 0),
+            transferedToSocietyHeadOfGroup: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)(payload.credit?.transferedToSocietyHeadOfGroup ?? 0),
+            assimiledTaxes: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)(payload.credit?.assimiledTaxes ?? 0),
+            toReport: 0, // Calculé plus bas
             ticRefund: 0,
             ticTransfered: 0,
         },
         toPay: {
-            netDue: 0,
-            acquittedBySocietyHeadOfGroup: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)((_234 = (_233 = payload.toPay) === null || _233 === void 0 ? void 0 : _233.acquittedBySocietyHeadOfGroup) !== null && _234 !== void 0 ? _234 : 0),
+            netDue: 0, // Calculé plus bas
+            acquittedBySocietyHeadOfGroup: isNil || isHolidayDeposit ? 0 : (0, lodash_1.round)(payload.toPay?.acquittedBySocietyHeadOfGroup ?? 0),
             total: 0,
         },
         tic: {
@@ -348,12 +347,11 @@ function getCerfa3310Century23Payload(accountingEntries, payload, updatedEntries
     initialPayload.credit.amount = initialPayload.vat.grossDue - initialPayload.vat.deductible.total < 0 ? Math.abs(initialPayload.vat.grossDue - initialPayload.vat.deductible.total) : 0;
     initialPayload.toPay.netDue = initialPayload.vat.grossDue - initialPayload.vat.deductible.total > 0 ? initialPayload.vat.grossDue - initialPayload.vat.deductible.total : 0;
     initialPayload.credit.toReport = initialPayload.credit.amount - initialPayload.credit.refundAsked - initialPayload.credit.transferedToSocietyHeadOfGroup;
-    initialPayload.toPay.total = initialPayload.toPay.netDue + initialPayload.credit.assimiledTaxes + ((_237 = (_236 = (_235 = initialPayload.tic) === null || _235 === void 0 ? void 0 : _235.total) === null || _236 === void 0 ? void 0 : _236.tax) !== null && _237 !== void 0 ? _237 : 0) - initialPayload.toPay.acquittedBySocietyHeadOfGroup;
+    initialPayload.toPay.total = initialPayload.toPay.netDue + initialPayload.credit.assimiledTaxes + (initialPayload.tic?.total?.tax ?? 0) - initialPayload.toPay.acquittedBySocietyHeadOfGroup;
     return initialPayload;
 }
 exports.getCerfa3310Century23Payload = getCerfa3310Century23Payload;
 function getCerfa3310Century23RegistrationFields(data) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15;
     const comment = (0, utils_1.textFormatting)(data.declaration.comment);
     const importFields = [];
     if (data.vat.oilProducts.normalRate20.base > 0) {
@@ -471,22 +469,22 @@ function getCerfa3310Century23RegistrationFields(data) {
                         {
                             tag: 'TexteLibre2',
                             description: 'FTX Commentaires type 1, ligne 2 2ème zone de 512',
-                            value: comment && ((_a = comment === null || comment === void 0 ? void 0 : comment.length) !== null && _a !== void 0 ? _a : 0) > 512 ? (0, utils_1.textFormatting)(comment.slice(512, 1024)) : null,
+                            value: comment && (comment?.length ?? 0) > 512 ? (0, utils_1.textFormatting)(comment.slice(512, 1024)) : null,
                         },
                         {
                             tag: 'TexteLibre3',
                             description: 'FTX Commentaires type 1, ligne 3 3ème zone de 512',
-                            value: comment && ((_b = comment === null || comment === void 0 ? void 0 : comment.length) !== null && _b !== void 0 ? _b : 0) > 1024 ? (0, utils_1.textFormatting)(comment.slice(1024, 1536)) : null,
+                            value: comment && (comment?.length ?? 0) > 1024 ? (0, utils_1.textFormatting)(comment.slice(1024, 1536)) : null,
                         },
                         {
                             tag: 'TexteLibre4',
                             description: 'FTX Commentaires type 1, ligne 4 4ème zone de 512',
-                            value: comment && ((_c = comment === null || comment === void 0 ? void 0 : comment.length) !== null && _c !== void 0 ? _c : 0) > 1536 ? (0, utils_1.textFormatting)(comment.slice(1536, 2048)) : null,
+                            value: comment && (comment?.length ?? 0) > 1536 ? (0, utils_1.textFormatting)(comment.slice(1536, 2048)) : null,
                         },
                         {
                             tag: 'TexteLibre5',
                             description: 'FTX Commentaires type 1, ligne 5 5ème zone de 512',
-                            value: comment && ((_d = comment === null || comment === void 0 ? void 0 : comment.length) !== null && _d !== void 0 ? _d : 0) > 2048 ? (0, utils_1.textFormatting)(comment.slice(2048, 2560)) : null,
+                            value: comment && (comment?.length ?? 0) > 2048 ? (0, utils_1.textFormatting)(comment.slice(2048, 2560)) : null,
                         },
                     ],
                 },
@@ -502,7 +500,7 @@ function getCerfa3310Century23RegistrationFields(data) {
                     tag: 'Valeur',
                     isMultiple: false,
                     description: 'CCITBX Mention expresse Table TBX avec X pour sélectionné, CCI/7037 = CAV/1131 =',
-                    value: comment && ((comment === null || comment === void 0 ? void 0 : comment.length) > 0) ? 'X' : null,
+                    value: comment && (comment?.length > 0) ? 'X' : null,
                 },
                 {
                     key: 'BE',
@@ -1147,63 +1145,63 @@ function getCerfa3310Century23RegistrationFields(data) {
                     tag: 'Valeur',
                     isMultiple: false,
                     description: 'MOA TICFE - crédit imputé sur la',
-                    value: (_f = (_e = data.tic) === null || _e === void 0 ? void 0 : _e.ticfe) === null || _f === void 0 ? void 0 : _f.imputed,
+                    value: data.tic?.ticfe?.imputed,
                 },
                 {
                     key: 'MK',
                     tag: 'Valeur',
                     isMultiple: false,
                     description: 'MOA TICGN - crédit imputé sur la',
-                    value: (_h = (_g = data.tic) === null || _g === void 0 ? void 0 : _g.ticgn) === null || _h === void 0 ? void 0 : _h.imputed,
+                    value: data.tic?.ticgn?.imputed,
                 },
                 {
                     key: 'ML',
                     tag: 'Valeur',
                     isMultiple: false,
                     description: 'MOA TICCE - crédit imputé sur la',
-                    value: (_k = (_j = data.tic) === null || _j === void 0 ? void 0 : _j.ticc) === null || _k === void 0 ? void 0 : _k.imputed,
+                    value: data.tic?.ticc?.imputed,
                 },
                 {
                     key: 'MM',
                     tag: 'Valeur',
                     isMultiple: false,
                     description: 'MOA TOTAL - crédit imputé sur la',
-                    value: (_m = (_l = data.tic) === null || _l === void 0 ? void 0 : _l.total) === null || _m === void 0 ? void 0 : _m.imputed,
+                    value: data.tic?.total?.imputed,
                 },
                 {
                     key: 'MN',
                     tag: 'Valeur',
                     isMultiple: false,
                     description: 'MOA Crédit de TIC imputé sur la TVA (Total',
-                    value: (_p = (_o = data.tic) === null || _o === void 0 ? void 0 : _o.total) === null || _p === void 0 ? void 0 : _p.imputed,
+                    value: data.tic?.total?.imputed,
                 },
                 {
                     key: 'MP',
                     tag: 'Valeur',
                     isMultiple: false,
                     description: 'MOA TICFE - Reliquat de crédit à',
-                    value: (_r = (_q = data.tic) === null || _q === void 0 ? void 0 : _q.ticfe) === null || _r === void 0 ? void 0 : _r.refund,
+                    value: data.tic?.ticfe?.refund,
                 },
                 {
                     key: 'MQ',
                     tag: 'Valeur',
                     isMultiple: false,
                     description: 'MOA TICGN - Reliquat de crédit à',
-                    value: (_t = (_s = data.tic) === null || _s === void 0 ? void 0 : _s.ticgn) === null || _t === void 0 ? void 0 : _t.refund,
+                    value: data.tic?.ticgn?.refund,
                 },
                 {
                     key: 'MR',
                     tag: 'Valeur',
                     isMultiple: false,
                     description: 'MOA TICCE - Reliquat de crédit à',
-                    value: (_v = (_u = data.tic) === null || _u === void 0 ? void 0 : _u.ticc) === null || _v === void 0 ? void 0 : _v.refund,
+                    value: data.tic?.ticc?.refund,
                 },
                 {
                     key: 'MS',
                     tag: 'Valeur',
                     isMultiple: false,
                     description: 'MOA TOTAL - reliquat de crédit à',
-                    value: (_x = (_w = data.tic) === null || _w === void 0 ? void 0 : _w.total) === null || _x === void 0 ? void 0 : _x.refund,
+                    value: data.tic?.total?.refund,
                 },
                 {
                     key: 'MT',
@@ -1217,63 +1215,63 @@ function getCerfa3310Century23RegistrationFields(data) {
                     tag: 'Valeur',
                     isMultiple: false,
                     description: 'MOA TICFE - Taxe',
-                    value: (_z = (_y = data.tic) === null || _y === void 0 ? void 0 : _y.ticfe) === null || _z === void 0 ? void 0 : _z.tax,
+                    value: data.tic?.ticfe?.tax,
                 },
                 {
                     key: 'MV',
                     tag: 'Valeur',
                     isMultiple: false,
                     description: 'MOA TICGN - Taxe',
-                    value: (_1 = (_0 = data.tic) === null || _0 === void 0 ? void 0 : _0.ticgn) === null || _1 === void 0 ? void 0 : _1.tax,
+                    value: data.tic?.ticgn?.tax,
                 },
                 {
                     key: 'MW',
                     tag: 'Valeur',
                     isMultiple: false,
                     description: 'MOA TICCE - Taxe',
-                    value: (_3 = (_2 = data.tic) === null || _2 === void 0 ? void 0 : _2.ticc) === null || _3 === void 0 ? void 0 : _3.tax,
+                    value: data.tic?.ticc?.tax,
                 },
                 {
                     key: 'MX',
                     tag: 'Valeur',
                     isMultiple: false,
                     description: 'MOA TOTAL - taxe',
-                    value: (_5 = (_4 = data.tic) === null || _4 === void 0 ? void 0 : _4.total) === null || _5 === void 0 ? void 0 : _5.tax,
+                    value: data.tic?.total?.tax,
                 },
                 {
                     key: 'MY',
                     tag: 'Valeur',
                     isMultiple: false,
                     description: 'MOA TICFE - crédit',
-                    value: (_7 = (_6 = data.tic) === null || _6 === void 0 ? void 0 : _6.ticfe) === null || _7 === void 0 ? void 0 : _7.credit,
+                    value: data.tic?.ticfe?.credit,
                 },
                 {
                     key: 'MZ',
                     tag: 'Valeur',
                     isMultiple: false,
                     description: 'MOA TICGN - crédit',
-                    value: (_9 = (_8 = data.tic) === null || _8 === void 0 ? void 0 : _8.ticgn) === null || _9 === void 0 ? void 0 : _9.credit,
+                    value: data.tic?.ticgn?.credit,
                 },
                 {
                     key: 'NA',
                     tag: 'Valeur',
                     isMultiple: false,
                     description: 'MOA TICCE - crédit',
-                    value: (_11 = (_10 = data.tic) === null || _10 === void 0 ? void 0 : _10.ticc) === null || _11 === void 0 ? void 0 : _11.credit,
+                    value: data.tic?.ticc?.credit,
                 },
                 {
                     key: 'NB',
                     tag: 'Valeur',
                     isMultiple: false,
                     description: 'MOA TOTAL - crédit',
-                    value: (_13 = (_12 = data.tic) === null || _12 === void 0 ? void 0 : _12.total) === null || _13 === void 0 ? void 0 : _13.credit,
+                    value: data.tic?.total?.credit,
                 },
                 {
                     key: 'NC',
                     tag: 'Valeur',
                     isMultiple: false,
                     description: 'MOA Total des taxes intérieures de consommation dues',
-                    value: (_15 = (_14 = data.tic) === null || _14 === void 0 ? void 0 : _14.total) === null || _15 === void 0 ? void 0 : _15.tax,
+                    value: data.tic?.total?.tax,
                 },
                 {
                     key: 'ND',