Commit 108b5fc5 authored by Florian Joriot's avatar Florian Joriot
Browse files

Merge remote-tracking branch 'origin/b24' into b24

# Conflicts:
#	module/Contrat/src/Form/ContratRetourForm.php
parents 703c4370 495d50b8
Loading
Loading
Loading
Loading
+0 −2
Changes for module/Contrat/src/Controller/ContratController.php: 0 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -262,8 +262,6 @@ class ContratController extends AbstractController
        if (!$this->isAllowed($contrat, Privileges::CONTRAT_VALIDATION)) {
            $this->flashMessenger()->addErrorMessage('Vous n\'avez pas le droit de valider ce projet ' . ($contrat->estUnAvenant() ? 'd\'avenant' : 'de contrat'));

            //$form = null;

            return new MessengerViewModel;
        }