@silexpert/core 0.4.133 → 0.4.134

package/ts/types/Enum/BalanceSheet.ts

@@ -1,3 +1,6 @@
+import { ThirdPartyType } from './ThirdPartyType';
+import { MathematicalSign } from './Util';
+
 export enum BalanceSheetState {
   TO_DO = 0,
   ACCEPTED_BY_SIE = 1,
@@ -37,6 +40,7 @@ export type BalanceSheetField = {
   calculationAdd?: string[]; // Tableau des keys à additionner pour obtenir le total
 
   type?: BalanceSheetType; // Permet de calculer par somme de compte, créditeur ou débiteur
+  idThirdPartyTypeToAdd?: [ThirdPartyType, MathematicalSign] // Type de tiers à additionner, uniquement au crédit / débit / tous
 };
 
 export type BalanceSheetList = BalanceSheetField[];
@@ -229,11 +233,13 @@ export const BALANCE_SHEET_LIST_ACTIVE: BalanceSheetList = [
           {
             name: 'Créances clients et comptes rattachés',
             accounts: ['411', '413', '416', '418'],
+            idThirdPartyTypeToAdd: [ThirdPartyType.CUSTOMER, MathematicalSign.LESS],
             accountsDeducted: ['491'],
           },
           {
             name: 'Autres',
             accounts: ['401', '4096', '4097', '4098', '42', '43', '44', '45', '46', '48'],
+            idThirdPartyTypeToAdd: [ThirdPartyType.PROVIDER, MathematicalSign.LESS],
             accountsDeducted: ['495', '496'], // Actif : On compte dedans que ceux qui sont positifs que 4
             type: 'active',
           },
@@ -488,6 +494,7 @@ export const BALANCE_SHEET_LIST_PASSIVE: BalanceSheetList = [
         name: 'Dettes Fournisseurs et Comptes rattachés',
         key: 'payables',
         accounts: ['401', '403', '4081', '4088'],
+        idThirdPartyTypeToAdd: [ThirdPartyType.PROVIDER, MathematicalSign.PLUS],
         isSubcategory: true,
         total: 0,
         type: 'passive',
@@ -512,6 +519,7 @@ export const BALANCE_SHEET_LIST_PASSIVE: BalanceSheetList = [
         name: 'Autres dettes',
         key: 'OtherDebts',
         accounts: ['411', '4196', '4197', '4198', '464', '467', '4686', '478', '509'],
+        idThirdPartyTypeToAdd: [ThirdPartyType.CUSTOMER, MathematicalSign.PLUS],
         isSubcategory: true,
         total: 0,
         type: 'passive',

package/ts/types/Enum/Util.ts

@@ -6,4 +6,9 @@ export enum YesNoNstState {
 export enum ToDoOrDone {
   TO_DO = 'TO_DO',
   DONE = 'DONE',
+}
+export enum MathematicalSign {
+  PLUS = '+',
+  LESS = '-',
+  EQUAL = '=',
 }

package/ts/types/Interface/api/revision/QueryRevisionAccount.ts

@@ -0,0 +1,42 @@
+import {
+  IsBoolean, IsDate, IsInt, IsNumber, IsString,
+} from 'class-validator';
+import { ApiProperty, QueryPaginate } from '../../../..';
+import { ApiPropertyOptional } from '../../../../utils';
+import { ToBoolean } from '../../../../utils/transforms/boolean.transform';
+
+export class QueryRevisionAccount implements QueryPaginate {
+  @ApiProperty()
+  @IsNumber()
+  page: number;
+
+  @ApiPropertyOptional({ default: 'idAccount' })
+  @IsString()
+  orderBy: string;
+
+  @ApiProperty()
+  @IsDate()
+  startDate: Date;
+
+  @ApiProperty()
+  @IsDate()
+  endDate: Date;
+
+  @ApiPropertyOptional({ default: 25 })
+  @IsNumber()
+  limit: number;
+
+  @ApiPropertyOptional({ default: true })
+  @IsBoolean()
+  @ToBoolean()
+  descending: boolean;
+
+  @ApiPropertyOptional()
+  @IsBoolean()
+  @ToBoolean()
+  isRevised: boolean;
+
+  @ApiProperty()
+  @IsInt()
+  idSociety: number;
+}

package/ts/types/Interface/api/revision/ReadRevisionAccount.ts

@@ -0,0 +1,40 @@
+import {
+  IAccountingFile, IAccountingJournal, ILettering, IUser,
+} from '../../..';
+
+export interface ReadRevisionAccount {
+  id: number;
+  master: boolean;
+  dateValue: Date;
+  designation: string | null;
+  comment: string | null;
+  debit: number;
+  credit: number;
+  isPerso: boolean;
+  autoAnnotate: boolean;
+  idInherit: number | null;
+  idAccount: number;
+  idThirdParty: number;
+  idAccountingTransaction: number;
+  idVat: number | null;
+  idImmobilization: number | null;
+  createdAt: Date;
+  updatedAt: Date;
+  accountingTransaction: {
+    id: number;
+    idBankAccount: number,
+    dateLocked: Date | null;
+    dateVerified: Date | null;
+    idUser: number | null;
+    exported: Date | null;
+    idAccountingJournal: number;
+    idLettering: number | null;
+    accountingFiles: Array<IAccountingFile>;
+    accountingJournal: IAccountingJournal;
+    lettering: ILettering;
+    user: IUser;
+  },
+  thirdParty: { id: number, fullname: string } | null,
+  calculatedVat?: number;
+  balance: number | null;
+}

package/ts/types/Interface/api/revision/ReadRevisionTransactionDetail.ts

@@ -0,0 +1,55 @@
+import { IFile } from '../../..';
+
+export interface ReadRevisionTransactionDetail {
+  id: number;
+  label: string | null;
+  reference: string | null;
+  dateValue: Date;
+  dateLocked: Date | null;
+  dateVerified: Date | null;
+  originalValue: number | null;
+  idUser: number | null;
+  isBlocked: boolean;
+  isMerged: boolean;
+  isAsset: boolean;
+  exported: Date | null;
+  kilometers: number | null;
+  internComment: string | null;
+  invoiceRequested: boolean;
+  idBankAccount: number | null;
+  idSociety: number;
+  idCurrency?: number | null;
+  idSocietyVehicle: number | null;
+  idSocietyPartner: number | null;
+  idRule: number | null;
+  idAccountingJournal: number;
+  idEstimateInvoice: number | null;
+  idEAF: number | null;
+  file: IFile[] | null;
+  accountingEntries: RevisionAccountingEntries[];
+}
+
+export interface RevisionAccountingEntries {
+  id: number;
+  master: boolean;
+  dateValue: Date;
+  designation: string;
+  comment: string | null;
+  debit: number;
+  credit: number;
+  isPerso: boolean;
+  idInherit: number | null;
+  idAccount: number | null;
+  idThirdParty: number | null;
+  idVat: number | null;
+  idImmobilization?: number | null;
+  account: RevisionAccount;
+}
+
+export interface RevisionAccount {
+  id: number;
+  number: number;
+  name: string;
+  idParentAccount: number | null;
+  idVat: number | null;
+}

package/ts/types/index.ts

@@ -481,6 +481,9 @@ export * from './Interface/api/revision/QueryRevision';
 export * from './Interface/api/revision/ReadRevision';
 export * from './Interface/api/revision/RevisionObject';
 export * from './Interface/api/revision/Revision';
+export * from './Interface/api/revision/QueryRevisionAccount';
+export * from './Interface/api/revision/ReadRevisionAccount';
+export * from './Interface/api/revision/ReadRevisionTransactionDetail';
 
 // export * from './Interface/api/survey/QuerySurvey';
 export * from './Interface/api/survey/ReadSurvey';

package/ts/utils/brands.ts

@@ -16,17 +16,17 @@ type getBrandConfigParams = {
 
 const getBrandNameByNodeEnv = (nodeEnv?: string): 'Legalstart'| 'Comptalib' | 'Clementine' => {
   if (nodeEnv) {
-    if (['staging_legalstart', 'production_legalstart'].includes(nodeEnv)) {
+    if (nodeEnv.indexOf('legalstart') > -1 || nodeEnv.indexOf('Legalstart') > -1) {
       return 'Legalstart';
     }
-    if (['staging_comptalib', 'production_comptalib'].includes(nodeEnv)) {
+    if (nodeEnv.indexOf('comptalib') > -1 || nodeEnv.indexOf('Comptalib') > -1) {
       return 'Comptalib';
     }
   } else if (process.env.API_HOST) {
-    if (process.env.API_HOST.indexOf('legalstart') > -1) {
+    if (process.env.API_HOST.indexOf('legalstart') > -1 || process.env.API_HOST.indexOf('Legalstart') > -1) {
       return 'Legalstart';
     }
-    if (process.env.API_HOST.indexOf('comptalib') > -1) {
+    if (process.env.API_HOST.indexOf('comptalib') > -1 || process.env.API_HOST.indexOf('Comptalib') > -1) {
       return 'Comptalib';
     }
   }