Merge remote-tracking branch 'origin/master'

module/Application/src/Service/AbstractEntityService.php

@@ -517,8 +517,8 @@ abstract class AbstractEntityService extends AbstractService
         if (!$structure){
             $qb->andWhere("$alias.structure IS NULL");
         }else{
-            $qb->leftJoin("$alias.structure", 'strids');
-            $qb->andWhere($e->like("strids.ids", $e->literal($structure->idsFilter())));
+            $qb->leftJoin("$alias.structure", $alias.'strids');
+            $qb->andWhere($e->like($alias."strids.ids", $e->literal($structure->idsFilter())));
         }
 
         return $qb;

module/Signature/src/Controller/SignatureFlowController.php

@@ -81,8 +81,13 @@ class SignatureFlowController extends AbstractController
             try{
                 $this->getServiceSignatureFlow()->delete($signatureFlow);
             }catch (\Exception $e){
+                if(str_contains($e->getMessage(), 'ORA-02292'))
+                {
+                    $this->flashMessenger()->addErrorMessage('Vous ne pouvez pas supprimer ce circuit de signature, car vous avez déjà des signatures électroniques qui l\'utilisent');
+                }
+                else{
                     $this->flashMessenger()->addErrorMessage($e->getMessage());
-
+                }
             }
         }