Commit be14d83f authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Merge remote-tracking branch 'origin/b24'

# Conflicts:
#	data/formules/FORMULE_ROCHELLE.ods
parents ee4c7a49 7d218a8d
Loading
Loading
Loading
Loading
Loading
+149 KiB (269 KiB)

File changed.

No diff preview for this file type.

+5 −0
Changes for module/Paiement/src/Tbl/Process/PaiementProcess.php: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -210,6 +210,11 @@ class PaiementProcess implements ProcessInterface
        $lap->fromBdd($data);
        if (!array_key_exists($lapKey, $this->services[$key]->lignesAPayer)) {
            $this->services[$key]->lignesAPayer[$lapKey] = $lap;
        }else{
            $oldLap = $this->services[$key]->lignesAPayer[$lapKey];

            $oldLap->heuresAA = round($oldLap->heuresAA + $lap->heuresAA,2);
            $oldLap->heuresAC = round($oldLap->heuresAC + $lap->heuresAC,2);
        }

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