Merge remote-tracking branch 'origin/b24' into b24 (026fca9d) · Commits · open-source / OSE

composer.json

+1 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@
		"unicaen/mail" : "7.1.2",
		"unicaen/vue" : "6.3.3",
		"unicaen/bddadmin" : "1.4.0",
		"unicaen/signature" : "1.0.4",
		"unicaen/signature": "1.0.6",
		"connecteur-ose/actul" : "dev-master",
		"connecteur-ose/pegase" : "dev-master"
		},

+195 −181

File changed.

Preview size limit exceeded, changes collapsed.

0 → 100644

+22 −0

Original line number	Diff line number	Diff line
		CREATE OR REPLACE FORCE VIEW V_TBL_CONTRAT_DOCTRINE AS
		SELECT
		vh.ID,
		c.id tbl_contrat_id,
		vh.UUID,
		vh.VOLUME_HORAIRE_INDEX,
		vh.SERVICE_ID,
		vh.SERVICE_REFERENTIEL_ID,
		vh.MISSION_ID,
		vh.VOLUME_HORAIRE_ID,
		vh.VOLUME_HORAIRE_REF_ID,
		vh.VOLUME_HORAIRE_MISSION_ID,
		vh.HEURES,
		vh.CM,
		vh.TD,
		vh.TP,
		vh.AUTRES,
		vh.HETD,
		vh.AUTRE_LIBELLE
		FROM
		TBL_CONTRAT vh
		JOIN TBL_CONTRAT c ON c.uuid = vh.uuid AND c.volume_horaire_index = 0
		No newline at end of file

+1 −1

Original line number	Diff line number	Diff line
		@@ -58,7 +58,7 @@ FROM
		LEFT JOIN etape e ON e.id = ep.etape_id
		LEFT JOIN centre_cout_ep ccep ON ccep.histo_destruction IS NULL
		AND ccep.element_pedagogique_id = ep.id
		AND ccep.type_heures_id = th.id
		AND ccep.type_heures_id = th.type_heures_element_id

		LEFT JOIN mise_en_paiement mep ON mep.histo_destruction IS NULL
		AND mep.service_id = frvh.service_id

+79.6 KiB (377 KiB)

File changed.

No diff preview for this file type.