diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/index.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/index.html.twig
index 0d4a7d637..6ea6cfc23 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/index.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/index.html.twig
@@ -10,12 +10,14 @@
 	{{ parent() }}
 	{{ encore_entry_script_tags('mod_async_upload') }}
     {{ encore_entry_script_tags('mod_docgen_picktemplate') }}
+    {{ encore_entry_script_tags('mod_entity_workflow_pick') }}
 {% endblock %}
 
 {% block css %}
 	{{ parent() }}
 	{{ encore_entry_link_tags('mod_async_upload') }}
     {{ encore_entry_link_tags('mod_docgen_picktemplate') }}
+    {{ encore_entry_link_tags('mod_entity_workflow_pick') }}
 {% endblock %}
 
 {% block content %}
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/List/list_item.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/List/list_item.html.twig
index 358127bfb..51a82b5d2 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/List/list_item.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/List/list_item.html.twig
@@ -48,6 +48,9 @@
     <div>
     {% if document.course is defined %}
         <ul class="record_actions">
+            <li>
+                {{ chill_entity_workflow_list('Chill\\DocStoreBundle\\Entity\\AccompanyingCourseDocument', document.id) }}
+            </li>
             {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_SEE_DETAILS', document) %}
                 <li>
                     {{ m.download_button(document.object, document.title) }}
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/ListWorkflow.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/ListWorkflow.vue
index ccc1d4568..38643dace 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/ListWorkflow.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/ListWorkflow.vue
@@ -5,7 +5,7 @@
 
          <div>
             <div class="item-row col">
-               <h2>Workflow</h2>
+               <h2>{{ w.title }} - ({{ w.workflow.text }})</h2>
                <div class="flex-grow-1 ms-3 h3">
                   <div class="visually-hidden">
                      {{ w.relatedEntityClass }}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Workflow/_extension_list_workflow_for.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_extension_list_workflow_for.html.twig
index 96c33e207..cfe8b83f5 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Workflow/_extension_list_workflow_for.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_extension_list_workflow_for.html.twig
@@ -7,7 +7,7 @@
 <div data-list-workflows="1"
     data-workflows="{{ entity_workflows_json|json_encode|e('html_attr') }}"
     data-allow-create="{{ acl }}"
-    data-related-entity-class="{{ blank_workflow.relatedEntityClass }}"
-    data-related-entity-id="{{ blank_workflow.relatedEntityId }}"
-    data-workflows-availables="{{ workflows_availables|json_encode()|e('html_attr') }}"
+    data-related-entity-class="{{ relatedEntityClass }}"
+    data-related-entity-id="{{ relatedEntityId }}"
+    data-workflows-availables="{{ workflows_available|json_encode()|e('html_attr') }}"
 ></div>
diff --git a/src/Bundle/ChillMainBundle/Workflow/Templating/WorkflowTwigExtensionRuntime.php b/src/Bundle/ChillMainBundle/Workflow/Templating/WorkflowTwigExtensionRuntime.php
index edb1aa7b7..e548c3e13 100644
--- a/src/Bundle/ChillMainBundle/Workflow/Templating/WorkflowTwigExtensionRuntime.php
+++ b/src/Bundle/ChillMainBundle/Workflow/Templating/WorkflowTwigExtensionRuntime.php
@@ -61,7 +61,46 @@ class WorkflowTwigExtensionRuntime implements RuntimeExtensionInterface
         return null;
     }
 
