Commit 308f1cbe authored by Florian Joriot's avatar Florian Joriot
Browse files

Merge remote-tracking branch 'origin/b24' into b24

parents 10a8cbf0 8ac9221d
Loading
Loading
Loading
Loading
Loading
+6 −10
Changes for doc/Connecteurs-Import/Octopus/MV_INTERVENANT.sql: 6 added lines, 10 removed lines.
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ SELECT DISTINCT
    CAST(NULL AS varchar2(255))                                                        adresse_voie,
    CAST(NULL AS varchar2(255))                                                        adresse_lieu_dit,
    adr.code_postal                                                                    adresse_code_postal,
    adr.ville_nom                                                                      adresse_commune,
    adr.ville                                                                      adresse_commune,
    pays.code_pays                                                                    z_adresse_pays_id,
    /* INSEE */
    COALESCE(TRIM(vindinsee.no_insee), TRIM(vindinsee.no_insee_provisoire))            numero_insee,
@@ -257,10 +257,10 @@ SELECT DISTINCT
            AND vindinsee.no_insee_provisoire IS NOT NULL
            THEN 1
        ELSE 0 END                                                                     numero_insee_provisoire,
    CAST(NULL AS varchar2(255))                                                        numero_pec,
    /* Banque */
    COALESCE(TRIM(vindiban.iban), ibandossier.iban)                                    iban,
    COALESCE(TRIM(vindiban.bic), ibandossier.bic)                                      bic,
    CAST(NULL AS varchar2(255))                                                        numero_pec,
    0                                                                                  rib_hors_sepa,
    /* Données complémentaires */
    CAST(NULL AS varchar2(255))                                                        autre_1,
@@ -292,7 +292,7 @@ FROM i
         LEFT JOIN octo.individu@octoprod ind ON ind.c_individu_chaine = induni.c_individu_chaine
         LEFT JOIN octo.v_via_individu_insee@octoprod vindinsee ON ind.c_individu_chaine = vindinsee.individu_id
         LEFT JOIN octo.v_via_individu_iban@octoprod vindiban ON vindiban.individu_id = ind.c_individu_chaine
         LEFT JOIN iban_dossier ibandossier ON ibandossier.code = ind.c_individu_chaine
         LEFT JOIN iban_dossier ibandossier ON ibandossier.code =  TO_CHAR(ind.c_individu_chaine)
         LEFT JOIN octo.v_individu@octoprod vind ON vind.c_individu_chaine = induni.c_individu_chaine
    --On récupére la structure principale de l'individu
         LEFT JOIN structure_aff_enseigne sae ON sae.individu_id = induni.c_individu_chaine
@@ -303,17 +303,13 @@ FROM i
         LEFT JOIN ind_grade indg ON induni.c_individu_chaine = indg.individu_id
         LEFT JOIN octo.grade@octoprod grade ON indg.grade_id = grade.id
    --On récupére l'adresse principale de l'individu
         LEFT JOIN octo.v_individu_adresse_perso@octoprod adr
         LEFT JOIN octo.individu_adresse_perso@octoprod adr
                   ON adr.individu_id = induni.c_individu_chaine
                       AND (t_principale = 'O' AND adr.source_id IN ('HARP', 'SIHAM'))
         LEFT JOIN octo.pays@octoprod pays ON pays.id = adr.pays_id
                       AND adr.c_source='SIHAM'
         LEFT JOIN octo.pays@octoprod pays ON pays.code_pays = adr.c_pays
    --On récupére le téléphone pro principal de l'indivdu
         LEFT JOIN telephone_pro_principal telpro ON telpro.individu_id = induni.c_individu_chaine
         LEFT JOIN compte ON compte.individu_id = induni.c_individu_chaine
    --On récupére la discipline adaptée directement dans Octopus
         LEFT JOIN cnua cnua ON cnua.individu_id = induni.c_individu_chaine
WHERE i.validite_fin >= (sysdate - (365 * 2)) AND  1 = (CASE WHEN str2.code IS NULL AND i.z_type = 'permanent' AND i.z_statut_id NOT IN ('BIATSS', 'PAMSU') THEN 0 ELSE 1 END )



+5 −8
Changes for doc/Connecteurs-Import/Octopus/MV_INTERVENANT_OSE.sql: 5 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ SELECT DISTINCT
    CAST(NULL AS varchar2(255))                                                        adresse_voie,
    CAST(NULL AS varchar2(255))                                                        adresse_lieu_dit,
    adr.code_postal                                                                    adresse_code_postal,
    adr.ville_nom                                                                      adresse_commune,
    adr.ville                                                                      adresse_commune,
    pays.code_pays                                                                    z_adresse_pays_id,
    /* INSEE */
    COALESCE(TRIM(vindinsee.no_insee), TRIM(vindinsee.no_insee_provisoire))            numero_insee,
@@ -273,7 +273,7 @@ FROM i
         LEFT JOIN octo.individu@octoprod ind ON ind.c_individu_chaine = induni.c_individu_chaine
         LEFT JOIN octo.v_via_individu_insee@octoprod vindinsee ON ind.c_individu_chaine = vindinsee.individu_id
         LEFT JOIN octo.v_via_individu_iban@octoprod vindiban ON vindiban.individu_id = ind.c_individu_chaine
         LEFT JOIN iban_dossier ibandossier ON ibandossier.code = ind.c_individu_chaine
         LEFT JOIN iban_dossier ibandossier ON ibandossier.code =  TO_CHAR(ind.c_individu_chaine)
         LEFT JOIN octo.v_individu@octoprod vind ON vind.c_individu_chaine = induni.c_individu_chaine
    --On récupére la structure principale de l'individu
         LEFT JOIN structure_aff_enseigne sae ON sae.individu_id = induni.c_individu_chaine
@@ -284,16 +284,13 @@ FROM i
         LEFT JOIN ind_grade indg ON induni.c_individu_chaine = indg.individu_id
         LEFT JOIN octo.grade@octoprod grade ON indg.grade_id = grade.id
    --On récupére l'adresse principale de l'individu
         LEFT JOIN octo.v_individu_adresse_perso@octoprod adr
         LEFT JOIN octo.individu_adresse_perso@octoprod adr
                   ON adr.individu_id = induni.c_individu_chaine
                       AND (t_principale = 'O' AND adr.source_id IN ('HARP', 'SIHAM'))
         LEFT JOIN octo.pays@octoprod pays ON pays.id = adr.pays_id
                       AND adr.c_source='SIHAM'
         LEFT JOIN octo.pays@octoprod pays ON pays.code_pays = adr.c_pays
    --On récupére le téléphone pro principal de l'indivdu
         LEFT JOIN telephone_pro_principal telpro ON telpro.individu_id = induni.c_individu_chaine
         LEFT JOIN compte ON compte.individu_id = induni.c_individu_chaine
    --On récupére la discipline adaptée directement dans Octopus
         LEFT JOIN cnua cnua ON cnua.individu_id = induni.c_individu_chaine
WHERE i.validite_fin >= (sysdate - (365 * 2)) AND  1 = (CASE WHEN str2.code IS NULL AND i.z_type = 'permanent' AND i.z_statut_id NOT IN ('BIATSS', 'PAMSU') THEN 0 ELSE 1 END )


+8 −13
Changes for doc/Connecteurs-Import/Octopus/MV_INTERVENANT_OSEMI.sql: 8 added lines, 13 removed lines.
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ SELECT DISTINCT
    /*Code RH si l'utilisateur est dans SIHAM*/
    ind.c_rh                                                                           code_rh,
    compte.ldap_uid                                                                    utilisateur_code,
    CAST(NULL AS varchar2(255))                                                        z_structure_id,
    str2.code                                                                          z_structure_id,
    i.z_statut_id                                                                      z_statut_id,
    grade.c_grade                                                                      z_grade_id,
    CASE WHEN COALESCE(cnua.code_cnu_arrange, '00') = '12'
