diff --git a/includes/scoresws/identite.php b/includes/scoresws/identite.php index a8e086009..44138162b 100644 --- a/includes/scoresws/identite.php +++ b/includes/scoresws/identite.php @@ -631,6 +631,53 @@ function identite_effectif($effectif, $bilan) return array($lib, $data, $title); } +function identite_typeetab($type) +{ + $lib = 'Type d\'Etablissement'; + $output = false; + if(isset($type) && $type!='N/C' && $type!='' ){ + $output = array($lib, $type); + } + return $output; +} + +function identite_statutsconst($StatutsConst, $StatutsConstDepot) +{ + + $lib = 'Dépot des statuts'; + $output = false; + $data = ''; + if(!empty($StatutsConst) && $StatutsConst!='0000-00-00') + { + $data.= 'Constitués le '.WDate::dateT('Y-m-d', 'd/m/Y', $StatutsConst); + } + if(!empty($StatutsConstDepot) && $StatutsConstDepot!='0000-00-00') + { + $data.= ' en dépôt du '.WDate::dateT('Y-m-d', 'd/m/Y', $StatutsConstDepot); + } + if($data!='') $output = array($lib, $data); + + return $output; +} + +function identite_statutsmodif($StatutsModif,$StatutsModifDepot) +{ + $lib = 'Modification des statuts'; + $output = false; + $data = ''; + if(!empty($StatutsModif) && $StatutsModif!='0000-00-00') + { + $data.= 'Modifiés le '.WDate::dateT('Y-m-d', 'd/m/Y', $StatutsModif); + } + + if(!empty($StatutsModifDepot) && $StatutsModifDepot!='0000-00-00') + { + $data.= ' en dépôt du '.WDate::dateT('Y-m-d', 'd/m/Y', $StatutsModifDepot); + } + if($data!='') $output = array($lib, $data); + return $output; +} + function normaliseVoie($voie) { switch (strtoupper($voie)) { case 'BD': case 'BVD': return 'BOULEVARD'; break; diff --git a/includes/scoresws/scoresws.php b/includes/scoresws/scoresws.php index ff7c70811..b9f9919e3 100644 --- a/includes/scoresws/scoresws.php +++ b/includes/scoresws/scoresws.php @@ -32,7 +32,16 @@ function scoresws_identite($siret, $siren, $idEntreprise) function scoresws_identite_ags($siret, $siren, $idEntreprise) { - global $client, $firephp; + global $firephp; + + $client = new SoapClient(null, array( + 'trace' => 1, + 'soap_version' => SOAP_1_1, + 'location' => 'http://78.31.45.206/ws2/', + 'uri' => 'http://78.31.45.206/', + 'login' => $_SESSION['tabInfo']['login'], + 'password' => $_SESSION['tabInfo']['password'], + )); if (($siret*1)==0 || ($siren*1)<100){ $fileName = 'identite-'.$idEntreprise; }else{ $fileName = 'identiteags-'.$siret; } diff --git a/www/pages/identite_60.php b/www/pages/identite_60.php index 7045364d2..c2f3561ae 100644 --- a/www/pages/identite_60.php +++ b/www/pages/identite_60.php @@ -21,9 +21,9 @@ function dRow($lib, $data, $title = '') return $html; } -function searchBlockAnnonces($annonces, $tabAnnonces) +function searchBlockAnnonces($annonces) { - global $firephp; + global $firephp, $tabAnnonces; // : => 2100:2199 Selection de toutes les annonces de 2100 à 2199 // - => 2100-2102 Selection des annonces @@ -60,6 +60,7 @@ function searchBlockAnnonces($annonces, $tabAnnonces) if(array_key_exists($code_even, $tabAnnonces)) { $output_annonces[] = $tabAnnonces[$code_even]; + unset($tabAnnonces[$code_even]); } } } @@ -120,7 +121,8 @@ $etab = scoresws_identite_ags($siret, $siren, $idEntreprise); //Regroupement des annonces suivant le code even $tabAnnonces = array(); -if(count($etab['Annonces'])>0){ +if(count($etab['Annonces'])>0) +{ foreach ($etab['Annonces'] as $key => $annonce) { foreach($annonce['evenements'] as $even) @@ -294,6 +296,18 @@ if($element!==false){ echo dRow($element['lib'], $element['data']); } //Effectif $element = formatElement('identite', 'effectif', array($etab['Effectif'], $etab['Bilan'])); if($element!==false){ echo dRow($element['lib'], $element['data'], $element['title']); } + +//LibTypeEtab +$element = formatElement('identite', 'typeetab', array($etab['LibTypeEtab'])); +if($element!==false){ echo dRow($element['lib'], $element['data']); } + +//Statuts +$element = formatElement('identite', 'statutsconst', array($etab['StatutsConst'],$etab['StatutsConstDepot'])); +if($element!==false){ echo dRow($element['lib'], $element['data']); } + +$element = formatElement('identite', 'statutsmodif', array($etab['StatutsModif'],$etab['StatutsModifDepot'])); +if($element!==false){ echo dRow($element['lib'], $element['data']); } + ?> @@ -316,9 +330,9 @@ if($element!==false){ echo dRow($element['lib'], $element['data'], $element['tit } else { - if (@count($etab['actionnaires'])>0) + if (@count($etab['Actionnaires'])>0) { - foreach ($etab['actionnaires'] as $i=>$lien) + foreach ($etab['Actionnaires'] as $i=>$lien) { if ($lien['Actif']==0) { @@ -343,7 +357,7 @@ if($element!==false){ echo dRow($element['lib'], $element['data'], $element['tit
Néant
+ @@ -454,51 +472,46 @@ if(count($etab['Organes'])>0) $countTypesProcedure = 0; //Procédure de conciliation $annonceSelect = array(); - $annonceSelect = searchBlockAnnonces('1050:1055',$tabAnnonces); + $annonceSelect = searchBlockAnnonces('1050:1055'); $countTypesProcedure+=count($annonceSelect); echo dAnnonces($annonceSelect, $siret); //Procédure de réglement amiable $annonceSelect = array(); - $annonceSelect = searchBlockAnnonces('1207-1209',$tabAnnonces); + $annonceSelect = searchBlockAnnonces('1207-1209'); $countTypesProcedure+=count($annonceSelect); echo dAnnonces($annonceSelect, $siret); //Jugement d'ouverture d'une procédure de sauvegarde $annonceSelect = array(); - $annonceSelect = searchBlockAnnonces('1100-1101-1407-1419-1513-1542-1545-1546',$tabAnnonces); + $annonceSelect = searchBlockAnnonces('1100-1101-1407-1419-1513-1542-1545-1546'); $countTypesProcedure+=count($annonceSelect); echo dAnnonces($annonceSelect, $siret); //Date cessation des paiements $annonceSelect = array(); - $annonceSelect = searchBlockAnnonces('1450',$tabAnnonces); + $annonceSelect = searchBlockAnnonces('1450'); $countTypesProcedure+=count($annonceSelect); echo dAnnonces($annonceSelect, $siret); -//Jugement d'ouverture en redressement judiciaire +//Jugement d'ouverture en redressement judiciaire / Jugement prononçant la liquidation judiciaire $annonceSelect = array(); - $annonceSelect = searchBlockAnnonces('1200-1201-1418-1543-1545-1546-1202',$tabAnnonces); - $countTypesProcedure+=count($annonceSelect); - echo dAnnonces($annonceSelect, $siret); -//Jugement prononçant la liquidation judiciaire - $annonceSelect = array(); - $annonceSelect = searchBlockAnnonces('1300-1301-1305-1308-1302-1306-1307-1304-1309-1312-1417-1541-1544-1545-1546',$tabAnnonces); + $annonceSelect = searchBlockAnnonces('1200-1201-1418-1541-1543-1544-1545-1546-1202-1300-1301-1305-1308-1302-1306-1307-1304-1309-1312-1417'); $countTypesProcedure+=count($annonceSelect); echo dAnnonces($annonceSelect, $siret); //Jugement de cession prononcé le $annonceSelect = array(); - $annonceSelect = searchBlockAnnonces('1313-1212',$tabAnnonces); + $annonceSelect = searchBlockAnnonces('1313-1212'); $countTypesProcedure+=count($annonceSelect); echo dAnnonces($annonceSelect, $siret); //Plan de redressement $annonceSelect = array(); - $annonceSelect = searchBlockAnnonces('1414-1407-1509-1421',$tabAnnonces); + $annonceSelect = searchBlockAnnonces('1414-1407-1509-1421'); echo dAnnonces($annonceSelect, $siret); //Plan de continuation $annonceSelect = array(); - $annonceSelect = searchBlockAnnonces('1413-1405-1512',$tabAnnonces); + $annonceSelect = searchBlockAnnonces('1413-1405-1512'); $countTypesProcedure+=count($annonceSelect); echo dAnnonces($annonceSelect, $siret); //Plan de cession $annonceSelect = array(); - $annonceSelect = searchBlockAnnonces('1425-1411-1407-1408-1415-1416-1511',$tabAnnonces); + $annonceSelect = searchBlockAnnonces('1425-1411-1407-1408-1415-1416-1511'); $countTypesProcedure+=count($annonceSelect); echo dAnnonces($annonceSelect, $siret); @@ -508,7 +521,7 @@ $countTypesProcedure = 0;Néant
'; @@ -517,7 +530,7 @@ $countTypesProcedure = 0;Néant
'; ?> @@ -525,7 +538,7 @@ $countTypesProcedure = 0;Néant
'; ?> @@ -533,10 +546,14 @@ $countTypesProcedure = 0;Néant
'; ?> +Néant
'; +?> \ No newline at end of file