-    public function listWorkflows(Environment $environment, string $relatedEntityClass, int $relatedEntityId, array $options = []): string
+    /**
+     * @param Environment $environment
+     * @param string $relatedEntityClass
+     * @param int $relatedEntityId
+     * @param array $options
+     * @param array{relatedEntityClass: string, relatedEntityId: int} $supplementaryRelated
+     * @return string
+     * @throws \Symfony\Component\Serializer\Exception\ExceptionInterface
+     * @throws \Twig\Error\LoaderError
+     * @throws \Twig\Error\RuntimeError
+     * @throws \Twig\Error\SyntaxError
+     */
+    public function listWorkflows(Environment $environment, string $relatedEntityClass, int $relatedEntityId, array $options = [], array $supplementaryRelated = []): string
+    {
+        list($blankEntityWorkflow, $workflowsAvailable, $entityWorkflows) = $this->getWorkflowsForRelated($relatedEntityClass, $relatedEntityId);
+
+        dump($supplementaryRelated);
+        foreach ($supplementaryRelated as $supplementary) {
+            dump($supplementary);
+            list($supplementaryBlankEntityWorkflow, $supplementaryWorkflowsAvailable, $supplementaryEntityWorkflows)
+                = $this->getWorkflowsForRelated($supplementary['relatedEntityClass'], $supplementary['relatedEntityId']);
+
+            $entityWorkflows = array_merge($entityWorkflows, $supplementaryEntityWorkflows);
+        }
+
+        return $environment->render('@ChillMain/Workflow/_extension_list_workflow_for.html.twig', [
+            'entity_workflows_json' => $this->normalizer->normalize($entityWorkflows, 'json', ['groups' => 'read']),
+            'blank_workflow' => $blankEntityWorkflow,
+            'workflows_available' => $workflowsAvailable,
+            'relatedEntityClass' => $relatedEntityClass,
+            'relatedEntityId' => $relatedEntityId,
+        ]);
+    }
+
+    /**
+     * @param string $relatedEntityClass
+     * @param int $relatedEntityId
+     * @return array where keys are: {0: blankWorkflow, 1: entityWorkflows, 2: workflowList}
+     */
+    private function getWorkflowsForRelated(string $relatedEntityClass, int $relatedEntityId): array
     {
         $blankEntityWorkflow = new EntityWorkflow();
         $blankEntityWorkflow
@@ -70,25 +109,12 @@ class WorkflowTwigExtensionRuntime implements RuntimeExtensionInterface
 
         $workflowsList = $this->metadataExtractor->availableWorkflowFor($relatedEntityClass, $relatedEntityId);
 
-        // get the related entity already created
-        $entityWorkflows = [];
-
-        foreach ($entityWorkflowsNaked = $this->repository->findBy(
-            ['relatedEntityClass' => $relatedEntityClass, 'relatedEntityId' => $relatedEntityId]
-        ) as $entityWorkflow) {
-            $workflow = $this->registry->get($entityWorkflow, $entityWorkflow->getWorkflowName());
-            $entityWorkflows[] = [
-                'entity_workflow' => $entityWorkflow,
-                'workflow' => $this->metadataExtractor->buildArrayPresentationForWorkflow($workflow),
-                'handler' => $this->entityWorkflowManager->getHandler($entityWorkflow),
+        return
+            [
+                $blankEntityWorkflow,
+                $workflowsList,
+                $this->repository->findBy(
+                    ['relatedEntityClass' => $relatedEntityClass, 'relatedEntityId' => $relatedEntityId]),
             ];
-        }
-
-        return $environment->render('@ChillMain/Workflow/_extension_list_workflow_for.html.twig', [
-            'entity_workflows_json' => $this->normalizer->normalize($entityWorkflowsNaked, 'json', ['groups' => 'read']),
-            'entity_workflows' => $entityWorkflows,
-            'blank_workflow' => $blankEntityWorkflow,
-            'workflows_availables' => $workflowsList,
-        ]);
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig
index b153329b7..0e73f138c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig
@@ -101,14 +101,25 @@
             {% if notif_counter.total > 0 %}
                 {{ chill_counter_notifications('Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork', w.id) }}
             {% endif %}
-            
+
             {% import '@ChillPerson/Macro/updatedBy.html.twig' as macro %}
             {{ macro.updatedBy(w) }}
         </div>
-            
+
         {% if displayAction is defined and displayAction == true %}
             <div class="item-col">
                 <ul class="record_actions">
+                    {% set suppEvaluations = [] %}
+                    {% for e in w.accompanyingPeriodWorkEvaluations %}
+                        {% set suppEvaluations = suppEvaluations|merge([
+                            {'relatedEntityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluation', 'relatedEntityId': e.id }
+                        ]) %}
+                    {% endfor %}
+                    <li>
+                        {{ chill_entity_workflow_list(
+                            'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork',
+                            w.id, [], suppEvaluations) }}
+                    </li>
                     <li>
                         <a class="btn btn-edit" title="{{ 'Edit'|trans }}"
                            href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_edit', { 'id': w.id }) }}"
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/index.html.twig
index d8125ef3e..99380921c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/index.html.twig
@@ -2,6 +2,16 @@
 
 {% block title 'accompanying_course_work.List accompanying course work'|trans %}
 
+{% block js %}
+    {{ parent() }}
+    {{ encore_entry_script_tags('mod_entity_workflow_pick') }}
+{% endblock %}
+
+{% block css %}
+    {{ parent() }}
+    {{ encore_entry_link_tags('mod_entity_workflow_pick') }}
+{% endblock %}
+
 {% block content %}
     <div class="accompanying_course_work">
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation.html.twig
index 989052a0a..488f31661 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation.html.twig
@@ -62,10 +62,14 @@
                                             </li>
                                         {% endif %}
                                         <li>
+                                            {% if evaluation.createdBy is not null %}
                                             <span class="item-key">créé par</span>
                                             <b>{{ evaluation.createdBy.username }}</b>
+                                            {% endif %}
+                                            {% if evaluation.createdAt is not null %}
                                             <span class="item-key">{{ 'le'|trans }}</span>
                                             <b>{{ evaluation.createdAt|format_date('short') }}</b>
+                                            {% endif %}
                                         </li>
                                     </ul>
                                     {% if evaluation.comment %}