@silexpert/core 1.1.33 → 1.1.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@silexpert/core",
-  "version": "1.1.33",
+  "version": "1.1.34",
   "description": "Silex Core perform HTTP Request and object binding. Silex core helps developers to retrieve and return formatted object",
   "homepage": "https://gitlab.compta-clementine.fr/dev/silex-api",
   "main": "js/index.js",

package/ts/types/Interface/api/registration/ReadRegistration.ts

@@ -26,6 +26,7 @@ export interface ReadRegistrationTick {
 }
 
 export interface ReadVatEntry {
+  isAsset: boolean;
   idVat: number | null;
   account: IAccount | null;
   totalTaxIncluded: number;
@@ -38,4 +39,6 @@ export interface ReadVatEntry {
   entry?: IAccountingEntry
 }
 
-export type UpdatedAnnotation = Array<{ old: IAccountingEntry[]; new: IAccountingEntry[] }>;
+export type UpdatedAnnotationObject = { old: IAccountingEntry[]; new: IAccountingEntry[] };
+
+export type UpdatedAnnotation = UpdatedAnnotationObject[];

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

@@ -1,6 +1,6 @@
 import * as dayjs from 'dayjs';
 import { isDefined } from 'class-validator';
-import { round as _round, flatten } from 'lodash';
+import { round as _round, flatten, uniqBy } 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';
@@ -18,7 +18,7 @@ export function getCerfa3310Century23Payload(accountingEntries: IAccountingEntry
   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 = accountingEntries.filter((ae) => typeof ae.idVat === 'number') as Array<IAccountingEntry & { idVat: number }>;
+  const vatEntries = uniqBy(accountingEntries.filter((ae) => typeof ae.idVat === 'number'), 'id') as Array<IAccountingEntry & { idVat: number }>;
 
   const oldEntries = flatten(updatedEntries?.map((u) => u.old));
   const newEntries = flatten(updatedEntries?.map((u) => u.new));
@@ -62,6 +62,7 @@ export function getCerfa3310Century23Payload(accountingEntries: IAccountingEntry
   // TVA brute
   const normalRate = getAmountByAccountNumber(taxedServicesEntries.filter((e) => vats.filter((v) => v.value === 20).map((v) => v.id).includes(e.idVat)), servicesAccounts, 0, true)
   + getAmountByAccountNumber(intracommunityServiceEntries.filter((e) => vats.filter((v) => v.value === 20).map((v) => v.id).includes(e.idVat)), ['6'], 0, true);
+  
   const normalRateTax = _round(normalRate * 0.2);
 
   const reducedRate5Dot5 = getAmountByAccountNumber(taxedServicesEntries.filter((e) => vats.filter((v) => v.value === 5.5).map((v) => v.id).includes(e.idVat)), servicesAccounts, 0, true)

package/ts/utils/vat/3517/century23.ts

@@ -1,6 +1,6 @@
 import * as dayjs from 'dayjs';
 import { isDefined } from 'class-validator';
-import { round as _round } from 'lodash';
+import { round as _round, uniqBy } from 'lodash';
 import { Cerfa3517_2023, PayloadCerfa3517_2023 } from '../../../types/Interface/api/cerfa/3517';
 import { IAccountingEntry } from '../../../types/Interface/models/IAccountingEntry';
 import { Vat } from '../../../types/Enum/Vat';
@@ -13,13 +13,14 @@ export function getCerfa3517Century23Payload(accountingEntries: IAccountingEntry
   const isNil = payload.isNil === true;
   const vats = Object.values(Vat);
 
-  const vatEntries = accountingEntries.filter((ae) => typeof ae.idVat === 'number') as Array<IAccountingEntry & { idVat: number }>;
+  const vatEntries = uniqBy(accountingEntries.filter((ae) => typeof ae.idVat === 'number'), 'id') as Array<IAccountingEntry & { idVat: number }>;
 
   const withoutTaxVat = vats.filter((v) => v.value === 0).map((v) => v.id);
   const intracomVat = vats.filter((v) => v.isVatIntracom && !v.isVatImportation).map((v) => v.id);
   const frenchVat = vats.filter((v) => !v.isVatImportation && !v.isVatIntracom).map((v) => v.id);
+  const importationVat = vats.filter((v) => v.isVatImportation && !v.isVatIntracom).map((v) => v.id);
 
-  const taxedOperationsAccounts = ['701', '702', '703', '704', '705', '706', '707', '708'];
+  const taxedOperationsAccounts = ['701', '702', '703', '704', '705', '706', '707', '708', '472'];
 
   const vatNormalRate20 = getAmountByAccountNumber(vatEntries.filter((ae) => ae.idVat === Vat.TX_20.id), taxedOperationsAccounts, 0, true);
   const vatReducedRate5Dot5 = getAmountByAccountNumber(vatEntries.filter((ae) => ae.idVat === Vat.TX_5_5.id), taxedOperationsAccounts, 0, true);
@@ -34,12 +35,12 @@ export function getCerfa3517Century23Payload(accountingEntries: IAccountingEntry
 
   const saleOfImmobilization = getAmountByAccountNumber(vatEntries.filter((ae) => !withoutTaxVat.includes(ae.idVat) && frenchVat.includes(ae.idVat)), ['775'], 0, true);
 
-  const onInvoiceDeductible = getAmountByAccountNumber(vatEntries, ['445660'], 0, true);
-  const onImmobilizationDeductible = getAmountByAccountNumber(vatEntries, ['44562'], 0, true);
+  const onInvoiceDeductible = getTaxAmountByAccountNumber(vatEntries.filter(ae => !importationVat.includes(ae.idVat)), ['6']);
+  const onImmobilizationDeductible = getTaxAmountByAccountNumber(vatEntries, ['2']);
 
-  const julyAdvance: IRegistration | null = payload?.exerciceAdvanceRegistrations?.find((a) => dayjs(a.endDate).month() === 6) ?? null;
+  const julyAdvance: IRegistration | null = payload?.exerciceAdvanceRegistrations?.find((a) => [5, 6].includes(dayjs(a.endDate).month())) ?? null;
   const julyAdvancePayload: Cerfa3514_2022 | null = julyAdvance?.payload?.cerfa3514 ?? null;
-  const decemberAdvance: IRegistration | null = payload?.exerciceAdvanceRegistrations?.find((a) => dayjs(a.endDate).month() === 11) ?? null;
+  const decemberAdvance: IRegistration | null = payload?.exerciceAdvanceRegistrations?.find((a) => [10, 11].includes(dayjs(a.endDate).month())) ?? null;
   const decemberAdvancePayload: Cerfa3514_2022 | null = decemberAdvance?.payload?.cerfa3514 ?? null;
 
   const data:Cerfa3517_2023 = {