diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index 8ddf40e2abf..38c87a2e23a 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -530,7 +530,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='') print ''.$langs->trans("Poste").''; print ''.$langs->trans("PhonePro").''; print ''.$langs->trans("PhoneMobile").''; - print ''.$langs->trans("Fax").''; // TODO Fax is obsolete, not used by several companies + print ''.$langs->trans("Fax").''; print ''.$langs->trans("EMail").''; print " "; if (! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create) @@ -578,7 +578,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='') print dol_print_phone($obj->phone_mobile,$country_code,$obj->rowid,$object->id,'AC_TEL'); print ''; print ''; - print dol_print_phone($obj->fax,$country_code,$obj->rowid,$object->id,'AC_FAX'); // TODO Fax is obsolete, not used by several companies + print dol_print_phone($obj->fax,$country_code,$obj->rowid,$object->id,'AC_FAX'); print ''; print ''; print dol_print_email($obj->email,$obj->rowid,$object->id,'AC_EMAIL'); @@ -586,9 +586,14 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='') if (! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create) { - print ''; - print img_object($langs->trans("Rendez-Vous"),"action_rdv"); - print ' '; + print ''; + if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) + { + print ''; + print img_object($langs->trans("Rendez-Vous"),"action_rdv"); + print ' '; + } + print ''; print img_object($langs->trans("Event"),"action"); print ''; }