lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2012-07-13 16:13:24 +02:00
commit a953dbd01c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/lib/functions.lib.php
View File

@ -1177,7 +1177,7 @@ function dol_print_phone($phone,$country="FR",$cid=0,$socid=0,$addlink=0,$separ=
if (! empty($addlink)) if (! empty($addlink))
{ {
if (! empty($conf->clicktodial->enabled)) if (! empty($conf->clicktodial->enabled) && $addlink == 'AC_TEL')
{ {
if (empty($user->clicktodial_loaded)) $user->fetch_clicktodial(); if (empty($user->clicktodial_loaded)) $user->fetch_clicktodial();
@ -1201,7 +1201,7 @@ 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 (($cid || $socid) && $conf->agenda->enabled && $user->rights->agenda->myactions->create)
if ($conf->agenda->enabled && $user->rights->agenda->myactions->create) if (! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)
{ {
$type='AC_TEL'; $link=''; $type='AC_TEL'; $link='';
if ($addlink == 'AC_FAX') $type='AC_FAX'; if ($addlink == 'AC_FAX') $type='AC_FAX';