diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php index f9edbb47c052da015a43d3b240f300e41f439dcf..59b2e6c0a8057b10af64754fe640fcf4330bdf49 100644 --- a/htdocs/comm/action/fiche.php +++ b/htdocs/comm/action/fiche.php @@ -56,7 +56,8 @@ $contactid=GETPOST('contactid','int'); $socid = GETPOST('socid','int'); $id = GETPOST('id','int'); if ($user->societe_id) $socid=$user->societe_id; -$result = restrictedArea($user, 'agenda', $id, 'actioncomm&societe', 'myactions&allactions', '', 'id'); +$result = restrictedArea($user,'societe',$id,'&societe'); +//$result = restrictedArea($user, 'agenda', $id, 'actioncomm&societe', 'myactions&allactions', '', 'id'); $error=GETPOST("error"); $mesg=''; diff --git a/htdocs/core/lib/images.lib.php b/htdocs/core/lib/images.lib.php index 9df392a66eba8f9d5362a0f3f1b4f68e73769500..7dea7357535788e5007f6e1859ca52a23664cbb0 100644 --- a/htdocs/core/lib/images.lib.php +++ b/htdocs/core/lib/images.lib.php @@ -65,16 +65,21 @@ function image_format_supported($file) * Return size of image file on disk (Supported extensions are gif, jpg, png and bmp) * * @param string $file Full path name of file + * @param bool $url Image with url (true or false) * @return array array('width'=>width, 'height'=>height) */ -function dol_getImageSize($file) +function dol_getImageSize($file, $url = false) { $ret=array(); if (image_format_supported($file) < 0) return $ret; - $fichier = realpath($file); // Chemin canonique absolu de l'image - $dir = dirname($file); // Chemin du dossier contenant l'image + $fichier = $file; + if (!$url) + { + $fichier = realpath($file); // Chemin canonique absolu de l'image + $dir = dirname($file); // Chemin du dossier contenant l'image + } $infoImg = getimagesize($fichier); // Recuperation des infos de l'image $ret['width']=$infoImg[0]; // Largeur de l'image diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php index 104114ed10a6c111103ca711d4fb009c39ada6d2..d6d135edc4a062cbc8c5f9776f2e21a27998ff55 100644 --- a/htdocs/core/lib/pdf.lib.php +++ b/htdocs/core/lib/pdf.lib.php @@ -261,13 +261,14 @@ function pdf_getPDFFontSize($outputlangs) * Return height to use for Logo onot PDF * * @param string $logo Full path to logo file to use + * @param bool $url Image with url (true or false) * @return number */ -function pdf_getHeightForLogo($logo) +function pdf_getHeightForLogo($logo, $url = false) { $height=22; $maxwidth=130; include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; - $tmp=dol_getImageSize($logo); + $tmp=dol_getImageSize($logo, $url); if ($tmp['height']) { $width=round($height*$tmp['width']/$tmp['height']); diff --git a/htdocs/index.php b/htdocs/index.php index 26a13b9d20c87b0dde563854cfb58af63423be6b..44aa2c6005ca34eddcf1c5e77af61b494f0554fb 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -106,6 +106,7 @@ print "</table>\n"; $langs->load("commercial"); $langs->load("bills"); $langs->load("orders"); +$langs->load("contracts"); //print memory_get_usage(); if ($user->societe_id == 0) diff --git a/htdocs/theme/amarok/style.css.php b/htdocs/theme/amarok/style.css.php index 195fed98facb2e1b66045a668fc82601139c8785..2866da544113b468120a19ea7e8c84e8bc5e6b7b 100755 --- a/htdocs/theme/amarok/style.css.php +++ b/htdocs/theme/amarok/style.css.php @@ -957,7 +957,7 @@ a.tabTitle img { } a.tab { - padding: 5px 12px 5px; + padding: 5px 12px 2px; margin: 0em 0.2em; background-color:rgba(0,0,0,.2); color:#666666;