Correction copier coller
This commit is contained in:
parent
1b45991ab2
commit
741e0704be
@ -393,7 +393,7 @@ foreach($tabExtract as $key)
|
||||
}
|
||||
|
||||
//Ajout colonne obligatoire SiretValide
|
||||
$tabEntete[] = 'SiretValide';
|
||||
$tabEntete[] = 'SiretValide';
|
||||
unset($tabExtract);
|
||||
|
||||
//Vérification et création des données
|
||||
@ -503,22 +503,22 @@ foreach($tabIdentifiant as $item)
|
||||
{
|
||||
$values = false;
|
||||
if( ${$item.'Data'}!=false ){
|
||||
//$values = explode(',', ${$item.'Data'});
|
||||
$values = ${$item.'Data'};
|
||||
}
|
||||
$tabData[$row] = array_merge($tabData[$row], call_user_func($item.'Data', $siren, $nicV, $values));
|
||||
$retour = call_user_func($item.'Data', $siren, $nicV, $values);
|
||||
$tabData[$row] = $tabData[$row] + $retour;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//Trier pour la sortie
|
||||
$tabSortie = array();
|
||||
foreach($tabEntete as $key){
|
||||
$tabSortie[$row][] = isset($tabData[$row][$key]) ? $tabData[$row][$key] : '';
|
||||
}
|
||||
foreach ($tabSortie as $fields) {
|
||||
fputcsv($fp, $fields, ',', '"');
|
||||
$tabSortie[] = isset($tabData[$row][$key]) ? $tabData[$row][$key] : '';
|
||||
}
|
||||
fputcsv($fp, $tabSortie, ',', '"');
|
||||
|
||||
$row++;
|
||||
|
||||
//Mise à jour des lignes traitées dans la base
|
||||
@ -746,12 +746,12 @@ function bilanN1Data($siren, $nic, $values = false)
|
||||
$tabBilans = $mBil->listeBilans(false, 9);
|
||||
if (count($tabBilans)>0) {
|
||||
$tabBi = findBilan($siren, $tabBilans, $annee);
|
||||
$tabData['bilanNdateCloture'] = $tabBi['DATE_CLOTURE'];
|
||||
$tabData['bilanNdureeMois'] = $tabBi['DUREE_MOIS'];
|
||||
$tabData['bilanN1dateCloture'] = $tabBi['DATE_CLOTURE'];
|
||||
$tabData['bilanN1dureeMois'] = $tabBi['DUREE_MOIS'];
|
||||
if (count($tabPostes)>0) {
|
||||
foreach ($tabPostes as $poste) {
|
||||
if (isset($tabBi[$poste])){
|
||||
$tabData['bilanN'.$poste] = $tabBi[$poste];
|
||||
$tabData['bilanN1'.$poste] = $tabBi[$poste];
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -785,12 +785,12 @@ function bilanN2Data($siren, $nic, $values = false)
|
||||
$tabBilans = $mBil->listeBilans(false, 9);
|
||||
if (count($tabBilans)>0) {
|
||||
$tabBi = findBilan($siren, $tabBilans, $annee);
|
||||
$tabData['bilanNdateCloture'] = $tabBi['DATE_CLOTURE'];
|
||||
$tabData['bilanNdureeMois'] = $tabBi['DUREE_MOIS'];
|
||||
$tabData['bilanN2dateCloture'] = $tabBi['DATE_CLOTURE'];
|
||||
$tabData['bilanN2dureeMois'] = $tabBi['DUREE_MOIS'];
|
||||
if (count($tabPostes)>0) {
|
||||
foreach ($tabPostes as $poste) {
|
||||
if (isset($tabBi[$poste])){
|
||||
$tabData['bilanN'.$poste] = $tabBi[$poste];
|
||||
$tabData['bilanN2'.$poste] = $tabBi[$poste];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user