diff --git a/app/config/packages/backoffice_menu.yaml b/app/config/packages/backoffice_menu.yaml
index 86a668798..2f03f1fee 100644
--- a/app/config/packages/backoffice_menu.yaml
+++ b/app/config/packages/backoffice_menu.yaml
@@ -226,10 +226,13 @@ parameters:
                         - admin_accounting_invoices_list
                 compta_journal:
                     nom: 'Journal'
+                    url: '/admin/accounting/journal/list'
                     niveau: 'ROLE_ADMIN'
                     extra_routes:
+                        - admin_accounting_journal_list
                         - admin_accounting_journal_add
                         - admin_accounting_journal_edit
+                        - admin_accounting_journal_import
                 compta_conf_evenement:
                     nom: 'Configuration'
                     niveau: 'ROLE_ADMIN'
diff --git a/app/config/routing/admin_accounting/journal.yml b/app/config/routing/admin_accounting/journal.yml
index fee0ba74c..061668a38 100644
--- a/app/config/routing/admin_accounting/journal.yml
+++ b/app/config/routing/admin_accounting/journal.yml
@@ -1,3 +1,8 @@
+admin_accounting_journal_list:
+  path: /list
+  defaults:
+    _controller: AppBundle\Controller\Admin\Accounting\Journal\ListAction
+
 admin_accounting_journal_delete:
   path: /delete/{id}
   defaults:
diff --git a/sources/AppBundle/Accounting/OperationType.php b/sources/AppBundle/Accounting/OperationType.php
new file mode 100644
index 000000000..349230b55
--- /dev/null
+++ b/sources/AppBundle/Accounting/OperationType.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace AppBundle\Accounting;
+
+enum OperationType: int
+{
+    case Debit = 1;
+    case Credit = 2;
+    case All = 0;
+}
diff --git a/sources/AppBundle/Controller/Admin/Accounting/Journal/AddTransactionAction.php b/sources/AppBundle/Controller/Admin/Accounting/Journal/AddTransactionAction.php
index 6577566af..1953a7a18 100644
--- a/sources/AppBundle/Controller/Admin/Accounting/Journal/AddTransactionAction.php
+++ b/sources/AppBundle/Controller/Admin/Accounting/Journal/AddTransactionAction.php
@@ -28,10 +28,8 @@ public function __invoke(Request $request): Response
         if ($form->isSubmitted() && $form->isValid()) {
             $this->transactionRepository->save($transaction);
             $this->audit->log("Ajout d'une écriture");
-            $_SESSION['flash']['message'] = "l'écriture a été ajoutée";
-            $_SESSION['flash']['error'] = false;
-            $this->addFlash('notice', "l'écriture a été ajoutée");
-            return $this->redirect('/pages/administration/index.php?page=compta_journal&action=lister#L' . $transaction->getId());
+            $this->addFlash('notice', "L'écriture a été ajoutée");
+            return $this->redirect('/admin/accounting/journal/list#L' . $transaction->getId());
         }
 
         return $this->render('admin/accounting/journal/add.html.twig', [
diff --git a/sources/AppBundle/Controller/Admin/Accounting/Journal/AllocateAction.php b/sources/AppBundle/Controller/Admin/Accounting/Journal/AllocateAction.php
index 1706eb129..c14ba1828 100644
--- a/sources/AppBundle/Controller/Admin/Accounting/Journal/AllocateAction.php
+++ b/sources/AppBundle/Controller/Admin/Accounting/Journal/AllocateAction.php
@@ -50,9 +50,7 @@ public function __invoke(Request $request, int $id): RedirectResponse
         $transaction->setAmount($transaction->getAmount() - $totalAmount);
         $this->transactionRepository->save($transaction);
 
-        $_SESSION['flash'] = "L'écriture a été ventilée";
-        $_SESSION['erreur'] = false;
         $this->addFlash('notice', "L'écriture a été ventilée");
-        return $this->redirect('/pages/administration/index.php?page=compta_journal#journal-ligne-' . $lastId);
+        return $this->redirect('/admin/accounting/journal/list#journal-ligne-' . $lastId);
     }
 }
