From 588a30fa80bab4113bc4c87f7e0a1580cfa1cf62 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 13 Nov 2013 21:14:11 +0100 Subject: [PATCH] Fix: Bad status --- htdocs/core/lib/company.lib.php | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index 582922cd60e..462db7c3ba3 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -555,10 +555,10 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='') print ''.$langs->trans("PhoneMobile").''; print ''.$langs->trans("Fax").''; print ''.$langs->trans("EMail").''; - if (! empty($conf->skype->enabled)) - { - $colspan++; - print ''.$langs->trans("Skype").''; + if (! empty($conf->skype->enabled)) + { + $colspan++; + print ''.$langs->trans("Skype").''; } print ''.$langs->trans("Status").''; print " "; @@ -592,13 +592,16 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='') while ($i < $num) { $obj = $db->fetch_object($result); + + $contactstatic->id = $obj->rowid; + $contactstatic->lastname = $obj->lastname; + $contactstatic->firstname = $obj->firstname; + $contactstatic->statut=$obj->statut; + $var = !$var; print ""; print ''; - $contactstatic->id = $obj->rowid; - $contactstatic->lastname = $obj->lastname; - $contactstatic->firstname = $obj->firstname; print $contactstatic->getNomUrl(1); print ''; @@ -619,15 +622,14 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='') print ''; print dol_print_email($obj->email,$obj->rowid,$object->id,'AC_EMAIL'); print ''; - if (! empty($conf->skype->enabled)) + if (! empty($conf->skype->enabled)) { print ''; print dol_print_skype($obj->skype,$obj->rowid,$object->id,'AC_SKYPE'); print ''; - } + } - if ($obj->statut==0) print ''.$langs->trans('Disabled').' '.img_picto($langs->trans('StatusContactDraftShort'),'statut0').''; - elseif ($obj->statut==1) print ''.$langs->trans('Enabled').' '.img_picto($langs->trans('StatusContactValidatedShort'),'statut1').''; + print ''.$contactstatic->getLibStatut(5).''; // copy in clipboard $coords = '';