Merge branch 'feature_admission_wf' into test__admission_v2 (4004f03c) · Commits · open-source / sygal

doc/release-notes/v11/11.0.0/01_admission.sql

+6 −0

Changes for doc/release-notes/v11/11.0.0/01_admission.sql: 6 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -8,6 +8,12 @@ alter table admission_inscription
		alter table admission_type_validation
		alter column code type varchar(128) using code::varchar(128);

		alter table admission_verification
		add admission_convention_formation_doctorale_id bigint
		constraint admission_verification_admission_convention_formation_doct_fkey
		references admission_convention_formation_doctorale;


		----------------

		update unicaen_avis_valeur set valeur = 'Avis négatif' where code = 'AVIS_ADMISSION_VALEUR_NEGATIF';

+6 −1

Changes for module/Admission/src/Admission/Form/Fieldset/Financement/FinancementFieldset.php: 6 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -161,8 +161,9 @@ class FinancementFieldset extends AdmissionBaseFieldset implements InputFilterPr
		'required' => false,
		],
		'estSalarie' => [
		'name' => 'contratDoctoral',
		'name' => 'estSalarie',
		'required' => false,
		'allow_empty' => true,
		],
		'statutProfessionnel' => [
		'name' => 'statutProfessionnel',
		@@ -172,6 +173,10 @@ class FinancementFieldset extends AdmissionBaseFieldset implements InputFilterPr
		['name' => StringTrim::class],
		],
		],
		'autreFinancementQueContratDoct' => [
		'name' => 'autreFinancementQueContratDoct',
		'required' => false,
		],
		];
		}
		}
		No newline at end of file