Commit 4ac9dde2 authored by Florian Joriot's avatar Florian Joriot
Browse files

Maj taux remu dans les paiements

parent 833a3807

data/ddl/package/OSE_PAIEMENT/body.sql

+25 −2
Changes for data/ddl/package/OSE_PAIEMENT/body.sql: 25 added lines, 2 removed lines.
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';







  PROCEDURE check_bad_paiements(formule_res_service_id NUMERIC DEFAULT NULL, formule_res_service_ref_id NUMERIC DEFAULT NULL) IS

    cc NUMERIC;

  BEGIN
@@ -62,5 +62,28 @@ CREATE OR REPLACE PACKAGE BODY "OSE_PAIEMENT" AS 
    RETURN '20' || ose_paiement.annee_extraction_paie || '-' || ose_paiement.mois_extraction_paie;

  END;



  Function get_taux_horaire (id_in IN NUMBER, date_val IN DATE) RETURN float IS

    valeur float;

  BEGIN

    SELECT trv.valeur INTO valeur

    FROM taux_remu tr

    JOIN taux_remu_valeur trv ON tr.id = trv.taux_remu_id

    WHERE tr.id = id_in

    AND tr.histo_destruction IS NULL

    AND trv.date_effet <= date_val

    AND rownum = 1

    ORDER BY trv.date_effet DESC;



    RETURN valeur;



    EXCEPTION

    WHEN OTHERS THEN

       return null;

  END get_taux_horaire;



  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

+4 −0
Changes for data/ddl/package/OSE_PAIEMENT/definition.sql: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -12,4 +12,8 @@ CREATE OR REPLACE PACKAGE "OSE_PAIEMENT" AS 


  FUNCTION get_format_mois_du RETURN VARCHAR2;



  FUNCTION get_taux_horaire(id_in IN NUMBER, date_val IN DATE) return float;



  FUNCTION get_code_taux_remu_legal RETURN VARCHAR2;



END ose_paiement;
 
 No newline at end of file

data/ddl/view/V_ETAT_PAIEMENT.sql

+13 −1
Changes for data/ddl/view/V_ETAT_PAIEMENT.sql: 13 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -116,7 +116,16 @@ SELECT 
                                mis.heures_ac                                                       exercice_ac,

                             --CASE WHEN th.code = 'fc_majorees' THEN 0 ELSE mep.heures END * 4 / 10                                                 exercice_aa,

                             --CASE WHEN th.code = 'fc_majorees' THEN 0 ELSE mep.heures END * 6 / 10                                                 exercice_ac,

                                OSE_FORMULE.GET_TAUX_HORAIRE_HETD( NVL(mep.date_mise_en_paiement,SYSDATE) )      taux_horaire

                                OSE_PAIEMENT.GET_TAUX_HORAIRE(

                                    CASE

                                        WHEN (ep.taux_remu_id IS NOT NULL) THEN ep.taux_remu_id

                                        WHEN (si.taux_remu_id IS NOT NULL) THEN si.taux_remu_id

                                        ELSE tr.id

                                    END,

                                    NVL(mep.date_mise_en_paiement,SYSDATE)

                                )      taux_horaire

                             --OSE_FORMULE.GET_TAUX_HORAIRE_HETD( NVL(mep.date_mise_en_paiement,SYSDATE) )      taux_horaire



                         FROM

                                     tbl_paiement mis

                                JOIN mise_en_paiement        mep ON mep.id = mis.mise_en_paiement_id AND mep.histo_destruction IS NULL
@@ -130,6 +139,9 @@ SELECT 
                           LEFT JOIN validation                v ON   v.id = mep.validation_id       AND v.histo_destruction IS NULL

                           LEFT JOIN domaine_fonctionnel      df ON  df.id = mis.domaine_fonctionnel_id

                           LEFT JOIN periode                   p ON   p.id = mep.periode_paiement_id

                           LEFT JOIN service                  se ON   mis.service_id = se.id

                           LEFT JOIN element_pedagogique      ep ON   ep.id = se.element_pedagogique_id

                           LEFT JOIN taux_remu                tr ON   tr.code = OSE_PAIEMENT.get_code_taux_remu_legal()

                     )

                     SELECT

                            periode_id,

module/Paiement/src/Entity/Db/TauxRemu.php

+1 −1
Changes for module/Paiement/src/Entity/Db/TauxRemu.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ class TauxRemu implements HistoriqueAwareInterface 
        $j            = 0;





        while ($i < $sizeIndex || $j < $sizeTaux) {

        while ($sizeIndex != 0 && $sizeTaux != 0 && ($i < $sizeIndex || $j < $sizeTaux)) {

            if ($valeursIndex[$i]->getDateEffet() == $valeurs[$j]->getDateEffet()) {

                $valeur['valeur'] = $valeursIndex[$i]->getValeur() * $valeurs[$j]->getValeur();

                $valeur['date']   = $valeursIndex[$i]->getDateEffet();