Merge branch 'develop'

src/Controller/ExpenseReportAdminController.php

@@ -318,6 +318,7 @@ class ExpenseReportAdminController extends CrudController
             ->setView('form', 'admin/expense_report/_form.html.twig')
             ->setView('show_entity', 'admin/expense_report/_show.html.twig')
             ->setView('edit', 'admin/expense_report/edit.html.twig')
+            ->setView('show', 'admin/expense_report/show.html.twig')
 
             ->setForm('edit', Type::class, [])
             ->setForm('new', Type::class)

templates/admin/expense_report/_show.html.twig

@@ -1,5 +1,7 @@
-{% set total = 0 %}
-
+<div id="form-main">
+    <div class="tab-content">
+        <div class="tab-pane active">
+            <div class="tab-form p-0">
                 {% if entity.moves|length %}
                     <div class="table-responsive">
                         <table class="table mb-0">
@@ -78,7 +80,7 @@
                 {% endif %}
 
                 <div class="table-responsive">
-    <table class="table">
+                    <table class="table mb-0">
                         <tr>
                             <td>
                                 Facture(s)
@@ -115,3 +117,7 @@
                         </tr>
                     </table>
                 </div>
+            </div>
+        </div>
+    </div>
+</div>

templates/admin/expense_report/show.html.twig

@@ -0,0 +1,3 @@
+{% extends '@Core/admin/crud/show.html.twig' %}
+
+{% block body_class %}has-form{% endblock %}