Commit 4991b933 authored by Antony Le Courtes's avatar Antony Le Courtes
Browse files

Merge remote-tracking branch 'origin/master'

parents c1823c96 23fc40cc
Loading
Loading
Loading
Loading
+11 −0
Changes for CHANGELOG.md: 11 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -42,6 +42,17 @@
 


# OSE 20.4 (début juin 2023)

## Corrections de bugs

* Erreur d'affichage du contrat unique avec des heures multi-composantes (#50889 et #50980)
* Problème de saisie de services hors établissement (#50990)
* Formulaire d'édition des états de sortie réparé au niveau de l'affichage des sous-requêtes
* Correction de la formule de Picardie
* Correction de la formule de calcul de Lyon 2



# OSE 20.3 (23/05/2023)

+1 −1
Changes for data/ddl/table/MISSION.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ return [
            'bdd-type'    => 'FLOAT',
            'length'      => 0,
            'scale'       => NULL,
            'precision'   => NULL,
            'precision'   => 126,
            'nullable'    => TRUE,
            'default'     => NULL,
            'position'    => 18,
+1 −1
Changes for data/privileges.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ return [
            'offre-emploi-postuler'      => 'Postuler à une offre d\'emploi',
            'candidature-valider'        => 'Valider une candidature',
            'candidature-visualisation'  => 'Visualiser les candidatures d\'une offre',

            'edition-centre-cout-type'   => 'Édition des centres de cout d\'un type de mission',

        ],
    ],
+2 −2
Changes for module/Application/src/Provider/Privilege/Privileges.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -9,8 +9,7 @@ namespace Application\Provider\Privilege;
 *
 * @author UnicaenCode
 */
class Privileges extends \UnicaenPrivilege\Provider\Privilege\Privileges
{
class Privileges extends \UnicaenPrivilege\Provider\Privilege\Privileges {

    const AGREMENT_CONSEIL_ACADEMIQUE_EDITION                  = 'agrement-conseil-academique-edition';
    const AGREMENT_CONSEIL_ACADEMIQUE_SUPPRESSION              = 'agrement-conseil-academique-suppression';
@@ -171,6 +170,7 @@ class Privileges extends \UnicaenPrivilege\Provider\Privilege\Privileges
    const MISSION_DEVALIDATION                                 = 'mission-devalidation';
    const MISSION_DEVALIDATION_REALISE                         = 'mission-devalidation-realise';
    const MISSION_EDITION                                      = 'mission-edition';
    const MISSION_EDITION_CENTRE_COUT_TYPE                     = 'mission-edition-centre-cout-type';
    const MISSION_EDITION_REALISE                              = 'mission-edition-realise';
    const MISSION_EDITION_TYPE                                 = 'mission-edition-type';
    const MISSION_OFFRE_EMPLOI_AJOUTER                         = 'mission-offre-emploi-ajouter';
+2 −2
Changes for module/Contrat/src/Entity/Db/Contrat.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -540,9 +540,9 @@ class Contrat implements HistoriqueAwareInterface, ResourceInterface


    /**
     * @return Mission
     * @return Mission|null
     */
    public function getMission(): Mission
    public function getMission(): ?Mission
    {
        return $this->mission;
    }
Loading