@silexpert/core 1.0.5 → 1.0.8

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

@@ -4,7 +4,7 @@ import {
 import { Order } from 'sequelize/types';
 import { ApiProperty, ApiPropertyOptional } from '../../../../utils';
 import { ToBoolean } from '../../../../utils/transforms/boolean.transform';
-import { DiscountType, InvoiceStatus } from '../../../Enum/CommercialManagement';
+import { DiscountType, EstimateStatus, InvoiceStatus } from '../../../Enum/CommercialManagement';
 import { EstimateInvoiceType } from '../../../Enum/EstimateInvoice';
 import { QueryPaginate } from '../BasePaginate';
 
@@ -90,7 +90,7 @@ export class QueryDocumentPaginated {
   @ApiPropertyOptional()
   @IsOptional()
   @IsString()
-  status?: InvoiceStatus;
+  status?: EstimateStatus;
 
   @ApiPropertyOptional()
   @IsOptional()

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

@@ -19,9 +19,11 @@ export type ReadProductEditing = IProductInvoice & {
   discountTypeFormatted: string | null;
   priceTaxExcludedFormatted: string | null;
   totalTaxExcludedFormatted: string | null;
+  marginVatFormatted: string | null;
 };
 
 export type ReadVatEditing = {
+  id: number;
   name: string;
   amount: number;
   value: number;
@@ -54,6 +56,7 @@ export type ReadDocumentEditing = CommercialDocumentInputs & {
   },
   shouldDisplayDiscountColumn: boolean;
   paymentLink?: string;
+  marginVats: string[];
 };
 
 export type ReadCommercialDocumentTemplate = {

package/ts/types/Interface/api/generalLedger/QueryGeneralLedgerAuxiliary.ts

@@ -1,5 +1,5 @@
 import {
-  IsBoolean, IsEnum, IsInt, IsOptional, IsString, Min,
+  IsBoolean, IsEnum, IsInt, IsOptional, IsString, Min, IsNumber,
 } from 'class-validator';
 import { ApiProperty, ApiPropertyOptional } from '../../../../utils';
 import { ToBoolean } from '../../../../utils/transforms/boolean.transform';
@@ -45,4 +45,9 @@ export class QueryGeneralLedgerAuxiliary {
   @IsString()
   @IsOptional()
   search?: string;
+
+  @ApiPropertyOptional()
+  @IsNumber()
+  @IsOptional()
+  idThirdParty?: number;
 }

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

@@ -20,7 +20,12 @@ export class CreateProduct {
 
   @ApiProperty()
   @IsNumber()
-  idVAT: number;
+  idVat: number;
+
+  @ApiPropertyOptional()
+  @IsNumber()
+  @IsOptional()
+  marginVatType?: number;
 
   @ApiPropertyOptional()
   @IsBoolean()

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

@@ -1,4 +1,6 @@
-import { IsEnum, IsOptional, IsString } from 'class-validator';
+import {
+  IsEnum, IsNumber, IsOptional, IsString,
+} from 'class-validator';
 import { ThirdPartyType } from '../../..';
 import { ApiPropertyOptional } from '../../../..';
 
@@ -12,4 +14,9 @@ export class QueryThirdParty {
   @IsOptional()
   @IsEnum(ThirdPartyType)
   type?: number;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsNumber()
+  idThirdParty?: number;
 }

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

@@ -10,7 +10,7 @@ import { IFile } from './IFile';
 import { IComptaType } from './IComptaType';
 import { IPartnerTransaction } from './IPartnerTransaction';
 import { ICurrency } from './ICurrency';
-import { IMachineLearningResult } from '../..';
+import { IMachineLearningResult } from './IMachineLearningResult';
 
 // accountingTransactions
 export interface IAccountingTransaction {

package/ts/types/Interface/models/IApiError.ts

@@ -24,6 +24,7 @@ export enum Code {
   failedCheckBalance = 'failed_check_balance',
   vatIntracomCanOnlyBeSetForDebit = 'vat_intracom_can_only_be_set_for_debit',
   vatMargeCanOnlyBeSetForCredit = 'vat_marge_can_only_be_set_for_credit',
+  vatMargeWithAssetCanOnlyBeSetForDebit = 'vat_marge_with_asset_can_only_be_set_for_debit',
   vatMargeCanOnlyBeSetIfAmountAllTaxIncludedPurchaseIsSet = 'vat_marge_can_only_be_set_if_amount_all_tax_included_purchase_is_set',
   missingParamSplit = 'missing_param_split',
   totalAmountSplitNotEqualTransaction = 'total_amount_split_not_equal_transaction',

package/ts/types/Interface/models/ICommercialMail.ts

@@ -1,5 +1,3 @@
-import { IEstimateInvoice } from '../..';
-
 export interface ICommercialMail {
   id?: number;
   to: string;
@@ -7,9 +5,7 @@ export interface ICommercialMail {
   bcc?: string | null;
   subject: string;
   content: string;
+  idFile: number;
   createdAt?: Date;
   updatedAt?: Date;
-  idEstimateInvoice: number;
-
-  estimateInvoice?: IEstimateInvoice;
 }

package/ts/types/Interface/models/IEngagementBankTransaction.ts

@@ -3,7 +3,6 @@ import { IEngagementAccountingEntry } from './IEngagementAccountingEntry';
 import { IAccountingJournal } from './IAccountingJournal';
 import { IUser } from './IUser';
 import { ILettering } from './ILettering';
-import { IPartnerTransaction } from './IPartnerTransaction';
 
 // engagementBankTransactions
 export interface IEngagementBankTransaction {
@@ -34,5 +33,4 @@ export interface IEngagementBankTransaction {
   accountingJournal: IAccountingJournal;
   user: IUser;
   lettering: ILettering;
-  partnersTransaction: IPartnerTransaction;
 }

package/ts/types/Interface/models/IFile.ts

@@ -1,6 +1,7 @@
 import { IAttachmentFile } from './IAttachmentFile';
 import { IFolderFile } from './IFolderFile';
 import { IFileType } from './IFileType';
+import { ICommercialMail } from '../..';
 
 // files
 export interface IFile {
@@ -17,4 +18,5 @@ export interface IFile {
   attachmentFile?: IAttachmentFile;
   folderFile?: IFolderFile;
   fileType?: IFileType;
+  commercialMails?: ICommercialMail[]
 }

package/ts/types/Interface/models/ILoan.ts

@@ -20,6 +20,7 @@ export interface ILoan {
   idAccountBenefit: number;
   idAccountInsurance: number;
   idAccountCommission: number;
+  idAccountReleaseLoanCapital: number;
   createdAt?: Date | null;
   updatedAt?: Date | null;
 
@@ -30,5 +31,6 @@ export interface ILoan {
   accountBenefit?: IAccount;
   accountInsurance?: IAccount;
   accountCommission?: IAccount;
+  accountReleaseLoanCapital?: IAccount;
   loanFiles?: ILoanFile[];
 }

package/ts/types/Interface/models/IPartnerTransaction.ts

@@ -10,7 +10,6 @@ export interface IPartnerTransaction {
   idAccountingTransaction: number | null;
   createdAt?: Date | null;
   updatedAt?: Date | null;
-  idEngagementBankTransaction: number | null;
 
   // Associations
   typePartnerTransaction?: IPartnerTransactionType;

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

@@ -6,12 +6,14 @@ export interface IProduct {
   id?: number;
   name: string;
   comment: string | null;
-  isFree: boolean;
+  isFree?: boolean;
   codeProduct: string | null;
   priceTaxExcluded: number;
-  idVAT: number;
+  idVat: number;
   unit: number | null;
   type: number | null;
+  amountOfPurchase: number | null;
+  marginVatType?: number;
   idSociety: number;
   createdAt?: Date | null;
   updatedAt?: Date | null;

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

@@ -8,6 +8,8 @@ export interface IProductInvoice {
   idEstimateInvoice: number;
   idProduct: number | null;
   idVat: number;
+  marginVatType?: number;
+  amountOfPurchase: number | null;
   unit: number;
   type: number;
   itemSaleName: string | null;

package/ts/utils/commercialManagement/document.ts

@@ -1,9 +1,12 @@
 import * as ejs from 'ejs';
-import { orderBy as _orderBy, groupBy as _groupBy, sumBy as _sumBy } from 'lodash';
+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 { fontList } from '../../types/Enum/CommercialManagement';
+import { fontList, VatMarginCategyList } from '../../types/Enum/CommercialManagement';
 import { EstimateInvoiceType } from '../../types/Enum/EstimateInvoice';
+import { Vat } from '../../types/Enum/Vat';
 import { integerToFormattedAmountString } from '../amount';
 import { CommercialDocumentCommonHTML } from './templates/common';
 import { bodyTemplate } from './templates/body';
@@ -13,8 +16,7 @@ import { CreateInvoiceDocument, CreatePreSaleDocument } from '../../types';
 
 export function generateCommercialDocument(idEstimateInvoiceType: EstimateInvoiceType, payload: CreateInvoiceDocument | CreatePreSaleDocument): ReadCommercialDocumentTemplate {
   const products = _orderBy(payload.products.map((product) => productToReadProductEditing(product), 'reorder'));
-  // FIXME: Par quoi regrouper ceux qui ont un nom ""
-  const vats = _orderBy(Object.values(_groupBy(products, 'vatFormatted')).map((v) => (vatToReadVatEditing(v)), 'value'));
+  const vats = _orderBy(Object.values(_groupBy(products, 'vatFormatted')).map((v) => (vatToReadVatEditing(v)), 'value')).filter((v) => v.id !== Vat.MARGE.id);
 
   const data: ReadDocumentEditing = {
     ...payload,
@@ -41,6 +43,8 @@ export function generateCommercialDocument(idEstimateInvoiceType: EstimateInvoic
     expirationDateFormatted: payload.expirationDate ? dayjs(payload.expirationDate).format('DD/MM/YYYY') : null,
     emissionDateFormatted: payload.emissionDate ? dayjs(payload.emissionDate).format('DD/MM/YYYY') : null,
     shouldDisplayDiscountColumn: !!products.find((p) => p.discount2 && p.discount2 > 0),
+    // @ts-ignore
+    marginVats: _uniq(products.filter((p) => p.marginVatFormatted !== null).map((p) => p.marginVatFormatted)),
   };
 
   const commonTemplate = new CommercialDocumentCommonHTML();
@@ -92,6 +96,8 @@ export function generateAdvanceDocument(payload: CreateInvoiceDocument): ReadCom
     emissionDateFormatted: payload.emissionDate ? dayjs(payload.emissionDate).format('DD/MM/YYYY') : null,
     shouldDisplayDiscountColumn: false,
     disableVat: true,
+    // @ts-ignore
+    marginVats: _uniq((payload.assetMarginVatIds ?? []).map((m) => VatMarginCategyList.find((c) => c.id === m)?.label ?? null)),
   };
 
   const commonTemplate = new CommercialDocumentCommonHTML();

package/ts/utils/commercialManagement/product.ts

@@ -1,7 +1,7 @@
 import { isDefined } from 'class-validator';
 import { IProductInvoice, ReadProductEditing } from '../../types';
 import { Unit } from '../../types/Enum/Unit';
-import { DiscountType } from '../../types/Enum/CommercialManagement';
+import { DiscountType, VatMarginCategyList } from '../../types/Enum/CommercialManagement';
 import { getById } from './vat';
 import { integerToFormattedAmountString } from '../amount';
 
@@ -32,5 +32,6 @@ export function productToReadProductEditing(payload: IProductInvoice): ReadProdu
     totalTaxExcludedFormatted: isDefined(payload.priceTaxExcluded) ? integerToFormattedAmountString(getTotalTaxExcluded(payload)) : null,
     discountFormatted: payload.discount2 && payload.discount2 > 0 ? integerToFormattedAmountString(getDiscount(payload)) : null,
     discountTypeFormatted: payload.discount2 && payload.discount2 > 0 ? payload.discountType === DiscountType.PERCENT ? `${(payload.discount2 / 100).toFixed(2)}%` : `${integerToFormattedAmountString(payload.discount2)}€` : null,
+    marginVatFormatted: payload.marginVatType ? VatMarginCategyList.find((c) => c.id === payload.marginVatType)?.label ?? null : null,
   };
 }

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

@@ -89,7 +89,7 @@ export const bodyTemplate = `<html>
     </div>
 
     <% if ((settings && (settings.iban || settings.bic)) || isStripeAllowed) { %>
-      <div class="row mt-30 space-between">
+      <div class="row mt-30 space-between" style="page-break-inside: avoid !important;">
         <div>
           <% if (settings && (settings.iban || settings.bic)) { %>
             <% if(settings.iban) { %>IBAN : <%= settings.iban %><br/><% } %>

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

@@ -10,7 +10,7 @@ export class CommercialDocumentCommonHTML {
 
   footer = `<div style="font-size: 8px; color: #DADCDF; text-align: center; margin-left: 40px; margin-right: 40px; display: block; width: 100%">
     <% if (freeText) { %><%- freeText %><br/><br/><% } %>
-    <% if(penalties || compensation || discount) {%><%= penalties ? 'Pénalités en cas de retard : ' + penalties : ''%><%= penalties && compensation ? '|' : ''%><%= compensation ? 'Indemnité forfaitaire en cas de retard :' + compensation : '' %><%= (compensation || penalties) && discount ? '| ' : '' %><%= discount %><% if(name || legalForm || capital || siren || rcs) {%><br/><br/><% } %><% }%>
+    <% if(marginVats.length > 0) {%>Régime TVA sur marge - <% marginVats.forEach(function(v, index) { %><%= v %> - <% }) } %> ART 297-A du CGI ou directive 2006-212 CE | <% if(penalties || compensation || discount) {%><%= penalties ? 'Pénalités en cas de retard : ' + penalties : ''%><%= penalties && compensation ? '|' : ''%><%= compensation ? 'Indemnité forfaitaire en cas de retard :' + compensation : '' %><%= (compensation || penalties) && discount ? '| ' : '' %><%= discount %><% if(name || legalForm || capital || siren || rcs) {%><br/><br/><% } %><% }%>
     <%= name %><%= name && (legalForm || capital || siren || rcs) ? ',' : ''%><%= legalForm %><%= capital ? ' au capital de ' + capitalFormatted + ' €' : '' %><%= siren ? ' immatriculée sous le SIREN ' + siren : ''%><%= rcs ? 'RCS ' + rcs + vatCode || nafCode ? '|' : '' : ''%><% if (vatCode || nafCode) {%><br/><% } %><%= vatCode ? 'N° TVA '+vatCode : ''%><% if(vatCode && nafCode){%>|<%}%><%= nafCode ? 'APE '+nafCode : '' %>
     </div>`;
 

package/ts/utils/commercialManagement/vat.ts

@@ -15,6 +15,7 @@ export function getById(id: number): VatType | undefined {
 export function vatToReadVatEditing(products: ReadProductEditing[]): ReadVatEditing {
   const { idVat } = products[0];
   return {
+    id: idVat,
     name: getById(idVat)?.saleName ?? '',
     amount: _sumBy(products, (p) => getAmount(p.totalTaxExcluded, getById(idVat)?.value ?? 0)),
     value: getById(idVat)?.value ?? 0,