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

Fix aide_logement_neutralisation_rsa #708

Merged
merged 5 commits into from
May 5, 2017

Conversation

benjello
Copy link
Member

@benjello benjello commented Mar 20, 2017

Depends on openfisca/openfisca-core#499

  • Changement mineur.
  • Périodes concernées : toutes.
  • Zones impactées : prestations/aides_logement.
  • Détails :
    • Corrige le calcul de aide_logement_neutralisation_rsa.

Ces changements (effacez les lignes ne correspondant pas à votre cas) :

  • Corrigent ou améliorent un calcul déjà existant.

@benjello benjello requested a review from fpagnoux March 20, 2017 16:04
@benjello
Copy link
Member Author

@fpagnoux : Un test mes aides ne passe plus après correction du bug ...

@fpagnoux
Copy link
Member

Je regarde cette semaine.

@benjello
Copy link
Member Author

cc @SophieIPP @bfabre01

@fpagnoux fpagnoux force-pushed the fix-aide_logement_neutralisation_rsa branch 5 times, most recently from 5ad7e2d to 299cca8 Compare March 24, 2017 18:03
@fpagnoux
Copy link
Member

fpagnoux commented Mar 24, 2017

Il y avait un autre bug dans la neutralisation qui était camouflé par le bug que tu as corrigé :D.

Normalement ça devrait passer, j'en profite pour migrer tout le module.

@fpagnoux
Copy link
Member

@benjello je ne peux pas te demander une revue sur ta propore PR mais ça pourrait être utile :)

@benjello
Copy link
Member Author

@fpagnoux : je regarde ce week-end

@fpagnoux
Copy link
Member

Il reste des erreurs, je vais regarder

@benjello
Copy link
Member Author

@fpagnoux : j'ai un peu décroché, on en est où sur cette PR ?

@fpagnoux fpagnoux force-pushed the fix-aide_logement_neutralisation_rsa branch 3 times, most recently from 639c297 to 23c4f80 Compare April 26, 2017 23:09
definition_period = YEAR

def function(individu, period, legislation):
revenus_non_salaire = individu('rpns', period)
Copy link
Member

@fpagnoux fpagnoux Apr 27, 2017

Choose a reason for hiding this comment

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

Rename to revenus_non_salarie

"""
Références législatives :
Article R532-7 du Code de la sécurité sociale
https://www.legifrance.gouv.fr/affichCodeArticle.do?idArticle=LEGIARTI000031694522&cidTexte=LEGITEXT000006073189&categorieLien=id&dateTexte=
Copy link
Member

Choose a reason for hiding this comment

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

Use url =

"""
Références législatives :
Article R532-5 du Code de la sécurité sociale
https://www.legifrance.gouv.fr/affichCodeArticle.do?idArticle=LEGIARTI000006750910&cidTexte=LEGITEXT000006073189&dateTexte=20151231
Copy link
Member

Choose a reason for hiding this comment

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

Use url =

@@ -275,6 +275,7 @@ menages:
personne_de_reference: 5592b4049e2a9d0330e7a5b5
statut_occupation_logement: 5
output_variables:
aide_logement_base_ressources: 0
Copy link
Member

Choose a reason for hiding this comment

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

why add this ?

@fpagnoux fpagnoux force-pushed the fix-aide_logement_neutralisation_rsa branch from 23c4f80 to 99f7388 Compare April 27, 2017 13:56
@fpagnoux
Copy link
Member

fpagnoux commented Apr 27, 2017

@benjello c'est prêt à merger pour moi. Je te laisse y jeter un oeil, valider, et appuyer sur un bouton :).

@fpagnoux fpagnoux force-pushed the fix-aide_logement_neutralisation_rsa branch from 99f7388 to 934d4b9 Compare May 4, 2017 14:19
@benjello benjello self-assigned this May 4, 2017
@fpagnoux fpagnoux force-pushed the fix-aide_logement_neutralisation_rsa branch from e2847cd to a5c200d Compare May 4, 2017 17:08
@fpagnoux
Copy link
Member

fpagnoux commented May 4, 2017

Still ready to merge ;)

@benjello benjello merged commit e05ae3e into master May 5, 2017
@MattiSG MattiSG removed the support label May 5, 2017
@benjello benjello deleted the fix-aide_logement_neutralisation_rsa branch March 30, 2018 14:08
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.

3 participants