diff --git a/includes/identite/content.php b/includes/identite/content.php index 250b99960..e7bec6721 100644 --- a/includes/identite/content.php +++ b/includes/identite/content.php @@ -114,8 +114,12 @@ if (isset($etab['AutreSiren'])) { $element = formatElement('identite', 'raisonsociale', array($etab['Nom'], $etab['Nom2'], $etab['NomLong'])); if($element!==false){ echo dRow($element['lib'], $element['data'], $element['title']); } +//Nom Commercial +$element = formatElement('identite', 'nomcommercial', array($etab['NomCommercial'])); +if($element!==false){ echo dRow($element['lib'], $element['data'], $element['title']); } + //Enseigne / Sigle -$element = formatElement('identite', 'enseignesigle', array($etab['Enseigne'], $etab['Sigle'], $etab['SigleLong'])); +$element = formatElement('identite', 'enseignesigle', array($etab['Enseigne'], $etab['EnseigneLong'], $etab['Sigle'], $etab['SigleLong'])); if($element!==false){ echo dRow($element['lib'], $element['data'], $element['title']); } // Forme juridique diff --git a/includes/scoresws/identite.php b/includes/scoresws/identite.php index 4e2fed54b..4b83aba98 100644 --- a/includes/scoresws/identite.php +++ b/includes/scoresws/identite.php @@ -198,9 +198,10 @@ function identite_raisonsociale($nom, $nom2, $nomlong) return array( $lib , $data , $title ); } -function identite_enseignesigle($enseigne, $sigle, $siglelong) +function identite_enseignesigle($enseigne, $enseignelong, $sigle, $siglelong) { $lib = ''; + if ($enseigne!='' && $sigle!=''){ $lib='Enseigne / Sigle'; $data=$enseigne.' / '.$sigle; @@ -878,3 +879,14 @@ function identite_saisonnalite($saisonnalite = 0){ return $return; } +function identite_nomcommercial($nom) +{ + $return = false; + if (!empty($nom)){ + $lib = 'Nom Commercial'; + $data = $nom; + $return = array($lib, $data); + } + return $return; +} +