From 8cc770ea6b13ed76124f115e47935847ba3575d2 Mon Sep 17 00:00:00 2001 From: Mael Thomas Date: Thu, 16 Feb 2017 15:56:43 +0100 Subject: [PATCH 1/6] Update fillon 2017 value --- openfisca_france/param/param.xml | 8 ++++---- openfisca_france/parameters/prelevements_sociaux.xml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/openfisca_france/param/param.xml b/openfisca_france/param/param.xml index d6cdb22db2..f0df9fc18c 100644 --- a/openfisca_france/param/param.xml +++ b/openfisca_france/param/param.xml @@ -939,15 +939,15 @@ - - + + - - + + diff --git a/openfisca_france/parameters/prelevements_sociaux.xml b/openfisca_france/parameters/prelevements_sociaux.xml index 19dfb4d2c3..54865ff5c0 100644 --- a/openfisca_france/parameters/prelevements_sociaux.xml +++ b/openfisca_france/parameters/prelevements_sociaux.xml @@ -2529,13 +2529,13 @@ - + - + From 46439a78a6c78b2d58768cb7aa8d35eaac7d4dfc Mon Sep 17 00:00:00 2001 From: Mael Thomas Date: Thu, 16 Feb 2017 15:57:59 +0100 Subject: [PATCH 2/6] Add test fillon Augment fillon computing precision --- .../tests/formulas/reduction_generale-fillon.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 openfisca_france/tests/formulas/reduction_generale-fillon.yaml diff --git a/openfisca_france/tests/formulas/reduction_generale-fillon.yaml b/openfisca_france/tests/formulas/reduction_generale-fillon.yaml new file mode 100644 index 0000000000..0c22c533b7 --- /dev/null +++ b/openfisca_france/tests/formulas/reduction_generale-fillon.yaml @@ -0,0 +1,15 @@ +- period: "2017-01" + name: Base + relative_error_margin: 0.001 + input_variables: + allegement_fillon_mode_recouvrement: 1 + effectif_entreprise: 1 + salaire_de_base: 1500 + output_variables: + allegement_fillon: > + 1500 * + ( + (.2809 / .6) + * + (1.6 * ( 17763.20 / (1500 * 12)) - 1) + ) From be9e9412c67db5feb31e68574b10b6ea3cb5e261 Mon Sep 17 00:00:00 2001 From: Mael Thomas Date: Thu, 16 Feb 2017 16:14:00 +0100 Subject: [PATCH 3/6] Update taux 2017 maladie employeur --- openfisca_france/param/param.xml | 2 +- openfisca_france/parameters/cotsoc.xml | 2 +- openfisca_france/parameters/prelevements_sociaux.xml | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/openfisca_france/param/param.xml b/openfisca_france/param/param.xml index f0df9fc18c..096018409a 100644 --- a/openfisca_france/param/param.xml +++ b/openfisca_france/param/param.xml @@ -1579,7 +1579,7 @@ - + diff --git a/openfisca_france/parameters/cotsoc.xml b/openfisca_france/parameters/cotsoc.xml index 3f6b53be0d..27fdcc2b43 100644 --- a/openfisca_france/parameters/cotsoc.xml +++ b/openfisca_france/parameters/cotsoc.xml @@ -738,7 +738,7 @@ - + diff --git a/openfisca_france/parameters/prelevements_sociaux.xml b/openfisca_france/parameters/prelevements_sociaux.xml index 54865ff5c0..3ff6033bcf 100644 --- a/openfisca_france/parameters/prelevements_sociaux.xml +++ b/openfisca_france/parameters/prelevements_sociaux.xml @@ -2215,7 +2215,8 @@ - + + From 44f8beccc345c61d687588bdc2a13e817942ea06 Mon Sep 17 00:00:00 2001 From: Mael Thomas Date: Thu, 16 Feb 2017 16:17:33 +0100 Subject: [PATCH 4/6] Add test maladie mmid employeur --- .../tests/formulas/maladie_mmid_employeur.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 openfisca_france/tests/formulas/maladie_mmid_employeur.yaml diff --git a/openfisca_france/tests/formulas/maladie_mmid_employeur.yaml b/openfisca_france/tests/formulas/maladie_mmid_employeur.yaml new file mode 100644 index 0000000000..1d2c0c6db6 --- /dev/null +++ b/openfisca_france/tests/formulas/maladie_mmid_employeur.yaml @@ -0,0 +1,8 @@ +- period: "2017-02" + name: + Cotisation maladie MMID employeur + relative_error_margin: 0.001 + input_variables: + salaire_de_base: 2300 + output_variables: + mmid_employeur: -.1289 * 2300 From aade39e68cd3925333d917dc6621e2c46b07f276 Mon Sep 17 00:00:00 2001 From: Mael Thomas Date: Thu, 16 Feb 2017 16:23:41 +0100 Subject: [PATCH 5/6] patch --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ca17432a0c..b780c84da4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog + +## 13.1.5 + +* Fix 2017 rates and test them: + - réduction générale sur les bas salaires (fillon) had a minor difference (we used the 2016 provisionnal value) + - maladie MMID employeur had not been updated + ## 13.1.4 * Fix AGS value in cotsoc.xml. v10.0.1's fix was ineffective. diff --git a/setup.py b/setup.py index 69671707ac..e55fdd5982 100755 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ setup( name = 'OpenFisca-France', - version = '13.1.4', + version = '13.1.5', author = 'OpenFisca Team', author_email = 'contact@openfisca.fr', classifiers = [ From b8d76a292381cab497c14b12a71e6c2061772d9c Mon Sep 17 00:00:00 2001 From: Mael Thomas Date: Thu, 16 Feb 2017 17:00:54 +0100 Subject: [PATCH 6/6] Add reference links --- .../prelevements_sociaux/cotisations_sociales/allegements.py | 3 ++- .../prelevements_sociaux/cotisations_sociales/travail_prive.py | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/cotisations_sociales/allegements.py b/openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/cotisations_sociales/allegements.py index 3b6737663d..18bac81873 100644 --- a/openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/cotisations_sociales/allegements.py +++ b/openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/cotisations_sociales/allegements.py @@ -301,6 +301,7 @@ class allegement_fillon(DatedVariable): column = FloatCol entity = Individu label = u"Allègement de charges employeur sur les bas et moyens salaires (dit allègement Fillon)" + url = u"https://www.service-public.fr/professionnels-entreprises/vosdroits/F24542" # Attention : cet allègement a des règles de cumul spécifiques @@ -327,7 +328,7 @@ def function(self, simulation, period): def compute_allegement_fillon(simulation, period): """ Exonération Fillon - http://www.securite-sociale.fr/comprendre/dossiers/exocotisations/exoenvigueur/fillon.htm + https://www.service-public.fr/professionnels-entreprises/vosdroits/F24542 """ assiette = simulation.calculate_add('assiette_allegement', period) smic_proratise = simulation.calculate_add('smic_proratise', period) diff --git a/openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/cotisations_sociales/travail_prive.py b/openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/cotisations_sociales/travail_prive.py index c9964c3d9a..d9a1f18afc 100644 --- a/openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/cotisations_sociales/travail_prive.py +++ b/openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/cotisations_sociales/travail_prive.py @@ -587,6 +587,7 @@ class mmid_employeur(Variable): column = FloatCol entity = Individu label = u"Cotisation maladie (employeur)" + url = u"https://www.urssaf.fr/portail/home/employeur/calculer-les-cotisations/les-taux-de-cotisations/la-cotisation-maladie---maternit.html" def function(self, simulation, period): period = period.start.period(u'month').offset('first-of')