Commit 1b530283 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Merge remote-tracking branch 'origin/master'

parents 5cf8b328 0f954c34

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
## 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

data/ddl/package/OSE_PAIEMENT/body.sql

+0 −9
Original line number Diff line number Diff line 
CREATE OR REPLACE PACKAGE BODY "OSE_PAIEMENT" AS



  code_taux_remu_legal 	CONSTANT VARCHAR2(3) := 'TLD';



  mois_extraction_paie VARCHAR2(50) := '01';

  annee_extraction_paie VARCHAR2(50) := '22';
@@ -161,11 +159,4 @@ CREATE OR REPLACE PACKAGE BODY "OSE_PAIEMENT" AS 
       RETURN to_date('00/00/0000', 'dd/mm/YYYY');

  END get_taux_horaire_date;







  FUNCTION get_code_taux_remu_legal RETURN VARCHAR2 IS

  BEGIN

    RETURN code_taux_remu_legal;

  END;



END ose_paiement;
 
 No newline at end of file

data/ddl/package/OSE_PAIEMENT/definition.sql

+0 −2
Original line number Diff line number Diff line
@@ -16,6 +16,4 @@ CREATE OR REPLACE PACKAGE "OSE_PAIEMENT" AS 


  FUNCTION get_taux_horaire_date(id_in IN NUMBER, date_val IN DATE) return DATE;



  FUNCTION get_code_taux_remu_legal RETURN VARCHAR2;



END ose_paiement;
 
 No newline at end of file

data/ddl/table/MISSION.php

+1 −1
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,

data/ddl/table/STATUT.php

+24 −0
Original line number Diff line number Diff line
@@ -789,6 +789,30 @@ return [ 
            'position'    => 88,

            'commentaire' => NULL,

        ],

        'MODE_ENSEIGNEMENT_PREVISIONNEL'      => [

            'name'        => 'MODE_ENSEIGNEMENT_PREVISIONNEL',

            'type'        => 'string',

            'bdd-type'    => 'VARCHAR2',

            'length'      => 50,

            'scale'       => NULL,

            'precision'   => NULL,

            'nullable'    => TRUE,

            'default'     => NULL,

            'position'    => 83,

            'commentaire' => NULL,

        ],

        'MODE_ENSEIGNEMENT_REALISE'           => [

            'name'        => 'MODE_ENSEIGNEMENT_REALISE',

            'type'        => 'string',

            'bdd-type'    => 'VARCHAR2',

            'length'      => 50,

            'scale'       => NULL,

            'precision'   => NULL,

            'nullable'    => TRUE,

            'default'     => NULL,

            'position'    => 84,

            'commentaire' => NULL,

        ],

        'MODIF_SERVICE_DU'               => [

            'name'        => 'MODIF_SERVICE_DU',

            'type'        => 'bool',