Skip to content
Snippets Groups Projects
Commit 64a94f3c authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Finalisation v8.0.3

parent dec2dce1
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
No preview for this file type
No preview for this file type
No preview for this file type
......@@ -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
......@@ -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 = [];
$recherche->setAnnee($this->getServiceContext()->getAnnee());
if ($role->getStructure()){
$options['composante'] = $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;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment