Commit 87ed30d7 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Bug sur le calcul des CP

parent ee82e878
Loading
Loading
Loading
Loading
+1 −1
Changes for data/ddl/package/OSE_PAIEMENT/body.sql: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ CREATE OR REPLACE PACKAGE BODY "OSE_PAIEMENT" AS

    EXCEPTION
    WHEN OTHERS THEN
       RETURN -1;
       RETURN 1;
  END get_taux_horaire;


+12 −1
Changes for data/ddl/package/OSE_PARAMETRE/body.sql: 12 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ CREATE OR REPLACE PACKAGE BODY "OSE_PARAMETRE" AS



  FUNCTION get_pourc_s1_annee_civ RETURN VARCHAR2 IS
  FUNCTION get_pourc_s1_annee_civ RETURN FLOAT IS
  BEGIN
    IF pourc_s1_pour_annee_civile IS NULL THEN
      SELECT TO_NUMBER(valeur, '999999999D999999999', 'NLS_NUMERIC_CHARACTERS =.,') INTO pourc_s1_pour_annee_civile FROM parametre WHERE nom = 'pourc_s1_pour_annee_civile';
@@ -92,6 +92,17 @@ CREATE OR REPLACE PACKAGE BODY "OSE_PARAMETRE" AS
  END;



  FUNCTION get_taux_conges_payes RETURN FLOAT IS
  BEGIN
    IF taux_conges_payes IS NULL THEN
      SELECT COALESCE(TO_NUMBER(valeur, '999999999D999999999', 'NLS_NUMERIC_CHARACTERS =.,'),1) INTO taux_conges_payes FROM parametre WHERE nom = 'taux_conges_payes';
    END IF;

    RETURN taux_conges_payes;
  END;


  PROCEDURE CLEAR_CACHE IS
  BEGIN
    annee := NULL;
+2 −1
Changes for data/ddl/package/OSE_PARAMETRE/definition.sql: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -6,7 +6,8 @@ CREATE OR REPLACE PACKAGE "OSE_PARAMETRE" AS
  FUNCTION get_ose_user RETURN Numeric;
  FUNCTION get_formule RETURN formule%rowtype;
  FUNCTION get_regle_paiement_annee_civ RETURN VARCHAR2;
  FUNCTION get_pourc_s1_annee_civ RETURN VARCHAR2;
  FUNCTION get_pourc_s1_annee_civ RETURN FLOAT;
  FUNCTION get_taux_conges_payes RETURN FLOAT;

  PROCEDURE CLEAR_CACHE;

+1 −2
Changes for data/ddl/view/V_TBL_PAIEMENT.sql: 1 added line, 2 removed lines.
Original line number Diff line number Diff line
@@ -181,12 +181,11 @@ SELECT
  0.6                                         pourc_exercice_ac,
  COALESCE(mep.heures,0) * 0.4                heures_aa,
  COALESCE(mep.heures,0) * 0.6                heures_ac,
  null taux_remu_id, null taux_horaire,COALESCE(to_number(p.valeur),1) taux_conges_payes
  null taux_remu_id, 1 taux_horaire,ose_parametre.get_taux_conges_payes taux_conges_payes
  --COALESCE(si.taux_remu_id, to_number(p3.valeur))                  taux_remu_id,
  --OSE_PAIEMENT.GET_TAUX_HORAIRE(COALESCE(si.taux_remu_id, to_number(p3.valeur)),COALESCE(vhr.horaire_debut, a.date_debut)) taux_horaire
FROM
  tbl_mission tm
  JOIN parametre p ON p.nom = 'taux_conges_payes'
  LEFT JOIN mise_en_paiement                mep ON mep.mission_id = tm.mission_id
                                               AND mep.histo_destruction IS NULL
WHERE