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

Update cotisations 2018 #867

Merged
merged 13 commits into from
Feb 7, 2018
Merged

Update cotisations 2018 #867

merged 13 commits into from
Feb 7, 2018

Conversation

laem
Copy link
Contributor

@laem laem commented Dec 26, 2017

No description provided.

@laem laem changed the title Update cotisation maladie salarié 2018 (WIP) Update cotisation maladie salarié 2018 Dec 26, 2017
@monbocal
Copy link
Contributor

<3 thank you!

@laem laem changed the title Update cotisation maladie salarié 2018 Update cotisations 2018 Jan 4, 2018
@laem laem requested a review from sandcha January 4, 2018 13:10
@benjello
Copy link
Member

benjello commented Jan 8, 2018

@SophieIPP : pas mal de cotisations sont là.
@laem : ce serait cool d'avoir les références législatives si tu les as conservées.

@laem
Copy link
Contributor Author

laem commented Jan 8, 2018

@SophieIPP : pas mal de cotisations sont là.

tu veux dire qu'il manque des mises à jour ? (à part le versement transport)

Non je n'ai pas les références législatives, je me suis basé sur les fiches et lettres de l'URSSAF essentiellement.

@benjello
Copy link
Member

benjello commented Jan 8, 2018

@laem: si on en trouve on te dira (avec @SophieIPP, on doit mettre à jour les barèmes IPP en excel ... toujours pas complètement réglée cette affaire-là).

@laem
Copy link
Contributor Author

laem commented Jan 11, 2018

@benjello @sandcha je pense que c'est dommage de laisser traîner cette PR. Elle contient des changegments aussi importants que le SMIC et le plafond de la sécu. S'il y a des choses perfectibles, comme les références législatives, elle devraient faire l'objet d'une nouvelle issue. Cette branche est en production sur le module embauche depuis le 1er janvier.

@benjello
Copy link
Member

@laem ; next thing on my TODO-list ;-)

@benjello
Copy link
Member

LGTM @sandcha

@laem
Copy link
Contributor Author

laem commented Jan 18, 2018

Un oubli, le taux de la cotisation GMP a aussi changé.

@bonjourmauko
Copy link
Member

bonjourmauko commented Feb 6, 2018

C'est cool ! Merci. Il faut pour merger :

  • Faire un rebase
  • Mettre à jour le changelog

def formula_2018(self, simulation, period):
salarie_regime_alsace_moselle = simulation.calculate('salarie_regime_alsace_moselle', period)

cotisation_regime_alsace_moselle = apply_bareme(
Copy link
Member

Choose a reason for hiding this comment

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

@Morendil C'est ici que le problème se pose !

Copy link
Member

Choose a reason for hiding this comment

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

Il faut prendre la syntaxe post-migration comme ici

@@ -182,6 +182,8 @@ def formula_2015_01_01(individu, period, parameters):

return cotisation

def formula_2018(self, simulation, period):
Copy link
Member

Choose a reason for hiding this comment

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

def formula_2018(individu, period, parameters):

Copy link
Member

Choose a reason for hiding this comment

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

Et plus bas aussi (dans apply_barame)

@@ -633,6 +636,21 @@ def formula(individu, period, parameters):

return cotisation

def formula_2018(self, simulation, period):
Copy link
Member

Choose a reason for hiding this comment

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

def formula_2018(individu, period, parameters):

def formula_2018(self, simulation, period):
salarie_regime_alsace_moselle = simulation.calculate('salarie_regime_alsace_moselle', period)

cotisation_regime_alsace_moselle = apply_bareme(
Copy link
Member

Choose a reason for hiding this comment

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

        cotisation_regime_alsace_moselle = apply_bareme(
            individu,
            period,
            parameters,
            cotisation_type = 'salarie',
            bareme_name = 'maladie_alsace_moselle',
            variable_name = 'mmid_salarie',
            )

salaire_de_base: 1500
complementaire_sante_taux_employeur: .625
complementaire_sante_montant: 40
categorie_salarie: prive_cadre # cadre
Copy link
Member

Choose a reason for hiding this comment

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

Plus besoin du commentaire avec les énumérés non ?

@Morendil Morendil merged commit be3c217 into master Feb 7, 2018
@Morendil Morendil deleted the cotisations-2018 branch February 7, 2018 12:36
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.

6 participants