@silexpert/core 1.1.25 → 1.1.27
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/es/api/resources/Vat.d.ts +2 -2
- package/es/api/resources/Vat.d.ts.map +1 -1
- package/es/api/resources/Vat.js +2 -4
- package/es/api/resources/Vat.js.map +1 -1
- package/es/types/Interface/api/vatDeclaration/QueryVatDeclaration.d.ts +3 -1
- package/es/types/Interface/api/vatDeclaration/QueryVatDeclaration.d.ts.map +1 -1
- package/es/types/Interface/api/vatDeclaration/QueryVatDeclaration.js +13 -2
- package/es/types/Interface/api/vatDeclaration/QueryVatDeclaration.js.map +1 -1
- package/es/utils/vat/3517/century23.js +9 -9
- package/es/utils/vat/3517/century23.js.map +1 -1
- package/es/utils/vat/utils.d.ts.map +1 -1
- package/es/utils/vat/utils.js +1 -3
- package/es/utils/vat/utils.js.map +1 -1
- package/js/api/resources/Vat.js +2 -4
- package/js/api/resources/Vat.js.map +1 -1
- package/js/types/Interface/api/vatDeclaration/QueryVatDeclaration.js +3 -1
- package/js/types/Interface/api/vatDeclaration/QueryVatDeclaration.js.map +1 -1
- package/js/utils/vat/3517/century23.js +9 -9
- package/js/utils/vat/3517/century23.js.map +1 -1
- package/js/utils/vat/utils.js +1 -3
- package/js/utils/vat/utils.js.map +1 -1
- package/package.json +1 -1
- package/ts/api/resources/Vat.ts +3 -5
- package/ts/types/Interface/api/vatDeclaration/QueryVatDeclaration.ts +11 -2
- package/ts/utils/vat/3517/century23.ts +9 -9
- package/ts/utils/vat/utils.ts +1 -3
package/js/utils/vat/utils.js
CHANGED
|
@@ -14,9 +14,7 @@ function getAmountByAccountNumber(accountingEntries, accountsNumber, precision =
|
|
|
14
14
|
let accTmp = acc;
|
|
15
15
|
accountsNumber.some(number => {
|
|
16
16
|
if (accountingEntry.account && accountingEntry.account.number && accountingEntry.account.number.toString().startsWith(number)) {
|
|
17
|
-
|
|
18
|
-
accTmp += accountingEntry.debit - accountingEntry.credit;
|
|
19
|
-
}
|
|
17
|
+
accTmp += accountingEntry.debit - accountingEntry.credit;
|
|
20
18
|
return true;
|
|
21
19
|
}
|
|
22
20
|
return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","names":["getAmountByAccountNumber","exports","getTaxAmountByAccountNumber","textFormatting","_lodash","require","_Vat","accountingEntries","accountsNumber","precision","isAbs","accountingEntriesUniq","_uniqBy","result","_round","reduce","acc","accountingEntry","accTmp","some","number","account","toString","startsWith","debit","credit","Math","abs","_b","_a","Object","values","Vat","find","v","id","idVat","value","length","formattedValue","replace","slice"],"sources":["../../../ts/utils/vat/utils.ts"],"sourcesContent":["import { round as _round, uniqBy as _uniqBy } from 'lodash';\nimport { IAccountingEntry } from '../../types/Interface/models/IAccountingEntry';\nimport { Vat } from '../../types/Enum/Vat';\n\nexport function getAmountByAccountNumber(accountingEntries: IAccountingEntry[], accountsNumber: string[], precision = 0, isAbs = false): number {\n const accountingEntriesUniq = _uniqBy(accountingEntries, 'id');\n const result = _round(accountingEntriesUniq.reduce((acc, accountingEntry) => {\n let accTmp = acc;\n accountsNumber.some((number) => {\n if (accountingEntry.account && accountingEntry.account.number && accountingEntry.account.number.toString().startsWith(number)) {\n
|
|
1
|
+
{"version":3,"file":"utils.js","names":["getAmountByAccountNumber","exports","getTaxAmountByAccountNumber","textFormatting","_lodash","require","_Vat","accountingEntries","accountsNumber","precision","isAbs","accountingEntriesUniq","_uniqBy","result","_round","reduce","acc","accountingEntry","accTmp","some","number","account","toString","startsWith","debit","credit","Math","abs","_b","_a","Object","values","Vat","find","v","id","idVat","value","length","formattedValue","replace","slice"],"sources":["../../../ts/utils/vat/utils.ts"],"sourcesContent":["import { round as _round, uniqBy as _uniqBy } from 'lodash';\nimport { IAccountingEntry } from '../../types/Interface/models/IAccountingEntry';\nimport { Vat } from '../../types/Enum/Vat';\n\nexport function getAmountByAccountNumber(accountingEntries: IAccountingEntry[], accountsNumber: string[], precision = 0, isAbs = false): number {\n const accountingEntriesUniq = _uniqBy(accountingEntries, 'id');\n const result = _round(accountingEntriesUniq.reduce((acc, accountingEntry) => {\n let accTmp = acc;\n accountsNumber.some((number) => {\n if (accountingEntry.account && accountingEntry.account.number && accountingEntry.account.number.toString().startsWith(number)) {\n accTmp += (accountingEntry.debit - accountingEntry.credit);\n return true;\n }\n return false;\n });\n return accTmp;\n }, 0), precision);\n return isAbs ? Math.abs(result) : result;\n}\n\nexport function getTaxAmountByAccountNumber(accountingEntries: IAccountingEntry[], accountsNumber: string[], precision = 0): number {\n const accountingEntriesUniq = _uniqBy(accountingEntries, 'id');\n return _round(accountingEntriesUniq.reduce((acc, accountingEntry) => {\n let accTmp = acc;\n accountsNumber.some((number) => {\n if (accountingEntry.account && accountingEntry.account.number && accountingEntry.account.number.toString().startsWith(number)) {\n accTmp += ((accountingEntry.debit - accountingEntry.credit) * (((Object.values(Vat).find((v) => v.id === accountingEntry.idVat)?.value ?? 0) / 100)));\n return true;\n }\n return false;\n });\n return accTmp;\n }, precision));\n}\n\nexport function textFormatting(value: any, length: number | null = null): string | null {\n if (value && typeof value === 'string') {\n let formattedValue = value.replace(/[\\u2018\\u2019]/g, '\\''); // Suppression des \"Curly Quotes\"\n formattedValue = formattedValue.replace(/&/g, ''); // Suppression des &\n formattedValue = formattedValue.replace(/!/g, ''); // Suppression des !\n formattedValue = formattedValue.replace(/[\\t]/g, ''); // Suppression des tabulations\n formattedValue = formattedValue.replace(/`/g, '\\''); // Suppression des `\n formattedValue = formattedValue.replace(/\"/g, ''); // Suppression des \"\n formattedValue = formattedValue.replace(/^ */, ''); // Suppression des espaces de début\n formattedValue = formattedValue.replace(/ *$/, ''); // Suppression des espaces de fin\n if (length) formattedValue = formattedValue.slice(0, length);\n return formattedValue;\n }\n return null;\n}"],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@silexpert/core",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.27",
|
|
4
4
|
"description": "Silex Core perform HTTP Request and object binding. Silex core helps developers to retrieve and return formatted object",
|
|
5
5
|
"homepage": "https://gitlab.compta-clementine.fr/dev/silex-api",
|
|
6
6
|
"main": "js/index.js",
|
package/ts/api/resources/Vat.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import {
|
|
2
|
-
BasePaginate, CreateRegistrationDetail, IAccountingTransaction, ICustomerVat, QueryCerfa, QueryPaginatedRegistration, QueryPreviousVatDeclaration, QueryVatEntry, ReadFormattedAccountingTransaction, ReadRegistration, ReadVatDeclarationUpdatedEntry, ReadVatEntry, ReadVatVariousOperations, UpdateOrCreateVatAdvance, UpdateOrCreateVatRegistration, UpdateRegistration,
|
|
2
|
+
BasePaginate, CreateRegistrationDetail, IAccountingTransaction, ICustomerVat, QueryCerfa, QueryPaginatedRegistration, QueryPreviousVatDeclaration, QueryVatEntry, QueryVatMigrationEntry, ReadFormattedAccountingTransaction, ReadRegistration, ReadVatDeclarationUpdatedEntry, ReadVatEntry, ReadVatVariousOperations, UpdateOrCreateVatAdvance, UpdateOrCreateVatRegistration, UpdateRegistration,
|
|
3
3
|
} from '../..';
|
|
4
4
|
import { Resource } from '../Resource';
|
|
5
5
|
|
|
@@ -31,11 +31,9 @@ export class Vat extends Resource {
|
|
|
31
31
|
return this.axios.$post(`/societies/${idSociety}/vat/preview`, payload);
|
|
32
32
|
}
|
|
33
33
|
|
|
34
|
-
migrateEntries(
|
|
34
|
+
migrateEntries(query: QueryVatMigrationEntry): Promise<ReadFormattedAccountingTransaction[]> {
|
|
35
35
|
return this.axios.$post('vat-declarations/migrate-entries', null, {
|
|
36
|
-
params:
|
|
37
|
-
id: idSociety,
|
|
38
|
-
},
|
|
36
|
+
params: query,
|
|
39
37
|
});
|
|
40
38
|
}
|
|
41
39
|
|
|
@@ -15,10 +15,19 @@ export class QueryPreviousVatDeclaration {
|
|
|
15
15
|
}
|
|
16
16
|
|
|
17
17
|
export class QueryVatMigrationEntry {
|
|
18
|
-
@
|
|
18
|
+
@ApiProperty()
|
|
19
19
|
@IsNumber()
|
|
20
|
+
id: number;
|
|
21
|
+
|
|
22
|
+
@ApiPropertyOptional()
|
|
23
|
+
@IsDateString()
|
|
24
|
+
@IsOptional()
|
|
25
|
+
startDate?: string;
|
|
26
|
+
|
|
27
|
+
@ApiPropertyOptional()
|
|
28
|
+
@IsDateString()
|
|
20
29
|
@IsOptional()
|
|
21
|
-
|
|
30
|
+
endDate?: string;
|
|
22
31
|
}
|
|
23
32
|
|
|
24
33
|
export class QueryVatDeclaration {
|
|
@@ -21,21 +21,21 @@ export function getCerfa3517Century23Payload(accountingEntries: IAccountingEntry
|
|
|
21
21
|
|
|
22
22
|
const taxedOperationsAccounts = ['701', '702', '703', '704', '705', '706', '707', '708'];
|
|
23
23
|
|
|
24
|
-
const vatNormalRate20 = getAmountByAccountNumber(vatEntries.filter((ae) => ae.idVat === Vat.TX_20.id), taxedOperationsAccounts);
|
|
25
|
-
const vatReducedRate5Dot5 = getAmountByAccountNumber(vatEntries.filter((ae) => ae.idVat === Vat.TX_5_5.id), taxedOperationsAccounts);
|
|
26
|
-
const vatReducedRate10 = getAmountByAccountNumber(vatEntries.filter((ae) => ae.idVat === Vat.TX_10.id), taxedOperationsAccounts);
|
|
27
|
-
const vatReducedRate8Dot5 = getAmountByAccountNumber(vatEntries.filter((ae) => ae.idVat === Vat.TX_8_5.id), taxedOperationsAccounts);
|
|
28
|
-
const vatReducedRate2Dot1 = getAmountByAccountNumber(vatEntries.filter((ae) => ae.idVat === Vat.TX_2_1.id), taxedOperationsAccounts);
|
|
24
|
+
const vatNormalRate20 = getAmountByAccountNumber(vatEntries.filter((ae) => ae.idVat === Vat.TX_20.id), taxedOperationsAccounts, 0, true);
|
|
25
|
+
const vatReducedRate5Dot5 = getAmountByAccountNumber(vatEntries.filter((ae) => ae.idVat === Vat.TX_5_5.id), taxedOperationsAccounts, 0, true);
|
|
26
|
+
const vatReducedRate10 = getAmountByAccountNumber(vatEntries.filter((ae) => ae.idVat === Vat.TX_10.id), taxedOperationsAccounts, 0, true);
|
|
27
|
+
const vatReducedRate8Dot5 = getAmountByAccountNumber(vatEntries.filter((ae) => ae.idVat === Vat.TX_8_5.id), taxedOperationsAccounts, 0, true);
|
|
28
|
+
const vatReducedRate2Dot1 = getAmountByAccountNumber(vatEntries.filter((ae) => ae.idVat === Vat.TX_2_1.id), taxedOperationsAccounts, 0, true);
|
|
29
29
|
|
|
30
30
|
const prestation2Entries = vatEntries.filter((ae) => intracomVat.includes(ae.idVat));
|
|
31
31
|
const presta2Accounts = ['604', '61', '62'];
|
|
32
|
-
const prestation2Base = getAmountByAccountNumber(prestation2Entries, presta2Accounts);
|
|
32
|
+
const prestation2Base = getAmountByAccountNumber(prestation2Entries, presta2Accounts, 0, true);
|
|
33
33
|
const prestation2AmountOfVat = getTaxAmountByAccountNumber(prestation2Entries, presta2Accounts);
|
|
34
34
|
|
|
35
|
-
const saleOfImmobilization = getAmountByAccountNumber(vatEntries.filter((ae) => !withoutTaxVat.includes(ae.idVat) && frenchVat.includes(ae.idVat)), ['775']);
|
|
35
|
+
const saleOfImmobilization = getAmountByAccountNumber(vatEntries.filter((ae) => !withoutTaxVat.includes(ae.idVat) && frenchVat.includes(ae.idVat)), ['775'], 0, true);
|
|
36
36
|
|
|
37
|
-
const onInvoiceDeductible = getAmountByAccountNumber(vatEntries, ['445660']);
|
|
38
|
-
const onImmobilizationDeductible = getAmountByAccountNumber(vatEntries, ['445662']);
|
|
37
|
+
const onInvoiceDeductible = getAmountByAccountNumber(vatEntries, ['445660'], 0, true);
|
|
38
|
+
const onImmobilizationDeductible = getAmountByAccountNumber(vatEntries, ['445662'], 0, true);
|
|
39
39
|
|
|
40
40
|
const julyAdvance: IRegistration | null = payload?.exerciceAdvanceRegistrations?.find((a) => dayjs(a.endDate).month() === 6) ?? null;
|
|
41
41
|
const julyAdvancePayload: Cerfa3514_2022 | null = julyAdvance?.payload ?? null;
|
package/ts/utils/vat/utils.ts
CHANGED
|
@@ -8,9 +8,7 @@ export function getAmountByAccountNumber(accountingEntries: IAccountingEntry[],
|
|
|
8
8
|
let accTmp = acc;
|
|
9
9
|
accountsNumber.some((number) => {
|
|
10
10
|
if (accountingEntry.account && accountingEntry.account.number && accountingEntry.account.number.toString().startsWith(number)) {
|
|
11
|
-
|
|
12
|
-
accTmp += (accountingEntry.debit - accountingEntry.credit);
|
|
13
|
-
}
|
|
11
|
+
accTmp += (accountingEntry.debit - accountingEntry.credit);
|
|
14
12
|
return true;
|
|
15
13
|
}
|
|
16
14
|
return false;
|