@silexpert/core 1.1.270 → 1.1.272

package/ts/types/Interface/api/mail/QueryPaginatedMail.ts

@@ -5,6 +5,12 @@ import { ApiPropertyOptional } from '../../../../utils';
 import { ToBoolean } from '../../../../utils/transforms/boolean.transform';
 
 export class QueryPaginatedMail {
+  @ApiPropertyOptional({ default: false })
+  @IsOptional()
+  @IsBoolean()
+  @ToBoolean()
+    displayAccountant? = false;
+
   @ApiPropertyOptional()
   @IsOptional()
   @IsString()

package/ts/utils/commercialManagement/document.ts

@@ -2,7 +2,7 @@ import {
   orderBy as _orderBy, groupBy as _groupBy, sumBy as _sumBy, uniq as _uniq,
 } from 'lodash';
 import * as dayjs from 'dayjs';
-import { ReadCommercialDocumentTemplate, ReadDocumentEditing } from '../../types/Interface/api/commercialManagement/Read';
+import { ReadCommercialDocumentTemplate, ReadDocumentEditing, ReadVatEditing } from '../../types/Interface/api/commercialManagement/Read';
 import {
   AccountingCategoryList, FontIds, fontList,
 } from '../../types/Enum/CommercialManagement';
@@ -36,6 +36,22 @@ export function generateCommercialDocument(idEstimateInvoiceType: EstimateInvoic
   const vats = _orderBy(Object.values(_groupBy(products, 'vatFormatted')).map((v) => (vatToReadVatEditing(v)), 'value')).filter((v) => v.id !== Vat.MARGE.id);
   const thirdParty = thirdPartyToReadThirdPartyEditing(payload.thirdParty);
 
+  let forcedVats: ReadVatEditing[] | undefined = undefined;
+
+  if (payload.advanceProducts?.length) {
+    const advanceVats = Object.values(_groupBy(payload.advanceProducts, 'vatFormatted')).map((v) => (vatToReadVatEditing(v)), 'value').filter((v) => v.id !== Vat.MARGE.id);
+    
+    forcedVats = vats.map(v => {
+      const base = v.base - (advanceVats.find(a => a.id === v.id)?.base ?? 0);
+      const toPay = v.toPay - (advanceVats.find(a => a.id === v.id)?.toPay ?? 0);
+      return {
+        ...v,
+        baseFormatted: integerToFormattedAmountString(base),
+        amountFormatted: integerToFormattedAmountString(toPay),
+      };
+    });
+  }
+
   const data: ReadDocumentEditing & { brandColors: brandColorType, brandName: string, shouldHideBrandName: boolean } = {
     ...payload,
     thirdParty,
@@ -113,6 +129,7 @@ export function generateCommercialDocument(idEstimateInvoiceType: EstimateInvoic
             ? p.comment?.replace(/\n/g, '<br/>')
             : null,
       })),
+      vats: forcedVats ?? vats,
     }),
     footer: ejs.render(commonTemplate.footer, {
       ...data,

package/ts/utils/commercialManagement/vat.ts

@@ -21,5 +21,7 @@ export function vatToReadVatEditing(products: ReadProductEditing[]): ReadVatEdit
     value: getById(idVat)?.value ?? 0,
     baseFormatted: integerToFormattedAmountString(_sumBy(products, (p) => (p.totalTaxExcluded ? +p.totalTaxExcluded : 0))),
     amountFormatted: integerToFormattedAmountString((_sumBy(products, (p) => (p.totalTaxExcluded ? +p.totalTaxExcluded : 0)) * ((getById(idVat)?.value ?? 0))) / 100),
+    toPay: (_sumBy(products, (p) => (p.totalTaxExcluded ? +p.totalTaxExcluded : 0)) * ((getById(idVat)?.value ?? 0))) / 100,
+    base: _sumBy(products, (p) => (p.totalTaxExcluded ? +p.totalTaxExcluded : 0)),
   };
 }