Skip to content

Commit

Permalink
Fix some regressions in parameters introcduced by 6.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
fpagnoux authored Dec 2, 2016
2 parents 001c391 + 84b2640 commit 2b79ac8
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 4 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## 6.0.4

* Fix some regressions in parameters introcduced by 6.0.0
* Re-apply RSA revalorisation from september
* Correct bonification rate for PPA

## 6.0.3

* Migrate some formulas to new syntax
Expand Down
8 changes: 5 additions & 3 deletions openfisca_france/parameters/prestations.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3254,7 +3254,7 @@
<VALUE deb="2016-01-01" fuzzy="true" valeur="95" />
</CODE>
<CODE code="taux_bonification_max" conflicts="children:openfisca-not-fully-included-in-ipp(openfisca_deb=2016-01-01,openfisca_fin=2016-12-31,openfisca_valeur=0.12782,ipp_valeur=unknown)" description="Bonification maximale, en pourcentage du montant de base du RSA" format="percent" origin="ipp">
<VALUE deb="2016-01-01" fuzzy="true" valeur="0.122782" />
<VALUE deb="2016-01-01" fuzzy="true" valeur="0.12782" />
</CODE>
</NODE>
<CODE code="majoration_isolement_enf_charge" format="percent" origin="ipp">
Expand Down Expand Up @@ -3435,7 +3435,8 @@
<VALUE deb="2009-01-01" fin="2009-12-31" valeur="200" />
</CODE>
<CODE code="rmi" description="Rsa socle" format="float" origin="openfisca" type="monetary">
<VALUE deb="2016-04-01" fuzzy="true" valeur="524.68" />
<VALUE deb="2016-09-01" fuzzy="true" valeur="535.17" />
<VALUE deb="2016-04-01" fin="2016-08-31" valeur="524.68" />
<VALUE deb="2016-01-01" fin="2016-03-31" valeur="524.16" />
<VALUE deb="2015-09-01" fin="2015-12-31" valeur="524.16" />
<VALUE deb="2015-01-01" fin="2015-08-31" valeur="513.88" />
Expand Down Expand Up @@ -3576,7 +3577,8 @@
</CODE>
</NODE>
<CODE code="montant_de_base_du_rsa" conflicts="children:openfisca-not-fully-included-in-ipp(openfisca_deb=2001-01-01,openfisca_fin=2001-12-31,openfisca_valeur=397.6,ipp_valeur=unknown),children:openfisca-not-fully-included-in-ipp(openfisca_deb=2005-01-01,openfisca_fin=2005-12-31,openfisca_valeur=425.4,ipp_valeur=unknown),children:openfisca-not-fully-included-in-ipp(openfisca_deb=2002-01-01,openfisca_fin=2002-12-31,openfisca_valeur=405.62,ipp_valeur=unknown),children:openfisca-not-fully-included-in-ipp(openfisca_deb=2003-01-01,openfisca_fin=2003-12-31,openfisca_valeur=411.7,ipp_valeur=unknown),children:openfisca-not-fully-included-in-ipp(openfisca_deb=2009-01-01,openfisca_fin=2009-12-31,openfisca_valeur=454.63,ipp_valeur=unknown),children:openfisca-not-fully-included-in-ipp(openfisca_deb=2007-01-01,openfisca_fin=2007-12-31,openfisca_valeur=440.86,ipp_valeur=unknown),children:openfisca-not-fully-included-in-ipp(openfisca_deb=2006-01-01,openfisca_fin=2006-12-31,openfisca_valeur=433.06,ipp_valeur=unknown),children:openfisca-not-fully-included-in-ipp(openfisca_deb=2008-01-01,openfisca_fin=2008-12-31,openfisca_valeur=447.91,ipp_valeur=unknown),children:openfisca-not-fully-included-in-ipp(openfisca_deb=2004-01-01,openfisca_fin=2004-12-31,openfisca_valeur=417.88,ipp_valeur=unknown)" description="Rsa socle" format="float" origin="ipp" type="monetary">
<VALUE deb="2016-04-01" fuzzy="true" valeur="524.68" />
<VALUE deb="2016-09-01" fuzzy="true" valeur="535.17" />
<VALUE deb="2016-04-01" fin="2016-08-31" valeur="524.68" />
<VALUE deb="2015-09-01" fin="2016-03-31" valeur="524.16" />
<VALUE deb="2015-01-01" fin="2015-08-31" valeur="513.88" />
<VALUE deb="2014-09-01" fin="2014-12-31" valeur="509.3" />
Expand Down
9 changes: 9 additions & 0 deletions openfisca_france/tests/formulas/rsa_celibataire.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -274,3 +274,12 @@
age: 8
output_variables:
rsa_forfait_asf: 91.38

- name: "Revalorisation septembre 2016"
period: 2016-10
relative_error_margin: 0.01
input_variables:
age: 40
output_variables:
rsa: 535.17

2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

setup(
name = 'OpenFisca-France',
version = '6.0.3',
version = '6.0.4',
author = 'OpenFisca Team',
author_email = 'contact@openfisca.fr',
classifiers = [
Expand Down

0 comments on commit 2b79ac8

Please sign in to comment.