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

Ipp update charges deductibles #907

Merged
merged 49 commits into from
Mar 5, 2018
Merged

Ipp update charges deductibles #907

merged 49 commits into from
Mar 5, 2018

Commits on Feb 19, 2018

  1. Update bareme IR 2016

    @Anna-Livia
    Anna-Livia committed Feb 19, 2018
    Configuration menu
    Copy the full SHA
    f0623ca View commit details
    Browse the repository at this point in the history

  2. Update parameters of 'abatpro' 2016

    @Anna-Livia
    Anna-Livia committed Feb 19, 2018
    Configuration menu
    Copy the full SHA
    ae39c19 View commit details
    Browse the repository at this point in the history

  3. Update parameters of charges deductibles 2016

    @Anna-Livia
    Anna-Livia committed Feb 19, 2018
    Configuration menu
    Copy the full SHA
    95fe314 View commit details
    Browse the repository at this point in the history

  4. Update parameters of decote 2015

    @Anna-Livia
    Anna-Livia committed Feb 19, 2018
    Configuration menu
    Copy the full SHA
    3a49b47 View commit details
    Browse the repository at this point in the history

  5. Fix error in parameters value for tax reduction 'mohist'

    @Anna-Livia
    Anna-Livia committed Feb 19, 2018
    Configuration menu
    Copy the full SHA
    26dfcf6 View commit details
    Browse the repository at this point in the history

  6. Update parameters values for tax reduction 'donapd' 2014-2016

    @Anna-Livia
    Anna-Livia committed Feb 19, 2018
    Configuration menu
    Copy the full SHA
    7942eee View commit details
    Browse the repository at this point in the history

  7. update Cessions titres réalisées par un entrepreneur

    @Anna-Livia
    Anna-Livia committed Feb 19, 2018
    Configuration menu
    Copy the full SHA
    9af5ba1 View commit details
    Browse the repository at this point in the history

  8. Update parameters

    @Anna-Livia
    Anna-Livia committed Feb 19, 2018
    Configuration menu
    Copy the full SHA
    dbc72ff View commit details
    Browse the repository at this point in the history

  9. Update parameter of income tax

    @Anna-Livia
    Anna-Livia committed Feb 19, 2018
    Configuration menu
    Copy the full SHA
    f953e0e View commit details
    Browse the repository at this point in the history

  10. Correct parameters dates

    @Anna-Livia
    Anna-Livia committed Feb 19, 2018
    Configuration menu
    Copy the full SHA
    7e4927b View commit details
    Browse the repository at this point in the history

  11. Add charges deductibles to income tax computation for 2015-2016 incomes

    @Anna-Livia
    Anna-Livia committed Feb 19, 2018
    Configuration menu
    Copy the full SHA
    a500945 View commit details
    Browse the repository at this point in the history

  12. Update 'grosses_reparations' for year 2015-2016 and correct for year … 

    …2013
    @Anna-Livia
    Anna-Livia committed Feb 19, 2018
    Configuration menu
    Copy the full SHA
    af7f04d View commit details
    Browse the repository at this point in the history

  13. Correct formula of variable 'grosses_reparations' for year 2009-2012

    @Anna-Livia
    Anna-Livia committed Feb 19, 2018
    Configuration menu
    Copy the full SHA
    9596fd2 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2018

  1. Update CHANGELOG and setup.py

    Claire Leroy committed Feb 21, 2018
    Configuration menu
    Copy the full SHA
    75a9920 View commit details
    Browse the repository at this point in the history

  2. Add charges deductibles to income tax computation for 2015-2016 incomes

    @Anna-Livia
    Anna-Livia authored and Claire Leroy committed Feb 21, 2018
    Configuration menu
    Copy the full SHA
    35b0312 View commit details
    Browse the repository at this point in the history

  3. Update 'grosses_reparations' for year 2015-2016 and correct for year … 

    …2013
    @Anna-Livia
    Anna-Livia authored and Claire Leroy committed Feb 21, 2018
    Configuration menu
    Copy the full SHA
    315f7b7 View commit details
    Browse the repository at this point in the history

  4. Correct formula of variable 'grosses_reparations' for year 2009-2012

    @Anna-Livia
    Anna-Livia authored and Claire Leroy committed Feb 21, 2018
    Configuration menu
    Copy the full SHA
    bfb8cf4 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'ipp-update-charges-deductibles' of https://github.com/o… 

    …penfisca/openfisca-france into ipp-update-charges-deductibles
    Claire Leroy committed Feb 21, 2018
    Configuration menu
    Copy the full SHA
    591b6be View commit details
    Browse the repository at this point in the history

  6. Update CHANGELOG et setup.py

    Claire Leroy committed Feb 21, 2018
    Configuration menu
    Copy the full SHA
    3d44ae4 View commit details
    Browse the repository at this point in the history

  7. Ajout références

    Claire Leroy committed Feb 21, 2018
    Configuration menu
    Copy the full SHA
    5068b5a View commit details
    Browse the repository at this point in the history

  8. Add charges deductibles to income tax computation for 2015-2016 incomes

    @Anna-Livia
    Anna-Livia authored and Claire Leroy committed Feb 21, 2018
    Configuration menu
    Copy the full SHA
    d5c7a70 View commit details
    Browse the repository at this point in the history

  9. Update 'grosses_reparations' for year 2015-2016 and correct for year … 

    …2013
    @Anna-Livia
    Anna-Livia authored and Claire Leroy committed Feb 21, 2018
    Configuration menu
    Copy the full SHA
    e1a0fdd View commit details
    Browse the repository at this point in the history

  10. Correct formula of variable 'grosses_reparations' for year 2009-2012

    @Anna-Livia
    Anna-Livia authored and Claire Leroy committed Feb 21, 2018
    Configuration menu
    Copy the full SHA
    cb96b8b View commit details
    Browse the repository at this point in the history

  11. Update CHANGELOG et setup.py

    Claire Leroy committed Feb 21, 2018
    Configuration menu
    Copy the full SHA
    52dbc2c View commit details
    Browse the repository at this point in the history

  12. Update CHANGELOG

    Claire Leroy committed Feb 21, 2018
    Configuration menu
    Copy the full SHA
    b0e23d7 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'ipp-update-charges-deductibles' of https://github.com/o… 

    …penfisca/openfisca-france into ipp-update-charges-deductibles

