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

Jump to bottom

Fjerner toggle #562

Merged
merged 1 commit into from
Oct 31, 2024
Merged

Fjerner toggle #562

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion ...loven/kalkulator/adapter/vltilregelmodell/MapBeregningAktiviteterFraVLTilRegelFelles.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public class MapBeregningAktiviteterFraVLTilRegelFelles implements MapBeregningA
modell.setSkjæringstidspunktForOpptjening(opptjeningSkjæringstidspunkt);


if (input.getOpptjeningAktiviteter().erMidlertidigInaktiv() && KonfigurasjonVerdi.instance().get("BRUKERS_ANDEL_8_47_B", false)) {
if (input.getOpptjeningAktiviteter().erMidlertidigInaktiv()) {
// Skal ikkje ha nokon aktiviteter ved midlertidig inaktiv
// Beregningsgrunnlaget skal alltid bestå av kun BRUKERS_ANDEL og alle andre aktiviter regnes som tilkommet
return modell;
Expand Down
1 change: 0 additions & 1 deletion ...c/main/java/no/nav/folketrygdloven/kalkulus/beregning/v1/PleiepengerSyktBarnGrunnlag.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ public class PleiepengerSyktBarnGrunnlag extends YtelsespesifiktGrunnlagDto {
@Valid
private LocalDate tilkommetInntektHensyntasFom;


protected PleiepengerSyktBarnGrunnlag() {
// default ctor
}
Expand Down