Commit b0999cec authored by Antony Le Courtes's avatar Antony Le Courtes
Browse files

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

parents 277f8df5 c5b1ee12

data/ddl/view/V_TBL_PAIEMENT.sql

+2 −2
Original line number Diff line number Diff line 
CREATE OR REPLACE FORCE VIEW V_TBL_PAIEMENT AS

SELECT

  'e' || '-' || frs.id || '-' || COALESCE(thens.id,th.id) || '-' || prd.id key,

  'e' || '-' || frs.id || '-' || COALESCE(thens.id,th.id) key,

  CASE WHEN si.mode_enseignement_realise = 'semestriel' THEN 1 ELSE 0 END calcul_semestriel,

  vh.id                                       a_payer_id,

  i.annee_id                                  annee_id,
@@ -86,7 +86,7 @@ WHERE 
UNION ALL



SELECT

  'e' || '-' || frs.id || '-' || mep.type_heures_id || '-0' key,

  'e' || '-' || frs.id || '-' || mep.type_heures_id key,

  CASE WHEN si.mode_enseignement_realise = 'semestriel' THEN 1 ELSE 0 END calcul_semestriel,

  mep.id                                      a_payer_id,

  i.annee_id                                  annee_id,

module/Plafond/src/View/Helper/PlafondConfigElementViewHelper.php

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ class PlafondConfigElementViewHelper extends AbstractHtmlElement 
                                plafond: el.data('plafond-id'),

                                name: el.data('name'),

                                value: el.val(),

                                entityId: <?= $entityId ?: 'null' ?>

                                entityId: el.data('entity-id')

                            },

                            success: function () {

                                unicaenVue.flashMessenger.toast('Votre modification a bien été prise en compte', 'success');