@silexpert/core 1.1.344 → 1.1.346

package/ts/types/Enum/TimeSlot.ts

@@ -18,7 +18,6 @@ export enum TimeSlot {
   CLOSE_SOCIETY = 14,
   TAX_ADVICE_OR_COMPLEX_LEGAL_ARRANGEMENTS = 15,
   FIX_UNPAID = 16,
-  POST_BILAN = 17,
   ANNUAL_FINANCIAL_STATEMENTS = 18,
   MANAGER_REVENUE = 19,
   SPECIALISED_FISCAL_QUESTIONS = 20,
@@ -33,13 +32,16 @@ export enum TimeSlotCategory {
   SPECIALISED = 4,
 }
 
+/**
+ * @param {number[]} idRole if idRole not set, return all users except customers
+ */
 export type TimeSlotDetailType = {
   id: number;
   name: string;
   internalName: string;
   category?: string,
   duration: number;
-  idRole: number[];
+  idRole?: number[];
   forWholeService?: boolean
   idRoleExcluded?: number[];
   idTimeCounterType: number;
@@ -99,7 +101,7 @@ export const TimeSlotDetail:TimeSlotDetailType[] = [
     internalName: 'Rdv bilan',
     category: TimeSlotCategoryDetail.find(c => c.id === TimeSlotCategory.ACCOUNTING)?.name,
     duration: 30,
-    idRole: [Role.ACCOUNTANT, Role.TECHNICAL_ADVISOR],
+    idRole: [Role.ACCOUNTANT],
     forWholeService: false,
     idTimeCounterType: TimeCounterType.CALENDLY.id,
   },
@@ -109,7 +111,7 @@ export const TimeSlotDetail:TimeSlotDetailType[] = [
     internalName: 'Rdv TVA',
     category: TimeSlotCategoryDetail.find(c => c.id === TimeSlotCategory.ACCOUNTING)?.name,
     duration: 30,
-    idRole:[Role.ACCOUNTANT, Role.TECHNICAL_ADVISOR],
+    idRole:[Role.ACCOUNTANT],
     idRoleExcluded:[Role.MANAGER],
     forWholeService: false,
     idTimeCounterType: TimeCounterType.CALENDLY.id,
@@ -137,7 +139,7 @@ export const TimeSlotDetail:TimeSlotDetailType[] = [
     internalName: 'Rdv Conseils',
     category: TimeSlotCategoryDetail.find(c => c.id === TimeSlotCategory.ACCOUNTING)?.name,
     duration: 30,
-    idRole:[Role.ACCOUNTANT, Role.TECHNICAL_ADVISOR],
+    idRole:[Role.ACCOUNTANT],
     idRoleExcluded:[Role.MANAGER],
     forWholeService: false,
     idTimeCounterType: TimeCounterType.CALENDLY.id,
@@ -166,7 +168,7 @@ export const TimeSlotDetail:TimeSlotDetailType[] = [
     name: 'Rdv',
     internalName: 'Rdv',
     duration: 20,
-    idRole: [Role.ACCOUNTANT, Role.COMMERCIAL, Role.SOCIAL, Role.JURIDIC, Role.EXPERT_ACCOUNTANT, Role.FACTURATION, Role.LITIGE, Role.TECHNICAL_ADVISOR],
+    // idRole: [Role.ACCOUNTANT, Role.COMMERCIAL, Role.SOCIAL, Role.JURIDIC, Role.EXPERT_ACCOUNTANT, Role.FACTURATION, Role.LITIGE, Role.TECHNICAL_ADVISOR],
     forWholeService: false,
     idTimeCounterType: TimeCounterType.CALENDLY.id,
   },
@@ -217,7 +219,7 @@ export const TimeSlotDetail:TimeSlotDetailType[] = [
     category: TimeSlotCategoryDetail.find(c => c.id === TimeSlotCategory.JURIDIC)?.name,
     duration: 60, 
     idRole: [Role.JURIDIC, Role.DIRECTOR],
-    forWholeService: true,
+    forWholeService: false,
     idTimeCounterType: TimeCounterType.CALENDLY.id,
   },
   {
@@ -230,16 +232,6 @@ export const TimeSlotDetail:TimeSlotDetailType[] = [
     forWholeService: true,
     idTimeCounterType: TimeCounterType.CALENDLY.id,
   },
-  {
-    id: TimeSlot.POST_BILAN,
-    name: 'Prise de rendez-vous rendus bilan',
-    internalName: 'Rdv rendus bilan',
-    category: TimeSlotCategoryDetail.find(c => c.id === TimeSlotCategory.ACCOUNTING)?.name,
-    duration: 30,
-    idRole: [Role.TECHNICAL_ADVISOR],
-    forWholeService: false,
-    idTimeCounterType: TimeCounterType.CALENDLY.id,
-  },
   {
     id: TimeSlot.ANNUAL_FINANCIAL_STATEMENTS,
     name: 'Lecture et explication des comptes annuels',

package/ts/utils/payment.ts

@@ -114,6 +114,11 @@ const calculatePaymentsAuto = (params: ParamsForPaymentsAuto):PaymentAuto[] => {
 
   if (prestationList?.isCatalog || !prestationList?.isComptable) throw new Error('Ce type de prestation ne correspond pas aux conditions attendues.');
   if (listPartialExercicePrestationExpress.length && listPartialExercicePrestationExpress?.some((ep: PartialExercicePrestationExpress) => !ep?.startDate)) throw new Error('Start date of some exercice are missing');
+  
+  let yearlyAmountNonExpressClone = yearlyAmountNonExpress;
+  if (isWithApplicationFees) {
+    yearlyAmountNonExpressClone -= getApplicationFeesAmount(idLegalForm); //HT
+  }
 
   const nbExoExpress = listPartialExercicePrestationExpress.length;
   const listPayments:PaymentAuto[] = [];
@@ -248,7 +253,7 @@ const calculatePaymentsAuto = (params: ParamsForPaymentsAuto):PaymentAuto[] => {
     let countMonthsBeforeExerciceEnd = Math.ceil(dayjs(exerciceEndDate).diff(paymentDate, 'months', true));
     if (countMonthsBeforeExerciceEnd < 3) countMonthsBeforeExerciceEnd = 3;
 
-    const exoAmount = isFirstNonExpress ? yearlyAmountNonExpress : nextYearlyAmountNonExpress;
+    const exoAmount = isFirstNonExpress ? yearlyAmountNonExpressClone : nextYearlyAmountNonExpress;
     const remainingBeforeThisExo = remainingAmount;
     remainingAmount += priceWithTaxesIncluded ? exoAmount : getTaxesIncludedAmount(exoAmount, idVat);
 

package/ts/utils/prestation.ts

@@ -119,7 +119,7 @@ const isExpress = (idPrestationList: number):boolean => {
 };
 
 const calculateScoringOfPrestation = (idPrestationType: PrestationType, prestations: IPrestation[]): number => {
-  const prestationsSignedPaid = prestations.filter((prestation) => prestation.paid && prestation.signed && prestation.terminationList === null);
+  const prestationsSignedPaid = prestations.filter((prestation) => prestation.terminationList === null);
 
   // Get the list of prestations that are half price
   const prestationHalfPriceList = Object.values(PrestationDetail).filter((p) => p.isComptable && !p.isCatalog);