@silexpert/core 2.0.67 → 2.0.68-2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@silexpert/core",
-  "version": "2.0.67",
+  "version": "2.0.68-2",
   "description": "Silex Core perform HTTP Request and object binding. Silex core helps developers to retrieve and return formatted object",
   "keywords": [
     "accounting",

package/ts/api/resources/Acd.ts

@@ -1,8 +1,12 @@
-import { CreateAcdAuthentication } from '../../index.js';
+import type { CreateAcdAuthentication, IAccount } from '../../index.js';
 import { Resource } from '../Resource.js';
 
 export class Acd extends Resource {
   authenticate(body: CreateAcdAuthentication): Promise<{ token: string }> {
     return this.axios.$post('/connectors/acd/authenticate', body);
   }
+
+  getAccounts(): Promise<IAccount[]> {
+    return this.axios.$get('/connectors/acd/accounts');
+  }
 }

package/ts/index.ts

@@ -2,5 +2,6 @@ export * from './utils/index.js';
 export * from './utils/commercialManagement/product.js';
 export * from './utils/commercialManagement/vat.js';
 export * from './utils/commercialManagement/recovery.js';
+export * from './utils/acdVat.js';
 export * from './types/index.js';
 export * from './api/index.js';

package/ts/types/Interface/api/acd/Vat.ts

@@ -0,0 +1,52 @@
+export enum AcdVatCode {
+  AUTOL = 'AUTOL',
+  INTRACOM = 'INTRACOM',
+  NON_AFFECTE = 'NON_AFFECTE',
+  ONI = 'ONI',
+  SUR_IMMOBILISATION = 'TI',
+  NORMAL = 'TN',
+  REDUIT_5_5 = 'TR1',
+  REDUIT_10 = 'TR2',
+  REDUIT_2_1 = 'TSR',
+  SPECIAL = 'TS',
+}
+
+export type AcdCompte = {
+  Code: string | null;
+  Categ: string | null;
+  Lib: string | null;
+  Let: string | null;
+  RegEc: string | null;
+  Qte: string | null;
+  Coll: boolean;
+  CptCptCol: string | null;
+  CodeTVA: string | null;
+  CompteHorsTaxe: string | null;
+  CptInactif: boolean;
+  UniteQte1: Array<string> | null;
+  UniteQte2: Array<string> | null;
+  ActivationAnalytique: boolean;
+  CleRepartition: {
+    Code: string | null;
+    Lib: string | null;
+    Auto: boolean;
+  } | null;
+  Tiers: {
+    Code: number;
+    RaisonSociale: string | null;
+    Siren: string | null;
+    Siret: string | null;
+    Telephone: string | null;
+    Email: string | null;
+    Fax: string | null;
+    NumeroIntracom: string | null;
+    Adresse?: {
+      Numero: string | null;
+      Nature: string | null;
+      Complement: string | null;
+      Hameau: string | null;
+      CodePostal: string | null;
+      Pays: string | null;
+    };
+  } | null;
+};

package/ts/types/Interface/api/commercialManagement/Create.ts

@@ -462,6 +462,11 @@ export class CommercialDocumentInputs {
   @ApiProperty({ description: 'Commercial street address of seller' })
   street: string | null;
 
+  @ApiPropertyOptional({ description: 'Commercial address complement of seller' })
+  @IsOptional()
+  @IsString()
+  addressComplement?: string | null;
+
   @ApiProperty({ description: 'Commercial zip code address of seller' })
   zipCode: string | null;
 

package/ts/types/Interface/api/product/CreateProduct.ts

@@ -1,4 +1,4 @@
-import { IsBoolean, IsNumber, IsOptional, IsString, Min } from 'class-validator';
+import { IsBoolean, IsInt, IsNumber, IsOptional, IsString, Min } from 'class-validator';
 import { ProductType, Unit } from '../../../index.js';
 import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
 import { ToBoolean } from '../../../../utils/transforms/boolean.transform.js';
@@ -54,4 +54,9 @@ export class CreateProduct {
   @IsString()
   @IsOptional()
   codeProduct?: string;
+
+  @ApiPropertyOptional()
+  @IsInt()
+  @IsOptional()
+  idAccount?: number;
 }

package/ts/types/Interface/api/thirdParty/CreateThirdPartyForm.ts

@@ -18,6 +18,9 @@ export class CreateThirdPartyForm {
   @ApiPropertyOptional()
   address?: string | null;
 
+  @ApiPropertyOptional()
+  addressComplement?: string | null;
+
   @ApiPropertyOptional()
   zipCode?: string | null;
 
@@ -77,6 +80,10 @@ export class CreateThirdPartyForm {
   @IsOptional()
   deliveryAddress?: string | null;
 
+  @ApiPropertyOptional()
+  @IsOptional()
+  deliveryAddressComplement?: string | null;
+
   @ApiPropertyOptional()
   @IsOptional()
   deliveryCity?: string | null;

package/ts/types/Interface/api/thirdParty/UpdateThirdPartyForm.ts

@@ -23,6 +23,10 @@ export class UpdateThirdPartyForm {
   @IsOptional()
   address?: string | null;
 
+  @ApiPropertyOptional()
+  @IsOptional()
+  addressComplement?: string | null;
+
   @ApiPropertyOptional()
   @IsOptional()
   zipCode?: string | null;
@@ -99,6 +103,10 @@ export class UpdateThirdPartyForm {
   @IsOptional()
   deliveryAddress?: string | null;
 
+  @ApiPropertyOptional()
+  @IsOptional()
+  deliveryAddressComplement?: string | null;
+
   @ApiPropertyOptional()
   @IsOptional()
   deliveryCity?: string | null;

package/ts/types/Interface/models/IAccount.ts

@@ -40,6 +40,7 @@ export class IAccount {
   idRegisterCategorie?: number | null;
   idSector?: number | null;
   idParentAccount?: number | null;
+  metadata?: Record<string, any> | null;
   createdAt?: Date | null;
   updatedAt?: Date | null;
   deletedAt?: Date | null;

package/ts/types/Interface/models/IProduct.ts

@@ -1,5 +1,6 @@
 import { IVat } from './IVat.js';
 import { ISociety } from './ISociety.js';
+import { IAccount } from './IAccount.js';
 
 // products
 export class IProduct {
@@ -15,6 +16,7 @@ export class IProduct {
   amountOfPurchase: number | null;
   marginVatType?: number;
   idSociety: number;
+  idAccount?: number | null;
   createdAt?: Date | null;
   updatedAt?: Date | null;
   deletedAt?: Date | null;
@@ -22,4 +24,5 @@ export class IProduct {
   // Associations
   vat?: IVat;
   society?: ISociety;
+  account?: IAccount;
 }

package/ts/types/Interface/models/IProductInvoice.ts

@@ -1,5 +1,6 @@
 import { IVat } from './IVat.js';
 import { IProduct } from './IProduct.js';
+import type { IAccount } from './IAccount.js';
 import { DiscountType } from '../../Enum/CommercialManagement.js';
 
 // itemsEstimates
@@ -7,6 +8,7 @@ export class IProductInvoice {
   id?: number;
   idEstimateInvoice: number;
   idProduct: number | null;
+  idAccount?: number | null;
   idVat: number;
   marginVatType?: number;
   amountOfPurchase: number | null;
@@ -26,4 +28,5 @@ export class IProductInvoice {
   // Associations
   vat?: IVat;
   product?: IProduct;
+  account?: IAccount;
 }

package/ts/types/Interface/models/ISocietyGescom.ts

@@ -47,6 +47,8 @@ export class ISocietyGescom {
   idSociety?: number | null;
   shouldHideBrandName?: boolean;
   shouldHideEmailHeader?: boolean;
+  // Regroupe les ecritures comptables par compte pour l export des ecritures comptables.
+  areEntriesGroupedByAccount?: boolean;
   customerBlockBorderThickness?: number | null;
   customerBlockBorderColor?: string | null;
   lineSeparationThickness?: number | null;

package/ts/types/Interface/models/IThirdParty.ts

@@ -13,6 +13,7 @@ export class IThirdParty {
   fullnameAccountant?: string | null;
   company: string;
   address?: string | null;
+  addressComplement?: string | null;
   zipCode?: string | null;
   city?: string | null;
   phone?: string | null;
@@ -33,6 +34,7 @@ export class IThirdParty {
   idCountry?: number | null;
   idThirdPartyType: ThirdPartyType;
   deliveryAddress?: string | null;
+  deliveryAddressComplement?: string | null;
   deliveryZipCode?: string | null;
   deliveryCity?: string | null;
   deliveryIdCountry?: number | null;

package/ts/types/index.ts

@@ -540,6 +540,7 @@ export * from './Enum/Kyc.js';
 
 // Interfaces API
 export * from './Interface/api/accountingTransaction/Create.js';
+export * from './Interface/api/acd/Vat.js';
 export * from './Interface/api/acd/Create.js';
 export * from './Interface/api/authentification/AuthenticationResponse.js';
 export * from './Interface/api/exercice/ReadExercice.js';

package/ts/utils/acdVat.ts

@@ -0,0 +1,63 @@
+import { Vat } from '../types/Enum/Vat.js';
+import { AcdVatCode } from '../types/Interface/api/acd/Vat.js';
+
+export function idVatToAcdVatCode(idVat?: number | null): AcdVatCode | null {
+  if (!idVat) {
+    return null;
+  }
+
+  const vat = Object.values(Vat).find((currentVat) => currentVat.id === idVat);
+
+  if (!vat) {
+    return AcdVatCode.NON_AFFECTE;
+  }
+
+  if (vat.isVatIntracom) {
+    return AcdVatCode.INTRACOM;
+  }
+
+  if (vat.isVatImportation) {
+    return AcdVatCode.AUTOL;
+  }
+
+  switch (vat.value) {
+    case 2.1:
+      return AcdVatCode.REDUIT_2_1;
+    case 5.5:
+      return AcdVatCode.REDUIT_5_5;
+    case 10:
+      return AcdVatCode.REDUIT_10;
+    case 20:
+      return AcdVatCode.NORMAL;
+    case 0:
+      return null;
+    default:
+      return AcdVatCode.NON_AFFECTE;
+  }
+}
+
+export function acdVatCodeToIdVat(acdVatCode?: AcdVatCode | null): number | null {
+  switch (acdVatCode) {
+    case AcdVatCode.NORMAL:
+      return Vat.TX_20.id;
+    case AcdVatCode.REDUIT_10:
+      return Vat.TX_10.id;
+    case AcdVatCode.REDUIT_5_5:
+      return Vat.TX_5_5.id;
+    case AcdVatCode.REDUIT_2_1:
+      return Vat.TX_2_1.id;
+    case AcdVatCode.INTRACOM:
+      // L'information de taux est perdue dans le code ACD, on retombe sur l'intracom a 20% par defaut.
+      return Vat.INTRACOM_TX_20.id;
+    case AcdVatCode.AUTOL:
+      // L'information de taux est perdue dans le code ACD, on retombe sur l'importation a 20% par defaut.
+      return Vat.IMPORTATION_TX_20.id;
+    case AcdVatCode.NON_AFFECTE:
+    case AcdVatCode.ONI:
+    case AcdVatCode.SUR_IMMOBILISATION:
+    case AcdVatCode.SPECIAL:
+    case null:
+    case undefined:
+      return null;
+  }
+}

package/ts/utils/commercialManagement/document.ts

@@ -138,6 +138,7 @@ export function generateCommercialDocument(
     brandColors: getBrandConfig({ objectWaited: 'colors', nodeEnv }) as brandColorType,
     brandName: `${getBrandConfig({ objectWaited: 'name', nodeEnv }) as unknown as string}`,
     shouldHideBrandName,
+    addressComplement: payload.addressComplement ?? null,
     paymentType: payload.paymentType
       ? (internationalizationConsistency(locale, payload.paymentType, 'paymentType') ?? payload.paymentType)
       : null,

package/ts/utils/commercialManagement/templates/body.ts

@@ -56,8 +56,9 @@ const headOfDocument = `<div class="row space-between">
         <% if(thirdParty.company) {%><b><%= thirdParty.company %></b><br/><% } %>
         <% if(thirdParty.fullname) {%><%= thirdParty.fullname %><br/><% } %>
           <% if(thirdParty.address) {%><%= thirdParty.address %><br/><% } %>
+          <% if(thirdParty.addressComplement) {%><%= thirdParty.addressComplement %><br/><% } %>
           <% if(thirdParty.zipCode) {%><%= thirdParty.zipCode + ' ' %><% } %><%= thirdParty.city %> <%= thirdParty.country %><br/>
-          <% if(thirdParty.deliveryAddress && thirdParty.deliveryCity && thirdParty.deliveryZipCode) {%>Adresse de livraison : <%= thirdParty.deliveryAddress %> <%= thirdParty.deliveryZipCode %> <%= thirdParty.deliveryCity %> <%= thirdParty.deliveryCountry %><br/><% } %>
+          <% if(thirdParty.deliveryAddress && thirdParty.deliveryCity && thirdParty.deliveryZipCode) {%>Adresse de livraison : <%= thirdParty.deliveryAddress %><% if(thirdParty.deliveryAddressComplement) {%> <%= thirdParty.deliveryAddressComplement %><% } %> <%= thirdParty.deliveryZipCode %> <%= thirdParty.deliveryCity %> <%= thirdParty.deliveryCountry %><br/><% } %>
           <% if(thirdParty.nSiret) {%>SIRET : <%= thirdParty.nSiret %><br/><% } %>
           <% if(thirdParty.nTva) {%>N° TVA : <%= thirdParty.nTva %><% } %>
         </div>
@@ -103,10 +104,13 @@ export const bodyTemplate = `<html class="pdf-content">
       <div class="row mt-30 space-between" style="page-break-inside: avoid !important;">
         <div>
           <% if ((settings && (settings.iban || settings.bic || settings.bank)) || paymentType) { %>
-            <% if(paymentType) { %><%= languageTemplate.template.common.options.paymentType %> : <%= paymentType %><br/><% } %>
-            <% if(settings.bank) { %><%= languageTemplate.template.common.options.bank %> : <%= settings.bank %><br/><% } %>
-            <% if(settings.iban) { %>IBAN : <%= settings.iban %><br/><% } %>
-            <% if(settings.bic) { %>BIC : <%= settings.bic %><% } %>
+            <% if(paymentType) { %><%= languageTemplate.template.common.options.paymentType %> : <%= paymentType %><br/>
+              <% if (!['Carte bancaire', 'Espèces', 'Chèque'].includes(paymentType)) { %>
+                <% if(settings.bank) { %><%= languageTemplate.template.common.options.bank %> : <%= settings.bank %><br/><% } %>
+                <% if(settings.iban) { %>IBAN : <%= settings.iban %><br/><% } %>
+                <% if(settings.bic) { %>BIC : <%= settings.bic %><% } %>
+              <% } %>
+            <% } %>
           <% } %>
         </div>
       </div>

package/ts/utils/commercialManagement/templates/common.ts

@@ -33,6 +33,7 @@ export class CommercialDocumentCommonHTML {
   company = `<div>
     <% if (name) { %><p><%= name %></p><% } %>
     <% if (number || street) { %><p><% } %><% if (number) { %><%= number + ' ' %><% } if (street) { %><%= street %><% } if (number || street) { %></p><% } %>
+    <% if (addressComplement) { %><p><%= addressComplement %></p><% } %>
     <% if (zipCode || city) { %><p><% } %><% if (zipCode) { %><%= zipCode + ' ' %><% } if (city) { %><%= city %><% } if (zipCode || city) { %></p><% } %>
   </div>
   <% if (phoneContact) { %><p><%= phoneContact %><p><% } %>

package/ts/utils/index.ts

@@ -20,5 +20,6 @@ export * from './bankAccount.js';
 export * from './commercialOffer.js';
 export * from './societyApproval.js';
 export * from './commercialManagement/saleEmail.js';
+export * from './acdVat.js';
 export * from './transforms/boolean.transform.js';
 export * from './transforms/number.transform.js';

package/ts/utils/tests/acdVat.spec.ts

@@ -0,0 +1,26 @@
+import { describe, expect, test } from 'vitest';
+import { Vat } from '../../types/Enum/Vat.js';
+import { AcdVatCode } from '../../types/Interface/api/acd/Vat.js';
+import { acdVatCodeToIdVat, idVatToAcdVatCode } from '../acdVat.js';
+
+describe('acdVat utils', () => {
+  test('should map internal VAT ids to ACD VAT codes', () => {
+    expect(idVatToAcdVatCode(Vat.TX_20.id)).toBe(AcdVatCode.NORMAL);
+    expect(idVatToAcdVatCode(Vat.TX_10.id)).toBe(AcdVatCode.REDUIT_10);
+    expect(idVatToAcdVatCode(Vat.TX_5_5.id)).toBe(AcdVatCode.REDUIT_5_5);
+    expect(idVatToAcdVatCode(Vat.TX_2_1.id)).toBe(AcdVatCode.REDUIT_2_1);
+    expect(idVatToAcdVatCode(Vat.INTRACOM_TX_20.id)).toBe(AcdVatCode.INTRACOM);
+    expect(idVatToAcdVatCode(Vat.IMPORTATION_TX_20.id)).toBe(AcdVatCode.AUTOL);
+    expect(idVatToAcdVatCode(Vat.WITHOUT_TAXE.id)).toBeNull();
+  });
+
+  test('should map ACD VAT codes back to internal VAT ids', () => {
+    expect(acdVatCodeToIdVat(AcdVatCode.NORMAL)).toBe(Vat.TX_20.id);
+    expect(acdVatCodeToIdVat(AcdVatCode.REDUIT_10)).toBe(Vat.TX_10.id);
+    expect(acdVatCodeToIdVat(AcdVatCode.REDUIT_5_5)).toBe(Vat.TX_5_5.id);
+    expect(acdVatCodeToIdVat(AcdVatCode.REDUIT_2_1)).toBe(Vat.TX_2_1.id);
+    expect(acdVatCodeToIdVat(AcdVatCode.INTRACOM)).toBe(Vat.INTRACOM_TX_20.id);
+    expect(acdVatCodeToIdVat(AcdVatCode.AUTOL)).toBe(Vat.IMPORTATION_TX_20.id);
+    expect(acdVatCodeToIdVat(AcdVatCode.NON_AFFECTE)).toBeNull();
+  });
+});