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

data/ddl/package/FORMULE_PARIS1/body.sql

@@ -1019,7 +1019,7 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_PARIS1 AS
     RETURN '
     SELECT
       fvh.*,
-      CASE WHEN COALESCE(gtf.libelle_court,'') = ''DU'' THEN ''Oui'' ELSE ''Non'' END param_1,
+      CASE WHEN COALESCE(gtf.libelle_court,'''') = ''DU'' THEN ''Oui'' ELSE ''Non'' END param_1,
       COALESCE(tfr.code,fr.code) param_2,
       NULL param_3,
       NULL param_4,

data/ddl/package/FORMULE_PICARDIE/body.sql

@@ -228,15 +228,15 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_PICARDIE AS
 
 
 
-      -- AD=IF(ISERROR([.I20]);1;[.I20])
+      -- AD=IF(ISERROR([.I20]);1;[.I20]*[.K20])
       WHEN 'AD' THEN
-        RETURN vh.taux_service_du;
+        RETURN (vh.taux_service_du * vh.ponderation_service_du);
 
 
 
-      -- AE=IF(ISERROR([.J20]);1;[.J20])
+      -- AE=IF(ISERROR([.J20]);1;[.J20]*[.L20])
       WHEN 'AE' THEN
-        RETURN vh.taux_service_compl;
+        RETURN (vh.taux_service_compl * vh.ponderation_service_compl);
 
 
 

data/ddl/view/V_INTERVENANT_HISTORIQUE.sql

@@ -357,7 +357,8 @@ SELECT i.id
 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
+          JOIN type_validation tv ON tv.id = v.type_validation_id
+WHERE v.histo_destruction IS NULL AND tv.code = 'CLOTURE_REALISE'
 GROUP BY i.id
 
 UNION ALL