diff --git a/CHANGELOG b/CHANGELOG index c295e30c61e7a365df0cd53b46fc682b9ae68131..9e8c51954872c2dfc6c1af7a6848bed62b35a539 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,14 @@ title: "Changements intervenus sur OSE" author: Laurent Lécluse - DSI - Unicaen ... +#OSE 8.0.3 + +## Corrections de bugs + +* L'export CSV global des paiements refonctionne +* Le tri des demandes de mises en paiements et mises en paiement se fait de nouveau par intervenant +* Dans Gestion/Paiement/Mises en paiement, les mises en paiement fonctionnent à nouveau + #OSE 8.0.2 ## Corrections de bugs diff --git "a/data/D\303\251ploiement/Changements.pdf" "b/data/D\303\251ploiement/Changements.pdf" index eeedf035f2bcfa4f569882f498e3d70ae1b96eea..da8fbd3b049bc27ab1dd63c77e7d81acc41eef29 100644 Binary files "a/data/D\303\251ploiement/Changements.pdf" and "b/data/D\303\251ploiement/Changements.pdf" differ diff --git "a/data/D\303\251ploiement/Proc\303\251dure d'installation.pdf" "b/data/D\303\251ploiement/Proc\303\251dure d'installation.pdf" index b803b2ec2e8648643b807f38adb7ac13ed243884..2f0c6a618868c9ee23b79f5a44a5738d30766092 100644 Binary files "a/data/D\303\251ploiement/Proc\303\251dure d'installation.pdf" and "b/data/D\303\251ploiement/Proc\303\251dure d'installation.pdf" differ diff --git "a/data/D\303\251ploiement/Proc\303\251dure de mise \303\240 jour.pdf" "b/data/D\303\251ploiement/Proc\303\251dure de mise \303\240 jour.pdf" index f12a682fb05b9ddcf01974339f03d3b98dfddd08..b9028f028fc79aac740bbb435bf4d18020f3699f 100644 Binary files "a/data/D\303\251ploiement/Proc\303\251dure de mise \303\240 jour.pdf" and "b/data/D\303\251ploiement/Proc\303\251dure de mise \303\240 jour.pdf" differ diff --git "a/data/D\303\251ploiement/ose-ddl.sql" "b/data/D\303\251ploiement/ose-ddl.sql" index fc441cea9ecd35ffc7c988ed525b9785e9b2fd95..66ab91a9c387308a42efdc899fbf7faebb2f1fa2 100755 --- "a/data/D\303\251ploiement/ose-ddl.sql" +++ "b/data/D\303\251ploiement/ose-ddl.sql" @@ -4097,7 +4097,7 @@ CREATE OR REPLACE FORCE VIEW "V_ETAT_PAIEMENT" ("ANNEE_ID", "TYPE_INTERVENANT_ID type_intervenant_id, structure_id, periode_id, - intervenant_id; + intervenant_nom; -- V_EXP_HETD_CENTRE_COUT CREATE OR REPLACE FORCE VIEW "V_EXP_HETD_CENTRE_COUT" ("TYPE_VOLUME_HORAIRE_ID", "ETAT_VOLUME_HORAIRE_ID", "ANNEE_ID", "INTERVENANT_ID", "STATUT_INTERVENANT_ID", "TYPE_INTERVENANT_ID", "GRADE_ID", "STRUCTURE_ID", "GROUPE_TYPE_FORMATION_ID", "TYPE_FORMATION_ID", "ETAPE_ID", "TYPE_VOLUME_HORAIRE", "ETAT_VOLUME_HORAIRE", "ANNEE", "CODE_INTERVENANT", "INTERVENANT", "STATUT_INTERVENANT", "TYPE_INTERVENANT", "GRADE", "STRUCTURE_ENSEIGNEMENT", "GROUPE_TYPE_FORMATION", "TYPE_FORMATION", "CODE_FORMATION", "TOTAL_HETD", "CENTRE_COUTS", "TOTAL_EUROS") AS diff --git a/module/Application/src/Application/Controller/PaiementController.php b/module/Application/src/Application/Controller/PaiementController.php index 4d212c64df17695e077d95fc486d594053ebb899..498d419cf3a7435115234708a21991559ce32413 100644 --- a/module/Application/src/Application/Controller/PaiementController.php +++ b/module/Application/src/Application/Controller/PaiementController.php @@ -422,13 +422,18 @@ class PaiementController extends AbstractController $this->initFilters(); $role = $this->getServiceContext()->getSelectedIdentityRole(); + $etatSortie = $this->getServiceEtatSortie()->getByParametre('es_etat_paiement'); + $recherche = new MiseEnPaiementRecherche; - $options = []; - if ($role->getStructure()) { - $options['composante'] = $role->getStructure(); + $recherche->setAnnee($this->getServiceContext()->getAnnee()); + if ($role->getStructure()){ + $recherche->setStructure($role->getStructure()); } - return $this->etatPaiementCsv($recherche, $options); + $csvModel = $this->getServiceEtatSortie()->genererCsv($etatSortie, $recherche->getFilters()); + $csvModel->setFilename($this->makeFilenameFromRecherche($recherche).'.csv'); + + return $csvModel; }