# Conflicts:
#	CHANGELOG.md
    Claire Leroy committed Feb 21, 2018
    Configuration menu
    Copy the full SHA
    2e62f83 View commit details
    Browse the repository at this point in the history

  14. Non end_date + Label plus explicite

    Claire Leroy committed Feb 21, 2018
    Configuration menu
    Copy the full SHA
    a731552 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2018

  1. Noms de variables plus explicite

    Claire Leroy committed Feb 22, 2018
    Configuration menu
    Copy the full SHA
    540ec0a View commit details
    Browse the repository at this point in the history

  2. Ajout référence

    Claire Leroy committed Feb 22, 2018
    Configuration menu
    Copy the full SHA
    c182523 View commit details
    Browse the repository at this point in the history

  3. Update CHANGELOG and setup.py

    Claire Leroy committed Feb 22, 2018
    Configuration menu
    Copy the full SHA
    19a4c80 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2018

  1. Make formula and variables more explicit

    Claire Leroy committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    0d1ea37 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2018

  1. Merge branch 'master' into ipp-update-baremes

    @claireleroy
    claireleroy committed Feb 26, 2018
    Configuration menu
    Copy the full SHA
    37f8cbf View commit details
    Browse the repository at this point in the history

  2. Update setup.py

    Claire Leroy committed Feb 26, 2018
    Configuration menu
    Copy the full SHA
    4fa0938 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'ipp-update-baremes' of git+ssh://github.com/openfisca/o… 

    …penfisca-france into ipp-update-baremes
    Claire Leroy committed Feb 26, 2018
    Configuration menu
    Copy the full SHA
    aec13d2 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'ipp-update-baremes' into ipp-update-charges-deductibles

    @claireleroy
    claireleroy committed Feb 26, 2018
    Configuration menu
    Copy the full SHA
    bca6335 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2018

  1. Add charges deductibles to income tax computation for 2015-2016 incomes

    @Anna-Livia
    Anna-Livia authored and Claire Leroy committed Feb 28, 2018
    Configuration menu
    Copy the full SHA
    0f05eda View commit details
    Browse the repository at this point in the history

  2. Update 'grosses_reparations' for year 2015-2016 and correct for year … 

    …2013
    @Anna-Livia
    Anna-Livia authored and Claire Leroy committed Feb 28, 2018
    Configuration menu
    Copy the full SHA
    fd631e7 View commit details
    Browse the repository at this point in the history

  3. Correct formula of variable 'grosses_reparations' for year 2009-2012

    @Anna-Livia
    Anna-Livia authored and Claire Leroy committed Feb 28, 2018
    Configuration menu
    Copy the full SHA
    7cc60bd View commit details
    Browse the repository at this point in the history

  4. Update CHANGELOG and setup.py

    Claire Leroy committed Feb 28, 2018
    Configuration menu
    Copy the full SHA
    1bc7664 View commit details
    Browse the repository at this point in the history

  5. Non end_date + Label plus explicite

    Claire Leroy committed Feb 28, 2018
    Configuration menu
    Copy the full SHA
    9b81919 View commit details
    Browse the repository at this point in the history

  6. Noms de variables plus explicite

    Claire Leroy committed Feb 28, 2018
    Configuration menu
    Copy the full SHA
    c54e93e View commit details
    Browse the repository at this point in the history

  7. Ajout référence

    Claire Leroy committed Feb 28, 2018
    Configuration menu
    Copy the full SHA
    97b9179 View commit details
    Browse the repository at this point in the history

  8. Make formula and variables more explicit

    Claire Leroy committed Feb 28, 2018
    Configuration menu
    Copy the full SHA
    26ab2e0 View commit details
    Browse the repository at this point in the history

  9. Update CHANGELOG and setup.py

    Claire Leroy committed Feb 28, 2018
    Configuration menu
    Copy the full SHA
    f140627 View commit details
    Browse the repository at this point in the history

  10. Update CHANGELOG

    Claire Leroy committed Feb 28, 2018
    Configuration menu
    Copy the full SHA
    09c6acc View commit details
    Browse the repository at this point in the history

  11. Correction d'erreurs dans la formule de 'grosses_reparations'

    Claire Leroy committed Feb 28, 2018
    Configuration menu
    Copy the full SHA
    d2ad4c4 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2018

  1. Update CHANGELOG

    Claire Leroy committed Mar 1, 2018
    Configuration menu
    Copy the full SHA
    f1b5655 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into ipp-update-charges-deductibles

    Claire Leroy committed Mar 1, 2018
    Configuration menu
    Copy the full SHA
    cd89a15 View commit details
    Browse the repository at this point in the history

  3. Update setup.py

    Claire Leroy committed Mar 1, 2018
    Configuration menu
    Copy the full SHA
    ad2372d View commit details
    Browse the repository at this point in the history