Commit 85380a32 authored by Antony Le Courtes's avatar Antony Le Courtes
Browse files

Merge remote-tracking branch 'origin/master'

parents 6c19f865 73f85372
Loading
Loading
Loading
Loading
Loading
+1 −1
Changes for data/ddl/table/TBL_CONTRAT.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ return [
            'precision'   => 126,
            'nullable'    => FALSE,
            'default'     => '0',
            'position'    => 37,
            'position'    => 36,
            'commentaire' => 'Nombre de volumes horaires signés',
        ],
        'TP'                        => [
+4 −4
Changes for data/ddl/view/V_CONTRAT_MAIN.sql: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -132,12 +132,12 @@ FROM ( SELECT c.*,
               COALESCE(d.numero_insee, i.numero_insee)                                                                                                       "numInsee",
               si.libelle                                                                                                                                     "statut",
               REPLACE(ltrim(to_char(COALESCE(c.total_hetd, fr.total, 0), '999999.00')), '.', ',')                                                            "totalHETD",
               REPLACE(ltrim(to_char(COALESCE(OSE_PAIEMENT.get_taux_horaire(tr.id, a.date_debut), 0), '999999.00')), '.', ',')                              "tauxHoraireValeur",
               COALESCE(to_char(OSE_PAIEMENT.get_taux_horaire_date(tr.id, a.date_debut), 'dd/mm/YYYY'), 'TAUX INTROUVABLE')                                 "tauxHoraireDate",
               tblc.taux_Remu_Valeur                                                                                           "tauxHoraireValeur",
               to_char(tblc.taux_Remu_Date)                                                                                                      "tauxHoraireDate",
               tr.id                                                                                                                                        "tauxId",
               tr.libelle                                                                                                                                   "tauxNom",
               REPLACE(ltrim(to_char(COALESCE(OSE_PAIEMENT.get_taux_horaire(trm.id, a.date_debut), 0), '999999.00')), '.', ',')                             "tauxMajoreHoraireValeur",
               COALESCE(to_char(OSE_PAIEMENT.get_taux_horaire_date(trm.id, a.date_debut), 'dd/mm/YYYY'), 'TAUX INTROUVABLE')                                "tauxMajoreHoraireDate",
               tblc.taux_Remu_Majore_Valeur                                                                                                 "tauxMajoreHoraireValeur",
               to_char(tblc.taux_Remu_Majore_Date)                                                                                             "tauxMajoreHoraireDate",
               trm.id                                                                                                                                       "tauxMajoreId",
               trm.libelle                                                                                                                                  "tauxMajoreNom",
               to_char(COALESCE(v.histo_creation, a.date_debut), 'dd/mm/YYYY')                                                                                "dateSignature",
−4
Changes for module/Contrat/view/contrat/contrat/index.phtml: 0 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -32,10 +32,6 @@ echo $this->messenger() ?>
        width: 10%;
    }

    .ui-datepicker {
        z-index: 1151 !important;
    }

    td .card {
        margin-bottom: 0px;
    }