Merge from 1.2

This commit is contained in:
Michael RICOIS 2016-02-18 09:47:52 +00:00
commit 40879d4083

View File

@ -256,7 +256,7 @@ $tabDico = array(
'participations', 'participations',
'annoncetxt', 'annoncetxt',
'groupes', 'groupes',
'etablissements' 'etablissementliste'
), ),
); );
@ -1984,15 +1984,15 @@ function groupesChildren($tab, $level)
return $result; return $result;
} }
function etablissementsEntete() function etablissementlisteEntete()
{ {
return array( return array(
'SIRET', 'etabSIRET',
'SIEGE', 'etabSIEGE',
'ACTIF', 'etabACTIF',
); );
} }
function etablissementsMultiple($siren, $nic, $values = false) function etablissementlisteMultiple($siren, $nic, $values = false)
{ {
global $iDb; global $iDb;
$mInsee = new MInsee($iDb); $mInsee = new MInsee($iDb);
@ -2001,9 +2001,9 @@ function etablissementsMultiple($siren, $nic, $values = false)
if (count($result) > 0) { if (count($result) > 0) {
foreach ($result as $r) { foreach ($result as $r) {
$tabData[] = array( $tabData[] = array(
'SIRET' => $result['Siret'], 'etabSIRET' => $result['Siret'],
'SIEGE' => $result['Siege'], 'etabSIEGE' => $result['Siege'],
'ACTIF' => $result['Actif'], 'etabACTIF' => $result['Actif'],
); );
} }
} }