diff --git a/sources/AppBundle/Controller/Admin/Accounting/Journal/DeleteAction.php b/sources/AppBundle/Controller/Admin/Accounting/Journal/DeleteAction.php
index d2bbc9a7d..65ab0014a 100644
--- a/sources/AppBundle/Controller/Admin/Accounting/Journal/DeleteAction.php
+++ b/sources/AppBundle/Controller/Admin/Accounting/Journal/DeleteAction.php
@@ -22,17 +22,13 @@ public function __invoke(Request $request, int $id): Response
     {
         $accounting = $this->transactionRepository->get($id);
         if (!$accounting instanceof Transaction) {
-            $_SESSION['flash'] = "Une erreur est survenue lors de la suppression de l'écriture";
-            $_SESSION['erreur'] = true;
             $this->addFlash('error', "Une erreur est survenue lors de la suppression de l'écriture");
-            return $this->redirect('/pages/administration/index.php?page=compta_journal');
+            return $this->redirectToRoute('admin_accounting_journal_list');
         }
 
         $this->transactionRepository->delete($accounting);
         $this->audit->log("Suppression de l'écriture {$id}");
-        $_SESSION['flash'] = "L'écriture a été supprimée";
-        $_SESSION['erreur'] = false;
         $this->addFlash('notice', "L'écriture a été supprimée");
-        return $this->redirect('/pages/administration/index.php?page=compta_journal');
+        return $this->redirectToRoute('admin_accounting_journal_list');
     }
 }
diff --git a/sources/AppBundle/Controller/Admin/Accounting/Journal/EditTransactionAction.php b/sources/AppBundle/Controller/Admin/Accounting/Journal/EditTransactionAction.php
index 4ef3889fd..c32e52a56 100644
--- a/sources/AppBundle/Controller/Admin/Accounting/Journal/EditTransactionAction.php
+++ b/sources/AppBundle/Controller/Admin/Accounting/Journal/EditTransactionAction.php
@@ -46,7 +46,7 @@ public function __invoke(Request $request, int $id): Response
             if ($submitAndPassButton instanceof SubmitButton && $submitAndPassButton->isClicked()) {
                 return $this->redirectToRoute('admin_accounting_journal_edit', ['id' => $nextTransaction->getId()]);
             } else {
-                return $this->redirect('/pages/administration/index.php?page=compta_journal&action=lister#L' . $transaction->getId());
+                return $this->redirect('/admin/accounting/journal/list#L' . $transaction->getId());
             }
         }
         return $this->render('admin/accounting/journal/edit.html.twig', [
diff --git a/sources/AppBundle/Controller/Admin/Accounting/Journal/ImportAction.php b/sources/AppBundle/Controller/Admin/Accounting/Journal/ImportAction.php
index c99983be5..db81f3aac 100644
--- a/sources/AppBundle/Controller/Admin/Accounting/Journal/ImportAction.php
+++ b/sources/AppBundle/Controller/Admin/Accounting/Journal/ImportAction.php
@@ -36,16 +36,12 @@ public function __invoke(Request $request): Response
                 $importer = $this->importerFactory->create($this->uploadDir . 'banque.csv', $form->get('bankAccount')->getData());
                 if ($this->compta->extraireComptaDepuisCSVBanque($importer)) {
                     $this->audit->log('Chargement fichier banque');
-                    $_SESSION['flash'] = "Le fichier a été importé";
-                    $_SESSION['erreur'] = false;
                     $this->addFlash('notice', "Le fichier a été importé");
                 } else {
-                    $_SESSION['flash'] = "Le fichier n'a pas été importé. Le format est-il valide ?";
-                    $_SESSION['erreur'] = true;
                     $this->addFlash('error', "Le fichier n'a pas été importé. Le format est-il valide ?");
                 }
                 unlink($this->uploadDir . 'banque.csv');
-                return $this->redirect('/pages/administration/index.php?page=compta_journal&&action=lister');
+                return $this->redirectToRoute('admin_accounting_journal_list');
             }
         }
 
