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.

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

TFP-4416 riktig starterMedFullUbtetaling for frilans og SN ved flere … #2451

Merged
merged 1 commit into from
Oct 31, 2023

Conversation

palfi
Copy link
Contributor

@palfi palfi commented Oct 31, 2023

…arbeidsforhold

@palfi palfi requested a review from a team as a code owner October 31, 2023 10:08
@@ -61,6 +61,7 @@ public static List<Utbetalingsperiode> mergePerioder(List<Utbetalingsperiode> pe
.medPeriodeDagsats(periodeEn.getPeriodeDagsats())
.medAntallTapteDager(finnRiktigAntallTapteDager(periodeEn, periodeTo), BigDecimal.ZERO)
.medPrioritertUtbetalingsgrad(periodeEn.getPrioritertUtbetalingsgrad())
.medFullUtbetaling(periodeEn.isFullUtbetaling())
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dette er vel greit siden vi allerede har sjekket at dagsats er lik

@palfi palfi merged commit 60477b5 into master Oct 31, 2023
9 checks passed
@palfi palfi deleted the feature/TFP-4416_fl branch October 31, 2023 10:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants