diff --git a/htdocs/contact/index.php b/htdocs/contact/index.php index a3c36847d43730b23a27887f4a2077ea841fb0fb..3ac9795ae237fdfd913ef2b42a7ce591e4fd867f 100644 --- a/htdocs/contact/index.php +++ b/htdocs/contact/index.php @@ -22,7 +22,7 @@ /** * \file htdocs/contact/index.php * \ingroup societe - * \brief Page liste des contacts + * \brief Page to list all contacts * \version $Id$ */ @@ -296,7 +296,7 @@ if ($result) $contactstatic->firstname=''; $contactstatic->id=$obj->cidp; print $contactstatic->getNomUrl(1,'',20); - print '</td>'; + print '</td>'; // Firstname print '<td>'.dol_trunc($obj->firstname,20).'</td>'; @@ -337,8 +337,11 @@ if ($result) // Private/Public print '<td align="center">'.$contactstatic->LibPubPriv($obj->priv).'</td>'; - // Link export vcard + // Links Add action and Export vcard print '<td align="right">'; + $link='<a href="'.DOL_URL_ROOT.'/comm/action/fiche.php?action=create&backtopage=1&contactid='.$cid.'&socid='.$socid.'">'.img_object($langs->trans("AddAction"),"calendar").'</a>'; + print $link; + print ' '; print '<a href="'.DOL_URL_ROOT.'/contact/vcard.php?id='.$obj->cidp.'">'; print img_picto($langs->trans("VCard"),'vcard.png').' '; print '</a></td>'; diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php index 053ea7bea3096cbbc3ab742dac681e7633c83a34..f4f9bd8994511c8a0ba821243b730c3ee71b4a32 100644 --- a/htdocs/lib/functions.lib.php +++ b/htdocs/lib/functions.lib.php @@ -918,8 +918,8 @@ function dol_print_email($email,$cid=0,$socid=0,$addlink=0,$max=64,$showinvalid= if (($cid || $socid) && $conf->agenda->enabled && $user->rights->agenda->myactions->create) { - $type='AC_EMAIL'; - $link='<a href="'.DOL_URL_ROOT.'/comm/action/fiche.php?action=create&backtopage=1&actioncode='.$type.'&contactid='.$cid.'&socid='.$socid.'">'.img_object($langs->trans("AddAction"),"calendar").'</a>'; + $type='AC_EMAIL'; $link=''; + if (! empty($conf->global->AGENDA_ADDACTIONFOREMAIL)) $link='<a href="'.DOL_URL_ROOT.'/comm/action/fiche.php?action=create&backtopage=1&actioncode='.$type.'&contactid='.$cid.'&socid='.$socid.'">'.img_object($langs->trans("AddAction"),"calendar").'</a>'; $newemail='<table class="nobordernopadding"><tr><td>'.$newemail.' </td><td> '.$link.'</td></tr></table>'; } } @@ -1008,9 +1008,9 @@ function dol_print_phone($phone,$country="FR",$cid=0,$socid=0,$addlink=0,$separ= //if (($cid || $socid) && $conf->agenda->enabled && $user->rights->agenda->myactions->create) if ($conf->agenda->enabled && $user->rights->agenda->myactions->create) { - $type='AC_TEL'; + $type='AC_TEL'; $link=''; if ($addlink == 'AC_FAX') $type='AC_FAX'; - $link='<a href="'.DOL_URL_ROOT.'/comm/action/fiche.php?action=create&backtopage=1&actioncode='.$type.($cid?'&contactid='.$cid:'').($socid?'&socid='.$socid:'').'">'.img_object($langs->trans("AddAction"),"calendar").'</a>'; + if (! empty($conf->global->AGENDA_ADDACTIONFORPHONE)) $link='<a href="'.DOL_URL_ROOT.'/comm/action/fiche.php?action=create&backtopage=1&actioncode='.$type.($cid?'&contactid='.$cid:'').($socid?'&socid='.$socid:'').'">'.img_object($langs->trans("AddAction"),"calendar").'</a>'; $newphone='<table class="nobordernopadding"><tr><td>'.$newphone.' </td><td> '.$link.'</td></tr></table>'; } }