Commit 034c2b2d authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

bug mep

parent 8d85cd23

module/Paiement/src/Tbl/Process/PaiementDebugger.php

+6 −1
Changes for module/Paiement/src/Tbl/Process/PaiementDebugger.php: 6 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ use Paiement\Entity\Db\TauxRemu; 
use Paiement\Tbl\Process\Sub\ServiceAPayer;

use Referentiel\Entity\Db\ServiceReferentiel;

use Referentiel\Entity\Db\VolumeHoraireReferentiel;

use Service\Entity\Db\EtatVolumeHoraire;

use Service\Entity\Db\TypeVolumeHoraire;

use UnicaenApp\Entity\HistoriqueAwareInterface;



/**
@@ -365,10 +367,13 @@ class PaiementDebugger 
          'Dernière modification par ' || u.display_name || ' le ' || to_char(vhr.histo_modification,'dd/mm/YYYY') histo

        FROM

          formule_resultat_volume_horaire frvh

          JOIN formule_resultat_intervenant fri ON fri.id = frvh.formule_resultat_intervenant_id

          JOIN type_volume_horaire tvh ON tvh.id = fri.type_volume_horaire_id AND tvh.code = '".TypeVolumeHoraire::CODE_REALISE."'

          JOIN etat_volume_horaire evh ON evh.id = fri.etat_volume_horaire_id AND evh.code = '".EtatVolumeHoraire::CODE_VALIDE."'

          JOIN volume_horaire_ref vhr ON vhr.id = frvh.volume_horaire_ref_id

          JOIN utilisateur u ON u.id = vhr.histo_modificateur_id

        WHERE

          frvh.id = :frsr

          frvh.service_referentiel_id = :frsr

        ORDER BY

          frvh.id

        ";

module/Paiement/src/Tbl/Process/PaiementProcess.php

+6 −1
Changes for module/Paiement/src/Tbl/Process/PaiementProcess.php: 6 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -195,14 +195,19 @@ class PaiementProcess implements ProcessInterface 
            $this->services[$key] = $sap;

        }



        if (!array_key_exists($lapKey, $this->services[$key]->lignesAPayer)) {

        $lap             = new LigneAPayer();

        $tauxRemu        = (int)$data['TAUX_REMU_ID'];

        $horaireDebut    = (string)$data['HORAIRE_DEBUT'];

        $lap->tauxValeur = $this->getServiceTauxRemu()->tauxValeur($tauxRemu, $horaireDebut);

        $lap->pourcAA    = $this->repartiteur->fromBdd($data);

        $lap->fromBdd($data);

        if (!array_key_exists($lapKey, $this->services[$key]->lignesAPayer)) {



            $this->services[$key]->lignesAPayer[$lapKey] = $lap;

        }else{

            $olap = &$this->services[$key]->lignesAPayer[$lapKey];

            $olap->heuresAA += $lap->heuresAA;

            $olap->heuresAC += $lap->heuresAC;

        }



        if ($mepKey > 0 && !array_key_exists($mepKey, $this->services[$key]->misesEnPaiement)) {