Merge branch 'cherry-pick-91e9b74d' into 'master'

Correction bug : on ne sync plus un EP de force si c'est pour le détruire

See merge request !61

module/Application/src/Application/Controller/OffreFormation/ElementPedagogiqueController.php

@@ -232,7 +232,8 @@ class ElementPedagogiqueController extends AbstractController
 
         $saisie = $this->params()->fromPost('vhes');
 
-        $tis = $element->getTypesInterventionPossibles();
+        $tis  = $element->getTypesInterventionPossibles();
+        $vhes = [];
         foreach ($tis as $typeIntervention) {
             if (!isset($existsVhes[$typeIntervention->getId()])) {
                 $vhe = $this->getServiceVolumeHoraireEns()->newEntity($element, $typeIntervention);

module/Application/src/Application/Service/ElementPedagogiqueService.php

@@ -434,7 +434,7 @@ where rang = 1
             DECLARE
               element_id NUMERIC;
             BEGIN
-              unicaen_import.synchronisation('ELEMENT_PEDAGOGIQUE', 'WHERE code =''' || " . $c->quote($code) . " || ''' AND annee_id = ' || " . $annee . ");
+              unicaen_import.synchronisation('ELEMENT_PEDAGOGIQUE', 'WHERE code =''' || " . $c->quote($code) . " || ''' AND import_action <> ''delete'' AND annee_id = ' || " . $annee . ");
               BEGIN  
                 SELECT id INTO element_id FROM element_pedagogique ep WHERE code = " . $c->quote($code) . " AND ep.annee_id = " . $annee . " AND histo_destruction IS NULL;