From 2c4fada7c48663d69073253b5d2cc344fbcec695 Mon Sep 17 00:00:00 2001 From: Michael RICOIS Date: Mon, 26 Jan 2015 15:47:53 +0000 Subject: [PATCH] =?UTF-8?q?RRG=20:=20mise=20en=20surveillance,=20libell?= =?UTF-8?q?=C3=A9=20CS=20et=20test=20retour=20calcul=20indiscore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 1.2/scripts/clients/RrgSurv.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/1.2/scripts/clients/RrgSurv.php b/1.2/scripts/clients/RrgSurv.php index 439d5caf..47febd99 100644 --- a/1.2/scripts/clients/RrgSurv.php +++ b/1.2/scripts/clients/RrgSurv.php @@ -167,7 +167,7 @@ if ( count($resultItem) == 0 ) { if ( count($fileOptionsOut['header']) > 0 ) { fputcsv($fp, $fileOptionsOut['header'], $fileOptionsOut['delimiter'], $fileOptionsOut['enclosure']); } - + $iDb = new WDB(); $row = 0; // --- Content @@ -186,9 +186,9 @@ if ( count($resultItem) == 0 ) { $DateCreaEn = ''; $BilanCA = ''; $BilanDateCloture = ''; - if (/*true*/$item->indiScoreDate === null) { + if ($item->indiScoreDate === null) { if ($opts->debug) { echo " - Calcul du score"; } - $evaluation = calculIndiScore($item->siren, 0, false, 0); + $evaluation = calculIndiScore($item->siren, 0, false, 0, false, 'scores', $iDb); if ( $evaluation['DateCreaEt'] > 0 && $evaluation['DateCreaEt'] < $evaluation['DateCreaEn'] ) { $DateCreaEn = $evaluation['DateCreaEt']; } elseif ( $evaluation['DateCreaEn'] > 0 ) { @@ -234,7 +234,7 @@ if ( count($resultItem) == 0 ) { if ( in_array($PaiementCS, array('0', 'I', 'P', 'D')) ) { $iFacto = new MFacto($iDb); $info = $iFacto->getLibInfoCS($PaiementCS); - $PaiementInfo = $info['libExt']; + $PaiementInfo = $info['LibCS']; } $values = array(