@@ -174,9 +174,8 @@ SELECT DISTINCT
    CAST(telpro.numero AS varchar2(255))                                               tel_pro,
    COALESCE(ind.tel_perso_ow, ind.tel_perso)                                          tel_perso,
    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 */
    CAST(NULL AS varchar2(255))                                                        email_perso,
    --COALESCE(ind.email_perso_ow, ind.email_perso)                                      email_perso,    /* Adresse */
    TRIM(adr.adresse1 ||
         CASE
             WHEN adr.adresse1 IS NOT NULL
@@ -194,7 +193,7 @@ SELECT DISTINCT
    CAST(NULL AS varchar2(255))                                                        adresse_voie,
    CAST(NULL AS varchar2(255))                                                        adresse_lieu_dit,
    adr.code_postal                                                                    adresse_code_postal,
    adr.ville_nom                                                                      adresse_commune,
    adr.ville                                                                      adresse_commune,
    pays.code_pays                                                                    z_adresse_pays_id,
    /* INSEE */
    COALESCE(TRIM(vindinsee.no_insee), TRIM(vindinsee.no_insee_provisoire))            numero_insee,
@@ -207,7 +206,6 @@ SELECT DISTINCT
    /* Banque */
    COALESCE(TRIM(vindiban.iban), ibandossier.iban)                                    iban,
    COALESCE(TRIM(vindiban.bic), ibandossier.bic)                                      bic,

    0                                                                                  rib_hors_sepa,
    /* Données complémentaires */
    CAST(NULL AS varchar2(255))                                                        autre_1,
@@ -239,7 +237,7 @@ FROM i
         LEFT JOIN octo.individu@octoprod ind ON ind.c_individu_chaine = induni.c_individu_chaine
         LEFT JOIN octo.v_via_individu_insee@octoprod vindinsee ON ind.c_individu_chaine = vindinsee.individu_id
         LEFT JOIN octo.v_via_individu_iban@octoprod vindiban ON vindiban.individu_id = ind.c_individu_chaine
         LEFT JOIN iban_dossier ibandossier ON ibandossier.code = ind.c_individu_chaine
         LEFT JOIN iban_dossier ibandossier ON ibandossier.code =  TO_CHAR(ind.c_individu_chaine)
         LEFT JOIN octo.v_individu@octoprod vind ON vind.c_individu_chaine = induni.c_individu_chaine
    --On récupére la structure principale de l'individu
         LEFT JOIN structure_aff_enseigne sae ON sae.individu_id = induni.c_individu_chaine
@@ -250,10 +248,10 @@ FROM i
         LEFT JOIN ind_grade indg ON induni.c_individu_chaine = indg.individu_id
         LEFT JOIN octo.grade@octoprod grade ON indg.grade_id = grade.id
    --On récupére l'adresse principale de l'individu
         LEFT JOIN octo.v_individu_adresse_perso@octoprod adr
         LEFT JOIN octo.individu_adresse_perso@octoprod adr
                   ON adr.individu_id = induni.c_individu_chaine
                       AND (t_principale = 'O' AND adr.source_id IN ('HARP', 'SIHAM'))
         LEFT JOIN octo.pays@octoprod pays ON pays.id = adr.pays_id
                       AND adr.c_source='SIHAM'
         LEFT JOIN octo.pays@octoprod pays ON pays.code_pays = adr.c_pays
    --On récupére le téléphone pro principal de l'indivdu
         LEFT JOIN telephone_pro_principal telpro ON telpro.individu_id = induni.c_individu_chaine
         LEFT JOIN compte ON compte.individu_id = induni.c_individu_chaine
@@ -261,6 +259,3 @@ FROM i
         LEFT JOIN cnua cnua ON cnua.individu_id = induni.c_individu_chaine
WHERE i.validite_fin >= (sysdate - (365 * 2)) AND  1 = (CASE WHEN str2.code IS NULL AND i.z_type = 'permanent' AND i.z_statut_id NOT IN ('BIATSS', 'PAMSU') THEN 0 ELSE 1 END )


+1 −1
Changes for module/Contrat/view/contrat/contrat/partial/contrat.phtml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ use Contrat\Entity\Db\TypeContrat;
 * @var bool $modelAvenantPresent
 */

$modelPresent = $tblContrat->getTypeContrat()->getCode() == TypeContrat::CODE_CONTRAT ? $modelContratPresent : $modelAvenantPresent;
$modelPresent = $tblContrat->getTypeContrat()->getCode() == TypeContrat::CODE_CONTRAT ? $modelContratPresent : ($modelAvenantPresent || $modelContratPresent);
$contrat = $tblContrat->getContrat();

$validation     = $tblContrat->getValidation();