Commit 97299d45 authored by Antony Le Courtes's avatar Antony Le Courtes
Browse files

Merge branch 'alc-numero-pec'

parents d4813fdf 5a85d0a2

data/ddl/table/INTERVENANT.php

+24 −0
Original line number Diff line number Diff line
@@ -537,6 +537,18 @@ return [ 
            'position'    => 33,

            'commentaire' => NULL,

        ],

        'NUMERO_PEC'               => [

            'name'        => 'NUMERO_PEC',

            'type'        => 'string',

            'bdd-type'    => 'VARCHAR2',

            'length'      => 100,

            'scale'       => NULL,

            'precision'   => NULL,

            'nullable'    => TRUE,

            'default'     => NULL,

            'position'    => 61,

            'commentaire' => NULL,

        ],

        'PAYS_NAISSANCE_ID'        => [

            'name'        => 'PAYS_NAISSANCE_ID',

            'type'        => 'int',
@@ -645,6 +657,18 @@ return [ 
            'position'    => 50,

            'commentaire' => NULL,

        ],

        'SYNC_PEC'              => [

            'name'        => 'SYNC_PEC',

            'type'        => 'bool',

            'bdd-type'    => 'NUMBER',

            'length'      => 0,

            'scale'       => '0',

            'precision'   => 1,

            'nullable'    => FALSE,

            'default'     => '1',

            'position'    => 62,

            'commentaire' => NULL,

        ],

        'SYNC_STRUCTURE'           => [

            'name'        => 'SYNC_STRUCTURE',

            'type'        => 'bool',

data/ddl/view/V_EXPORT_PAIEMENT_WINPAIE.sql

+2 −2
Original line number Diff line number Diff line
@@ -27,9 +27,9 @@ FROM (SELECT i.annee_id 
             t2.periode_paiement_id                                                                            periode_id,

             i.id                                                                                              intervenant_id,

             CASE

                 WHEN i.numero_insee IS NULL THEN '''' || TRIM(d.numero_insee)

                 WHEN i.numero_insee IS NULL THEN '''' || TRIM(d.numero_insee) || TRIM(numero_pec)

                 ELSE

                     '''' || TRIM(i.numero_insee)

                     '''' || TRIM(i.numero_insee) || TRIM(numero_pec)

                 END                                                                                           insee,

             i.nom_usuel || ',' || i.prenom                                                                    nom,

             t2.code_origine                                                                                   code_origine,

data/ddl_columns_pos.php

+1 −0
Original line number Diff line number Diff line
@@ -839,6 +839,7 @@ return [ 
        'HISTO_DESTRUCTEUR_ID',

        'EXPORT_DATE',

        'IRRECEVABLE',

        'NUMERO_PEC',

    ],

    'INTERVENANT_DOSSIER'            => [

        'ID',

doc/Connecteurs-Import/Générique/SRC_INTERVENANT.sql

+3 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ SELECT 
  adresse_pays_id,

  numero_insee,

  numero_insee_provisoire,

  numero_pec,

  -- Pour synchroniser les coord. bancaires uniquement sur l'année n, il faut décommenter les 3 lignes ci-dessous et commenter les trois lignes d'après

  --CASE WHEN annee_id < current_annee_id AND intervenant_id IS NOT NULL THEN i_iban          ELSE s_iban          END iban,

  --CASE WHEN annee_id < current_annee_id AND intervenant_id IS NOT NULL THEN i_bic           ELSE s_bic           END bic,
@@ -244,6 +245,7 @@ FROM ( 
      padr.id                                                                                adresse_pays_id,

      s.numero_insee                                                                         numero_insee,

      COALESCE(s.numero_insee_provisoire,i.numero_insee_provisoire,0)                        numero_insee_provisoire,

      CASE WHEN i.sync_pec = 0 THEN i.numero_pec ELSE s.numero_pec END                       nunmero_pec,

      s.iban                                                                                 s_iban,

      s.bic                                                                                  s_bic,

      s.rib_hors_sepa                                                                        s_rib_hors_sepa,
@@ -274,6 +276,7 @@ FROM ( 
      CASE WHEN ssi.type_intervenant_id = isi.type_intervenant_id THEN 1 ELSE 0 END          types_identiques,

      COALESCE(i.sync_statut,1)                                                              sync_statut,

      COALESCE(i.sync_utilisateur_code,1)                                                    sync_utilisateur_code,

      COALESCE(i.sync_pec,1)                                                                 sync_pec,

      CASE WHEN COALESCE(isrc.importable,1) = 1 THEN 0 ELSE 1 END                            intervenant_local,

      CASE WHEN idata.intervenant_id IS NULL THEN 0 ELSE 1 END                               intervenant_donnees,

      CASE WHEN i.histo_destruction IS NULL THEN 0 ELSE 1 END                                intervenant_histo,

doc/Connecteurs-Import/Octopus/MV_INTERVENANT.sql

+8 −9
Original line number Diff line number Diff line
@@ -225,12 +225,11 @@ SELECT DISTINCT 
    COALESCE(ind.c_pays_naissance_ow, ind.c_pays_naissance)                            z_pays_naissance_id,

    COALESCE(ind.c_dept_naissance_ow, ind.c_dept_naissance)                            z_departement_naissance_id,

    COALESCE(ind.c_pays_nationalite_ow, ind.c_pays_nationalite)                        z_pays_nationalite_id,

    telpro.numero                                                                      tel_pro,

    CAST(telpro.numero AS varchar2(255))                                               tel_pro,

    COALESCE(ind.tel_perso_ow, ind.tel_perso)                                          tel_perso,

    compte.email                                                                       email_pro,

    CAST(compte.email AS varchar2(255))                                                email_pro,

    CAST(NULL AS varchar2(255))                                                        email_perso,

    --COALESCE(ind.email_perso_ow, ind.email_perso)                                      email_perso,

    /* Adresse */

    --COALESCE(ind.email_perso_ow, ind.email_perso)                                      email_perso,    /* Adresse */

    TRIM(adr.adresse1 ||

         CASE

             WHEN adr.adresse1 IS NOT NULL
@@ -269,19 +268,19 @@ SELECT DISTINCT 
    CAST(NULL AS varchar2(255))                                                        autre_5,

    /* Employeur */

    CAST(NULL AS varchar2(255))                                                        z_employeur_id,

    CASE

    CAST(CASE

        WHEN i.validite_debut = to_date('01/01/1900', 'dd/mm/YYYY')

            THEN NULL

        ELSE i.validite_debut

        END                                                                            validite_debut,

    CASE

        END AS DATE)                                                                           validite_debut,

    CAST(CASE

        WHEN i.validite_fin = to_date('01/01/9999', 'dd/mm/YYYY')

            THEN NULL

        WHEN (i.z_type = 'vacataire' AND i.validite_fin < compte.date_fin AND i.validite_fin IS NOT NULL)

            THEN compte.date_fin

        ELSE i.validite_fin

        END                                                                            validite_fin,

    i.fin_affectation_siham                                                            affectation_fin

        END AS DATE)                                                                         validite_fin,

    CAST(i.fin_affectation_siham AS DATE)                                                           affectation_fin



FROM i

         JOIN induni