diff --git a/sources/AppBundle/Controller/Admin/Accounting/Journal/ListAction.php b/sources/AppBundle/Controller/Admin/Accounting/Journal/ListAction.php
new file mode 100644
index 000000000..1933428af
--- /dev/null
+++ b/sources/AppBundle/Controller/Admin/Accounting/Journal/ListAction.php
@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+namespace AppBundle\Controller\Admin\Accounting\Journal;
+
+use AppBundle\Accounting\Entity\Repository\CategoryRepository;
+use AppBundle\Accounting\Entity\Repository\EventRepository;
+use AppBundle\Accounting\Entity\Repository\PaymentRepository;
+use AppBundle\Accounting\Form\InvoicingPeriodType;
+use AppBundle\Accounting\Model\Repository\InvoicingPeriodRepository;
+use AppBundle\Accounting\Model\Repository\TransactionRepository;
+use AppBundle\Accounting\OperationType;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+class ListAction extends AbstractController
+{
+    public function __construct(
+        private readonly TransactionRepository $transactionRepository,
+        private readonly CategoryRepository $categoryRepository,
+        private readonly EventRepository $eventRepository,
+        private readonly PaymentRepository $paymentRepository,
+        private readonly InvoicingPeriodRepository $invoicingPeriodRepository,
+    ) {}
+
+    public function __invoke(Request $request): Response
+    {
+        $periodId = $request->query->has('periodId') ? $request->query->getInt('periodId') : null;
+        $period = $this->invoicingPeriodRepository->getCurrentPeriod($periodId);
+        $formPeriod = $this->createForm(InvoicingPeriodType::class, $period);
+        $periods = $this->invoicingPeriodRepository->getAll();
+        $withReconciled = $request->query->getBoolean('with_reconciled');
+        $type = OperationType::from($request->query->getInt('type'));
+
+        $transactions = $this->transactionRepository->getEntriesPerInvoicingPeriod($period, !$withReconciled, $type->value);
+
+        return $this->render('admin/accounting/journal/list.html.twig', [
+            'periods' => $periods,
+            'periodId' => $period->getId(),
+            'formPeriod' => $formPeriod->createView(),
+            'withReconciled' => $withReconciled,
+            'type' => $type,
+            'categories' => $this->categoryRepository->getAllSortedByName(),
+            'events' => $this->eventRepository->getAllSortedByName(),
+            'paymentTypes' => $this->paymentRepository->getAllSortedByName(),
+            'transactions' => $transactions,
+        ]);
+    }
+}
diff --git a/templates/admin/accounting/invoicing-period.form.html.twig b/templates/admin/accounting/invoicing-period.form.html.twig
index 71d447bfb..20925f975 100644
--- a/templates/admin/accounting/invoicing-period.form.html.twig
+++ b/templates/admin/accounting/invoicing-period.form.html.twig
@@ -1,5 +1,5 @@
 <div class="ui green segment">
-{{ form_start(form) }}
+{{ form_start(form, {'name': 'periodId_selector'}) }}
 <div class="ui form">
     <div class="inline fields">
         <div class="field">
