Ipp 10 : Update et corrige le crédit d'impôt 'aidper' #916
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
benjello
requested changes
Feb 21, 2018
| @@ -420,20 +420,21 @@ def formula_2012_01_01(foyer_fiscal, period, parameters): | |||
| _P = parameters(period) | |||
|
|
|||
| P = _P.impot_revenu.credits_impot.aidper | |||
| P.taux_wj * min_(f7wj, max1) + P.taux_wi * min_(f7wi, max2)) | ||
| max1 = max_(0, max0 - f7wj) # f7wj s'impute avant f7wl et f7wi | ||
| max2 = max_(0, max1 - f7wi) # f7wi s'impute avant f7wl | ||
| return (P.taux_wr * f7wr + |
| @@ -443,20 +444,20 @@ def formula_2013_01_01(foyer_fiscal, period, parameters): | |||
| _P = parameters(period) | |||
|
|
||
| return (P.taux_wr * f7wr + P.taux_wl * min_(f7wl, max00) + P.taux_wl * max_(f7wl - max00, 0) + P.taux_wj * | ||
| min_(f7wj, max1)) | ||
| return (P.taux_wr * f7wr + |
| @@ -466,16 +467,14 @@ def formula_2014_01_01(foyer_fiscal, period, parameters): | |||
| _P = parameters(period) | |||
| P.taux_wr * f7wr + P.taux_wl * min_(f7wl, max00) + P.taux_wl * max_(f7wl - max00, 0) + | ||
| P.taux_wj * min_(f7wj, max1) | ||
| ) | ||
| return (P.taux_wr * f7wr + |
Anna-Livia
reviewed
Mar 6, 2018
| _P = parameters(period) | ||
|
|
||
| P = _P.impot_revenu.credits_impot.aidper | ||
| P = parameters(period).impot_revenu.credits_impot.aidper |
| P.taux_wj * min_(f7wj, max1) + P.taux_wi * min_(f7wi, max2)) | ||
| max1 = max_(0, max0 - f7wj) # f7wj s'impute avant f7wl et f7wi | ||
| max2 = max_(0, max1 - f7wi) # f7wi s'impute avant f7wl | ||
| return ( |
There was a problem hiding this comment.
Il vaut mieux mettre les opérateurs (
+) en début de ligne qu'en fin de ligne : https://www.python.org/dev/peps/pep-0008/#should-a-line-break-before-or-after-a-binary-operator
claireleroy
force-pushed
the
ipp-update-tax-reduction-cappme
branch
from
d7dbd44 to
acbf554
Compare
…n 2013 - f7.. variables were replaced by fh.. variables
…se of the ceiling due to f7dl only applies to tax reduction not tax credit
…ng and wrong imputation order
claireleroy
force-pushed
the
ipp-update-tax-credit-aidper
branch
from
0a2dc73 to
f94ab8b
Compare
claireleroy
changed the base branch from
ipp-update-tax-reduction-cappme
to
master
39 tasks
Anna-Livia
reviewed
Apr 6, 2018
| * Évolution du système socio-fiscal. | ||
| * Zones impactées : | ||
| - `openfisca_france/model/prelevements_obligatoires/impot_revenu/credits_impots` | ||
| - `openfisca_france/parameters/impot_revenu/credits_impot/aidper/max_wl` |
There was a problem hiding this comment.
Il faut ajouter la période impactée
| @@ -2734,7 +2734,7 @@ def formula_2016_01_01(foyer_fiscal, period, parameters): | |||
| + P.report12 * min_(f7th + f7uu + f7uv + f7ti, max2) | |||
| ) | |||
|
|
|||
|
|
|||
Anna-Livia
approved these changes
Apr 6, 2018
benjello
approved these changes
Apr 6, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Les modifications de cette PR sont comparées à la branche
ipp-update-tax-reduction-cappme(#915)openfisca_france/model/prelevements_obligatoires/impot_revenu/credits_impots.py.openfisca_france/parameters/impot_revenu/credits_impot/aidper/max_wl.yamlCes changements :