Commit 62058ab9 authored by Alexandre Zvenigorosky's avatar Alexandre Zvenigorosky
Browse files

Merge branches 'Centres-cout' and 'master' of git.unicaen.fr:open-source/OSE into Centres-cout 

# Conflicts:
#	composer.json
#	composer.lock
parent 15b59018

module/Application/config/administration.config.php

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ return [ 
                        Privileges::TYPE_INTERVENTION_VISUALISATION,

                        Privileges::PIECE_JUSTIFICATIVE_GESTION_VISUALISATION,

                        Privileges::PLAFONDS_GESTION_VISUALISATION,

                        Privileges::CENTRES_COUTS_ADMINISTRATION_VISUALISATION,

                    ],

                    'assertion'  => Assertion\GestionAssertion::class,

                ],

module/Application/view/application/centre-cout/index.phtml

+2 −2
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ while ($i < $nTblListe) { 
        <td><?= $fr->getActivite()->getLibelle() . '<br>' ?></td>

        <td><?= $fr->getTypeRessource() . '<br>' ?></td>

        <td><?= $fr->getUniteBudgetaire() . '<br>' ?></td>

        <td><?php if (($fr->getSource()->getLibelle() == 'OSE') && ($canEdit)) { ?>

        <td style=" text-align: center;"><?php if (($fr->getSource()->getLibelle() == 'OSE') && ($canEdit)) { ?>

                <a class="ajax-modal" data-event="centre-cout-saisie"

                   href="<?= $this->url('centre-cout/saisie', ['centre-cout' => $fr->getId()]) ?>"

                   title="Modifier la Centre de Coûts">