Loading module/Administration/src/Command/UpdateCodeCommand.php +2 −0 Changes for module/Administration/src/Command/UpdateCodeCommand.php: 2 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -69,6 +69,7 @@ class UpdateCodeCommand extends Command // Récupération des sources $io->section("Mise à jour des fichiers à partir de GIT"); $this->exec("git reset --hard"); // purge des modifs locales $tbr = $repo->tagIsValid($version) ? 'tags/' : ''; if ($version == $repo->getCurrentBranche()) { $updcmd = 'git pull'; Loading Loading @@ -112,5 +113,6 @@ class UpdateCodeCommand extends Command } catch (ProcessFailedException $exception) { throw new \RuntimeException('Erreur lors de l\'exécution de la commande : ' . $exception->getMessage()); } } } No newline at end of file module/OffreFormation/src/Controller/EtapeCentreCoutController.php +5 −2 Changes for module/OffreFormation/src/Controller/EtapeCentreCoutController.php: 5 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -27,10 +27,13 @@ class EtapeCentreCoutController extends AbstractController */ protected function saisirAction() { $this->em()->getFilters()->enable('historique')->init([ $this->em()->getFilters() ->enable('historique') ->init([ \OffreFormation\Entity\Db\ElementPedagogique::class, \Paiement\Entity\Db\CentreCout::class, \OffreFormation\Entity\Db\CentreCoutEp::class \Paiement\Entity\Db\CentreCoutStructure::class, \OffreFormation\Entity\Db\CentreCoutEp::class, ]); $this->em()->getFilters()->enable('annee')->init([ \OffreFormation\Entity\Db\ElementPedagogique::class, Loading module/Paiement/src/Service/CentreCoutService.php +13 −1 Changes for module/Paiement/src/Service/CentreCoutService.php: 13 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -3,6 +3,7 @@ namespace Paiement\Service; use Application\Service\AbstractEntityService; use Doctrine\ORM\EntityNotFoundException; use Doctrine\ORM\QueryBuilder; use Lieu\Entity\Db\Structure; use OffreFormation\Entity\Db\TypeHeures; Loading Loading @@ -79,9 +80,20 @@ class CentreCoutService extends AbstractEntityService $result = []; foreach ($centresCouts as $cc) { try { $id = $cc->getId(); $ccp = $cc->getParent() ?: null; $idParent = $ccp ? $ccp->getId() : null; $idParent = null; if ($ccp) { $ccp->estHistorise(); $idParent = $ccp->getId(); } } catch (EntityNotFoundException $e) { //On catch l'exception dans le cas d'un centre de cout dont le parent a été historisé... $idParent = null; } if ($idParent) { $result[$idParent]['label'] = (string)$ccp; Loading Loading
module/Administration/src/Command/UpdateCodeCommand.php +2 −0 Changes for module/Administration/src/Command/UpdateCodeCommand.php: 2 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -69,6 +69,7 @@ class UpdateCodeCommand extends Command // Récupération des sources $io->section("Mise à jour des fichiers à partir de GIT"); $this->exec("git reset --hard"); // purge des modifs locales $tbr = $repo->tagIsValid($version) ? 'tags/' : ''; if ($version == $repo->getCurrentBranche()) { $updcmd = 'git pull'; Loading Loading @@ -112,5 +113,6 @@ class UpdateCodeCommand extends Command } catch (ProcessFailedException $exception) { throw new \RuntimeException('Erreur lors de l\'exécution de la commande : ' . $exception->getMessage()); } } } No newline at end of file
module/OffreFormation/src/Controller/EtapeCentreCoutController.php +5 −2 Changes for module/OffreFormation/src/Controller/EtapeCentreCoutController.php: 5 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -27,10 +27,13 @@ class EtapeCentreCoutController extends AbstractController */ protected function saisirAction() { $this->em()->getFilters()->enable('historique')->init([ $this->em()->getFilters() ->enable('historique') ->init([ \OffreFormation\Entity\Db\ElementPedagogique::class, \Paiement\Entity\Db\CentreCout::class, \OffreFormation\Entity\Db\CentreCoutEp::class \Paiement\Entity\Db\CentreCoutStructure::class, \OffreFormation\Entity\Db\CentreCoutEp::class, ]); $this->em()->getFilters()->enable('annee')->init([ \OffreFormation\Entity\Db\ElementPedagogique::class, Loading
module/Paiement/src/Service/CentreCoutService.php +13 −1 Changes for module/Paiement/src/Service/CentreCoutService.php: 13 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -3,6 +3,7 @@ namespace Paiement\Service; use Application\Service\AbstractEntityService; use Doctrine\ORM\EntityNotFoundException; use Doctrine\ORM\QueryBuilder; use Lieu\Entity\Db\Structure; use OffreFormation\Entity\Db\TypeHeures; Loading Loading @@ -79,9 +80,20 @@ class CentreCoutService extends AbstractEntityService $result = []; foreach ($centresCouts as $cc) { try { $id = $cc->getId(); $ccp = $cc->getParent() ?: null; $idParent = $ccp ? $ccp->getId() : null; $idParent = null; if ($ccp) { $ccp->estHistorise(); $idParent = $ccp->getId(); } } catch (EntityNotFoundException $e) { //On catch l'exception dans le cas d'un centre de cout dont le parent a été historisé... $idParent = null; } if ($idParent) { $result[$idParent]['label'] = (string)$ccp; Loading