Merge branch 'b19' of https://git.unicaen.fr/open-source/OSE into b19 (81e2b7ca) · Commits · open-source / OSE

data/ddl/package/FORMULE_ULHN/body.sql

+6 −1

Original line number	Diff line number	Diff line
		@@ -474,7 +474,12 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_ULHN AS
		HORAIRE_FIN,
		TYPE_INTERVENTION_CODE,
		TAUX_SERVICE_DU,
		TAUX_SERVICE_COMPL
		TAUX_SERVICE_COMPL,
		NULL param_1,
		NULL param_2,
		NULL param_3,
		NULL param_4,
		NULL param_5
		FROM
		v_formule_volume_horaire
		ORDER BY

data/ddl/package/OSE_WORKFLOW/body.sql

+1 −3

Original line number	Diff line number	Diff line
		@@ -688,7 +688,6 @@ CREATE OR REPLACE PACKAGE BODY OSE_WORKFLOW AS
		ELSE edite
		END realisation,
		p2.valeur avenant_mode,
		CASE WHEN p2.valeur = ''avenant_desactive'' THEN rownum ELSE 1 END to_delete
		FROM
		tbl_contrat c
		JOIN parametre p on p.nom = ''contrat_regle_franchissement''
		@@ -698,7 +697,6 @@ CREATE OR REPLACE PACKAGE BODY OSE_WORKFLOW AS
		AND actif = 1
		AND nbvh > 0
		) c
		WHERE to_delete = 1
		';

data/ddl/view/V_ETAT_PAIEMENT.sql

+11 −0

Original line number	Diff line number	Diff line
		@@ -2,6 +2,7 @@ CREATE OR REPLACE FORCE VIEW V_ETAT_PAIEMENT AS
		SELECT
		annee_id,
		type_intervenant_id,
		statut_id,
		structure_id,
		periode_id,
		intervenant_id,
		@@ -14,6 +15,7 @@ SELECT
		date_mise_en_paiement,
		periode,
		statut,
		statut_libelle,
		intervenant_code,
		intervenant_nom,
		intervenant_numero_insee,
		@@ -47,6 +49,7 @@ SELECT
		periode_id,
		structure_id,
		type_intervenant_id,
		statut_id,
		intervenant_id,
		annee_id,
		centre_cout_id,
		@@ -56,6 +59,7 @@ SELECT
		date_mise_en_paiement,
		periode,
		statut,
		statut_libelle,
		intervenant_code,
		intervenant_nom,
		intervenant_numero_insee,
		@@ -84,6 +88,7 @@ SELECT
		p.id periode_id,
		s.id structure_id,
		i.id intervenant_id,
		si.id statut_id,
		i.annee_id annee_id,
		cc.id centre_cout_id,
		df.id domaine_fonctionnel_id,
		@@ -97,6 +102,7 @@ SELECT
		mep.date_mise_en_paiement date_mise_en_paiement,
		s.libelle_court composante,
		ti.libelle statut,
		si.libelle statut_libelle,
		i.source_code intervenant_code,
		i.nom_usuel \|\| ' ' \|\| i.prenom intervenant_nom,
		i.numero_insee intervenant_numero_insee,
		@@ -129,6 +135,7 @@ SELECT
		periode_id,
		structure_id,
		type_intervenant_id,
		statut_id,
		intervenant_id,
		annee_id,
		centre_cout_id,
		@@ -138,6 +145,7 @@ SELECT
		composante,
		date_mise_en_paiement,
		statut,
		statut_libelle,
		intervenant_code,
		intervenant_nom,
		intervenant_numero_insee,
		@@ -156,6 +164,7 @@ SELECT
		periode_id,
		structure_id,
		type_intervenant_id,
		statut_id,
		intervenant_id,
		annee_id,
		centre_cout_id,
		@@ -165,6 +174,7 @@ SELECT
		composante,
		date_mise_en_paiement,
		statut,
		statut_libelle,
		intervenant_code,
		intervenant_nom,
		intervenant_numero_insee,
		@@ -183,6 +193,7 @@ SELECT
		ORDER BY
		annee_id,
		type_intervenant_id,
		statut_id,
		structure_id,
		periode_id,
		intervenant_nom
		No newline at end of file

data/ddl/view/V_INTERVENANT_HISTORIQUE.sql

+0 −1

Original line number	Diff line number	Diff line
		@@ -278,7 +278,6 @@ SELECT C.intervenant_id intervenant_id,
		5 ordre
		FROM fichier f
		JOIN contrat_fichier cf ON cf.fichier_id = f.id AND histo_destruction IS NULL
		JOIN fichier f ON f.id = cf.fichier_id AND f.histo_destruction IS NULL
		JOIN contrat C ON C.id = cf.contrat_id
		JOIN type_contrat tc ON tc.id = C.type_contrat_id
		JOIN STRUCTURE s ON s.id = C.structure_id

data/ddl/view/V_TBL_PIECE_JOINTE_DEMANDE.sql

+4 −2

Original line number	Diff line number	Diff line
		CREATE OR REPLACE FORCE VIEW V_TBL_PIECE_JOINTE_DEMANDE AS
		CREATE
		OR REPLACE FORCE VIEW V_TBL_PIECE_JOINTE_DEMANDE AS
		WITH i_h AS (
		SELECT
		s.intervenant_id,
		SUM(CASE WHEN vh.MOTIF_NON_PAIEMENT_ID IS NULL THEN vh.heures ELSE 0 END) heures,
		SUM(CASE WHEN vh.MOTIF_NON_PAIEMENT_ID IS NOT NULL THEN vh.heures ELSE 0 END) heures_non_payables,
		SUM(ep.taux_fc) fc
		--SUM(ep.taux_fc) fc
		SUM(CASE WHEN ep.taux_fc > 0 THEN vh.heures ELSE 0 END) fc
		FROM
		service s
		JOIN type_volume_horaire tvh ON tvh.code = 'PREVU'