Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
OSE
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
open-source
OSE
Commits
d830e099
Commit
d830e099
authored
1 year ago
by
Antony Le Courtes
Browse files
Options
Downloads
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
4ededde8
19662ddf
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGELOG.md
+1
-1
1 addition, 1 deletion
CHANGELOG.md
module/Dossier/src/Service/DossierService.php
+1
-1
1 addition, 1 deletion
module/Dossier/src/Service/DossierService.php
with
2 additions
and
2 deletions
CHANGELOG.md
+
1
−
1
View file @
d830e099
...
...
@@ -25,7 +25,7 @@
*
Prise en compte de la bonne fin d'année universitaire pour la clôture du dossier d'un vacataire (PEC) dans l'export Ose vers SIHAM (#52484)
*
Suppression des notes d'un intervenant avant sa suppression définitive de OSE (#52719)
*
Masquer 'Données personnelles' sur le menu de gauche lorsque celles-ci sont désactivées pour l'intervenant (#52479)
*
Le bandeau d'heures réalisé sur l'année précédente est bien affiché dans le menu données personelles (#48022)
...
...
This diff is collapsed.
Click to expand it.
module/Dossier/src/Service/DossierService.php
+
1
−
1
View file @
d830e099
...
...
@@ -152,7 +152,7 @@ class DossierService extends AbstractEntityService
$iPrec
=
$this
->
getServiceIntervenant
()
->
getPrecedent
(
$intervenant
,
-
$i
);
if
(
$iPrec
&&
$iPrec
->
getStatut
()
->
estVacataire
()
&&
$iPrec
->
getStatut
()
->
getService
Statutair
e
())
{
if
(
$iPrec
&&
$iPrec
->
getStatut
()
->
estVacataire
()
&&
$iPrec
->
getStatut
()
->
getService
Realis
e
())
{
return
$iPrec
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment