@silexpert/core 1.1.152 → 1.1.154

package/ts/types/Enum/PrestationType.ts

@@ -170,6 +170,9 @@ export enum PrestationType {
   STATUTS_OPTION_1 = 213,
   STATUTS_OPTION_2 = 214,
   STATUTS_OPTION_AE = 215,
+  COMPTA_MICRO_KLEMS = 216,
+  COMPTA_EI_KLEMS = 217,
+  COMPTA_LOUEUR_MEUBLE_NON_PRO_KLEMS = 218,
 }
 
 // Liste des prestations avec une lettre de mission à signer
@@ -3066,4 +3069,55 @@ export const PrestationDetail: PrestationDetailEnum = {
     signaturePage: null,
     point: 0,
   },
+  COMPTA_MICRO_KLEMS: {
+    id: PrestationType.COMPTA_MICRO_KLEMS,
+    name: 'Compta Micro Klems',
+    isComptable: true,
+    isJuridique: false,
+    isSocial: false,
+    isAttestation: false,
+    inAverageCart: false,
+    isBack: false,
+    price: null,
+    isCatalog: true,
+    hidden: false,
+    isComplementary: false,
+    signaturePosition: '',
+    signaturePage: null,
+    point: 0,
+  },
+  COMPTA_EI_KLEMS: {
+    id: PrestationType.COMPTA_EI_KLEMS,
+    name: 'Compta Entreprise Individuelle Klems',
+    isComptable: true,
+    isJuridique: false,
+    isSocial: false,
+    isAttestation: false,
+    inAverageCart: false,
+    isBack: false,
+    price: null,
+    isCatalog: true,
+    hidden: false,
+    isComplementary: false,
+    signaturePosition: '',
+    signaturePage: null,
+    point: 0,
+  },
+  COMPTA_LOUEUR_MEUBLE_NON_PRO_KLEMS: {
+    id: PrestationType.COMPTA_LOUEUR_MEUBLE_NON_PRO_KLEMS,
+    name: 'Compta Loueur Meublé Non Professionnel Klems',
+    isComptable: true,
+    isJuridique: false,
+    isSocial: false,
+    isAttestation: false,
+    inAverageCart: false,
+    isBack: false,
+    price: null,
+    isCatalog: true,
+    hidden: false,
+    isComplementary: false,
+    signaturePosition: '',
+    signaturePage: null,
+    point: 0,
+  },
 };

package/ts/types/Enum/SalesContractConfig.ts

@@ -1,3 +1,5 @@
+import { IsNumber, IsOptional, IsString } from 'class-validator';
+import { ApiProperty, ApiPropertyOptional } from '../../utils';
 import { PrestationType } from './PrestationType';
 
 // Config in the Brand enum
@@ -26,12 +28,45 @@ export type SalesContractConfig = {
 };
 
 // List of version for a config
-export type SalesContractConfigVersion = {
+export class SalesContractConfigVersion {
   versionId: string;
   name: string;
-};
+}
 
-export type ParamsPreviewContract = {
-  idPrestationList: number;
-  versionId?: string;
-};
+export class ParamsPreviewContract {
+  @ApiProperty()
+    idPrestationList: number;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+    versionId?: string;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsNumber()
+    idTypeBrand?: number;
+}
+
+export class ParamsGetConfig {
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+    versionId?: string;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsNumber()
+    idTypeBrand?: number;
+}
+
+export class ParamsBackgroundUpload {
+  @ApiProperty()
+  @IsString()
+    blocName: string;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsNumber()
+    idTypeBrand?: number;
+}

package/ts/types/Interface/api/cashAndExpense/Query.ts

@@ -0,0 +1,24 @@
+import { IsBoolean, IsDateString, IsOptional, IsString } from 'class-validator';
+import { ApiProperty, ApiPropertyOptional } from '../../../../utils';
+import { ToBoolean } from '../../../../utils/transforms/boolean.transform';
+
+export class QueryKilometricAllowance {
+  @ApiProperty()
+  @IsDateString()
+    startDate: string;
+
+  @ApiProperty()
+  @IsDateString()
+    endDate: string;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+    orderBy?: string;
+  
+  @ApiPropertyOptional()
+  @IsBoolean()
+  @ToBoolean()
+  @IsOptional()
+    isDescending?: boolean;
+}

package/ts/types/Interface/api/salesContract/SendSalesContractParams.ts

@@ -17,3 +17,20 @@ export class SendSalesContractParams {
   @ApiPropertyOptional()
     files?: File[];
 }
+
+export class SendMandateParams {
+  @ApiProperty()
+  @IsInt()
+    idSociety: number;
+    
+  @ApiProperty()
+  @IsString()
+    startText: string;
+
+  @ApiProperty()
+  @IsString()
+    endText: string;
+
+  @ApiPropertyOptional()
+    files?: File[];
+}

package/ts/types/Interface/models/IAccountingTransaction.ts

@@ -12,6 +12,7 @@ import { IPartnerTransaction } from './IPartnerTransaction';
 import { ICurrency } from './ICurrency';
 import { IMachineLearningResult } from './IMachineLearningResult';
 import { ISocietyPartner } from './ISocietyPartner';
