Ajoute la CSG retraite
2 open threads
2 open threads
Compare changes
- sandcha authored
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
+ 31
− 37
@@ -15,22 +15,41 @@
@@ -262,7 +281,7 @@
{#each Object.values(rootParameterImposableById).sort( (parameter1, parameter2) => (parameter1.class === parameter2.class || (parameter1.class !== ParameterClass.Node && parameter2.class !== ParameterClass.Node) ? parameter1.title.localeCompare(parameter2.title) : parameter1.class === ParameterClass.Node ? 1 : -1), ) as parameter}
{#each Object.values(rootParameterActiviteImposableById).sort( (parameter1, parameter2) => (parameter1.class === parameter2.class || (parameter1.class !== ParameterClass.Node && parameter2.class !== ParameterClass.Node) ? parameter1.title.localeCompare(parameter2.title) : parameter1.class === ParameterClass.Node ? 1 : -1), ) as parameter}
@@ -285,7 +304,7 @@
{#each Object.values(rootParameterDeductibleById).sort( (parameter1, parameter2) => (parameter1.class === parameter2.class || (parameter1.class !== ParameterClass.Node && parameter2.class !== ParameterClass.Node) ? parameter1.title.localeCompare(parameter2.title) : parameter1.class === ParameterClass.Node ? 1 : -1), ) as parameter}
{#each Object.values(rootParameterActiviteDeductibleById).sort( (parameter1, parameter2) => (parameter1.class === parameter2.class || (parameter1.class !== ParameterClass.Node && parameter2.class !== ParameterClass.Node) ? parameter1.title.localeCompare(parameter2.title) : parameter1.class === ParameterClass.Node ? 1 : -1), ) as parameter}
@@ -317,39 +336,14 @@
{#each Object.values(rootParameterImposableById).sort( (parameter1, parameter2) => (parameter1.class === parameter2.class || (parameter1.class !== ParameterClass.Node && parameter2.class !== ParameterClass.Node) ? parameter1.title.localeCompare(parameter2.title) : parameter1.class === ParameterClass.Node ? 1 : -1), ) as parameter}
{#each Object.values(rootParameterDeductibleById).sort( (parameter1, parameter2) => (parameter1.class === parameter2.class || (parameter1.class !== ParameterClass.Node && parameter2.class !== ParameterClass.Node) ? parameter1.title.localeCompare(parameter2.title) : parameter1.class === ParameterClass.Node ? 1 : -1), ) as parameter}
{#each Object.values(rootParameterRetraiteById).sort( (parameter1, parameter2) => (parameter1.class === parameter2.class || (parameter1.class !== ParameterClass.Node && parameter2.class !== ParameterClass.Node) ? parameter1.title.localeCompare(parameter2.title) : parameter1.class === ParameterClass.Node ? 1 : -1), ) as parameter}