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

Merge remote-tracking branch 'origin/master'

parents b128766a 1f7ef9b4
Loading
Loading
Loading
Loading
Loading
+1 −1
Changes for data/ddl/ref-constraint/CONTRAT_CONTRAT_FK.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ return [
    'name'        => 'CONTRAT_CONTRAT_FK',
    'table'       => 'CONTRAT',
    'rtable'      => 'CONTRAT',
    'delete_rule' => 'CASCADE',
    'delete_rule' => NULL,
    'index'       => NULL,
    'columns'     => [
        'CONTRAT_ID' => 'ID',
+1 −1
Changes for data/ddl/table/FONCTION_REFERENTIEL.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ return [
            'length'      => 0,
            'scale'       => NULL,
            'precision'   => NULL,
            'nullable'    => TRUE,
            'nullable'    => FALSE,
            'default'     => NULL,
            'position'    => 16,
            'commentaire' => NULL,
+2
Changes for data/ddl_config.php: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ return [
        'includes' => [
            'OSE_EVENT',
            'OSE_HISTO',
            'FORMULE_%',
            'OSE_FORMULE',
        ],
    ],
    'trigger'           => [
+2 −1
Changes for module/Contrat/src/Assertion/ContratAssertion.php: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -297,8 +297,9 @@ class ContratAssertion extends AbstractAssertion
        $contratDirect       = ($contratDirectResult == Parametre::CONTRAT_DIRECT);

        return $this->asserts([
                                  $devalid,
                                  $this->assertRole($contrat),
                                  !$contrat->getValidation() || ($contratDirect && $devalid),
                                  !$contrat->getValidation() || $contratDirect,
                                  !$contrat->getDateRetourSigne(),
                              ]);
    }
+3 −2
Changes for module/Intervenant/src/Processus/SuppressionProcessus.php: 3 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -218,11 +218,12 @@ SELECT
  c.intervenant_id              parent_id,
  c.id                          id,
  tc.libelle || 's'             categorie,
  'N°' || c.id || ', ' || s.libelle_court || case WHEN c.date_retour_signe IS NOT NULL THEN ', retourné signé le ' || to_char( c.date_retour_signe, 'dd/mm/YYYY' ) ELSE '' END label,
  'N°' || c.id || ', ' || COALESCE(s.libelle_court, 'établissement') || case WHEN c.date_retour_signe IS NOT NULL THEN ', retourné signé le ' || to_char( c.date_retour_signe, 'dd/mm/YYYY' ) ELSE '' END label,
  'fas fa-book'    icon
FROM
  contrat c
  JOIN type_contrat tc ON tc.id = c.type_contrat_id JOIN structure s ON s.id = c.structure_id
  JOIN type_contrat tc ON tc.id = c.type_contrat_id 
  LEFT JOIN structure s ON s.id = c.structure_id
WHERE
  c.intervenant_id IN (:id)
ORDER BY