Commit 7888daf9 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Merge remote-tracking branch 'origin/b24'

# Conflicts:
#	composer.lock
parents feabaa02 3f841fb2
Loading
Loading
Loading
Loading
Loading
+1 −1
Changes for composer.json: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@
        "unicaen/mail"                     : "7.1.2",
        "unicaen/vue"                      : "6.3.3",
        "unicaen/bddadmin"                 : "1.4.0",
        "unicaen/signature"                : "1.0.4",
        "unicaen/signature": "1.0.6",
        "connecteur-ose/actul"             : "dev-master",
        "connecteur-ose/pegase"            : "dev-master"
    },
+1 −1
Changes for data/ddl/view/V_TBL_PAIEMENT.sql: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ FROM
  LEFT JOIN etape                             e ON e.id = ep.etape_id
  LEFT JOIN centre_cout_ep                 ccep ON ccep.histo_destruction IS NULL
                                               AND ccep.element_pedagogique_id = ep.id
                                               AND ccep.type_heures_id = th.id
                                               AND ccep.type_heures_id = th.type_heures_element_id

  LEFT JOIN mise_en_paiement                mep ON mep.histo_destruction IS NULL
                                               AND mep.service_id = frvh.service_id
+185 KiB

File added.

No diff preview for this file type.

+200 KiB

File added.

No diff preview for this file type.

+1 −0
Changes for module/Application/src/Controller/Factory/IndexControllerFactory.php: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ class IndexControllerFactory
    public function __invoke(ContainerInterface $container, $requestedName, $options = null)
    {
        $controller = new IndexController();
        $controller->setServiceUserContext($container->get(UserContext::class));

        return $controller;
    }
Loading