Commit 251457af authored Nov 22, 2023 by Antony Le Courtes

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

parents a5e80f22 29f161fd

data/ddl/view/V_CONTRAT_MAIN.sql

+5 −1

Original line number	Diff line number	Diff line
		@@ -137,7 +137,11 @@ FROM ( SELECT c.*,
		), chr(13), ' - ')
		ELSE '' END "exemplaire2",
		REPLACE(ltrim(to_char(COALESCE(hs."serviceTotal", 0), '999999.00')), '.', ',') "serviceTotal",
		REPLACE(ltrim(to_char(COALESCE(hs."serviceTotal"/10, 0), '999999.00')), '.', ',') "totalDiviseParDix",
		CASE
		WHEN COALESCE(hs."serviceTotal"/10, 0) < 1
		THEN CONCAT('0', REPLACE(ltrim(to_char(COALESCE(hs."serviceTotal"/10, 0), '999999.00')), '.', ','))
		ELSE REPLACE(ltrim(to_char(COALESCE(hs."serviceTotal"/10, 0), '999999.00')), '.', ',')
		END "totalDiviseParDix",
		REPLACE(ltrim(to_char(COALESCE(hs."serviceTotal"+(hs."serviceTotal"/10), 0), '999999.00')), '.', ',') "serviceTotalPaye",
		CASE
		WHEN la.autre_libelles IS NOT NULL

data/ddl/view/V_EXPORT_SERVICE.sql

+1 −3

Original line number	Diff line number	Diff line
		@@ -316,5 +316,3 @@ FROM
		LEFT JOIN fonction_referentiel fr ON fr.id = t.fonction_referentiel_id
		LEFT JOIN type_validation tv ON tvh.code = 'REALISE' AND tv.code = 'CLOTURE_REALISE'
		LEFT JOIN validation v ON v.intervenant_id = i.id AND v.type_validation_id = tv.id AND v.histo_destruction IS NULL
		No newline at end of file

data/ddl/view/V_INTERVENANT_HISTORIQUE.sql

+1 −3

Original line number	Diff line number	Diff line
		@@ -537,5 +537,3 @@ SELECT rownum id,
		icon
		FROM historique
		ORDER BY intervenant_id, ordre ASC, histo_date ASC
		No newline at end of file