+import { ISocietyVehicle } from './ISocietyVehicle';
 
 // accountingTransactions
 export interface IAccountingTransaction {
@@ -76,4 +77,5 @@ export interface IAccountingTransaction {
   childs?: IAccountingTransaction[];
   machineLearningResults?: IMachineLearningResult[];
   societyPartner?: ISocietyPartner;
+  vehicle?: ISocietyVehicle | null;
 }

package/ts/types/index.ts

@@ -495,6 +495,7 @@ export * from './Enum/VatControl';
 export * from './Enum/Cycle';
 
 // Interfaces API
+export * from './Interface/api/cashAndExpense/Query';
 export * from './Interface/api/cerfa/das2';
 export * from './Interface/api/adjustment/Query';
 export * from './Interface/api/adjustment/Read';

package/ts/utils/brands.ts

@@ -31,7 +31,7 @@ type brand = {
   },
 };
 
-const allBrands = ['Legalstart', 'Comptalib', 'Clementine', 'Pourcentage', 'Clems', 'StatutsExpress'] as const;
+const allBrands = ['Legalstart', 'Comptalib', 'Clementine', 'Pourcentage', 'Klems', 'StatutsExpress'] as const;
 type BrandList = typeof allBrands[number];
 
 type getBrandConfigParams = {
@@ -52,8 +52,8 @@ const getBrandNameByNodeEnv = (nodeEnv?: string): BrandList => {
     if (env.indexOf('pourcentage') > -1 || env.indexOf('Pourcentage') > -1) {
       return 'Pourcentage';
     }
-    if (env.indexOf('clems') > -1 || env.indexOf('Clems') > -1) {
-      return 'Clems';
+    if (env.indexOf('klems') > -1 || env.indexOf('Klems') > -1) {
+      return 'Klems';
     }
     if (env.indexOf('statuts') > -1 || env.indexOf('Statuts') > -1) {
       return 'StatutsExpress';
@@ -130,6 +130,18 @@ const getBrandByEmail = (email: string): 'Legalstart' | 'Comptalib' | 'Clementin
   return null;
 };
 
+const getSubBrandList = (nodeEnv?: string): Array<object> => {
+  const nodeEnvUsed = nodeEnv ?? process.env.NODE_ENV;
+  const currentEnvName = getBrandNameByNodeEnv(nodeEnvUsed);
+  const listEnvEnum = {
+    BrandClementine, BrandLegalstart, BrandComptalib, BrandPourcentage, BrandClems, BrandStatutsExpress,
+  };
+  // @ts-ignore
+  const currentConfigFile: brand[] = listEnvEnum[`Brand${currentEnvName}`];
+
+  return currentConfigFile;
+};
+
 export {
-  getBrandConfig, isItThisEnv, getAllBrandByNodeEnv, getBrandNameByNodeEnv, getBrandByEmail,
+  getBrandConfig, isItThisEnv, getAllBrandByNodeEnv, getBrandNameByNodeEnv, getBrandByEmail, getSubBrandList,
 };

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

@@ -72,24 +72,24 @@ export function getCerfa3310Century23Payload(accountingEntries: IAccountingEntry
   const untaxedIntracommunityDelivery = setZeroIfIsNegative(getAmountByAccountNumber(vatEntries.filter((ae) => withoutTaxVat.includes(ae.idVat) && intracomVat.includes(ae.idVat)), ['701', '707'], 0, true));
   // TVA brute
   const normalRate = setZeroIfIsNegative(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)) + (payload?.vatControl?.france?.base20 ?? 0);
+  + 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 = _round(normalRate * 0.2);
 
   const reducedRate5Dot5 = setZeroIfIsNegative(getAmountByAccountNumber(taxedServicesEntries.filter((e) => vats.filter((v) => v.value === 5.5).map((v) => v.id).includes(e.idVat)), servicesAccounts, 0, true)
-  + 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);
+  + 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 = _round(reducedRate5Dot5 * 0.055);
 
   const reducedRate10 = setZeroIfIsNegative(getAmountByAccountNumber(taxedServicesEntries.filter((e) => vats.filter((v) => v.value === 10).map((v) => v.id).includes(e.idVat)), servicesAccounts, 0, true)
-  + 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);
+  + 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 = _round(reducedRate10 * 0.1);
 
   const reducedRate8Dot5 = setZeroIfIsNegative(getAmountByAccountNumber(taxedServicesEntries.filter((e) => vats.filter((v) => v.value === 8.5).map((v) => v.id).includes(e.idVat)), servicesAccounts, 0, true)
-  + 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);
+  + 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 = _round(reducedRate8Dot5 * 0.085);
 
   const reducedRate2Dot1 = setZeroIfIsNegative(getAmountByAccountNumber(taxedServicesEntries.filter((e) => vats.filter((v) => v.value === 2.1).map((v) => v.id).includes(e.idVat)), servicesAccounts, 0, true)
-  + 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);
+  + 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 = _round(reducedRate2Dot1 * 0.021);
 
   const importNormalRate = setZeroIfIsNegative(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);