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.

Sign up for GitHub

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

Jump to bottom

Improve projectors #895

Merged
merged 3 commits into from
Mar 21, 2018
Merged

Improve projectors #895

merged 3 commits into from
Mar 21, 2018

Conversation

fpagnoux
Copy link
Member

@fpagnoux fpagnoux commented Feb 5, 2018

Depends on openfisca/openfisca-core#602

  • Amélioration technique
  • Détails :
    • Adapte France à OpenFisca Core v22

@fpagnoux fpagnoux mentioned this pull request Feb 5, 2018
Merged
Anna-Livia
Anna-Livia reviewed Feb 15, 2018
View reviewed changes
Copy link
Contributor

@Anna-Livia Anna-Livia left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Ne faudrait il pas changer le requirement de openfisca-core :
'OpenFisca-Core >= 21.2.1, < 22', --> 'OpenFisca-Core >= 22.0.0, < 23',

openfisca_france/model/prestations/aides_logement.py
declarant_principal_i = famille.members.has_role(FoyerFiscal.DECLARANT_PRINCIPAL)
demandeur_declarant_principal = famille.value_from_person(declarant_principal_i, Famille.DEMANDEUR)
conjoint_declarant_principal = famille.value_from_person(declarant_principal_i, Famille.CONJOINT)
demandeur_declarant_principal = famille.demandeur.has_role(FoyerFiscal.DECLARANT_PRINCIPAL)
Copy link
Contributor

Choose a reason for hiding this comment

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

🙌

openfisca_france/model/prestations/prestations_familiales/base_ressource.py
declarant_principal_i = famille.members.has_role(FoyerFiscal.DECLARANT_PRINCIPAL)
demandeur_declarant_principal = famille.value_from_person(declarant_principal_i, Famille.DEMANDEUR)
conjoint_declarant_principal = famille.value_from_person(declarant_principal_i, Famille.CONJOINT)
demandeur_declarant_principal = famille.demandeur.has_role(FoyerFiscal.DECLARANT_PRINCIPAL)
Copy link
Contributor

Choose a reason for hiding this comment

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

🙌

@fpagnoux
Copy link
Member Author

Ne faudrait il pas changer le requirement de openfisca-core :
'OpenFisca-Core >= 21.2.1, < 22', --> 'OpenFisca-Core >= 22.0.0, < 23',

Si, absolument 👍

@fpagnoux fpagnoux requested a review from Anna-Livia February 27, 2018 01:55
@fpagnoux
Copy link
Member Author

To merge as soon as #922 is merged (so that the merge order is the same in core and france)

@fpagnoux fpagnoux force-pushed the improve-projectors branch from e7fec86 to 7ced57d Compare March 21, 2018 12:11
@fpagnoux fpagnoux merged commit dfa6794 into master Mar 21, 2018
@fpagnoux fpagnoux deleted the improve-projectors branch March 21, 2018 15:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Anna-Livia Anna-Livia Anna-Livia approved these changes

@sandcha sandcha Awaiting requested review from sandcha

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@fpagnoux @Anna-Livia