Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tillatter brevutfall om kun en inntekt men 2025 #6619

Merged
merged 1 commit into from
Dec 13, 2024
Merged

Tillatter brevutfall om kun en inntekt men 2025 #6619

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions apps/etterlatte-saksbehandling-ui/client/src/components/behandling/avkorting/Avkorting.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,11 @@ export const Avkorting = ({
if (avkorting == undefined) {
return false
}
if (behandling.behandlingType === IBehandlingsType.FØRSTEGANGSBEHANDLING && inntektNesteAarBryter) {
if (
behandling.behandlingType === IBehandlingsType.FØRSTEGANGSBEHANDLING &&
inntektNesteAarBryter &&
virkAar == 2024 // TODO EY-4632
) {
if (behandling.viderefoertOpphoer && new Date(behandling.viderefoertOpphoer.dato).getFullYear() === virkAar) {
// Trenger ikke to inntekter hvis det er opphør i samme året
return true
Expand Down Expand Up @@ -113,7 +117,7 @@ export const Avkorting = ({
resetInntektsavkortingValidering={resetInntektsavkortingValidering}
/>{' '}
{behandling.behandlingType === IBehandlingsType.FØRSTEGANGSBEHANDLING &&
virkAar === 2024 && // Midlertidig til vi får en bedre løsning på hele avkorting frontend....EY-4632
virkAar === 2024 && // TODO Midlertidig til vi får en bedre løsning på hele avkorting frontend....EY-4632
!!avkorting?.avkortingGrunnlag?.length && (
<AvkortingInntekt
behandling={behandling}
Expand Down
Loading