Ipp 7 : Update crédit d'IR "qualité environnementale" #913
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 20, 2018
| f7ay + f7az + f7bb + f7bc + f7bd + f7be + f7bf + f7bh + f7bk + f7bl | ||
| ) | ||
| depenses_transition_energetique = (depenses_transition_energetique_bouquet_2ans_2014_part2 * quaenv_bouquet + | ||
| depenses_transition_energetique_bouquet_2ans_2015 + |
| max00 = max_(0, max0 - depenses_transition_energetique) | ||
| max1 = max_(0, max00 - quaenv_bouquet * (f7sd + f7se + f7wc + f7vg + f7wt + f7sn + f7sp + f7sr + f7ss + f7sq + f7st) - not_(quaenv_bouquet) * (max00)) | ||
| credit_quaenv_bouquet_2ans = (quaenv_bouquet * (P.taux25 * (min_(max00, | ||
| f7sd + f7se + f7wc + f7vg + f7wt + f7sn + f7sp + f7sr + f7ss + f7sq + f7st)) + |
| f7se + f7sb + f7tb + | ||
| f7sp + f7rp + f7tp + | ||
| f7sq + f7rq + f7tq + | ||
| f7st + f7rt + f7tt > 0)*1 |
There was a problem hiding this comment.
espacesautour du *1
Vérifier les parenthèses : doit-on les fermer avant le > 0
claireleroy
force-pushed
the
ipp-update-tax-reductions-domtom
branch
from
206e6b4 to
b9a37c0
Compare
claireleroy
force-pushed
the
ipp-update-tax-reduction-quaenv
branch
from
68feb62 to
2f6f820
Compare
Anna-Livia
previously requested changes
Mar 6, 2018
|
|
||
| n = nb_pac2 | ||
| max0 = P.max * (1 + maries_ou_pacses) + P.pac1 * (n >= 1) + P.pac2 * (n >= 2) + P.pac2 * (max_(n - 2, 0)) | ||
|
|
||
| max1 = max_(0, max0 - f7wf) | ||
| max2 = max_(0, max1 - f7wg) | ||
| return (P.taux_wf * min_(f7wf, max0) + | ||
| 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
| P.taux_wh * min_(f7wh, max6) + | ||
| P.taux_sb * min_(f7sb, max7) + | ||
| P.taux_wq * min_(f7wq, max8)) | ||
| return or_(not_(f7we), rfr < P.max_rfr) * ( |
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
| @@ -1353,7 +1354,7 @@ def formula_2010_01_01(foyer_fiscal, period, parameters): | |||
| max5 = max_(0, max4 - f7wh) | |||
| max6 = max_(0, max5 - f7sb) | |||
| max7 = max_(0, max6 - f7wq) | |||
| return not_(f7wg) * or_(not_(f7we), (rfr < 45000)) * ( | |||
| return not_(f7wg) * or_(not_(f7we), (rfr < P.max_rfr)) * ( | |||
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
| @@ -1413,37 +1414,39 @@ def formula_2012_01_01(foyer_fiscal, period, parameters): | |||
| maxi3 = max_(0, maxi2 - f7tw) | |||
| maxi4 = max_(0, maxi3 - f7tv) | |||
| maxi5 = max_(0, maxi4 - f7tu) | |||
| collectif = (P.taux_ty * min_(f7ty, max0) + P.taux_tx * min_(f7tx, maxi1) + P.taux_tw * min_(f7tw, maxi2) + | |||
| P.taux_tv * min_(f7tv, maxi3) + P.taux_tu * min_(f7tu, maxi4) + P.taux_tt * min_(f7tt, maxi5)) | |||
| collectif = ( | |||
There was a problem hiding this comment.
Proposition :
collectif = (
P.taux_ty * min_(f7ty, max0)
+ P.taux_tx * min_(f7tx, maxi1)
+ P.taux_tw * min_(f7tw, maxi2)
+ P.taux_tv * min_(f7tv, maxi3)
+ P.taux_tu * min_(f7tu, maxi4)
+ P.taux_tt * min_(f7tt, maxi5)
)
| min_(max5, P.taux10 * (f7sd + f7wk * (f7sj + f7sk + f7sl)))) | ||
| )) | ||
| return not_(f7wg) * or_(not_(f7we), (rfr < 30000)) * (montant + collectif) + f7sz | ||
| montant = ( |
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
| @@ -856,7 +1118,7 @@ class f7rz(Variable): | |||
| unit = 'currency' | |||
| entity = FoyerFiscal | |||
| label = u"Investissements outre-mer: report de réduction d'impôt non imputée les années antérieures année n-3" | |||
| end = '2010-12-31' | |||
| # end = '2010-12-31' changes meaning in 2014 | |||
| @@ -3117,7 +3379,7 @@ class f7xb(Variable): | |||
| entity = FoyerFiscal | |||
| label = u"Investissements locatifs dans le secteur de touristique: travaux engagés avant 2011 dans une résidence de tourisme classée ou meublée" | |||
| # start_date = date(2011, 1, 1) | |||
| end = '2012-12-31' | |||
| # end = '2012-12-31' changes meaning in 2015 | |||
| @@ -3127,7 +3389,7 @@ class f7xc(Variable): | |||
| unit = 'currency' | |||
| entity = FoyerFiscal | |||
| label = u"Investissements locatifs dans le secteur de touristique: prix d'acquisition ou de revient d'un logement neuf acquis ou achevé en n-1" | |||
| end = '2012-12-31' | |||
| # end = '2012-12-31' changes meaning in 2015 | |||
| class f7sb(Variable): | ||
| cerfa_field = u"7SB" | ||
| value_type = int | ||
| unit = 'currency' | ||
| entity = FoyerFiscal | ||
| label = u"Dépenses en faveur de la qualité environnementale des logements donnés en location: crédit à 25 %" | ||
| # start_date = date(2009, 1, 1) | ||
| end = '2011-12-31' | ||
| # end = '2011-12-31' changes meaning in 2014 |
| @@ -0,0 +1,6 @@ | |||
| description: Taux 30% | |||
There was a problem hiding this comment.
cf remarques dans les formules
claireleroy
force-pushed
the
ipp-update-tax-reductions-domtom
branch
from
b44236a to
ca0d4e3
Compare
39 tasks
claireleroy
force-pushed
the
ipp-update-tax-reduction-quaenv
branch
from
29b39b6 to
e4e443e
Compare
claireleroy
changed the base branch from
ipp-update-tax-reductions-domtom
to
master
claireleroy
force-pushed
the
ipp-update-tax-reduction-quaenv
branch
from
084b4ba to
e73a466
Compare
added 11 commits
April 4, 2018 14:57
…or years 2014-2016
…Update formula for tax reduction 'duflot' (common tax base ceiling with 'rpinel')
…n 2013 - f7.. variables were replaced by fh.. variables
…vious formula (ceiling applies to tax base not tax credit) + update parameters
…2014 matter to define the bouquet condition
…1.12.2014 only provide tax credit if the "bouquet" condition is validated
…le - création de deux inputs variables distinctes
claireleroy
force-pushed
the
ipp-update-tax-reduction-quaenv
branch
from
b4debc3 to
70934e2
Compare
benjello
approved these changes
Apr 4, 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-reductions-domtom(#912)openfisca_france/model/prelevements_obligatoires/impot_revenu/credits_impots.py.openfisca_france/model/prelevements_obligatoires/impot_revenu/variables_reductions_credits.pyopenfisca_france/parameters/impot_revenu/credits_impot/quaenv/Ces changements :