Commit 52690210 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

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

parents 4548c98e 576d81dd

data/ddl/view/V_ETAT_PAIEMENT.sql

+0 −3
Original line number Diff line number Diff line
@@ -193,7 +193,4 @@ SELECT 
      ORDER BY

               annee_id,

               type_intervenant_id,

               statut_id,

               structure_id,

               periode_id,

               intervenant_nom
 
 No newline at end of file

data/ddl/view/V_INTERVENANT_HISTORIQUE.sql

+15 −0
Original line number Diff line number Diff line
@@ -343,6 +343,21 @@ FROM volume_horaire vh 
         LEFT JOIN motif_non_paiement mnp ON mnp.id = vh.motif_non_paiement_id

GROUP BY s.intervenant_id, ep.structure_id



UNION ALL



--Cloture de service

SELECT i.id                                                                                 intervenant_id,

       '6 - Services réalisés'                                                              categorie,

       'Clôture de service réalisé '													    label,

       MAX(v.histo_modification)                                                            histo_date,

       MAX(v.histo_modificateur_id)                                                         KEEP (dense_rank FIRST ORDER BY v.histo_creation  DESC)   histo_createur_id, MAX(u.display_name) KEEP (dense_rank FIRST ORDER BY v.histo_creation  DESC)    histo_user, 'glyphicon glyphicon-calendar' icon,

       5                                                                                    ordre

FROM validation  v

         JOIN intervenant i ON i.id = v.intervenant_id

         JOIN utilisateur u ON u.id = v.histo_createur_id

WHERE v.histo_destruction IS null

GROUP BY i.id



UNION ALL

--Mise en paiement

SELECT

module/Service/src/Form/MotifModificationServiceDuFieldset.php

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ class MotifModificationServiceDuFieldset extends AbstractFieldset 
                        'name'    => 'Laminas\Validator\GreaterThan',

                        'options' => [

                            'min'       => 0,

                            'inclusive' => false,

                            'inclusive' => true,

                            'messages'  => [

                                \Laminas\Validator\GreaterThan::NOT_GREATER => "Le nombre d'heures doit être strictement supérieur à 0",

                            ],