This commit is contained in:
Michael RICOIS 2013-01-29 15:05:14 +00:00
parent a3bf3e2ef7
commit ea6862b8c1

View File

@ -674,23 +674,23 @@ foreach($tabIdentifiant as $item)
$tabData[$row] = $tabData[$row] + $retour; $tabData[$row] = $tabData[$row] + $retour;
} }
} }
} } else {
//Traitement des libellés génériques
//Traitement des libellés génériques foreach($select['cle'] as $item)
foreach($select as $item) {
{ if ( in_array($item.'Lib', $tabEntete) && isset(${'tab'.ucfirst($item)}) )
if ( in_array($item.'Lib', $tabEntete) && isset(${'tab'.ucfirst($item)}) ) {
{ $retour = 'Non trouvé';
$retour = 'Non trouvé'; $codeFromData = $tabData[$row][$item];
$codeFromData = $tabData[$row][$item]; foreach( ${'tab'.ucfirst($item)} as $code => $label ) {
foreach( ${'tab'.ucfirst($item)} as $code => $label ) { if ( $codeFromData == $code ) {
if ( $codeFromData == $code ) { $retour = $label;
$retour = $label; break;
break; }
} }
} $tabData[$row] = $tabData[$row] + $retour;
$tabData[$row] = $tabData[$row] + $retour; }
} }
} }
} }
} }