From 27ff111e51ab11859c765a60dc98f71d103d482d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= <rdoursenaud@gpcsolutions.fr>
Date: Thu, 26 Apr 2012 15:47:21 +0200
Subject: [PATCH 1/3] =?UTF-8?q?Typo:=20instantan=C3=A9e=20ne=20prend=20qu'?=
 =?UTF-8?q?un=20n.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/langs/fr_FR/main.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index 81484ba7c2e..7102d977e92 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -603,7 +603,7 @@ Before=Avant
 After=Après
 IPAddress=Adresse IP
 Frequency=Fréquence
-IM=Messagerie instantannée
+IM=Messagerie instantanée
 NewAttribute=Nouvel attribut
 AttributeCode=Code de l'attribut
 OptionalFieldsSetup=Configuration des attributs complémentaires

From 412cbf2dfd6b073d1d840467c3b40e613f405dd5 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Mon, 7 May 2012 11:15:14 +0200
Subject: [PATCH 2/3] Fix: wrong permission

---
 htdocs/user/perms.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index 3cb1abffccb..0ee185c0432 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -46,7 +46,7 @@ if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS))
 {
 	$canreaduser=($user->admin || ($user->rights->user->user->lire && $user->rights->user->user_advance->readperms));
 	$caneditselfperms=($user->id == $id && $user->rights->user->self_advance->writeperms);
-	$caneditperms = (($caneditperms || $caneditselfperms) ? 0 : 1);
+	$caneditperms = (($caneditperms || $caneditselfperms) ? 1 : 0);
 }
 
 // Security check

From bfb102db18c3309de5ef24bb22d6224210567432 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Mon, 7 May 2012 17:05:15 +0200
Subject: [PATCH 3/3] Fix: add MAIN_HIDE_LEFT_MENU

---
 htdocs/main.inc.php | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 1d76e6782c1..e1705991b30 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -777,13 +777,15 @@ if (! function_exists("llxHeader"))
      * @param	string	$morequerystring	Query string to add to the link "print" to get same parameters (use only if autodetect fails)
      * @return	void
      */
-    function llxHeader($head = '', $title='', $help_url='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='', $morequerystring='')
-    {
-        top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);	// Show html headers
-        top_menu($head, $title, $target, $disablejs, $disablehead, $arrayofjs, $arrayofcss, $morequerystring);
-        left_menu('', $help_url, '', '', 1, $title);
-        main_area($title);
-    }
+	function llxHeader($head = '', $title='', $help_url='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='', $morequerystring='')
+	{
+		top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);	// Show html headers
+		top_menu($head, $title, $target, $disablejs, $disablehead, $arrayofjs, $arrayofcss, $morequerystring);
+		if (empty($conf->global->MAIN_HIDE_LEFT_MENU)) {
+			left_menu('', $help_url, '', '', 1, $title);
+		}
+		main_area($title);
+	}
 }
 
 
@@ -1172,11 +1174,10 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
 
     /*
      * Top menu
-    */
+     */
     $top_menu=empty($conf->browser->phone)?$conf->top_menu:$conf->smart_menu;
     if (GETPOST('menu')) $top_menu=GETPOST('menu'); // menu=eldy_backoffice.php
 
-    // Load the top menu manager
     // Load the top menu manager (only if not already done)
     if (! class_exists('MenuTop'))
     {