|
@@ -489,7 +489,7 @@ foreach ($search_array_options as $key => $val)
|
|
|
$crit=$val;
|
|
|
$tmpkey=preg_replace('/search_options_/','',$key);
|
|
|
if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
|
|
|
-}
|
|
|
+}
|
|
|
|
|
|
// Show delete result message
|
|
|
if (GETPOST('delsoc'))
|
|
@@ -599,9 +599,9 @@ if (! empty($arrayfields['s.fk_stcomm']['checked'])) print_liste_field_titr
|
|
|
// Extra fields
|
|
|
if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
|
|
|
{
|
|
|
- foreach($extrafields->attribute_label as $key => $val)
|
|
|
+ foreach($extrafields->attribute_label as $key => $val)
|
|
|
{
|
|
|
- if (! empty($arrayfields["ef.".$key]['checked']))
|
|
|
+ if (! empty($arrayfields["ef.".$key]['checked']))
|
|
|
{
|
|
|
$align=$extrafields->getAlignFlag($key);
|
|
|
print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
|
|
@@ -797,9 +797,9 @@ if (! empty($arrayfields['s.fk_stcomm']['checked']))
|
|
|
// Extra fields
|
|
|
if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
|
|
|
{
|
|
|
- foreach($extrafields->attribute_label as $key => $val)
|
|
|
+ foreach($extrafields->attribute_label as $key => $val)
|
|
|
{
|
|
|
- if (! empty($arrayfields["ef.".$key]['checked']))
|
|
|
+ if (! empty($arrayfields["ef.".$key]['checked']))
|
|
|
{
|
|
|
$align=$extrafields->getAlignFlag($key);
|
|
|
$typeofextrafield=$extrafields->attribute_type[$key];
|
|
@@ -854,7 +854,7 @@ while ($i < min($num, $limit))
|
|
|
{
|
|
|
$obj = $db->fetch_object($resql);
|
|
|
$var=!$var;
|
|
|
-
|
|
|
+
|
|
|
$companystatic->id=$obj->rowid;
|
|
|
$companystatic->name=$obj->name;
|
|
|
$companystatic->canvas=$obj->canvas;
|
|
@@ -865,7 +865,7 @@ while ($i < min($num, $limit))
|
|
|
$companystatic->code_fournisseur=$obj->code_fournisseur;
|
|
|
$companystatic->fk_prospectlevel=$obj->fk_prospectlevel;
|
|
|
$companystatic->name_alias=$obj->name_alias;
|
|
|
-
|
|
|
+
|
|
|
print "<tr ".$bc[$var].">";
|
|
|
if (! empty($arrayfields['s.nom']['checked']))
|
|
|
{
|
|
@@ -907,12 +907,12 @@ while ($i < min($num, $limit))
|
|
|
if (! empty($arrayfields['s.zip']['checked']))
|
|
|
{
|
|
|
print "<td>".$obj->zip."</td>\n";
|
|
|
- }
|
|
|
+ }
|
|
|
// State
|
|
|
if (! empty($arrayfields['state.nom']['checked']))
|
|
|
{
|
|
|
print "<td>".$obj->state_name."</td>\n";
|
|
|
- }
|
|
|
+ }
|
|
|
// Country
|
|
|
if (! empty($arrayfields['country.code_iso']['checked']))
|
|
|
{
|
|
@@ -925,7 +925,7 @@ while ($i < min($num, $limit))
|
|
|
if (! empty($arrayfields['typent.code']['checked']))
|
|
|
{
|
|
|
print '<td align="center">';
|
|
|
- if (count($typenArray)==0) $typenArray = $formcompany->typent_array(1);
|
|
|
+ if (! is_array($typenArray) || count($typenArray)==0) $typenArray = $formcompany->typent_array(1);
|
|
|
print $typenArray[$obj->typent_code];
|
|
|
print '</td>';
|
|
|
}
|