Skip to content
Snippets Groups Projects
Commit 138a392c authored by Florian Joriot's avatar Florian Joriot
Browse files

Correction probleme contrat taux et date

parent 31f0926e
Branches
Tags 24.0-beta10
No related merge requests found
Pipeline #35787 passed
...@@ -164,7 +164,7 @@ class ContratProcess implements ProcessInterface ...@@ -164,7 +164,7 @@ class ContratProcess implements ProcessInterface
$tauxRemuId = $service['TAUX_REMU_ID']; $tauxRemuId = $service['TAUX_REMU_ID'];
$tauxRemuMajoreId = isset($service['TAUX_REMU_MAJORE_ID']) ? $service['TAUX_REMU_MAJORE_ID'] : null; $tauxRemuMajoreId = isset($service['TAUX_REMU_MAJORE_ID']) ? $service['TAUX_REMU_MAJORE_ID'] : null;
if ($service['CONTRAT_ID'] != NULL) { if ($service['CONTRAT_ID'] != NULL) {
$date = max($service['DATE_DEBUT'], $service['DATE_CREATION']); $date = $service['DATE_DEBUT'] ?? $service['DATE_CREATION'];
$tauxRemuValeur = $this->getServiceTauxRemu()->tauxValeur($tauxRemuId, $date); $tauxRemuValeur = $this->getServiceTauxRemu()->tauxValeur($tauxRemuId, $date);
$service['TAUX_REMU_VALEUR'] = $tauxRemuValeur; $service['TAUX_REMU_VALEUR'] = $tauxRemuValeur;
$service['TAUX_REMU_DATE'] = $date; $service['TAUX_REMU_DATE'] = $date;
...@@ -302,7 +302,7 @@ class ContratProcess implements ProcessInterface ...@@ -302,7 +302,7 @@ class ContratProcess implements ProcessInterface
$contratToTbl['TAUX_REMU_MAJORE_VALEUR'] = NULL; $contratToTbl['TAUX_REMU_MAJORE_VALEUR'] = NULL;
if ($contratSansHeure['TAUX_REMU_ID'] != NULL) { if ($contratSansHeure['TAUX_REMU_ID'] != NULL) {
$date = max($contratSansHeure['DATE_DEBUT'], $contratSansHeure['DATE_CREATION']); $date = $contratSansHeure['DATE_DEBUT'] ?? $contratSansHeure['DATE_CREATION'];
$tauxRemuValeur = $this->getServiceTauxRemu()->tauxValeur($contratSansHeure['TAUX_REMU_ID'], $date); $tauxRemuValeur = $this->getServiceTauxRemu()->tauxValeur($contratSansHeure['TAUX_REMU_ID'], $date);
$contratToTbl['TAUX_REMU_DATE'] = $date; $contratToTbl['TAUX_REMU_DATE'] = $date;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment