Commit 80dcbd73 authored by joriot221's avatar joriot221
Browse files

Merge branch 'master' into FJ_Contrat_Sans_Avenant

parents 619ec018 cb6693c0

admin/src/DataGen.php

+1 −2
Changes for admin/src/DataGen.php: 1 added line, 2 removed lines.
Original line number Diff line number Diff line
@@ -161,9 +161,8 @@ class DataGen 
        ],

        [

            'table'   => 'TYPE_RESSOURCE',

            'context' => ['install', 'update'],

            'context' => ['install'],

            'key'     => 'CODE',

            'options' => ['update' => false, 'delete' => false],

        ],

        [

            'table'   => 'DOSSIER_CHAMP_AUTRE_TYPE',

doc/Connecteurs-Import/Octopus/MV_INTERVENANT.sql

+1 −1
Changes for doc/Connecteurs-Import/Octopus/MV_INTERVENANT.sql: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ SELECT DISTINCT 
    grade.c_grade                                                  z_grade_id,

    COALESCE(cnua.code_cnu_arrange, '00')                          z_discipline_id,

    /* Données identifiantes de base */

    CASE ind.sexe

    CASE COALESCE(ind.sexe_ow,ind.sexe)

        WHEN 'M' THEN 'M.'

        ELSE 'Mme'

        END                                                        z_civilite_id,