Commit f8bc92ab authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Merge branch 'master' of https://git.unicaen.fr/open-source/OSE into plafonds-perso

parents 55a52da9 58980b81

data/ddl/package/FORMULE_UNICAEN/body.sql

+1 −1
Changes for data/ddl/package/FORMULE_UNICAEN/body.sql: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -985,7 +985,7 @@ CREATE OR REPLACE PACKAGE BODY "FORMULE_UNICAEN" AS 
        element_modulateur

      SET

        histo_destruction = SYSDATE,

        histo_destructeur_id = ose_divers.GET_OSE_UTILISATEUR_ID()

        histo_destructeur_id = ose_parametre.get_ose_user

      WHERE

          id = em.id

      ;

data/ddl/package/UNICAEN_IMPORT/body.sql

+1 −1
Changes for data/ddl/package/UNICAEN_IMPORT/body.sql: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ CREATE OR REPLACE PACKAGE BODY "UNICAEN_IMPORT" AS 
  FUNCTION get_current_user RETURN INTEGER IS

  BEGIN

    IF v_current_user IS NULL THEN

      v_current_user := ose_divers.GET_OSE_UTILISATEUR_ID();

      v_current_user := OSE_PARAMETRE.GET_OSE_USER();

    END IF;

    RETURN v_current_user;

  END get_current_user;

doc/Connecteurs-Import/Siham/Partie_B_SIHAM_INTERV/B3_SIHAM_INTERV_Connecteur_OSE/mv_intervenant.sql

+4 −4
Changes for doc/Connecteurs-Import/Siham/Partie_B_SIHAM_INTERV/B3_SIHAM_INTERV_Connecteur_OSE/mv_intervenant.sql: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ SELECT 
  i.email_pro                                     																				  email_pro,

  uad.w_mail_perso                           																					  email_perso,

  uad.batiment 																													  adresse_precisions,

  substr(substr(uad.no_voie,1,instr(uad.no_voie,' ')),1, 4)								adresse_numero,

  uad.no_voie																	  												  adresse_numero,

  uad.numero_compl_code 																										  z_adresse_numero_compl_id,

  uad.voirie_code 																												  z_adresse_voirie_id,

  uad.nom_voie 																							  						  adresse_voie,
@@ -104,7 +104,7 @@ SELECT 
  i.email_pro                                     																				  email_pro,

  uad.w_mail_perso                           																					  email_perso,

  uad.batiment 																													  adresse_precisions,

  substr(substr(uad.no_voie,1,instr(uad.no_voie,' ')),1,4)								adresse_numero,

  uad.no_voie																	  												  adresse_numero,

  uad.numero_compl_code 																										  z_adresse_numero_compl_id,

  uad.voirie_code 																												  z_adresse_voirie_id,

  uad.nom_voie 																							  						  adresse_voie,
@@ -184,7 +184,7 @@ SELECT 
  i.email_pro                                     																				  email_pro,

  uad.w_mail_perso                           																					  email_perso,

  uad.batiment 																													  adresse_precisions,

  substr(substr(uad.no_voie,1,instr(uad.no_voie,' ')),1,4)								adresse_numero,

  uad.no_voie																	  												  adresse_numero,

  uad.numero_compl_code 																										  z_adresse_numero_compl_id,

  uad.voirie_code 																												  z_adresse_voirie_id,

  uad.nom_voie 																							  						  adresse_voie,
@@ -329,5 +329,5 @@ where a.source_code = i.source_code 
   and payr.source_code = uad.pays_code_insee

--   and opr.source_code = payr.source_code

   and i.w_statut_pip not in ('TITU1','STAGI')

   and vr.code(+) = uad.voirie_code

   and vr.code(+) = uad.voirie_code;

   ;
 
 No newline at end of file