diff --git a/templates/admin/accounting/journal/list.html.twig b/templates/admin/accounting/journal/list.html.twig
new file mode 100644
index 000000000..b64316529
--- /dev/null
+++ b/templates/admin/accounting/journal/list.html.twig
@@ -0,0 +1,402 @@
+{% extends 'admin/base_with_header.html.twig' %}
+
+{#{% form_theme form 'form_theme_admin.html.twig' %}#}
+
+{% block content %}
+    <h2>Journal</h2>
+
+    <div class="ui menu">
+        <a href="{{ path('admin_accounting_journal_add') }}" class="item">
+            <div data-tooltip="Ajouter une écriture" data-position="bottom left">
+                <i class="icon plus square"></i>
+                Ajouter
+            </div>
+        </a>
+        <a href="{{ url('admin_accounting_journal_import') }}" class="item">
+            <i class="icon upload"></i>
+            Importer un fichier CSV
+        </a>
+    </div>
+
+    {% include 'admin/accounting/invoicing-period.form.html.twig' with {form: formPeriod, url: path('admin_accounting_quotations_list')} %}
+
+    <div class="ui segment">
+        <form method="GET" name="filtre" class="js-form-search">
+            <input type="hidden" name="periodId" value="{{ periodId }}" />
+
+            <div class="ui form">
+                <div class="inline fields">
+                    <div class="field">
+                        <div class="ui checkbox">
+                            <input type="checkbox" tabindex="0" class="hidden" name="with_reconciled" {% if withReconciled %}checked="checked"{% endif %}>
+                            <label>Afficher aussi les entrées déjà pointées</label>
+                        </div>
+                    </div>
+                    <div class="field">
+                        <input type="submit" value="Filtrer" class="ui button" />
+                    </div>
+                </div>
+            </div>
+        </form>
+    </div>
+
+    <div class="ui menu">
+        <a href="{{ url('admin_accounting_journal_export', {periodId: periodId, with_reconciled: withReconciled}) }}" class="item">
+            <i class="icon file"></i>
+            Exporter la période en CSV
+        </a>
+        <a href="{{ url('admin_accounting_journal_download_attachments', {periodId: periodId}) }}" class="item">
+            <i class="icon file zip"></i>
+            Télécharger les justificatifs groupés par mois
+        </a>
+    </div>
+
+    <div class="ui top attached tabular menu">
+        <a class="item {% if type == enum('AppBundle\\Accounting\\OperationType').All %}active{% endif %}" href="{{ url('admin_accounting_journal_list', {periodId, with_reconciled: withReconciled}) }}">Dépenses/Recettes</a>
+        <a class="item {% if type == enum('AppBundle\\Accounting\\OperationType').Debit %}active{% endif %}" href="{{ url('admin_accounting_journal_list', {periodId, type: enum('AppBundle\\Accounting\\OperationType').Debit.value, with_reconciled: withReconciled}) }}">Dépenses</a>
+        <a class="item {% if type == enum('AppBundle\\Accounting\\OperationType').Credit %}active{% endif %}" href="{{ url('admin_accounting_journal_list', {periodId, type: enum('AppBundle\\Accounting\\OperationType').Credit.value, with_reconciled: withReconciled}) }}">Recettes</a><br />
+    </div>
+
+    <div class="ui bottom attached segment">
+    {% if transactions.count > 0 %}
+    <table class="ui table striped compact celled afup-tab-filterable">
+        <thead>
+        <tr>
+            <th>Date</th>
+            <th data-tf-filter-type="select">Compte</th>
+            <th data-tf-filter-type="select">Evenement</th>
+            <th data-tf-filter-type="select">Catégorie</th>
+            <th data-tf-filter-type="input">Description</th>
+            <th data-tf-filter-type="input" class="right aligned">Debit</th>
+            <th data-tf-filter-type="input" class="right aligned">Crédit</th>
+            <th data-tf-filter-type="select">Reglement</th>
+            <th>Justif ?</th>
+            <th>&nbsp;</th>
+        </tr>
+        </thead>
+        <tbody>
+        {% for line in transactions %}
+            <tr class="{{ cycle(['odd', 'even'], loop.index0) }}" id="journal-ligne-{{ line.idtmp }}">
+                <td nowrap="nowrap"><a name="L{{ line.idtmp }}"></a>{{ line.date_ecriture|format_date('short') }}</td>
+                <td>{{ line.nom_compte }}</td>
+                <td>
+                    {% if line.evenement == 'A déterminer' %}
+                    <div class="ui form">
+                        <select class=" js-select-change" data-post-url="{{ path('admin_accounting_journal_update_info', {'id': line.idtmp, 'modification': 'event'}) }}" style="min-width:130px">
+                            {% for event in events %}
+                            <option value="{{ event.id }}" {% if event.name == "A déterminer" %}selected="selected"{% endif %}>{{ event.name }}</option>
+                            {% endfor %}
+                        </select>
+                    </div>
+                    {% else %}
+                    {{ line.evenement }}
+                    {% endif %}
+                </td>
+                <td>
+                    {% if line.categorie == 'A déterminer' %}
+                    <div class="ui form">
+                        <select class="js-select-change" data-post-url="{{ path('admin_accounting_journal_update_info', {'id': line.idtmp, 'modification': 'category'}) }}" style="min-width:130px">
+                            {% for category in categories %}
+                                <option value="{{ category.id }}" {% if category.name == "A déterminer" %}selected="selected"{% endif %}>{{ category.name }}</option>
+                            {% endfor %}
+                        </select>
+                    </div>
+                    {% else %}
+                    {{ line.categorie }}
+                    {% endif %}
+                </td>
+                <td  width="250">
+                    {{ line.description }}
+                </td>
+                {% if line.idoperation == 1 %}
+                <td class="right aligned" width='100'>-{{ line.montant|number_format(2, ',', ' ') }}</td>
+                <td width='100'></td>
+                {% else %}
+                <td width='100'></td>
+                <td class="right aligned" width='100'>+{{ line.montant|number_format(2, ',', ' ') }}</td>
+                {% endif %}
+
+                <td>
+                    {% if line.reglement == 'A déterminer'%}
+                    <div class="ui form">
+                        <select class="js-select-change" data-post-url="{{ path('admin_accounting_journal_update_info', {'id': line.idtmp, 'modification': 'paymentType'}) }}" style="min-width:130px">
+                            {% for payment in paymentTypes %}
+                                <option value="{{ payment.id }}" {% if payment.name == "A déterminer" %}selected="selected"{% endif %}>{{ payment.name }}</option>
+                            {% endfor %}
+                        </select>
+                    </div>
+                    {% else %}
+                    {{ line.reglement }}
+                    {% endif %}
+                </td>
+                <td align="center">
+                    <input
+                            type="checkbox" class="js-attachment-change"
+                            data-post-url="{{ path('admin_accounting_journal_update_info', {'id': line.idtmp, 'modification': 'requiredAttachment'}) }}"
+                            value="1"
+                            {% if line.attachment_required %}checked{% endif %}
+                    />
+                    <a
+                            {% if line.attachment_filename == false %}style="display:none;"{% endif %}
+                    class="js-has-attachment"
+                    href="{{ path('admin_accounting_journal_download', {'id': line.idtmp}) }}"
+                    title="Télécharger le justificatif"
+                    >
+                    <i class="paperclip icon"></i>
+                    </a>
+                    <div class="js-attachment-form-container" style="{% if line.attachment_required == false %}display:none;"{% endif %}"
+                    data-position="left center"
+                    data-tooltip="Cliquez ou déposez un fichier dans la zone pour ajouter un justificatif"
+                    >
+                    <form action="{{ path('admin_accounting_journal_upload', {'id': line.idtmp}) }}"
+                          class="js-dropzone{% if line.attachment_required == false %}--lazy{% endif %} dz-journal-form ui center aligned tertiary blue segment"
+                          style="display:none;cursor: pointer"
+                    >
+                        <i class="upload icon dz-message"></i>
+                    </form>
+                </div>
+                </td>
+                <td style="text-align: right" class="single line">
+                    <a class="js-edit-comment compact ui icon button"
+                       style="cursor:pointer;"
+                       data-position="left center"
+                       data-tooltip='Editer le commentaire{% if line.comment %} ("{{ line.comment}}"){% endif %}'
+                       data-post-url="{{ path('admin_accounting_journal_update_info', {'id': line.idtmp, 'modification': 'comment'}) }}"
+                       data-comment="{{ line.comment|e('js') }}">
+                        <i class="comment {% if line.comment is empty %}outline{% endif %} icon"></i>
+                    </a>
+
+                    <a href="{{ path('admin_accounting_journal_edit', {'id': line.idtmp }) }}"
+                       data-position="left center"
+                       data-tooltip="Modifier la ligne {{ line.description }}"
+                       class="compact ui icon button"
+                    >
+                        <i class="pencil alternate icon"></i>
+                    </a>
+
+                    <a href="#"
+                       data-position="left center"
+                       data-tooltip="Ventiler la fiche de {{ line.description }}"
+                       class="compact ui icon button"
+                       onclick="javascript:ventiler({{ line.idtmp }}, {{ line.montant}});return false;"
+                    >
+                        <i class="calculator icon"></i>
+                    </a>
+
+                    <a href="{{ path('admin_accounting_journal_delete', {'id': line.idtmp }) }}"
+                       data-position="left center"
+                       data-tooltip="Supprimer la fiche de {{ line.description }} "
+                       class="compact ui red icon button confirmable"
+                       data-confirmable-label="Etes-vous sûr de vouloir supprimer la fiche de {{ line.description }} ?"
+                    >
+                        <i class="trash icon"></i>
+                    </a>
+
+                </td>
+            </tr>
+        {% endfor %}
+        </tbody>
+    </table>
+    {% else %}
+        <div class="ui placeholder segment">
+            <div class="ui icon header">
+                <i class="meh outline icon"></i>
+                Aucune ecriture
+            </div>
+            <div class="inline">
+                {% if withReconciled == false %}
+                <a class="ui button" href="{{ url('admin_accounting_journal_list', {type: type.value, periodId: periodId, with_reconciled: 1}) }}">Afficher aussi les entrées pointées</a>
+                {% endif %}
+
+            </div>
+        </div>
+    </div>
+    {% endif %}
+
+    <div class="js-dz-preview-template" style="display:none;">
+        <div class="dz-preview"></div>
+    </div>
+
+    <div class="js-upload-loader upload-loader" style="display: none;">
+        <img class="loader" src="/templates/administration/images/ajax-loader.gif" alt="Loading…" />
+    </div>
+
+    <!-- Required for paybox popups -->
+    <meta name="referrer" content="no-referrer" />
+
+{% endblock %}
+
+{% block javascript %}
+{{ parent() }}
+<script>
+  // Ventiler une ligne
+  function ventiler(idLigne, montant) {
+    ventilation = prompt('Combien souhaitez-vous ventiler ? (utilisez le séparateur ; pour ventiler sur plusieurs lignes)' + "\n" + '(toutes les values saisies seront déduites de la ligne existante)', montant);
+    if (ventilation) {
+      if (ventilation >= montant) {
+        alert('Vous ne pouvez pas saisir une valeur égale ou supérieur à la valeur initiale !')
+      } else {
+        window.location='/admin/accounting/journal/allocate/' + idLigne + '?amount=' + encodeURIComponent(ventilation);
+      }
+    }
+  }
+
+  // Paybox link in popup
+  (function ($) {
+    $(document).ready(function () {
+      $('.js-paybox-link').click(function () {
+        var url = $(this).attr('href');
+        window.open(url, "paybox", "width=1100, height=650");
+        return false;
+      });
+    });
+  })(jQuery);
+
+  // Update line column value using select
+  // Or update comment using simple link and dialog box
+  (function ($) {
+    $(document).ready(function () {
+      // Init dropzones
+      var initDropzone = function(container) {
+        $('.js-dropzone', container).each(function () {
+          var elmt = $(this);
+          elmt.dropzone({
+            url: elmt.attr('href'),
+            previewTemplate: $('.js-dz-preview-template').html(),
+            init: function() {
+              this.on("error", function(file, errorMessage, xhr) {
+                $('.js-upload-loader').hide();
+                alert(errorMessage);
+              });
+              this.on("success", function(file) {
+                $(elmt.parents('td').get(0)).find('.js-has-attachment').show();
+                $('.js-upload-loader').hide();
+              });
+              this.on("uploadprogress", function(file, progress, bytesSent) {
+                // Display the progress
+                if (!(progress >= 100)) {
+                  $('.js-upload-loader').show();
+                } else {
+                  $('.js-upload-loader').hide();
+                }
+              });
+            }
+          });
+          elmt.show();
+        });
+      }
+      initDropzone(document);
+      // When we change the checked flag of a checkbox
+      $('.js-attachment-change').change(function (e) {
+        var checkbox = e.target;
+        var val = checkbox.checked ? checkbox.value : null;
+
+        // Process request to change the column
+        $.ajax({
+          url: $(checkbox).data('post-url'),
+          type: 'post',
+          data: {
+            val: val
+          },
+          dataType: 'json',
+          success: function (/* data, textStatus, jqXHR */) {
+            // Change visibility of the form
+            var formContainer = $(checkbox).parent().find('.js-attachment-form-container');
+            if (val) {
+              formContainer.find('.js-dropzone--lazy')
+                  .addClass('js-dropzone')
+                  .removeClass('js-dropzone--lazy')
+              ;
+              initDropzone(formContainer);
+              formContainer.show();
+            } else {
+              formContainer.hide();
+            }
+          },
+          error: function (/* data, textStatus, jqXHR */) {
+            // Reverse checked status (put it back)
+            checkbox.checked = !checkbox.checked;
+            alert('Oops… something went wrong. Still logged in?');
+          }
+        });
+      });
+
+      // When we change the value of a select
+      $('.js-select-change').change(function (e) {
+        var elmt = $(e.target);
+
+        // Process request to change the column
+        $.ajax({
+          url: elmt.data('post-url'),
+          type: 'post',
+          data: {
+            val: elmt.val()
+          },
+          dataType: 'json',
+          success: function (data, textStatus, jqXHR) {
+            // remove all span in td
+            elmt.parent().find('span').remove();
+
+            // update td content
+            var span = $('<span></span>');
+            span.html(elmt.find('option:selected').html() + " &#x2705;"); // success emoji: &#x2705;
+            elmt.parent().append(span);
+            elmt.remove();
+          },
+          error: function (data, textStatus, jqXHR) {
+            // remove all span in td
+            elmt.parent().find('span').remove();
+
+            // update td content
+            var span = $('<span></span>');
+            span.html(" &#x1F6AB;"); // error emoji: &#x1F6AB;
+            elmt.parent().append(span);
+            elmt.val("");
+          }
+        });
+      });
+
+      // When we click on the comment link
+      $('a.js-edit-comment').click(function (e) {
+        e.stopPropagation(); // Stop here
+
+        if (e.target.nodeName === "I") {
+          var elmt = $(e.target).parent();
+        } else {
+          var elmt = $(e.target);
+        }
+
+        // Get comment
+        var comment = prompt("Commentaire :", elmt.data('comment'));
+
+        // We have a comment, so update it!
+        if (comment !== null) {
+          $.ajax({
+            url: elmt.data('post-url'),
+            type: 'post',
+            data: {
+              val: comment
+            },
+            dataType: 'json',
+            success: function () {
+              var icon = $('.icon', elmt);
+              icon.toggleClass('outline', comment.length === 0);
+              var tooltipLabel = 'Editer le commentaire';
+              if (comment.length > 0) {
+                tooltipLabel += ' ("' + comment + '")';
+              }
+              $(elmt).attr("data-tooltip", tooltipLabel);
+              $(elmt).data('comment', comment);
+            },
+            error: function () {
+              alert('Oops… something went wrong. Still logged in?');
+            }
+          });
+        }
+
+        return false;
+      });
+    });
+  })(jQuery);
+</script>
+{% endblock %}
diff --git a/tests/behat/features/Admin/Tresorerie/Journal.feature b/tests/behat/features/Admin/Tresorerie/Journal.feature
index 4e1d8548b..d9902a629 100644
--- a/tests/behat/features/Admin/Tresorerie/Journal.feature
+++ b/tests/behat/features/Admin/Tresorerie/Journal.feature
@@ -105,7 +105,7 @@ Feature: Administration - Trésorerie - Journal
   @reloadDbWithTestData
   Scenario: Compte journal Suppression d'une transaction
     Given I am logged in as admin and on the Administration
-    When I am on "/pages/administration/index.php?page=compta_journal&id_periode=15"
+    When I am on "/admin/accounting/journal/list?periodId=15"
     And I follow the button of tooltip "Supprimer la fiche de PRLV SEPA ONLINE SAS SCW SCALEWAY "
     Then I should see "L'écriture a été supprimée"
 
diff --git a/tests/behat/features/Admin/Tresorerie/JournalImport.feature b/tests/behat/features/Admin/Tresorerie/JournalImport.feature
index 802857094..ad759c912 100644
--- a/tests/behat/features/Admin/Tresorerie/JournalImport.feature
+++ b/tests/behat/features/Admin/Tresorerie/JournalImport.feature
@@ -6,13 +6,13 @@ Feature: Administration - Trésorerie - Journal import
     When I follow "Journal"
     Then the ".content h2" element should contain "Journal"
     # On vérifie qu'on a aucune entrée pour la période
-    When I select "2019-01-01 - 2019-12-31" from "id_periode"
-    And I submit the form with name "forum"
-    Then the current URL should match "/id_periode=13/"
-    When I check "also_display_classifed_entries"
+    When I select "01/01/2019 - 31/12/2019" from "periodId"
+    And I submit the form with name "periodId_selector"
+    Then the current URL should match "/periodId=13/"
+    When I check "with_reconciled"
     And I press "Filtrer"
-    Then the current URL should match "/id_periode=13/"
-    And the current URL should match "/also_display_classifed_entries=on/"
+    Then the current URL should match "/periodId=13/"
+    And the current URL should match "/with_reconciled=on/"
     And I should see " Aucune ecriture"
     # On importe le fichier sur le crédit mutuel
     When I follow "Importer un fichier CSV"
@@ -22,13 +22,13 @@ Feature: Administration - Trésorerie - Journal import
     And I press "Soumettre"
     Then I should see "Le fichier a été importé"
     # On vérifie que l'import s'est bien passé
-    When I select "2019-01-01 - 2019-12-31" from "id_periode"
-    And I submit the form with name "forum"
-    Then the current URL should match "/id_periode=13/"
-    When I check "also_display_classifed_entries"
+    When I select "01/01/2019 - 31/12/2019" from "periodId"
+    And I submit the form with name "periodId_selector"
+    Then the current URL should match "/periodId=13/"
+    When I check "with_reconciled"
     And I press "Filtrer"
-    Then the current URL should match "/id_periode=13/"
-    And the current URL should match "/also_display_classifed_entries=on/"
+    Then the current URL should match "/periodId=13/"
+    And the current URL should match "/with_reconciled=on/"
     And I should not see " Aucune ecriture"
     # Test meetup
     When I follow the button of tooltip "Modifier la ligne CB MEETUP ORG SUB FACT 190323 DONT FRAIS DE COMM. 1,89 EUR"