🖋️ met à jour les plafond auto-entrepreneur sur la page de comparaison

pull/855/head
Johan Girod 2020-01-22 16:43:01 +01:00
parent 0123dc7a86
commit c21a87fa95
3 changed files with 25 additions and 19 deletions

View File

@ -92,7 +92,7 @@
"i18n:rules:check": "node source/scripts/i18n/check-missing-rule-translation.js",
"i18n:rules:translate": "node source/scripts/i18n/translate-rules.js",
"i18n:ui:check": "yarn run i18next && node source/scripts/i18n/check-missing-UI-translation",
"i18n:ui:translate": "yarn run i18next && node source/scripts/i18n/translate-ui.js",
"i18n:ui:translate": "rm -rf source/locales/static-analysis-fr.json && yarn run i18next && node source/scripts/i18n/translate-ui.js",
"mon-entreprise:serve": "PORT=5000 serve --config serve.mon-entreprise.json --no-clipboard",
"mon-entreprise:test": "cypress open --browser chromium",
"mycompanyinfrance:serve": "PORT=5001 serve --config serve.infrance.json --no-clipboard",

View File

@ -1,5 +1,8 @@
import { setSimulationConfig, setSituationBranch } from 'Actions/actions'
import { defineDirectorStatus, isAutoentrepreneur } from 'Actions/companyStatusActions'
import {
defineDirectorStatus,
isAutoentrepreneur
} from 'Actions/companyStatusActions'
import classnames from 'classnames'
import Conversation from 'Components/conversation/Conversation'
import SeeAnswersButton from 'Components/conversation/SeeAnswersButton'
@ -15,7 +18,10 @@ import { Trans } from 'react-i18next'
import { useDispatch, useSelector } from 'react-redux'
import { Link } from 'react-router-dom'
import { RootState } from 'Reducers/rootReducer'
import { analysisWithDefaultsSelector, branchAnalyseSelector } from 'Selectors/analyseSelectors'
import {
analysisWithDefaultsSelector,
branchAnalyseSelector
} from 'Selectors/analyseSelectors'
import { DottedName } from 'Types/rule'
import Animate from 'Ui/animate'
import InfoBulle from 'Ui/InfoBulle'
@ -113,7 +119,9 @@ export default function SchemeComparaison({
<div className="indep">
<div>
{hideAssimiléSalarié ? (
<Trans i18nKey="comparaisonRégimes.status.indep.2">EI ou EIRL</Trans>
<Trans i18nKey="comparaisonRégimes.status.indep.2">
EI ou EIRL
</Trans>
) : (
<Trans i18nKey="comparaisonRégimes.status.indep.1">
EI, EIRL, EURL ou SARL avec gérant majoritaire
@ -122,7 +130,9 @@ export default function SchemeComparaison({
</div>
</div>
<div className="auto">
<Trans i18nKey="comparaisonRégimes.status.auto">Auto-entreprise</Trans>
<Trans i18nKey="comparaisonRégimes.status.auto">
Auto-entreprise
</Trans>
</div>
<Trans i18nKey="comparaisonRégimes.AT">
@ -169,7 +179,7 @@ export default function SchemeComparaison({
<>
<Trans i18nKey="comparaisonRégimes.ACRE">
<h3 className="legend">ACRE</h3>
<div className="all">
<div className="AS-indep-et-auto">
1 an <small>(sous conditions d'éligibilité)</small>
</div>
</Trans>
@ -243,7 +253,7 @@ export default function SchemeComparaison({
<div className="auto">
<Trans>Oui</Trans>
<small>
(70 000 en services / 170 000 en vente de biens,
(72 500 en services / 176 200 en vente de biens,
restauration ou hébergement)
</small>
</div>
@ -584,7 +594,9 @@ export default function SchemeComparaison({
Entreprise individuelle
</Trans>
) : (
<Trans i18nKey="comparaisonRégimes.choix.indep">Indépendant</Trans>
<Trans i18nKey="comparaisonRégimes.choix.indep">
Indépendant
</Trans>
)}
</button>
{!hideAutoEntrepreneur && (

View File

@ -945,12 +945,6 @@ comparaisonRégimes:
<2> Highly recommended </2>
indemnités: |
<0> Sickness allowances</0>
plafondCA: |
<0> Turnover ceiling</0>
<1>No</1>
<2>
Yes<1>(€70,000 in services, €170,000 for sale of properties, food or accommodation)</1>
</2>
période: |
<0>Period</0>
retraite: |
@ -964,10 +958,6 @@ comparaisonRégimes:
chartered management centre...)</1></1>
<2> Simplified <1>(can be managed by the auto-entrepreneur)</1></1>
ACRE: |
<0>ACRE</0>
<1>1 year<1>(partial contribution exemption)</1></1>
<2>3 years<1>(application of reduced contribution rates)</1></2>
déduction: |
<0> Deduction of expenses</0>
<1>Yes <1>(tax regime of the actual)</1></1>
@ -1034,6 +1024,10 @@ comparaisonRégimes:
indep: Independent
EI: Sole proprietorship
trimestreValidés: <0>Number of quarters validated <1>(for retirement)</1></0>
ACRE: <0>ACRE</0><1>1 year <1>(subject to eligibility requirements)</1></1>
plafondCA: >-
<0>Turnover ceiling</0><1><0>No</0></1><2><0>Yes</0><1>(72,500 € in services
/ 176,200 € in the sale of goods, catering or accommodation)</1></2>
J'ai compris: understood
trimestres validés: validated quarters
Année d'activité: Years of activity
@ -1048,7 +1042,7 @@ Pas implémenté: Not implemented
Votre entreprise: Your company
Crée le: Created on
domiciliée à: domiciled in
"Nom de l'entreprise ou SIREN ": Company name or SIREN code
'Nom de l''entreprise ou SIREN ': Company name or SIREN code
Ressources utiles: Helpful resources
Aucun résultat: No result$
inférieurs à: lower than