Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(meta): désactivation des anciennes CC Meta après 1er janvier #5488

Merged
merged 15 commits into from
Dec 27, 2023

Conversation

Viczei
Copy link
Contributor

@Viczei Viczei commented Dec 13, 2023

No description provided.

maxgfr and others added 2 commits December 12, 2023 16:52
…`convention-collective` (#5430)

* fix: add redirections

* fix: redirection

* fix: redirection
* feat: ajout de la 3248 au préavis de démission

* feat: implementation 32428

* chore: ajout du mock

* Revert "feat: ajout de la 3248 au préavis de démission"

This reverts commit 690d3a9.

* refactor: common updates

* chore: snap

* fix: remove bold from tooltips

* chore: snap

* feat: implementation indemnité précarité (#5423)



* feat: 5412 cc 3248 méta intégrer les nouvelles règles dans le préavis de retraite (#5421)

* feat: implementation 3248 preavis retraite

* feat: implementation 3248 preavis retraite

* feat: ajouter la notification

---------



* feat: 5409 cc 3248 méta intégrer les nouvelles règles dans le préavis de licenciement (#5418)

* feat: implementation 3248 preavis licenciment

* chore: clean 650

* chore: review

* chore: review

* chore: review

* feat: implementation preavis retraite 3248

* fix: note not displaying

* Revert "feat: implementation preavis retraite 3248"

This reverts commit ebe49ac.

* chore: review

* feat: implementation 3248 preavis licenciment

* chore: clean 650

* chore: review

* chore: review

* feat: implementation preavis retraite 3248

* fix: note not displaying

* Revert "feat: implementation preavis retraite 3248"

This reverts commit ebe49ac.

* chore: review

* chore: review

---------



* feat: ajout de la 3248 au préavis de démission (#5415)

* Revert "Revert "feat: ajout de la 3248 au préavis de démission""

This reverts commit 5dca47c.

* chore: review

* fix: ortho

* chore: review

* chore: review

---------



* feat: implementation 3248 pour recherche emploi (#5420)

* feat: implementation 3248 pour recherche emploi

* fix: ref .2

* chore: review

* chore: review

* feat: implementation 3248 pour recherche emploi

* fix: ref .2

* chore: review

* chore: review

* fix: type

* chore: key

* chore: fix typescript

* chore: snap

* chore: review

* fix: lint

* chore: snap

* chore: review

* chore: review

* chore: review

---------



* feat: ajout de la 3248 au préavis de démission

* feat: implementation 32428

* chore: ajout du mock

* Revert "feat: ajout de la 3248 au préavis de démission"

This reverts commit 690d3a9.

* refactor: common updates

* chore: snap

* fix: remove bold from tooltips

* chore: snap

* feat: implementation indemnité précarité (#5423)



* feat: 5412 cc 3248 méta intégrer les nouvelles règles dans le préavis de retraite (#5421)

* feat: implementation 3248 preavis retraite

* feat: implementation 3248 preavis retraite

* feat: ajouter la notification

---------



* feat: 5409 cc 3248 méta intégrer les nouvelles règles dans le préavis de licenciement (#5418)

* feat: implementation 3248 preavis licenciment

* chore: clean 650

* chore: review

* chore: review

* chore: review

* feat: implementation preavis retraite 3248

* fix: note not displaying

* Revert "feat: implementation preavis retraite 3248"

This reverts commit ebe49ac.

* chore: review

* feat: implementation 3248 preavis licenciment

* chore: clean 650

* chore: review

* chore: review

* feat: implementation preavis retraite 3248

* fix: note not displaying

* Revert "feat: implementation preavis retraite 3248"

This reverts commit ebe49ac.

* chore: review

* chore: review

---------



* feat: ajout de la 3248 au préavis de démission (#5415)

* Revert "Revert "feat: ajout de la 3248 au préavis de démission""

This reverts commit 5dca47c.

* chore: review

* fix: ortho

* chore: review

* chore: review

---------



* feat: implementation 3248 pour recherche emploi (#5420)

* feat: implementation 3248 pour recherche emploi

* fix: ref .2

* chore: review

* chore: review

* feat: implementation 3248 pour recherche emploi

* fix: ref .2

* chore: review

* chore: review

* fix: type

* chore: key

* chore: fix typescript

* chore: snap

* chore: review

* fix: lint

* chore: snap

* chore: review

* chore: review

* chore: review

---------



* chore: update test

* feat(indemnite-licenciement): ajout de la CC 3248 (#5439)

* feat(indemnite-licenciement): ajout de la CC 3248

* feat(indemnite-licenciement): ajout d'infos complémentaires pour calculer l'ancienneté requise

* feat(indemnite-licenciement): ajout de la notification si la date de notification est avant le 01/01/2024

* feat(indemnite-licenciement): correction des questions

* feat(indemnite-licenciement): cohabitation de la 650 et la 3248

* feat(indemnite-licenciement): afficher la 650 dans la recherche

* feat(indemnite-licenciement): correction des tests

* feat(indemnite-licenciement): correction suite au retour de Romain

* fix: mauvaise notification sur la 650

* fix: retours de romain

* fix: mauvais calcul de l'ancienneté pour la catégorie ABCDE

* fix: missing cases for 650

* fix: erreur sur le test 23

* feat: ajout de la référence Article 73

* fix: types

* fix: types

* fix: types

* fix: types

* fix: types

* fix: remove mocked 3248

---------

Co-authored-by: Victor <[email protected]>
Co-authored-by: Martial Maillot <[email protected]>
@Viczei Viczei self-assigned this Dec 13, 2023
@Viczei Viczei marked this pull request as draft December 13, 2023 14:05
@Viczei Viczei changed the title feat: Branche test pour après 1er janvier feat: Branche test pour après 1er janvier (DO NOT MERGE) Dec 13, 2023
@github-advanced-security
Copy link

This pull request sets up GitHub code scanning for this repository. Once the scans have completed and the checks have passed, the analysis results for this pull request branch will appear on this overview. Once you merge this pull request, the 'Security' tab will show more code scanning analysis results (for example, for the default branch). Depending on your configuration and choice of analysis tool, future pull requests will be annotated with code scanning analysis results. For more information about GitHub code scanning, check out the documentation.

…nvier) (#5469)

* feat: remplacer CC meta dans recherche entreprise

* fix: remove double after merge

* chore: rename tests

---------

Co-authored-by: Victor <[email protected]>
@Viczei Viczei changed the title feat: Branche test pour après 1er janvier (DO NOT MERGE) feat: désactivation des anciennes CC Meta après 1er janvier Dec 21, 2023
@Viczei Viczei requested a review from maxgfr December 21, 2023 09:34
@maxgfr maxgfr changed the title feat: désactivation des anciennes CC Meta après 1er janvier feat(meta): désactivation des anciennes CC Meta après 1er janvier Dec 27, 2023
@maxgfr maxgfr marked this pull request as ready for review December 27, 2023 17:35
Copy link

@maxgfr maxgfr merged commit 092069b into dev Dec 27, 2023
22 of 23 checks passed
@maxgfr maxgfr deleted the linked/after-01012024 branch December 27, 2023 18:03
Copy link
Member

@maxgfr maxgfr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚀🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants