diff --git a/htdocs/actioncomm.class.php b/htdocs/actioncomm.class.php
index e7c7247e658..64d1007e46c 100644
--- a/htdocs/actioncomm.class.php
+++ b/htdocs/actioncomm.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2002-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -390,12 +391,15 @@ class ActionComm
 
         $this->nbtodo=$this->nbtodolate=0;
         $sql = "SELECT a.id, a.datep as dp";
-        if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", sc.fk_soc, sc.fk_user";
         $sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as a";
-        if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+        $sql.= ", ".MAIN_DB_PREFIX."societe as s";
+        if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
         $sql.= " WHERE a.percent < 100";
+        $sql.= " AND a.fk_soc = s.rowid";
+        $sql.= " AND s.entity = ".$conf->entity;
         if ($user->societe_id) $sql.=" AND a.fk_soc = ".$user->societe_id;
-        if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= " AND a.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
+        if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND a.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
+        
         $resql=$this->db->query($sql);
         if ($resql)
         {
diff --git a/htdocs/adherents/adherent.class.php b/htdocs/adherents/adherent.class.php
index 7708318e6b8..0a6bda9600a 100644
--- a/htdocs/adherents/adherent.class.php
+++ b/htdocs/adherents/adherent.class.php
@@ -1721,9 +1721,11 @@ class Adherent extends CommonObject
 		if ($user->societe_id) return -1;   // protection pour eviter appel par utilisateur externe
 
 		$this->nbtodo=$this->nbtodolate=0;
+		
 		$sql = "SELECT a.rowid, a.datefin";
 		$sql.= " FROM ".MAIN_DB_PREFIX."adherent as a";
 		$sql.= " WHERE a.statut=1";
+		
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
diff --git a/htdocs/admin/adherent.php b/htdocs/admin/adherent.php
index 1cf51a46f59..c2ec209dec1 100644
--- a/htdocs/admin/adherent.php
+++ b/htdocs/admin/adherent.php
@@ -43,7 +43,7 @@ $typeconst=array('yesno','texte','chaine');
 // Action mise a jour ou ajout d'une constante
 if ($_POST["action"] == 'update' || $_POST["action"] == 'add')
 {
-	$result=dolibarr_set_const($db, $_POST["constname"],$_POST["constvalue"],$typeconst[$_POST["consttype"]],0,isset($_POST["constnote"])?$_POST["constnote"]:'');
+	$result=dolibarr_set_const($db, $_POST["constname"],$_POST["constvalue"],$typeconst[$_POST["consttype"]],0,isset($_POST["constnote"])?$_POST["constnote"]:'',$conf->entity);
 	if ($result < 0)
 	{
 		print $db->error();
@@ -53,7 +53,7 @@ if ($_POST["action"] == 'update' || $_POST["action"] == 'add')
 // Action activation d'un sous module du module adherent
 if ($_GET["action"] == 'set')
 {
-	$result=dolibarr_set_const($db, $_GET["name"],$_GET["value"]);
+	$result=dolibarr_set_const($db, $_GET["name"],$_GET["value"],'',0,'',$conf->entity);
 	if ($result < 0)
 	{
 		print $db->error();
@@ -63,7 +63,7 @@ if ($_GET["action"] == 'set')
 // Action desactivation d'un sous module du module adherent
 if ($_GET["action"] == 'unset')
 {
-	$result=dolibarr_del_const($db,$_GET["name"]);
+	$result=dolibarr_del_const($db,$_GET["name"],$conf->entity);
 	if ($result < 0)
 	{
 		print $db->error();
diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php
index e0dd2cbbd52..2c935fd5d2b 100644
--- a/htdocs/admin/agenda.php
+++ b/htdocs/admin/agenda.php
@@ -73,8 +73,8 @@ if ($action == "save")
 	{
 		$param='MAIN_AGENDA_ACTIONAUTO_'.$arr['id'];
 		//print "param=".$param." - ".$_POST[$param];
-		if (! empty($_POST[$param])) dolibarr_set_const($db,$param,$_POST[$param],'chaine',0);
-		else dolibarr_del_const($db,$param);
+		if (! empty($_POST[$param])) dolibarr_set_const($db,$param,$_POST[$param],'chaine',0,'',$conf->entity);
+		else dolibarr_del_const($db,$param,$conf->entity);
 	}
 	
     $db->commit();
diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php
index 4e2bea89d45..b5542297e38 100644
--- a/htdocs/admin/agenda_xcal.php
+++ b/htdocs/admin/agenda_xcal.php
@@ -45,7 +45,7 @@ if ($actionsave)
 
     $db->begin();
     
-    $i+=dolibarr_set_const($db,'MAIN_AGENDA_XCAL_EXPORTKEY',trim($_POST["MAIN_AGENDA_XCAL_EXPORTKEY"]),'chaine',0);
+    $i+=dolibarr_set_const($db,'MAIN_AGENDA_XCAL_EXPORTKEY',trim($_POST["MAIN_AGENDA_XCAL_EXPORTKEY"]),'chaine',0,'',$conf->entity);
 
     if ($i > 0)
     {
diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php
index afded12b260..d075b08b581 100644
--- a/htdocs/admin/barcode.php
+++ b/htdocs/admin/barcode.php
@@ -46,20 +46,20 @@ if ($_POST["action"] == 'setcoder')
 }
 else if ($_POST["action"] == 'setgenbarcodelocation')
 {
-	dolibarr_set_const($db, "GENBARCODE_LOCATION",$_POST["genbarcodelocation"]);
+	dolibarr_set_const($db, "GENBARCODE_LOCATION",$_POST["genbarcodelocation"],'chaine',0,'',$conf->entity);
 }
 else if ($_POST["action"] == 'setdefaultbarcodetype')
 {
-	dolibarr_set_const($db, "PRODUIT_DEFAULT_BARCODE_TYPE", $_POST["coder_id"]);
+	dolibarr_set_const($db, "PRODUIT_DEFAULT_BARCODE_TYPE", $_POST["coder_id"],'chaine',0,'',$conf->entity);
 }
 else if ($_POST["action"] == 'GENBARCODE_BARCODETYPE_THIRDPARTY')
 {
-	dolibarr_set_const($db, "GENBARCODE_BARCODETYPE_THIRDPARTY", $_POST["coder_id"]);
+	dolibarr_set_const($db, "GENBARCODE_BARCODETYPE_THIRDPARTY", $_POST["coder_id"],'chaine',0,'',$conf->entity);
 }
 /*
  else if ($_POST["action"] == 'setproductusebarcode')
  {
- dolibarr_set_const($db, "PRODUIT_USE_BARCODE",$_POST["value"]);
+ dolibarr_set_const($db, "PRODUIT_USE_BARCODE",$_POST["value"],'chaine',0,'',$conf->entity);
  Header("Location: barcode.php");
  exit;
  }
diff --git a/htdocs/admin/bookmark.php b/htdocs/admin/bookmark.php
index f8db67eaaac..b4ae3d904ac 100644
--- a/htdocs/admin/bookmark.php
+++ b/htdocs/admin/bookmark.php
@@ -34,7 +34,7 @@ if (!$user->admin)
 
 if ($_POST["action"] == 'setvalue' && $user->admin)
 {
-	$result=dolibarr_set_const($db, "BOOKMARKS_SHOW_IN_MENU",$_POST["BOOKMARKS_SHOW_IN_MENU"]);
+	$result=dolibarr_set_const($db, "BOOKMARKS_SHOW_IN_MENU",$_POST["BOOKMARKS_SHOW_IN_MENU"],'chaine',0,'',$conf->entity);
   	if ($result >= 0)
   	{
   		$mesg='<div class="ok">'.$langs->trans("SetupSaved").'</div>';
diff --git a/htdocs/admin/boutique.php b/htdocs/admin/boutique.php
index c7a63ce7f8e..13ed245f6b3 100644
--- a/htdocs/admin/boutique.php
+++ b/htdocs/admin/boutique.php
@@ -45,28 +45,28 @@ if (!$user->admin)
 
 if ($_POST["save"])
 {
-    $db->begin();
+	$db->begin();
 
-    $i=0;
+  $i=0;
     
-    $i+=dolibarr_set_const($db,'OSC_DB_HOST',trim($_POST["oscommerce_dbhost"]),'chaine',0);
-    $i+=dolibarr_set_const($db,'OSC_DB_NAME',trim($_POST["oscommerce_dbname"]),'chaine',0);
-    $i+=dolibarr_set_const($db,'OSC_DB_USER',trim($_POST["oscommerce_dbuser"]),'chaine',0);
-    $i+=dolibarr_set_const($db,'OSC_DB_PASS',trim($_POST["oscommerce_dbpass"]),'chaine',0);
-	$i+=dolibarr_set_const($db,'OSC_DB_TABLE_PREFIX',trim($_POST["oscommerce_db_table_prefix"]),'chaine',0); 
-  	$i+=dolibarr_set_const($db,'OSC_LANGUAGE_ID',1,'chaine',0);
+  $i+=dolibarr_set_const($db,'OSC_DB_HOST',trim($_POST["oscommerce_dbhost"]),'chaine',0,'',$conf->entity);
+  $i+=dolibarr_set_const($db,'OSC_DB_NAME',trim($_POST["oscommerce_dbname"]),'chaine',0,'',$conf->entity);
+  $i+=dolibarr_set_const($db,'OSC_DB_USER',trim($_POST["oscommerce_dbuser"]),'chaine',0,'',$conf->entity);
+  $i+=dolibarr_set_const($db,'OSC_DB_PASS',trim($_POST["oscommerce_dbpass"]),'chaine',0,'',$conf->entity);
+	$i+=dolibarr_set_const($db,'OSC_DB_TABLE_PREFIX',trim($_POST["oscommerce_db_table_prefix"]),'chaine',0,'',$conf->entity); 
+  $i+=dolibarr_set_const($db,'OSC_LANGUAGE_ID',1,'chaine',0,'',$conf->entity);
   
-    if ($i >= 4)
-    {
-        $db->commit();
-        $mesg = "<font class=\"ok\">".$langs->trans("OSCommerceSetupSaved")."</font>";
-    }
-    else
-    {
-        $db->rollback();
-        header("Location: ".$_SERVER["PHP_SELF"]);
-        exit;
-    }
+  if ($i >= 4)
+  {
+  	$db->commit();
+    $mesg = "<font class=\"ok\">".$langs->trans("OSCommerceSetupSaved")."</font>";
+  }
+  else
+  {
+  	$db->rollback();
+    header("Location: ".$_SERVER["PHP_SELF"]);
+    exit;
+  }
 }
 elseif ($_POST["test"])
 {
diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php
index 372d107ba21..a04c4c92904 100644
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@@ -42,39 +42,39 @@ $boxes = array();
  */
 if ((isset($_POST["action"]) && $_POST["action"] == 'addconst'))
 {
-    dolibarr_set_const($db, "MAIN_BOXES_MAXLINES",$_POST["MAIN_BOXES_MAXLINES"]);
+    dolibarr_set_const($db, "MAIN_BOXES_MAXLINES",$_POST["MAIN_BOXES_MAXLINES"],'',0,'',$conf->entity);
 }
 
 if ($_POST["action"] == 'add')
 {
 	$sql = "SELECT rowid";
-    $sql.= " FROM ".MAIN_DB_PREFIX."boxes";
-    $sql.= " WHERE fk_user=0 AND box_id=".$_POST["boxid"]." AND position=".$_POST["pos"];
-    $resql = $db->query($sql);
-    dol_syslog("boxes.php::search if box active sql=".$sql);
+  $sql.= " FROM ".MAIN_DB_PREFIX."boxes";
+  $sql.= " WHERE fk_user=0 AND box_id=".$_POST["boxid"]." AND position=".$_POST["pos"];
+  $resql = $db->query($sql);
+  dol_syslog("boxes.php::search if box active sql=".$sql);
 	if ($resql)
-    {
-	    $num = $db->num_rows($resql);
-	    if ($num == 0)
-	    {
-			$db->begin();
+  {
+  	$num = $db->num_rows($resql);
+	  if ($num == 0)
+	  {
+	  	$db->begin();
 
 			// Si la boite n'est pas deja active, insert with box_order=''
-	        $sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes (box_id, position, box_order, fk_user) values (".$_POST["boxid"].",".$_POST["pos"].", '', 0)";
+	    $sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes (box_id, position, box_order, fk_user) values (".$_POST["boxid"].",".$_POST["pos"].", '', 0)";
 			dol_syslog("boxes.php activate box sql=".$sql);
-	        $resql = $db->query($sql);
+	    $resql = $db->query($sql);
 
-		    // Remove all personalized setup when a box is activated or disabled
+		  // Remove all personalized setup when a box is activated or disabled
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_param";
-		    $sql.= " WHERE param like 'MAIN_BOXES_%'";
+		  $sql.= " WHERE param like 'MAIN_BOXES_%'";
 			dol_syslog("boxes.php delete user_param sql=".$sql);
-		    $resql = $db->query($sql);
+		  $resql = $db->query($sql);
 
 			$db->commit();
 		}
 		
-	    Header("Location: boxes.php");
-	    exit;
+		Header("Location: boxes.php");
+	  exit;
 	}
 	else
 	{
@@ -86,49 +86,49 @@ if ($_GET["action"] == 'delete')
 {
 	$db->begin();
 	
-    $sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes";
-    $sql.= " WHERE rowid=".$_GET["rowid"];
-    $resql = $db->query($sql);
+  $sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes";
+  $sql.= " WHERE rowid=".$_GET["rowid"];
+  $resql = $db->query($sql);
 
-    // Remove all personalized setup when a box is activated or disabled
-    $sql = "DELETE FROM ".MAIN_DB_PREFIX."user_param";
-    $sql.= " WHERE param like 'MAIN_BOXES_%'";
-    $resql = $db->query($sql);
+  // Remove all personalized setup when a box is activated or disabled
+  $sql = "DELETE FROM ".MAIN_DB_PREFIX."user_param";
+  $sql.= " WHERE param like 'MAIN_BOXES_%'";
+  $resql = $db->query($sql);
 
 	$db->commit();
 }
 
 if ($_GET["action"] == 'switch')
 {
-    // On permute les valeur du champ box_order des 2 lignes de la table boxes
-    $db->begin();
+	// On permute les valeur du champ box_order des 2 lignes de la table boxes
+  $db->begin();
 
-    $objfrom=new ModeleBoxes($db);
-    $objfrom->fetch($_GET["switchfrom"]);
-
-    $objto=new ModeleBoxes($db);
-    $objto->fetch($_GET["switchto"]);
+  $objfrom=new ModeleBoxes($db);
+  $objfrom->fetch($_GET["switchfrom"]);
+  
+  $objto=new ModeleBoxes($db);
+  $objto->fetch($_GET["switchto"]);
     
-    if (is_object($objfrom) && is_object($objto))
-    {
-        $sql="UPDATE ".MAIN_DB_PREFIX."boxes set box_order='".$objto->box_order."' WHERE rowid=".$objfrom->rowid;
+  if (is_object($objfrom) && is_object($objto))
+  {
+  	$sql="UPDATE ".MAIN_DB_PREFIX."boxes set box_order='".$objto->box_order."' WHERE rowid=".$objfrom->rowid;
 		//print "xx".$sql;
-        $resultupdatefrom = $db->query($sql);
-        if (! $resultupdatefrom) { dol_print_error($db); }
-        $sql="UPDATE ".MAIN_DB_PREFIX."boxes set box_order='".$objfrom->box_order."' WHERE rowid=".$objto->rowid;
+    $resultupdatefrom = $db->query($sql);
+    if (! $resultupdatefrom) { dol_print_error($db); }
+    $sql="UPDATE ".MAIN_DB_PREFIX."boxes set box_order='".$objfrom->box_order."' WHERE rowid=".$objto->rowid;
 		//print "xx".$sql;
-        $resultupdateto = $db->query($sql);
-        if (! $resultupdateto) { dol_print_error($db); }
-    }
+    $resultupdateto = $db->query($sql);
+    if (! $resultupdateto) { dol_print_error($db); }
+   }
 
-    if ($resultupdatefrom && $resultupdateto)
-    {
-        $db->commit();
-    }
-    else
-    {
-        $db->rollback();
-    }
+   if ($resultupdatefrom && $resultupdateto)
+   {
+   	 $db->commit();
+   }
+   else
+   {
+   	 $db->rollback();
+   }
 
 }
 
@@ -147,10 +147,12 @@ print $langs->trans("BoxesDesc")." ".$langs->trans("OnlyActiveElementsAreShown")
 $actives = array();
 
 $sql = "SELECT b.rowid, b.box_id, b.position, b.box_order,";
-$sql.= " d.rowid as boxid";
-$sql.= " FROM ".MAIN_DB_PREFIX."boxes as b, ".MAIN_DB_PREFIX."boxes_def as d";
-$sql.= " WHERE b.box_id = d.rowid AND fk_user=0";
-$sql.= " ORDER by position, box_order";
+$sql.= " bd.rowid as boxid";
+$sql.= " FROM ".MAIN_DB_PREFIX."boxes as b, ".MAIN_DB_PREFIX."boxes_def as bd";
+$sql.= " WHERE b.box_id = bd.rowid";
+$sql.= " AND bd.entity = ".$conf->entity;
+$sql.= " AND b.fk_user=0";
+$sql.= " ORDER by b.position, b.box_order";
 
 $resql = $db->query($sql);
 if ($resql)
@@ -243,6 +245,7 @@ print "</tr>\n";
 
 $sql = "SELECT rowid, file, note, tms";
 $sql.= " FROM ".MAIN_DB_PREFIX."boxes_def";
+$sql.= " WHERE entity = ".$conf->entity;
 $resql = $db->query($sql);
 $var=True;
 
@@ -316,11 +319,12 @@ print '<td align="center" width="80">'.$langs->trans("Disable").'</td>';
 print "</tr>\n";
 
 $sql = "SELECT b.rowid, b.box_id, b.position,";
-$sql.= " d.file, d.note, d.tms";
-$sql.= " FROM ".MAIN_DB_PREFIX."boxes as b, ".MAIN_DB_PREFIX."boxes_def as d";
-$sql.= " WHERE b.box_id = d.rowid";
+$sql.= " bd.file, bd.note, bd.tms";
+$sql.= " FROM ".MAIN_DB_PREFIX."boxes as b, ".MAIN_DB_PREFIX."boxes_def as bd";
+$sql.= " WHERE b.box_id = bd.rowid";
+$sql.= " AND bd.entity = ".$conf->entity;
 $sql.= " AND b.fk_user=0";
-$sql.= " ORDER by position, box_order";	// Note box_order return A01,A03...,B02,B04...
+$sql.= " ORDER by b.position, b.box_order";	// Note box_order return A01,A03...,B02,B04...
 
 $resql = $db->query($sql);
 
diff --git a/htdocs/admin/cashdesk.php b/htdocs/admin/cashdesk.php
index 10c513cd061..95d5c3f0929 100644
--- a/htdocs/admin/cashdesk.php
+++ b/htdocs/admin/cashdesk.php
@@ -43,9 +43,9 @@ if ($_POST["action"] == 'set')
 	if ($_POST["CASHDESK_ID_WAREHOUSE"] < 0)  $_POST["CASHDESK_ID_WAREHOUSE"]='';
 	if ($_POST["CASHDESK_ID_BANKACCOUNT"] < 0)  $_POST["CASHDESK_ID_BANKACCOUNT"]='';
 	
-	dolibarr_set_const($db,"CASHDESK_ID_THIRDPARTY",$_POST["CASHDESK_ID_THIRDPARTY"]);
-	dolibarr_set_const($db,"CASHDESK_ID_BANKACCOUNT",$_POST["CASHDESK_ID_BANKACCOUNT"]);
-	dolibarr_set_const($db,"CASHDESK_ID_WAREHOUSE",$_POST["CASHDESK_ID_WAREHOUSE"]);
+	dolibarr_set_const($db,"CASHDESK_ID_THIRDPARTY",$_POST["CASHDESK_ID_THIRDPARTY"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db,"CASHDESK_ID_BANKACCOUNT",$_POST["CASHDESK_ID_BANKACCOUNT"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db,"CASHDESK_ID_WAREHOUSE",$_POST["CASHDESK_ID_WAREHOUSE"],'chaine',0,'',$conf->entity);
 	
 	dol_syslog("admin/cashdesk: level ".$_POST["level"]);
 }
diff --git a/htdocs/admin/clicktodial.php b/htdocs/admin/clicktodial.php
index 919a6c2c443..a3af735a1b7 100644
--- a/htdocs/admin/clicktodial.php
+++ b/htdocs/admin/clicktodial.php
@@ -34,7 +34,7 @@ if (!$user->admin)
 
 if ($_POST["action"] == 'setvalue' && $user->admin)
 {
-	$result=dolibarr_set_const($db, "CLICKTODIAL_URL",$_POST["url"]);
+	$result=dolibarr_set_const($db, "CLICKTODIAL_URL",$_POST["url"],'chaine',0,'',$conf->entity);
   	if ($result >= 0)
   	{
   		$mesg='<div class="ok">'.$langs->trans("Success").'</div>';
diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index a1f58753dfa..be92b4aeb37 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -1,11 +1,11 @@
 <?php
-/* Copyright (C) 2003-2006 Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2004      Sebastien Di Cintio  <sdicintio@ressource-toi.org>
- * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
- * Copyright (C) 2004      Andre Cianfarani     <acianfa@free.fr>
- * Copyright (C) 2005-2007 Regis Houssin        <regis.houssin@dolibarr.fr>
- * Copyright (C) 2008 	Raphael Bertrand (Resultic)  <raphael.bertrand@resultic.fr>
+/* Copyright (C) 2003-2006 Rodolphe Quiedeville	        <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2009 Laurent Destailleur          <eldy@users.sourceforge.net>
+ * Copyright (C) 2004      Sebastien Di Cintio          <sdicintio@ressource-toi.org>
+ * Copyright (C) 2004      Benoit Mortier               <benoit.mortier@opensides.be>
+ * Copyright (C) 2004      Andre Cianfarani             <acianfa@free.fr>
+ * Copyright (C) 2005-2009 Regis Houssin                <regis.houssin@dolibarr.fr>
+ * Copyright (C) 2008 	   Raphael Bertrand (Resultic)  <raphael.bertrand@resultic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -49,7 +49,7 @@ if ($_POST["action"] == 'updateMask')
 {
 	$maskconstorder=$_POST['maskconstorder'];
 	$maskorder=$_POST['maskorder'];
-	if ($maskconstorder)  dolibarr_set_const($db,$maskconstorder,$maskorder);
+	if ($maskconstorder)  dolibarr_set_const($db,$maskconstorder,$maskorder,'chaine',0,'',$conf->entity);
 }
 
 if ($_GET["action"] == 'specimen')
@@ -90,7 +90,7 @@ if ($_GET["action"] == 'specimen')
 if ($_GET["action"] == 'set')
 {
 	$type='order';
-	$sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type) VALUES ('".$_GET["value"]."','".$type."')";
+	$sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES ('".$_GET["value"]."','".$type."',".$conf->entity.")";
 	if ($db->query($sql))
 	{
 
@@ -101,7 +101,10 @@ if ($_GET["action"] == 'del')
 {
 	$type='order';
 	$sql = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
-	$sql .= "  WHERE nom = '".$_GET["value"]."' AND type = '".$type."'";
+	$sql.= " WHERE nom = '".$_GET["value"];
+	$sql.= " AND type = '".$type."'";
+	$sql.= " AND entity = ".$conf->entity;
+	
 	if ($db->query($sql))
 	{
 
@@ -112,7 +115,7 @@ if ($_GET["action"] == 'setdoc')
 {
 	$db->begin();
 
-	if (dolibarr_set_const($db, "COMMANDE_ADDON_PDF",$_GET["value"]))
+	if (dolibarr_set_const($db, "COMMANDE_ADDON_PDF",$_GET["value"],'chaine',0,'',$conf->entity))
 	{
 		$conf->global->COMMANDE_ADDON_PDF = $_GET["value"];
 	}
@@ -120,9 +123,11 @@ if ($_GET["action"] == 'setdoc')
 	// On active le modele
 	$type='order';
 	$sql_del = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
-	$sql_del .= "  WHERE nom = '".$_GET["value"]."' AND type = '".$type."'";
+	$sql_del.= " WHERE nom = '".$_GET["value"];
+	$sql_del.= " AND type = '".$type."'";
+	$sql_del.= " AND entity = ".$conf->entity;
 	$result1=$db->query($sql_del);
-	$sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom,type) VALUES ('".$_GET["value"]."','".$type."')";
+	$sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom,type,entity) VALUES ('".$_GET["value"]."','".$type."',".$conf->entity.")";
 	$result2=$db->query($sql);
 	if ($result1 && $result2)
 	{
@@ -139,32 +144,32 @@ if ($_GET["action"] == 'setmod')
 	// \todo Verifier si module numerotation choisi peut etre active
 	// par appel methode canBeActivated
 
-	dolibarr_set_const($db, "COMMANDE_ADDON",$_GET["value"]);
+	dolibarr_set_const($db, "COMMANDE_ADDON",$_GET["value"],'chaine',0,'',$conf->entity);
 }
 
 if ($_POST["action"] == 'set_COMMANDE_DRAFT_WATERMARK')
 {
-	dolibarr_set_const($db, "COMMANDE_DRAFT_WATERMARK",trim($_POST["COMMANDE_DRAFT_WATERMARK"]));
+	dolibarr_set_const($db, "COMMANDE_DRAFT_WATERMARK",trim($_POST["COMMANDE_DRAFT_WATERMARK"]),'chaine',0,'',$conf->entity);
 }
 
 if ($_POST["action"] == 'set_COMMANDE_FREE_TEXT')
 {
-	dolibarr_set_const($db, "COMMANDE_FREE_TEXT",trim($_POST["COMMANDE_FREE_TEXT"]));
+	dolibarr_set_const($db, "COMMANDE_FREE_TEXT",trim($_POST["COMMANDE_FREE_TEXT"]),'chaine',0,'',$conf->entity);
 }
 
 if ($_POST["action"] == 'setvalidorder')
 {
-	dolibarr_set_const($db, "COMMANDE_VALID_AFTER_CLOSE_PROPAL",$_POST["validorder"]);
+	dolibarr_set_const($db, "COMMANDE_VALID_AFTER_CLOSE_PROPAL",$_POST["validorder"],'chaine',0,'',$conf->entity);
 }
 
 if ($_POST["action"] == 'deliverycostline')
 {
-	dolibarr_set_const($db, "COMMANDE_ADD_DELIVERY_COST_LINE",$_POST["addline"]);
+	dolibarr_set_const($db, "COMMANDE_ADD_DELIVERY_COST_LINE",$_POST["addline"],'chaine',0,'',$conf->entity);
 }
 
 if ($_POST["action"] == 'set_use_customer_contact_as_recipient')
 {
-	dolibarr_set_const($db, "COMMANDE_USE_CUSTOMER_CONTACT_AS_RECIPIENT",$_POST["use_customer_contact_as_recipient"]);
+	dolibarr_set_const($db, "COMMANDE_USE_CUSTOMER_CONTACT_AS_RECIPIENT",$_POST["use_customer_contact_as_recipient"],'chaine',0,'',$conf->entity);
 }
 
 
@@ -288,6 +293,7 @@ $def = array();
 $sql = "SELECT nom";
 $sql.= " FROM ".MAIN_DB_PREFIX."document_model";
 $sql.= " WHERE type = '".$type."'";
+$sql.= " AND entity = ".$conf->entity;
 $resql=$db->query($sql);
 if ($resql)
 {
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index 3fd0a12e70b..8de21f6b6de 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -41,18 +41,18 @@ accessforbidden();
 if ( (isset($_POST["action"]) && $_POST["action"] == 'update')
 || (isset($_POST["action"]) && $_POST["action"] == 'updateedit') )
 {
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_NOM",$_POST["nom"]);
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_ADRESSE",$_POST["address"]);
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_VILLE",$_POST["ville"]);
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_CP",$_POST["cp"]);
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_PAYS",$_POST["pays_id"]);
-	dolibarr_set_const($db, "MAIN_MONNAIE",$_POST["currency"]);
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_TEL",$_POST["tel"]);
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_FAX",$_POST["fax"]);
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_MAIL",$_POST["mail"]);
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_WEB",$_POST["web"]);
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_NOTE",$_POST["note"]);
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_GENCOD",$_POST["gencod"]);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_NOM",$_POST["nom"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_ADRESSE",$_POST["address"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_VILLE",$_POST["ville"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_CP",$_POST["cp"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_PAYS",$_POST["pays_id"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_MONNAIE",$_POST["currency"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_TEL",$_POST["tel"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_FAX",$_POST["fax"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_MAIL",$_POST["mail"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_WEB",$_POST["web"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_NOTE",$_POST["note"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_GENCOD",$_POST["gencod"],'chaine',0,'',$conf->entity);
 	if ($_FILES["logo"]["tmp_name"])
 	{
 		if (eregi('([^\\\/:]+)$',$_FILES["logo"]["name"],$reg))
@@ -69,7 +69,7 @@ if ( (isset($_POST["action"]) && $_POST["action"] == 'update')
 				}
 				if (dol_move_uploaded_file($_FILES["logo"]["tmp_name"],$conf->societe->dir_logos.'/'.$original_file,1) > 0)
 				{
-					dolibarr_set_const($db, "MAIN_INFO_SOCIETE_LOGO",$original_file);
+					dolibarr_set_const($db, "MAIN_INFO_SOCIETE_LOGO",$original_file,'chaine',0,'',$conf->entity);
 
 					// Create thumbs of logo
 					if ($isimage > 0)
@@ -80,7 +80,7 @@ if ( (isset($_POST["action"]) && $_POST["action"] == 'update')
 						if (eregi('([^\\\/:]+)$',$imgThumbSmall,$reg))
 						{
 							$imgThumbSmall = $reg[1];
-							dolibarr_set_const($db, "MAIN_INFO_SOCIETE_LOGO_SMALL",$imgThumbSmall);
+							dolibarr_set_const($db, "MAIN_INFO_SOCIETE_LOGO_SMALL",$imgThumbSmall,'chaine',0,'',$conf->entity);
 						}
 						else dol_syslog($imgThumbSmall);
 
@@ -89,7 +89,7 @@ if ( (isset($_POST["action"]) && $_POST["action"] == 'update')
 						if (eregi('([^\\\/:]+)$',$imgThumbMini,$reg))
 						{
 							$imgThumbMini = $reg[1];
-							dolibarr_set_const($db, "MAIN_INFO_SOCIETE_LOGO_MINI",$imgThumbMini);
+							dolibarr_set_const($db, "MAIN_INFO_SOCIETE_LOGO_MINI",$imgThumbMini,'chaine',0,'',$conf->entity);
 						}
 						else dol_syslog($imgThumbMini);
 					}
@@ -107,17 +107,17 @@ if ( (isset($_POST["action"]) && $_POST["action"] == 'update')
 		}
 	}
 
-	dolibarr_set_const($db, "MAIN_INFO_CAPITAL",$_POST["capital"]);
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_FORME_JURIDIQUE",$_POST["forme_juridique_code"]);
-	dolibarr_set_const($db, "MAIN_INFO_SIREN",$_POST["siren"]);
-	dolibarr_set_const($db, "MAIN_INFO_SIRET",$_POST["siret"]);
-	dolibarr_set_const($db, "MAIN_INFO_APE",$_POST["ape"]);
-	dolibarr_set_const($db, "MAIN_INFO_RCS",$_POST["rcs"]);
-	dolibarr_set_const($db, "MAIN_INFO_TVAINTRA",$_POST["tva"]);
+	dolibarr_set_const($db, "MAIN_INFO_CAPITAL",$_POST["capital"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_FORME_JURIDIQUE",$_POST["forme_juridique_code"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SIREN",$_POST["siren"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SIRET",$_POST["siret"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_APE",$_POST["ape"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_RCS",$_POST["rcs"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_TVAINTRA",$_POST["tva"],'chaine',0,'',$conf->entity);
 
-	dolibarr_set_const($db, "SOCIETE_FISCAL_MONTH_START",$_POST["fiscalmonthstart"]);
+	dolibarr_set_const($db, "SOCIETE_FISCAL_MONTH_START",$_POST["fiscalmonthstart"],'chaine',0,'',$conf->entity);
 
-	dolibarr_set_const($db, "FACTURE_TVAOPTION",$_POST["optiontva"]);
+	dolibarr_set_const($db, "FACTURE_TVAOPTION",$_POST["optiontva"],'chaine',0,'',$conf->entity);
 
 	if ($_POST['action'] != 'updateedit' && ! $message)
 	{
@@ -140,7 +140,7 @@ if ($_GET["action"] == 'addthumb')
 			if (image_format_supported($imgThumbSmall) >= 0 && eregi('([^\\\/:]+)$',$imgThumbSmall,$reg))
 			{
 				$imgThumbSmall = $reg[1];
-				dolibarr_set_const($db, "MAIN_INFO_SOCIETE_LOGO_SMALL",$imgThumbSmall);
+				dolibarr_set_const($db, "MAIN_INFO_SOCIETE_LOGO_SMALL",$imgThumbSmall,'chaine',0,'',$conf->entity);
 			}
 			else dol_syslog($imgThumbSmall);
 
@@ -149,7 +149,7 @@ if ($_GET["action"] == 'addthumb')
 			if (image_format_supported($imgThumbSmall) >= 0 && eregi('([^\\\/:]+)$',$imgThumbMini,$reg))
 			{
 				$imgThumbMini = $reg[1];
-				dolibarr_set_const($db, "MAIN_INFO_SOCIETE_LOGO_MINI",$imgThumbMini);
+				dolibarr_set_const($db, "MAIN_INFO_SOCIETE_LOGO_MINI",$imgThumbMini,'chaine',0,'',$conf->entity);
 			}
 			else dol_syslog($imgThumbMini);
 
@@ -173,17 +173,17 @@ if ($_GET["action"] == 'removelogo')
 {
 	$logofile=$conf->societe->dir_logos.'/'.$mysoc->logo;
 	dol_delete_file($logofile);
-	dolibarr_del_const($db, "MAIN_INFO_SOCIETE_LOGO");
+	dolibarr_del_const($db, "MAIN_INFO_SOCIETE_LOGO",$conf->entity);
 	$mysoc->logo='';
 
 	$logosmallfile=$conf->societe->dir_logos.'/thumbs/'.$mysoc->logo_small;
 	dol_delete_file($logosmallfile);
-	dolibarr_del_const($db, "MAIN_INFO_SOCIETE_LOGO_SMALL");
+	dolibarr_del_const($db, "MAIN_INFO_SOCIETE_LOGO_SMALL",$conf->entity);
 	$mysoc->logo_small='';
 
 	$logominifile=$conf->societe->dir_logos.'/thumbs/'.$mysoc->logo_mini;
 	dol_delete_file($logominifile);
-	dolibarr_del_const($db, "MAIN_INFO_SOCIETE_LOGO_MINI");
+	dolibarr_del_const($db, "MAIN_INFO_SOCIETE_LOGO_MINI",$conf->entity);
 	$mysoc->logo_mini='';
 }
 
diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php
index 68ac2429f56..3b84fa61265 100644
--- a/htdocs/admin/compta.php
+++ b/htdocs/admin/compta.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -42,7 +43,7 @@ $compta_mode = defined('COMPTA_MODE')?COMPTA_MODE:'RECETTES-DEPENSES';
 if ($_POST['action'] == 'setcomptamode')
 {
 	$compta_mode = $_POST['compta_mode'];
-	if (! dolibarr_set_const($db, 'COMPTA_MODE', $compta_mode)) { print $db->error(); }
+	if (! dolibarr_set_const($db, 'COMPTA_MODE', $compta_mode,'chaine',0,'',$conf->entity)) { print $db->error(); }
 	// Note: This setup differs from TAX_MODE.
 	// TAX_MODE is used with 0=normal, 1=option vat for services is on debit
 }
@@ -54,7 +55,7 @@ $typeconst=array('yesno','texte','chaine');
 
 if ($_POST['action'] == 'update' || $_POST['action'] == 'add')
 {
-	if (! dolibarr_set_const($db, $_POST['constname'], $_POST['constvalue'], $typeconst[$_POST['consttype']], 0, isset($_POST['constnote']) ? $_POST['constnote'] : ''));
+	if (! dolibarr_set_const($db, $_POST['constname'], $_POST['constvalue'], $typeconst[$_POST['consttype']], 0, isset($_POST['constnote']) ? $_POST['constnote'] : '',$conf->entity));
 	{
 		print $db->error();
 	}
@@ -63,7 +64,7 @@ if ($_POST['action'] == 'update' || $_POST['action'] == 'add')
 
 if ($_GET['action'] == 'delete')
 {
-	if (! dolibarr_del_const($db, $_GET['constname']));
+	if (! dolibarr_del_const($db, $_GET['constname'],$conf->entity));
 	{
 		print $db->error();
 	}
@@ -113,9 +114,12 @@ print "</table>\n";
 print "<br>\n";
 
 // Cas des autres parametres COMPTA_*
-$sql ="SELECT rowid, name, value, type, note";
-$sql.=" FROM llx_const";
-$sql.=" WHERE name like 'COMPTA_%' and name not in ('COMPTA_MODE')";
+$sql = "SELECT rowid, name, value, type, note";
+$sql.= " FROM ".MAIN_DB_PREFIX."const";
+$sql.= " WHERE name LIKE 'COMPTA_%'";
+$sql.= " AND name NOT IN ('COMPTA_MODE')";
+$sql.= " AND entity = ".$conf->entity;
+
 $result = $db->query($sql);
 if ($result)
 {
diff --git a/htdocs/admin/comptaexpert.php b/htdocs/admin/comptaexpert.php
index b3b3c94ce98..4dc5a0cf9c9 100644
--- a/htdocs/admin/comptaexpert.php
+++ b/htdocs/admin/comptaexpert.php
@@ -45,7 +45,7 @@ $compta_mode = defined('COMPTA_MODE')?COMPTA_MODE:'RECETTES-DEPENSES';
 if ($_POST['action'] == 'setcomptamode')
 {
   $compta_mode = $_POST['compta_mode'];
-  if (! dolibarr_set_const($db, 'COMPTA_MODE', $compta_mode)) { print $db->error(); }
+  if (! dolibarr_set_const($db, 'COMPTA_MODE', $compta_mode,'chaine',0,'',$conf->entity)) { print $db->error(); }
 }
 
 
@@ -55,7 +55,7 @@ $typeconst=array('yesno','texte','chaine');
 
 if ($_POST['action'] == 'update' || $_POST['action'] == 'add')
 {
-	if (! dolibarr_set_const($db, $_POST['constname'], $_POST['constvalue'], $typeconst[$_POST['consttype']], 0, isset($_POST['constnote']) ? $_POST['constnote'] : ''));
+	if (! dolibarr_set_const($db, $_POST['constname'], $_POST['constvalue'], $typeconst[$_POST['consttype']], 0, isset($_POST['constnote']) ? $_POST['constnote'] : '',$conf->entity));
 	{
 	  	print $db->error();
 	}
@@ -64,7 +64,7 @@ if ($_POST['action'] == 'update' || $_POST['action'] == 'add')
 
 if ($_GET['action'] == 'delete')
 {
-	if (! dolibarr_del_const($db, $_GET['constname']));
+	if (! dolibarr_del_const($db, $_GET['constname'],$conf->entity));
 	{
 	  	print $db->error();
 	}
diff --git a/htdocs/admin/confexped.php b/htdocs/admin/confexped.php
index 14e0dbdaed4..55d228dea47 100644
--- a/htdocs/admin/confexped.php
+++ b/htdocs/admin/confexped.php
@@ -1,6 +1,7 @@
 <?php
-/* Copyright (C) 2004-2008 Laurent Destailleur       <eldy@users.sourceforge.net>
- * Copyright (C) 2006      Andre Cianfarani          <acianfa@free.fr>
+/* Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -38,25 +39,25 @@ if (!$user->admin)
 
 if ($_GET["action"] == 'activate_sending')
 {
-    dolibarr_set_const($db, "MAIN_SUBMODULE_EXPEDITION", "1");
+    dolibarr_set_const($db, "MAIN_SUBMODULE_EXPEDITION", "1",'chaine',0,'',$conf->entity);
     Header("Location: confexped.php");
     exit;
 }
 else if ($_GET["action"] == 'disable_sending')
 {
-	dolibarr_del_const($db, "MAIN_SUBMODULE_EXPEDITION");
+	dolibarr_del_const($db, "MAIN_SUBMODULE_EXPEDITION",$conf->entity);
     Header("Location: confexped.php");
     exit;
 }
 else if ($_GET["action"] == 'activate_delivery')
 {
-			dolibarr_set_const($db, "MAIN_SUBMODULE_LIVRAISON", "1");
+			dolibarr_set_const($db, "MAIN_SUBMODULE_LIVRAISON", "1",'chaine',0,'',$conf->entity);
 			Header("Location: confexped.php");
 			exit;
 }
 else if ($_GET["action"] == 'disable_delivery')
 {
-	dolibarr_del_const($db, "MAIN_SUBMODULE_LIVRAISON");
+	dolibarr_del_const($db, "MAIN_SUBMODULE_LIVRAISON",$conf->entity);
     Header("Location: confexped.php");
     exit;
 }
diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php
index 0104c6f7020..a0a23f0f068 100644
--- a/htdocs/admin/const.php
+++ b/htdocs/admin/const.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -107,12 +108,13 @@ print '</form>';
 if ($all==1){
 	$sql = "SELECT rowid, name, value, note, entity ";
 	$sql.= "FROM llx_const ";
-	$sql.= "WHERE entity = 0 OR entity = ".$conf->entity." ";
+	$sql.= "WHERE entity IN (0,".$conf->entity.") ";
 	$sql.= "ORDER BY name ASC";
 }else{
 	$sql = "SELECT rowid, name, value, note, entity ";
 	$sql.= "FROM llx_const ";
-	$sql.= "WHERE visible = 1 AND (entity = 0 OR entity = ".$conf->entity.") ";
+	$sql.= "WHERE visible = 1 ";
+	$sql.= "AND entity IN (0,".$conf->entity.") ";
 	$sql.= "ORDER BY name ASC";
 }
 dol_syslog("Const::listConstant sql=".$sql,LOG_DEBUG);
diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php
index cd77ac98e05..4d050701b97 100644
--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005      Simon Tosser         <simon@kornog-computing.com>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,17 +41,17 @@ if (!$user->admin)
 if ( (isset($_POST["action"]) && $_POST["action"] == 'update'))
 {
 	//Conversion des jours en secondes
-    dolibarr_set_const($db, "MAIN_DELAY_ACTIONS_TODO",$_POST["ActionsToDo"]);
-    dolibarr_set_const($db, "MAIN_DELAY_ORDERS_TO_PROCESS",$_POST["OrdersToProcess"]);
-    dolibarr_set_const($db, "MAIN_DELAY_PROPALS_TO_CLOSE",$_POST["PropalsToClose"]);
-    dolibarr_set_const($db, "MAIN_DELAY_PROPALS_TO_BILL",$_POST["PropalsToBill"]);
-    dolibarr_set_const($db, "MAIN_DELAY_NOT_ACTIVATED_SERVICES",$_POST["BoardNotActivatedServices"]);
-    dolibarr_set_const($db, "MAIN_DELAY_RUNNING_SERVICES",$_POST["BoardRunningServices"]);
-    dolibarr_set_const($db, "MAIN_DELAY_SUPPLIER_BILLS_TO_PAY",$_POST["SupplierBillsToPay"]);
-    dolibarr_set_const($db, "MAIN_DELAY_CUSTOMER_BILLS_UNPAYED",$_POST["CustomerBillsUnpayed"]);
-    dolibarr_set_const($db, "MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE",$_POST["TransactionsToConciliate"]);
-    dolibarr_set_const($db, "MAIN_DELAY_CHEQUES_TO_DEPOSIT",$_POST["ChequesToDeposit"]);
-	dolibarr_set_const($db, "MAIN_DELAY_MEMBERS",$_POST["Members"]);
+  if ($_POST["ActionsToDo"]) dolibarr_set_const($db, "MAIN_DELAY_ACTIONS_TODO",$_POST["ActionsToDo"],'chaine',0,'',$conf->entity);
+  if ($_POST["OrdersToProcess"]) dolibarr_set_const($db, "MAIN_DELAY_ORDERS_TO_PROCESS",$_POST["OrdersToProcess"],'chaine',0,'',$conf->entity);
+  if ($_POST["PropalsToClose"]) dolibarr_set_const($db, "MAIN_DELAY_PROPALS_TO_CLOSE",$_POST["PropalsToClose"],'chaine',0,'',$conf->entity);
+  if ($_POST["PropalsToBill"]) dolibarr_set_const($db, "MAIN_DELAY_PROPALS_TO_BILL",$_POST["PropalsToBill"],'chaine',0,'',$conf->entity);
+  if ($_POST["BoardNotActivatedServices"]) dolibarr_set_const($db, "MAIN_DELAY_NOT_ACTIVATED_SERVICES",$_POST["BoardNotActivatedServices"],'chaine',0,'',$conf->entity);
+  if ($_POST["BoardRunningServices"]) dolibarr_set_const($db, "MAIN_DELAY_RUNNING_SERVICES",$_POST["BoardRunningServices"],'chaine',0,'',$conf->entity);
+  if ($_POST["SupplierBillsToPay"]) dolibarr_set_const($db, "MAIN_DELAY_SUPPLIER_BILLS_TO_PAY",$_POST["SupplierBillsToPay"],'chaine',0,'',$conf->entity);
+  if ($_POST["CustomerBillsUnpayed"]) dolibarr_set_const($db, "MAIN_DELAY_CUSTOMER_BILLS_UNPAYED",$_POST["CustomerBillsUnpayed"],'chaine',0,'',$conf->entity);
+  if ($_POST["TransactionsToConciliate"]) dolibarr_set_const($db, "MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE",$_POST["TransactionsToConciliate"],'chaine',0,'',$conf->entity);
+  if ($_POST["ChequesToDeposit"]) dolibarr_set_const($db, "MAIN_DELAY_CHEQUES_TO_DEPOSIT",$_POST["ChequesToDeposit"],'chaine',0,'',$conf->entity);
+	if ($_POST["Members"]) dolibarr_set_const($db, "MAIN_DELAY_MEMBERS",$_POST["Members"],'chaine',0,'',$conf->entity);
 }
 
 
diff --git a/htdocs/admin/dons.php b/htdocs/admin/dons.php
index 53e50f47099..8c558525619 100644
--- a/htdocs/admin/dons.php
+++ b/htdocs/admin/dons.php
@@ -77,7 +77,7 @@ if ($_GET["action"] == 'setdoc')
 {
 	$db->begin();
 
-    if (dolibarr_set_const($db, "DON_ADDON_MODEL",$_GET["value"]))
+    if (dolibarr_set_const($db, "DON_ADDON_MODEL",$_GET["value"],'chaine',0,'',$conf->entity))
     {
         $conf->global->DON_ADDON_MODEL = $_GET["value"];
     }
diff --git a/htdocs/admin/droitpret.php b/htdocs/admin/droitpret.php
index e39a56c3963..cf6e2be5df6 100644
--- a/htdocs/admin/droitpret.php
+++ b/htdocs/admin/droitpret.php
@@ -46,7 +46,7 @@ $var=True;
 if ($_POST["action"] == 'update' || $_POST["action"] == 'add')
 {
 
-	if (! dolibarr_set_const($db, $_POST["constname"],$_POST["constvalue"],$_POST["consttype"],0,isset($_POST["constnote"])?$_POST["constnote"]:''))
+	if (! dolibarr_set_const($db, $_POST["constname"],$_POST["constvalue"],$_POST["consttype"],0,isset($_POST["constnote"])?$_POST["constnote"]:'',$conf->entity))
 	{
 		print $db->error();
 	}
@@ -80,7 +80,7 @@ print "</tr>\n";
 $var=true;
 $form = new Form($db);
 
-// Cat�gorie
+// Categorie
 $var=!$var;
 print '<form action="droitpret.php" method="POST">';
 print '<input type="hidden" name="action" value="update">';
diff --git a/htdocs/admin/editeur.php b/htdocs/admin/editeur.php
index c32d581c18a..a23e2c80c4d 100644
--- a/htdocs/admin/editeur.php
+++ b/htdocs/admin/editeur.php
@@ -33,11 +33,11 @@ if (!$user->admin)
   accessforbidden();
 
 
-// Action activation d'un sous module du module adh�rent
+// Action activation d'un sous module du module adherent
 if ($_POST["action"] == 'set')
 {
 	$name = "EDITEUR_LIVRE_FORMAT_".time();
-	$result=dolibarr_set_const($db, $name, $_POST["format"]);
+	$result=dolibarr_set_const($db, $name, $_POST["format"],'chaine',0,'',$conf->entity);
 	if ($result < 0)
 	{
 		print $db->error();
diff --git a/htdocs/admin/energie.php b/htdocs/admin/energie.php
index bc8a41166dc..a35e314fc21 100644
--- a/htdocs/admin/energie.php
+++ b/htdocs/admin/energie.php
@@ -36,7 +36,7 @@ if (!$user->admin)
 
 if ($_POST["action"] == 'setvalue' && $user->admin)
 {
-	dolibarr_set_const($db, "JPGRAPH_DIR",$_POST["url"]);
+	dolibarr_set_const($db, "JPGRAPH_DIR",$_POST["url"],'chaine',0,'',$conf->entity);
 }
 
 
diff --git a/htdocs/admin/events.php b/htdocs/admin/events.php
index 247268177b8..c06d1a33200 100644
--- a/htdocs/admin/events.php
+++ b/htdocs/admin/events.php
@@ -88,8 +88,8 @@ if ($action == "save")
 	{
 		$param='MAIN_LOGEVENTS_'.$arr['id'];
 		//print "param=".$param." - ".$_POST[$param];
-		if (! empty($_POST[$param])) dolibarr_set_const($db,$param,$_POST[$param],'chaine',0);
-		else dolibarr_del_const($db,$param);
+		if (! empty($_POST[$param])) dolibarr_set_const($db,$param,$_POST[$param],'chaine',0,'',$conf->entity);
+		else dolibarr_del_const($db,$param,$conf->entity);
 	}
 
     $db->commit();
diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index 3b1254e0086..4c3892a6e79 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2004      Sebastien Di Cintio  <sdicintio@ressource-toi.org>
  * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2007 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -83,7 +83,7 @@ if ($_GET["action"] == 'specimen')
 if ($_GET["action"] == 'set')
 {
 	$type='shipping';
-	$sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type) VALUES ('".$_GET["value"]."','".$type."')";
+	$sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES ('".$_GET["value"]."','".$type."',".$conf->entity.")";
 	if ($db->query($sql))
 	{
 
@@ -94,7 +94,10 @@ if ($_GET["action"] == 'del')
 {
 	$type='shipping';
 	$sql = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
-	$sql .= "  WHERE nom = '".$_GET["value"]."' AND type = '".$type."'";
+	$sql.= " WHERE nom = '".$_GET["value"];
+	$sql.= " AND type = '".$type."'";
+	$sql.= " AND entity = ".$conf->entity;
+	
 	if ($db->query($sql))
 	{
 
@@ -105,7 +108,7 @@ if ($_GET["action"] == 'setdoc')
 {
 	$db->begin();
 
-	if (dolibarr_set_const($db, "EXPEDITION_ADDON_PDF",$_GET["value"]))
+	if (dolibarr_set_const($db, "EXPEDITION_ADDON_PDF",$_GET["value"],'chaine',0,'',$conf->entity))
 	{
 		$conf->global->EXPEDITION_ADDON_PDF = $_GET["value"];
 	}
@@ -113,9 +116,11 @@ if ($_GET["action"] == 'setdoc')
 	// On active le modele
 	$type='shipping';
 	$sql_del = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
-	$sql_del .= "  WHERE nom = '".$_GET["value"]."' AND type = '".$type."'";
+	$sql_del.= " WHERE nom = '".$_GET["value"];
+	$sql_del.= " AND type = '".$type."'";
+	$sql_del.= " AND entity = ".$conf->entity;
 	$result1=$db->query($sql_del);
-	$sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom,type) VALUES ('".$_GET["value"]."','".$type."')";
+	$sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom,type,entity) VALUES ('".$_GET["value"]."','".$type."',".$conf->entity.")";
 	$result2=$db->query($sql);
 	if ($result1 && $result2)
 	{
@@ -139,7 +144,9 @@ if ($_GET["action"] == 'setmethod' || $_GET["action"] == 'setmod')
 	$class = "methode_expedition_$module";
 	$expem = new $class($db);
 
-	$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."expedition_methode WHERE rowid = ".$moduleid;
+	$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."expedition_methode";
+	$sql.= " WHERE rowid = ".$moduleid;
+	
 	$resql = $db->query($sql);
 	if ($resql && ($statut == 1 || $_GET["action"] == 'setmod'))
 	{
@@ -148,6 +155,7 @@ if ($_GET["action"] == 'setmethod' || $_GET["action"] == 'setmod')
 		$sqlu = "UPDATE ".MAIN_DB_PREFIX."expedition_methode";
 		$sqlu.= " SET statut=1";
 		$sqlu.= " WHERE rowid=".$moduleid;
+		
 		$result=$db->query($sqlu);
 		if ($result)
 		{
@@ -200,7 +208,7 @@ if ($_GET["action"] == 'setmod')
 	// \todo Verifier si module numerotation choisi peut etre active
 	// par appel methode canBeActivated
 
-	dolibarr_set_const($db, "EXPEDITION_ADDON",$_GET["module"]);
+	dolibarr_set_const($db, "EXPEDITION_ADDON",$_GET["module"],'chaine',0,'',$conf->entity);
 }
 
 
@@ -253,9 +261,12 @@ print_titre($langs->trans("SendingsReceiptModel"));
 // Defini tableau def de modele invoice
 $type="shipping";
 $def = array();
+
 $sql = "SELECT nom";
 $sql.= " FROM ".MAIN_DB_PREFIX."document_model";
 $sql.= " WHERE type = '".$type."'";
+$sql.= " AND entity = ".$conf->entity;
+
 $resql=$db->query($sql);
 if ($resql)
 {
diff --git a/htdocs/admin/external_rss.php b/htdocs/admin/external_rss.php
index 2c505444d05..f08f78b99a9 100644
--- a/htdocs/admin/external_rss.php
+++ b/htdocs/admin/external_rss.php
@@ -83,7 +83,7 @@ if ($_POST["action"] == 'add' || $_POST["modify"])
 		}
 		else
 		{
-			// Ajoute boite box_external_rss dans d�finition des boites
+			// Ajoute boite box_external_rss dans definition des boites
 	        $sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes_def (file, note)";
 			$sql.= " VALUES ('box_external_rss.php','".addslashes($_POST["norss"].' ('.$_POST[$external_rss_title]).")')";
 	        if (! $db->query($sql))
@@ -93,8 +93,8 @@ if ($_POST["action"] == 'add' || $_POST["modify"])
 	        }
 		}
 		
-		$result1=dolibarr_set_const($db, "EXTERNAL_RSS_TITLE_" . $_POST["norss"],$_POST[$external_rss_title]);
-		if ($result1) $result2=dolibarr_set_const($db, "EXTERNAL_RSS_URLRSS_" . $_POST["norss"],$_POST[$external_rss_urlrss]);
+		$result1=dolibarr_set_const($db, "EXTERNAL_RSS_TITLE_" . $_POST["norss"],$_POST[$external_rss_title],'chaine',0,'',$conf->entity);
+		if ($result1) $result2=dolibarr_set_const($db, "EXTERNAL_RSS_URLRSS_" . $_POST["norss"],$_POST[$external_rss_urlrss],'chaine',0,'',$conf->entity);
 
         if ($result1 && $result2)
         {
@@ -117,7 +117,7 @@ if ($_POST["delete"])
     {
         $db->begin();
 
-		// Supprime boite box_external_rss de d�finition des boites
+		// Supprime boite box_external_rss de definition des boites
         $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."boxes_def";
         $sql.= " WHERE file ='box_external_rss.php' AND note like '".$_POST["norss"]." %'";
         
@@ -158,8 +158,8 @@ if ($_POST["delete"])
         }
 
 
-		$result1=dolibarr_del_const($db,"EXTERNAL_RSS_TITLE_" . $_POST["norss"]);
-		if ($result1) $result2=dolibarr_del_const($db,"EXTERNAL_RSS_URLRSS_" . $_POST["norss"]);
+		$result1=dolibarr_del_const($db,"EXTERNAL_RSS_TITLE_" . $_POST["norss"],$conf->entity);
+		if ($result1) $result2=dolibarr_del_const($db,"EXTERNAL_RSS_URLRSS_" . $_POST["norss"],$conf->entity);
 		
         if ($result1 && $result2)
         {
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index ab028368db9..a3688e6b0ba 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -1,8 +1,8 @@
 <?php
-/* Copyright (C) 2003-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2007 Regis Houssin        <regis@dolibarr.fr>
+/* Copyright (C) 2003-2004 Rodolphe Quiedeville         <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2008 Laurent Destailleur          <eldy@users.sourceforge.net>
+ * Copyright (C) 2005      Eric Seigne                  <eric.seigne@ryxeo.com>
+ * Copyright (C) 2005-2009 Regis Houssin                <regis@dolibarr.fr>
  * Copyright (C) 2008 	   Raphael Bertrand (Resultic)  <raphael.bertrand@resultic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -52,8 +52,8 @@ if ($_POST["action"] == 'updateMask')
 	$maskconstcredit=$_POST['maskconstcredit'];
 	$maskinvoice=$_POST['maskinvoice'];
 	$maskcredit=$_POST['maskcredit'];
-	if ($maskconstinvoice) dolibarr_set_const($db,$maskconstinvoice,$maskinvoice);
-	if ($maskconstcredit)  dolibarr_set_const($db,$maskconstcredit,$maskcredit);
+	if ($maskconstinvoice) dolibarr_set_const($db,$maskconstinvoice,$maskinvoice,'chaine',0,'',$conf->entity);
+	if ($maskconstcredit)  dolibarr_set_const($db,$maskconstcredit,$maskcredit,'chaine',0,'',$conf->entity);
 }
 
 if ($_GET["action"] == 'specimen')
@@ -94,7 +94,7 @@ if ($_GET["action"] == 'specimen')
 if ($_GET["action"] == 'set')
 {
 	$type='invoice';
-    $sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type) VALUES ('".$_GET["value"]."','".$type."')";
+    $sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES ('".$_GET["value"]."','".$type."',".$conf->entity.")";
     if ($db->query($sql))
     {
 
@@ -105,7 +105,10 @@ if ($_GET["action"] == 'del')
 {
     $type='invoice';
     $sql = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
-    $sql .= "  WHERE nom = '".$_GET["value"]."' AND type = '".$type."'";
+    $sql.= " WHERE nom = '".$_GET["value"];
+    $sql.= " AND type = '".$type."'";
+    $sql.= " AND entity = ".$conf->entity;
+    
     if ($db->query($sql))
     {
 
@@ -116,7 +119,7 @@ if ($_GET["action"] == 'setdoc')
 {
 	$db->begin();
 
-    if (dolibarr_set_const($db, "FACTURE_ADDON_PDF",$_GET["value"]))
+    if (dolibarr_set_const($db, "FACTURE_ADDON_PDF",$_GET["value"],'chaine',0,'',$conf->entity))
     {
         $conf->global->FACTURE_ADDON_PDF = $_GET["value"];
     }
@@ -124,9 +127,11 @@ if ($_GET["action"] == 'setdoc')
     // On active le modele
     $type='invoice';
     $sql_del = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
-    $sql_del.= " WHERE nom = '".$_GET["value"]."' AND type = '".$type."'";
+    $sql_del.= " WHERE nom = '".$_GET["value"];
+    $sql_del.= " AND type = '".$type."'";
+    $sql_del.= " AND entity = ".$conf->entity;
     $result1=$db->query($sql_del);
-    $sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom,type) VALUES ('".$_GET["value"]."','".$type."')";
+    $sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom,type,entity) VALUES ('".$_GET["value"]."','".$type."',".$conf->entity.")";
     $result2=$db->query($sql);
     if ($result1 && $result2)
     {
@@ -143,43 +148,43 @@ if ($_GET["action"] == 'setmod')
     // \todo Verifier si module numerotation choisi peut etre activ�
     // par appel methode canBeActivated
 
-	dolibarr_set_const($db, "FACTURE_ADDON",$_GET["value"]);
+	dolibarr_set_const($db, "FACTURE_ADDON",$_GET["value"],'chaine',0,'',$conf->entity);
 }
 
 if ($_POST["action"] == 'setribchq')
 {
-    dolibarr_set_const($db, "FACTURE_RIB_NUMBER",$_POST["rib"]);
-    dolibarr_set_const($db, "FACTURE_CHQ_NUMBER",$_POST["chq"]);
+    dolibarr_set_const($db, "FACTURE_RIB_NUMBER",$_POST["rib"],'chaine',0,'',$conf->entity);
+    dolibarr_set_const($db, "FACTURE_CHQ_NUMBER",$_POST["chq"],'chaine',0,'',$conf->entity);
 }
 
 if ($_POST["action"] == 'set_FACTURE_DRAFT_WATERMARK')
 {
-    dolibarr_set_const($db, "FACTURE_DRAFT_WATERMARK",trim($_POST["FACTURE_DRAFT_WATERMARK"]));
+    dolibarr_set_const($db, "FACTURE_DRAFT_WATERMARK",trim($_POST["FACTURE_DRAFT_WATERMARK"]),'chaine',0,'',$conf->entity);
 }
 
 if ($_POST["action"] == 'set_FACTURE_FREE_TEXT')
 {
-    dolibarr_set_const($db, "FACTURE_FREE_TEXT",trim($_POST["FACTURE_FREE_TEXT"]));
+    dolibarr_set_const($db, "FACTURE_FREE_TEXT",trim($_POST["FACTURE_FREE_TEXT"]),'chaine',0,'',$conf->entity);
 }
 
 if ($_POST["action"] == 'setforcedate')
 {
-    dolibarr_set_const($db, "FAC_FORCE_DATE_VALIDATION",$_POST["forcedate"]);
+    dolibarr_set_const($db, "FAC_FORCE_DATE_VALIDATION",$_POST["forcedate"],'chaine',0,'',$conf->entity);
 }
 
 if ($_POST["action"] == 'set_enable_editdelete')
 {
-    dolibarr_set_const($db, "FACTURE_ENABLE_EDITDELETE",$_POST["enable_editdelete"]);
+    dolibarr_set_const($db, "FACTURE_ENABLE_EDITDELETE",$_POST["enable_editdelete"],'chaine',0,'',$conf->entity);
 }
 
 if ($_POST["action"] == 'set_use_bill_contact_as_recipient')
 {
-    dolibarr_set_const($db, "FACTURE_USE_BILL_CONTACT_AS_RECIPIENT",$_POST["use_bill_contact_as_recipient"]);
+    dolibarr_set_const($db, "FACTURE_USE_BILL_CONTACT_AS_RECIPIENT",$_POST["use_bill_contact_as_recipient"],'chaine',0,'',$conf->entity);
 }
 
 if ($_POST["action"] == 'update' || $_POST["action"] == 'add')
 {
-	if (! dolibarr_set_const($db, $_POST["constname"],$_POST["constvalue"],$typeconst[$_POST["consttype"]],0,isset($_POST["constnote"])?$_POST["constnote"]:''));
+	if (! dolibarr_set_const($db, $_POST["constname"],$_POST["constvalue"],$typeconst[$_POST["consttype"]],0,isset($_POST["constnote"])?$_POST["constnote"]:'',$conf->entity));
 	{
 	   dol_print_error($db);
 	}
@@ -187,20 +192,20 @@ if ($_POST["action"] == 'update' || $_POST["action"] == 'add')
 
 if ($_GET["action"] == 'delete')
 {
-  if (! dolibarr_del_const($db, $_GET["rowid"]));
+  if (! dolibarr_del_const($db, $_GET["rowid"],$conf->entity));
   {
     dol_print_error($db);
   }
 }
 
 // defini les constantes du modele pluton
-if ($_POST["action"] == 'updateMatrice') dolibarr_set_const($db, "FACTURE_NUM_MATRICE",$_POST["matrice"]);
-if ($_POST["action"] == 'updatePrefixFacture') dolibarr_set_const($db, "FACTURE_NUM_PREFIX",$_POST["prefixfacture"]);
-if ($_POST["action"] == 'updatePrefixAvoir') dolibarr_set_const($db, "AVOIR_NUM_PREFIX",$_POST["prefixavoir"]);
-if ($_POST["action"] == 'setOffsetInvoice') dolibarr_set_const($db, "FACTURE_NUM_DELTA",$_POST["offsetinvoice"]);
-if ($_POST["action"] == 'setOffsetCreditNote') dolibarr_set_const($db, "AVOIR_NUM_DELTA",$_POST["offsetcreditnote"]);
-if ($_POST["action"] == 'setNumRestart') dolibarr_set_const($db, "FACTURE_NUM_RESTART_BEGIN_YEAR",$_POST["numrestart"]);
-if ($_POST["action"] == 'setNumWithInvoice') dolibarr_set_const($db, "AVOIR_NUM_WITH_INVOICE",$_POST["numwithinvoice"]);
+if ($_POST["action"] == 'updateMatrice') dolibarr_set_const($db, "FACTURE_NUM_MATRICE",$_POST["matrice"],'chaine',0,'',$conf->entity);
+if ($_POST["action"] == 'updatePrefixFacture') dolibarr_set_const($db, "FACTURE_NUM_PREFIX",$_POST["prefixfacture"],'chaine',0,'',$conf->entity);
+if ($_POST["action"] == 'updatePrefixAvoir') dolibarr_set_const($db, "AVOIR_NUM_PREFIX",$_POST["prefixavoir"],'chaine',0,'',$conf->entity);
+if ($_POST["action"] == 'setOffsetInvoice') dolibarr_set_const($db, "FACTURE_NUM_DELTA",$_POST["offsetinvoice"],'chaine',0,'',$conf->entity);
+if ($_POST["action"] == 'setOffsetCreditNote') dolibarr_set_const($db, "AVOIR_NUM_DELTA",$_POST["offsetcreditnote"],'chaine',0,'',$conf->entity);
+if ($_POST["action"] == 'setNumRestart') dolibarr_set_const($db, "FACTURE_NUM_RESTART_BEGIN_YEAR",$_POST["numrestart"],'chaine',0,'',$conf->entity);
+if ($_POST["action"] == 'setNumWithInvoice') dolibarr_set_const($db, "AVOIR_NUM_WITH_INVOICE",$_POST["numwithinvoice"],'chaine',0,'',$conf->entity);
 
 
 /*
@@ -344,6 +349,7 @@ $def = array();
 $sql = "SELECT nom";
 $sql.= " FROM ".MAIN_DB_PREFIX."document_model";
 $sql.= " WHERE type = 'invoice'";
+$sql.= " AND entity = ".$conf->entity;
 $resql=$db->query($sql);
 if ($resql)
 {
@@ -392,7 +398,7 @@ while (($file = readdir($handle))!==false)
         print $module->description;
         print '</td>';
 
-		// Activ�
+		// Active
 		if (in_array($name, $def))
 		{
 			print "<td align=\"center\">\n";
@@ -457,7 +463,7 @@ print '</table>';
 
 
 /*
- *  Modes de r�glement
+ *  Modes de reglement
  *
  */
 print '<br>';
@@ -481,8 +487,9 @@ if ($conf->banque->enabled)
 {
     $sql = "SELECT rowid, label";
     $sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
-    $sql.= " where clos = 0";
-    $sql.= " and courant = 1";
+    $sql.= " WHERE clos = 0";
+    $sql.= " AND courant = 1";
+    $sql.= " AND entity = ".$conf->entity;
     $resql=$db->query($sql);
     if ($resql)
     {
@@ -523,8 +530,9 @@ print '<option value="-1"'.($conf->global->FACTURE_CHQ_NUMBER?' selected="true"'
 
 $sql = "SELECT rowid, label";
 $sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
-$sql.= " where clos = 0";
-$sql.= " and courant = 1";
+$sql.= " WHERE clos = 0";
+$sql.= " AND courant = 1";
+$sql.= " AND entity = ".$conf->entity;
 $var=True;
 $resql=$db->query($sql);
 if ($resql)
diff --git a/htdocs/admin/fckeditor.php b/htdocs/admin/fckeditor.php
index ff9809e677d..d690cea67b1 100644
--- a/htdocs/admin/fckeditor.php
+++ b/htdocs/admin/fckeditor.php
@@ -68,18 +68,18 @@ foreach($modules as $const => $desc)
 {
 	if ($_GET["action"] == 'activate_'.strtolower($const))
 	{
-	    dolibarr_set_const($db, "FCKEDITOR_ENABLE_".$const, "1");
+	    dolibarr_set_const($db, "FCKEDITOR_ENABLE_".$const, "1",'chaine',0,'',$conf->entity);
 	    // Si fckeditor est activé dans la description produit/service, on l'active dans les formulaires
 	    if ($const == 'PRODUCTDESC' && $conf->global->PRODUIT_DESC_IN_FORM)
 	    {
-	    	dolibarr_set_const($db, "FCKEDITOR_ENABLE_DETAILS", "1");
+	    	dolibarr_set_const($db, "FCKEDITOR_ENABLE_DETAILS", "1",'chaine',0,'',$conf->entity);
 	    }
 	    Header("Location: fckeditor.php");
 	    exit;
 	}
 	if ($_GET["action"] == 'disable_'.strtolower($const))
 	{
-		dolibarr_del_const($db, "FCKEDITOR_ENABLE_".$const);
+		dolibarr_del_const($db, "FCKEDITOR_ENABLE_".$const,$conf->entity);
 		Header("Location: fckeditor.php");
 		exit;
 	}
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index 98d5abf12b5..d8cf86159a0 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -1,9 +1,9 @@
 <?php
-/* Copyright (C) 2003-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2004      Sebastien Di Cintio  <sdicintio@ressource-toi.org>
- * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
- * Copyright (C) 2005-2007 Regis Houssin        <regis@dolibarr.fr>
+/* Copyright (C) 2003-2004 Rodolphe Quiedeville         <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2008 Laurent Destailleur          <eldy@users.sourceforge.net>
+ * Copyright (C) 2004      Sebastien Di Cintio          <sdicintio@ressource-toi.org>
+ * Copyright (C) 2004      Benoit Mortier               <benoit.mortier@opensides.be>
+ * Copyright (C) 2005-2009 Regis Houssin                <regis@dolibarr.fr>
  * Copyright (C) 2008 	   Raphael Bertrand (Resultic)  <raphael.bertrand@resultic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -48,12 +48,12 @@ if ($_POST["action"] == 'updateMask')
 {
 	$maskconst=$_POST['maskconst'];
 	$maskvalue=$_POST['maskvalue'];
-	if ($maskconst) dolibarr_set_const($db,$maskconst,$maskvalue);
+	if ($maskconst) dolibarr_set_const($db,$maskconst,$maskvalue,'chaine',0,'',$conf->entity);
 }
 
 if ($_POST["action"] == 'set_FICHINTER_DRAFT_WATERMARK')
 {
-	dolibarr_set_const($db, "FICHINTER_DRAFT_WATERMARK",trim($_POST["FICHINTER_DRAFT_WATERMARK"]));
+	dolibarr_set_const($db, "FICHINTER_DRAFT_WATERMARK",trim($_POST["FICHINTER_DRAFT_WATERMARK"]),'chaine',0,'',$conf->entity);
 }
 
 if ($_GET["action"] == 'specimen')
@@ -94,7 +94,7 @@ if ($_GET["action"] == 'specimen')
 if ($_GET["action"] == 'set')
 {
 	$type='ficheinter';
-	$sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type) VALUES ('".$_GET["value"]."','".$type."')";
+	$sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES ('".$_GET["value"]."','".$type."',".$conf->entity.")";
 	if ($db->query($sql))
 	{
 
@@ -105,7 +105,10 @@ if ($_GET["action"] == 'del')
 {
 	$type='ficheinter';
 	$sql = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
-	$sql .= "  WHERE nom = '".$_GET["value"]."' AND type = '".$type."'";
+	$sql.= " WHERE nom = '".$_GET["value"];
+	$sql.= " AND type = '".$type."'";
+	$sql.= " AND entity = ".$conf->entity;
+	
 	if ($db->query($sql))
 	{
 
@@ -116,19 +119,21 @@ if ($_GET["action"] == 'setdoc')
 {
 	$db->begin();
 
-	if (dolibarr_set_const($db, "FICHEINTER_ADDON_PDF",$_GET["value"]))
+	if (dolibarr_set_const($db, "FICHEINTER_ADDON_PDF",$_GET["value"],'chaine',0,'',$conf->entity))
 	{
-		// La constante qui a �t� lue en avant du nouveau set
-		// on passe donc par une variable pour avoir un affichage coh�rent
+		// La constante qui a ete lue en avant du nouveau set
+		// on passe donc par une variable pour avoir un affichage coherent
 		$conf->global->FICHEINTER_ADDON_PDF = $_GET["value"];
 	}
 
 	// On active le modele
 	$type='ficheinter';
 	$sql_del = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
-	$sql_del .= "  WHERE nom = '".$_GET["value"]."' AND type = '".$type."'";
+	$sql_del.= " WHERE nom = '".$_GET["value"];
+	$sql_del.= " AND type = '".$type."'";
+	$sql_del.= " AND entity = ".$conf->entity;
 	$result1=$db->query($sql_del);
-	$sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom,type) VALUES ('".$_GET["value"]."','".$type."')";
+	$sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom,type,entity) VALUES ('".$_GET["value"]."','".$type."',".$conf->entity.")";
 	$result2=$db->query($sql);
 	if ($result1 && $result2)
 	{
@@ -142,17 +147,17 @@ if ($_GET["action"] == 'setdoc')
 
 if ($_GET["action"] == 'setmod')
 {
-	// \todo Verifier si module numerotation choisi peut etre activ�
+	// \todo Verifier si module numerotation choisi peut etre active
 	// par appel methode canBeActivated
 
-	dolibarr_set_const($db, "FICHEINTER_ADDON",$_GET["value"]);
+	dolibarr_set_const($db, "FICHEINTER_ADDON",$_GET["value"],'chaine',0,'',$conf->entity);
 }
 
-// d�fini les constantes du mod�le arctic
-if ($_POST["action"] == 'updateMatrice') dolibarr_set_const($db, "FICHEINTER_NUM_MATRICE",$_POST["matrice"]);
-if ($_POST["action"] == 'updatePrefix') dolibarr_set_const($db, "FICHEINTER_NUM_PREFIX",$_POST["prefix"]);
-if ($_POST["action"] == 'setOffset') dolibarr_set_const($db, "FICHEINTER_NUM_DELTA",$_POST["offset"]);
-if ($_POST["action"] == 'setNumRestart') dolibarr_set_const($db, "FICHEINTER_NUM_RESTART_BEGIN_YEAR",$_POST["numrestart"]);
+// defini les constantes du modele arctic
+if ($_POST["action"] == 'updateMatrice') dolibarr_set_const($db, "FICHEINTER_NUM_MATRICE",$_POST["matrice"],'chaine',0,'',$conf->entity);
+if ($_POST["action"] == 'updatePrefix') dolibarr_set_const($db, "FICHEINTER_NUM_PREFIX",$_POST["prefix"],'chaine',0,'',$conf->entity);
+if ($_POST["action"] == 'setOffset') dolibarr_set_const($db, "FICHEINTER_NUM_DELTA",$_POST["offset"],'chaine',0,'',$conf->entity);
+if ($_POST["action"] == 'setNumRestart') dolibarr_set_const($db, "FICHEINTER_NUM_RESTART_BEGIN_YEAR",$_POST["numrestart"],'chaine',0,'',$conf->entity);
 
 
 /*
@@ -258,6 +263,7 @@ $def = array();
 $sql = "SELECT nom";
 $sql.= " FROM ".MAIN_DB_PREFIX."document_model";
 $sql.= " WHERE type = '".$type."'";
+$sql.= " AND entity = ".$conf->entity;
 $resql=$db->query($sql);
 if ($resql)
 {
@@ -307,7 +313,7 @@ while (($file = readdir($handle))!==false)
 		print $module->description;
 		print '</td>';
 
-		// Activ�
+		// Active
 		if (in_array($name, $def))
 		{
 			print "<td align=\"center\">\n";
diff --git a/htdocs/admin/fournisseur.php b/htdocs/admin/fournisseur.php
index ba0fce2fde7..10e4eee0f96 100644
--- a/htdocs/admin/fournisseur.php
+++ b/htdocs/admin/fournisseur.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2003-2007 Rodolphe Quiedeville    <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2008 Laurent Destailleur     <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2007 Regis Houssin           <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin           <regis@dolibarr.fr>
  * Copyright (C) 2004      Sebastien Di Cintio     <sdicintio@ressource-toi.org>
  * Copyright (C) 2004      Benoit Mortier          <benoit.mortier@opensides.be>
  *
@@ -49,7 +49,7 @@ if ($_POST["action"] == 'updateMask')
 {
 	$maskconstorder=$_POST['maskconstorder'];
 	$maskorder=$_POST['maskorder'];
-	if ($maskconstorder)  dolibarr_set_const($db,$maskconstorder,$maskorder);
+	if ($maskconstorder)  dolibarr_set_const($db,$maskconstorder,$maskorder,'chaine',0,'',$conf->entity);
 }
 
 if ($_GET["action"] == 'specimen')
@@ -90,7 +90,7 @@ if ($_GET["action"] == 'specimen')
 if ($_GET["action"] == 'set')
 {
 	$type='supplier_order';
-	$sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type) VALUES ('".$_GET["value"]."','".$type."')";
+	$sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES ('".$_GET["value"]."','".$type."',".$conf->entity.")";
 	if ($db->query($sql))
 	{
 
@@ -101,7 +101,9 @@ if ($_GET["action"] == 'del')
 {
 	$type='supplier_order';
 	$sql = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
-	$sql .= "  WHERE nom = '".$_GET["value"]."' AND type = '".$type."'";
+	$sql.= " WHERE nom = '".$_GET["value"];
+	$sql.= " AND type = '".$type."'";
+	$sql.= " AND entity = ".$conf->entity;
 	if ($db->query($sql))
 	{
 
@@ -112,7 +114,7 @@ if ($_GET["action"] == 'setdoc')
 {
 	$db->begin();
 
-	if (dolibarr_set_const($db, "COMMANDE_SUPPLIER_ADDON_PDF",$_GET["value"]))
+	if (dolibarr_set_const($db, "COMMANDE_SUPPLIER_ADDON_PDF",$_GET["value"],'chaine',0,'',$conf->entity))
 	{
 		$conf->global->COMMANDE_SUPPLIER_ADDON_PDF = $_GET["value"];
 	}
@@ -120,9 +122,11 @@ if ($_GET["action"] == 'setdoc')
 	// On active le modele
 	$type='supplier_order';
 	$sql_del = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
-	$sql_del .= "  WHERE nom = '".$_GET["value"]."' AND type = '".$type."'";
+	$sql_del.= " WHERE nom = '".$_GET["value"];
+	$sql_del.= " AND type = '".$type."'";
+	$sql_del.= " AND entity = ".$conf->entity;
 	$result1=$db->query($sql_del);
-	$sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom,type) VALUES ('".$_GET["value"]."','".$type."')";
+	$sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom,type,entity) VALUES ('".$_GET["value"]."','".$type."',".$conf->entity.")";
 	$result2=$db->query($sql);
 	if ($result1 && $result2)
 	{
@@ -136,10 +140,10 @@ if ($_GET["action"] == 'setdoc')
 
 if ($_GET["action"] == 'setmod')
 {
-	// \todo Verifier si module numerotation choisi peut etre activ�
+	// \todo Verifier si module numerotation choisi peut etre active
 	// par appel methode canBeActivated
 
-	dolibarr_set_const($db, "COMMANDE_SUPPLIER_ADDON",$_GET["value"]);
+	dolibarr_set_const($db, "COMMANDE_SUPPLIER_ADDON",$_GET["value"],'chaine',0,'',$conf->entity);
 }
 
 if ($_POST["action"] == 'addcat')
@@ -148,11 +152,11 @@ if ($_POST["action"] == 'addcat')
 	$fourn->CreateCategory($user,$_POST["cat"]);
 }
 
-// d�fini les constantes du mod�le orchidee
-if ($_POST["action"] == 'updateMatrice') dolibarr_set_const($db, "COMMANDE_FOURNISSEUR_NUM_MATRICE",$_POST["matrice"]);
-if ($_POST["action"] == 'updatePrefixCommande') dolibarr_set_const($db, "COMMANDE_FOURNISSEUR_NUM_PREFIX",$_POST["prefixcommande"]);
-if ($_POST["action"] == 'setOffset') dolibarr_set_const($db, "COMMANDE_FOURNISSEUR_NUM_DELTA",$_POST["offset"]);
-if ($_POST["action"] == 'setNumRestart') dolibarr_set_const($db, "COMMANDE_FOURNISSEUR_NUM_RESTART_BEGIN_YEAR",$_POST["numrestart"]);
+// defini les constantes du modele orchidee
+if ($_POST["action"] == 'updateMatrice') dolibarr_set_const($db, "COMMANDE_FOURNISSEUR_NUM_MATRICE",$_POST["matrice"],'chaine',0,'',$conf->entity);
+if ($_POST["action"] == 'updatePrefixCommande') dolibarr_set_const($db, "COMMANDE_FOURNISSEUR_NUM_PREFIX",$_POST["prefixcommande"],'chaine',0,'',$conf->entity);
+if ($_POST["action"] == 'setOffset') dolibarr_set_const($db, "COMMANDE_FOURNISSEUR_NUM_DELTA",$_POST["offset"],'chaine',0,'',$conf->entity);
+if ($_POST["action"] == 'setNumRestart') dolibarr_set_const($db, "COMMANDE_FOURNISSEUR_NUM_RESTART_BEGIN_YEAR",$_POST["numrestart"],'chaine',0,'',$conf->entity);
 
 
 /*
@@ -272,9 +276,12 @@ print_titre($langs->trans("OrdersModelModule"));
 // Defini tableau def de modele
 $type='supplier_order';
 $def = array();
+
 $sql = "SELECT nom";
 $sql.= " FROM ".MAIN_DB_PREFIX."document_model";
 $sql.= " WHERE type = '".$type."'";
+$sql.= " AND entity = ".$conf->entity;
+
 $resql=$db->query($sql);
 if ($resql)
 {
@@ -321,7 +328,7 @@ while (($file = readdir($handle))!==false)
 		print $module->description;
 		print "</td>\n";
 
-		// Activ�
+		// Active
 		if (in_array($name, $def))
 		{
 	  print "<td align=\"center\">\n";
@@ -378,50 +385,5 @@ closedir($handle);
 
 print '</table><br/>';
 
-/* Obsolete. Les categories de fournisseurs sont gerees dans la table llx_categories
- sur le meme principe que les categories clients et produits
-
- print_titre($langs->trans("Categories"));
-
- $sql = "SELECT rowid, label";
- $sql.= " FROM ".MAIN_DB_PREFIX."fournisseur_categorie";
- $sql.= " ORDER BY label ASC";
-
- $resql = $db->query($sql);
- if ($resql)
- {
- $num = $db->num_rows($resql);
- $i = 0;
-
- print '<form action="fournisseur.php" method="POST"><table class="liste" width="100%">';
- print '<input type="hidden" name="action" value="addcat">';
- print '<tr class="liste_titre"><td>';
- print $langs->trans("Num").'</td><td>'.$langs->trans("Name");
- print "</td></tr>\n";
- $var=True;
-
- print "<tr $bc[$var]><td>&nbsp;</td>";
- print '<td><input type="text" name="cat">&nbsp;';
- print '<input type="submit" value="'.$langs->trans("Add").'">';
- print "</td></tr>\n";
-
- while ($obj = $db->fetch_object($resql))
- {
- $var=!$var;
- print "<tr $bc[$var]>\n";
- print '<td width="10%">'.$obj->rowid.'</td>';
- print '<td width="90%"><a href="liste.php?cat='.$obj->rowid.'">'.stripslashes($obj->label).'</a></td>';
- print "</tr>\n";
- }
- print "</table></form>\n";
-
- $db->free($resql);
- }
- else
- {
- dol_print_error($db);
- }
- */
-
 llxFooter('$Date$ - $Revision$');
 ?>
diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index c511ddca4f3..e41ba8a04cd 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -56,26 +56,26 @@ $searchformmodule=array('Module1Name','Module1Name',
 
 if (isset($_POST["action"]) && $_POST["action"] == 'update')
 {
-	dolibarr_set_const($db, "MAIN_LANG_DEFAULT",       $_POST["main_lang_default"]);
-	dolibarr_set_const($db, "MAIN_MULTILANGS",         $_POST["main_multilangs"]);
-	dolibarr_set_const($db, "MAIN_SIZE_LISTE_LIMIT",   $_POST["main_size_liste_limit"]);
-	dolibarr_set_const($db, "MAIN_DISABLE_JAVASCRIPT", $_POST["main_disable_javascript"]);
-	dolibarr_set_const($db, "MAIN_CONFIRM_AJAX",       $_POST["main_confirm_ajax"]);
-	dolibarr_set_const($db, "MAIN_POPUP_CALENDAR",     $_POST["main_popup_calendar"]);
-	dolibarr_set_const($db, "MAIN_USE_PREVIEW_TABS",   $_POST["main_use_preview_tabs"]);
+	dolibarr_set_const($db, "MAIN_LANG_DEFAULT",       $_POST["main_lang_default"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_MULTILANGS",         $_POST["main_multilangs"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_SIZE_LISTE_LIMIT",   $_POST["main_size_liste_limit"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_DISABLE_JAVASCRIPT", $_POST["main_disable_javascript"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_CONFIRM_AJAX",       $_POST["main_confirm_ajax"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_POPUP_CALENDAR",     $_POST["main_popup_calendar"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_USE_PREVIEW_TABS",   $_POST["main_use_preview_tabs"],'chaine',0,'',$conf->entity);
 
-	dolibarr_set_const($db, "MAIN_SHOW_BUGTRACK_LINK", $_POST["main_show_bugtrack_link"]);
-	dolibarr_set_const($db, "MAIN_SHOW_WORKBOARD",     $_POST["main_show_workboard"]);
+	dolibarr_set_const($db, "MAIN_SHOW_BUGTRACK_LINK", $_POST["main_show_bugtrack_link"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_SHOW_WORKBOARD",     $_POST["main_show_workboard"],'chaine',0,'',$conf->entity);
 
-	dolibarr_set_const($db, "MAIN_THEME",              $_POST["main_theme"]);
+	dolibarr_set_const($db, "MAIN_THEME",              $_POST["main_theme"],'chaine',0,'',$conf->entity);
 
-	dolibarr_set_const($db, "MAIN_SEARCHFORM_CONTACT", $_POST["MAIN_SEARCHFORM_CONTACT"]);
-	dolibarr_set_const($db, "MAIN_SEARCHFORM_SOCIETE", $_POST["MAIN_SEARCHFORM_SOCIETE"]);
-	dolibarr_set_const($db, "MAIN_SEARCHFORM_PRODUITSERVICE",$_POST["MAIN_SEARCHFORM_PRODUITSERVICE"]);
-	dolibarr_set_const($db, "MAIN_SEARCHFORM_ADHERENT",$_POST["MAIN_SEARCHFORM_ADHERENT"]);
+	dolibarr_set_const($db, "MAIN_SEARCHFORM_CONTACT", $_POST["MAIN_SEARCHFORM_CONTACT"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_SEARCHFORM_SOCIETE", $_POST["MAIN_SEARCHFORM_SOCIETE"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_SEARCHFORM_PRODUITSERVICE",$_POST["MAIN_SEARCHFORM_PRODUITSERVICE"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_SEARCHFORM_ADHERENT",$_POST["MAIN_SEARCHFORM_ADHERENT"],'chaine',0,'',$conf->entity);
 
-	dolibarr_set_const($db, "MAIN_MOTD",               dol_htmlcleanlastbr($_POST["main_motd"]));
-	dolibarr_set_const($db, "MAIN_HOME",               dol_htmlcleanlastbr($_POST["main_home"]));
+	dolibarr_set_const($db, "MAIN_MOTD",               dol_htmlcleanlastbr($_POST["main_motd"]),'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_HOME",               dol_htmlcleanlastbr($_POST["main_home"]),'chaine',0,'',$conf->entity);
 
 	$_SESSION["mainmenu"]="";   // Le gestionnaire de menu a pu changer
 
diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php
index f19e27f6fcf..8637afd6a54 100644
--- a/htdocs/admin/ldap.php
+++ b/htdocs/admin/ldap.php
@@ -49,18 +49,18 @@ if ($_GET["action"] == 'setvalue' && $user->admin)
 {
 	$error=0;
 	
-	if (! dolibarr_set_const($db, 'LDAP_SERVER_TYPE',$_POST["type"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_SERVER_PROTOCOLVERSION',$_POST["version"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_SERVER_HOST',$_POST["host"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_SERVER_HOST_SLAVE',$_POST["slave"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_SERVER_PORT',$_POST["port"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_SERVER_DN',$_POST["dn"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_ADMIN_DN',$_POST["admin"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_ADMIN_PASS',$_POST["pass"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_SERVER_USE_TLS',$_POST["usetls"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_CONTACT_ACTIVE',$_POST["activecontact"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_SYNCHRO_ACTIVE',$_POST["activesynchro"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_MEMBER_ACTIVE',$_POST["activemembers"])) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_SERVER_TYPE',$_POST["type"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_SERVER_PROTOCOLVERSION',$_POST["version"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_SERVER_HOST',$_POST["host"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_SERVER_HOST_SLAVE',$_POST["slave"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_SERVER_PORT',$_POST["port"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_SERVER_DN',$_POST["dn"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_ADMIN_DN',$_POST["admin"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_ADMIN_PASS',$_POST["pass"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_SERVER_USE_TLS',$_POST["usetls"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_CONTACT_ACTIVE',$_POST["activecontact"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_SYNCHRO_ACTIVE',$_POST["activesynchro"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_MEMBER_ACTIVE',$_POST["activemembers"],'chaine',0,'',$conf->entity)) $error++;
 
 	if ($error)
 	{
diff --git a/htdocs/admin/ldap_contacts.php b/htdocs/admin/ldap_contacts.php
index 2181044feb6..8eae8905918 100644
--- a/htdocs/admin/ldap_contacts.php
+++ b/htdocs/admin/ldap_contacts.php
@@ -46,24 +46,24 @@ if (!$user->admin)
 if ($_GET["action"] == 'setvalue' && $user->admin)
 {
 	$error=0;
-	if (! dolibarr_set_const($db, 'LDAP_KEY_CONTACTS',$_POST["key"])) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_KEY_CONTACTS',$_POST["key"],'chaine',0,'',$conf->entity)) $error++;
 
-	if (! dolibarr_set_const($db, 'LDAP_CONTACT_DN',$_POST["contactdn"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_CONTACT_OBJECT_CLASS',$_POST["objectclass"])) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_CONTACT_DN',$_POST["contactdn"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_CONTACT_OBJECT_CLASS',$_POST["objectclass"],'chaine',0,'',$conf->entity)) $error++;
 	
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_FULLNAME',$_POST["fieldfullname"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_NAME',$_POST["fieldname"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_FIRSTNAME',$_POST["fieldfirstname"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_COMPANY',$_POST["fieldcompany"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_MAIL',$_POST["fieldmail"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_PHONE',$_POST["fieldphone"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_HOMEPHONE',$_POST["fieldhomephone"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_MOBILE',$_POST["fieldmobile"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_FAX',$_POST["fieldfax"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_ADDRESS',$_POST["fieldaddress"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_ZIP',$_POST["fieldzip"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_TOWN',$_POST["fieldtown"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_COUNTRY',$_POST["fieldcountry"])) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_FULLNAME',$_POST["fieldfullname"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_NAME',$_POST["fieldname"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_FIRSTNAME',$_POST["fieldfirstname"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_COMPANY',$_POST["fieldcompany"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_MAIL',$_POST["fieldmail"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_PHONE',$_POST["fieldphone"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_HOMEPHONE',$_POST["fieldhomephone"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_MOBILE',$_POST["fieldmobile"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_FAX',$_POST["fieldfax"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_ADDRESS',$_POST["fieldaddress"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_ZIP',$_POST["fieldzip"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_TOWN',$_POST["fieldtown"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_COUNTRY',$_POST["fieldcountry"],'chaine',0,'',$conf->entity)) $error++;
 	
 	if ($error)
 	{
diff --git a/htdocs/admin/ldap_groups.php b/htdocs/admin/ldap_groups.php
index b424d53e6bb..4b1c8a38047 100644
--- a/htdocs/admin/ldap_groups.php
+++ b/htdocs/admin/ldap_groups.php
@@ -47,14 +47,14 @@ if (!$user->admin)
 if ($_GET["action"] == 'setvalue' && $user->admin)
 {
 	$error=0;
-	if (! dolibarr_set_const($db, 'LDAP_KEY_GROUPS',$_POST["key"])) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_KEY_GROUPS',$_POST["key"],'chaine',0,'',$conf->entity)) $error++;
 
-	if (! dolibarr_set_const($db, 'LDAP_GROUP_DN',$_POST["group"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_GROUP_OBJECT_CLASS',$_POST["objectclass"])) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_GROUP_DN',$_POST["group"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_GROUP_OBJECT_CLASS',$_POST["objectclass"],'chaine',0,'',$conf->entity)) $error++;
 	
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_FULLNAME',$_POST["fieldfullname"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_NAME',$_POST["fieldname"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_DESCRIPTION',$_POST["fielddescription"])) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_FULLNAME',$_POST["fieldfullname"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_NAME',$_POST["fieldname"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_DESCRIPTION',$_POST["fielddescription"],'chaine',0,'',$conf->entity)) $error++;
 
 	if ($error)
 	{
diff --git a/htdocs/admin/ldap_members.php b/htdocs/admin/ldap_members.php
index d3ee7d0216b..afd3ac7bc58 100644
--- a/htdocs/admin/ldap_members.php
+++ b/htdocs/admin/ldap_members.php
@@ -47,37 +47,37 @@ if (!$user->admin)
 if ($_GET["action"] == 'setvalue' && $user->admin)
 {
 	$error=0;
-	if (! dolibarr_set_const($db, 'LDAP_KEY_MEMBERS',$_POST["key"])) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_KEY_MEMBERS',$_POST["key"],'chaine',0,'',$conf->entity)) $error++;
 	
-	if (! dolibarr_set_const($db, 'LDAP_MEMBER_DN',$_POST["user"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_MEMBER_OBJECT_CLASS',$_POST["objectclass"])) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_MEMBER_DN',$_POST["user"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_MEMBER_OBJECT_CLASS',$_POST["objectclass"],'chaine',0,'',$conf->entity)) $error++;
 	// Members
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_FULLNAME',$_POST["fieldfullname"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_LOGIN',$_POST["fieldlogin"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_LOGIN_SAMBA',$_POST["fieldloginsamba"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_PASSWORD',$_POST["fieldpassword"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_PASSWORD_CRYPTED',$_POST["fieldpasswordcrypted"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_NAME',$_POST["fieldname"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_FIRSTNAME',$_POST["fieldfirstname"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_MAIL',$_POST["fieldmail"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_PHONE',$_POST["fieldphone"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_PHONE_PERSO',$_POST["fieldphoneperso"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_MOBILE',$_POST["fieldmobile"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_FAX',$_POST["fieldfax"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_ADDRESS',$_POST["fieldaddress"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_ZIP',$_POST["fieldzip"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_TOWN',$_POST["fieldtown"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_COUNTRY',$_POST["fieldcountry"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_DESCRIPTION',$_POST["fielddescription"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_BIRTHDATE',$_POST["fieldbirthdate"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_MEMBER_STATUS',$_POST["fieldstatus"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_MEMBER_END_LASTSUBSCRIPTION', $_POST["fieldendlastsubscription"])) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_FULLNAME',$_POST["fieldfullname"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_LOGIN',$_POST["fieldlogin"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_LOGIN_SAMBA',$_POST["fieldloginsamba"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_PASSWORD',$_POST["fieldpassword"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_PASSWORD_CRYPTED',$_POST["fieldpasswordcrypted"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_NAME',$_POST["fieldname"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_FIRSTNAME',$_POST["fieldfirstname"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_MAIL',$_POST["fieldmail"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_PHONE',$_POST["fieldphone"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_PHONE_PERSO',$_POST["fieldphoneperso"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_MOBILE',$_POST["fieldmobile"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_FAX',$_POST["fieldfax"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_ADDRESS',$_POST["fieldaddress"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_ZIP',$_POST["fieldzip"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_TOWN',$_POST["fieldtown"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_COUNTRY',$_POST["fieldcountry"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_DESCRIPTION',$_POST["fielddescription"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_BIRTHDATE',$_POST["fieldbirthdate"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_MEMBER_STATUS',$_POST["fieldstatus"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_MEMBER_END_LASTSUBSCRIPTION', $_POST["fieldendlastsubscription"],'chaine',0,'',$conf->entity)) $error++;
 
 	// Subscriptions
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_DATE',  $_POST["fieldfirstsubscriptiondate"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_AMOUNT',$_POST["fieldfirstsubscriptionamount"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_DATE',   $_POST["fieldlastsubscriptiondate"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_AMOUNT', $_POST["fieldlastsubscriptionamount"])) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_DATE',  $_POST["fieldfirstsubscriptiondate"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_AMOUNT',$_POST["fieldfirstsubscriptionamount"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_DATE',   $_POST["fieldlastsubscriptiondate"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_AMOUNT', $_POST["fieldlastsubscriptionamount"],'chaine',0,'',$conf->entity)) $error++;
 
 	if ($error)
 	{
diff --git a/htdocs/admin/ldap_users.php b/htdocs/admin/ldap_users.php
index 449ad6e502a..35e308a2845 100644
--- a/htdocs/admin/ldap_users.php
+++ b/htdocs/admin/ldap_users.php
@@ -47,25 +47,25 @@ if (!$user->admin)
 if ($_GET["action"] == 'setvalue' && $user->admin)
 {
 	$error=0;
-	if (! dolibarr_set_const($db, 'LDAP_KEY_USERS',$_POST["key"])) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_KEY_USERS',$_POST["key"],'chaine',0,'',$conf->entity)) $error++;
 
-	if (! dolibarr_set_const($db, 'LDAP_USER_DN',$_POST["user"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_USER_OBJECT_CLASS',$_POST["objectclass"])) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_USER_DN',$_POST["user"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_USER_OBJECT_CLASS',$_POST["objectclass"],'chaine',0,'',$conf->entity)) $error++;
 	
-	if (! dolibarr_set_const($db, 'LDAP_FILTER_CONNECTION',$_POST["filterconnection"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_FULLNAME',$_POST["fieldfullname"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_LOGIN',$_POST["fieldlogin"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_LOGIN_SAMBA',$_POST["fieldloginsamba"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_PASSWORD',$_POST["fieldpassword"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_PASSWORD_CRYPTED',$_POST["fieldpasswordcrypted"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_NAME',$_POST["fieldname"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_FIRSTNAME',$_POST["fieldfirstname"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_MAIL',$_POST["fieldmail"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_PHONE',$_POST["fieldphone"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_MOBILE',$_POST["fieldmobile"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_FAX',$_POST["fieldfax"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_DESCRIPTION',$_POST["fielddescription"])) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_SID',$_POST["fieldsid"])) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FILTER_CONNECTION',$_POST["filterconnection"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_FULLNAME',$_POST["fieldfullname"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_LOGIN',$_POST["fieldlogin"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_LOGIN_SAMBA',$_POST["fieldloginsamba"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_PASSWORD',$_POST["fieldpassword"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_PASSWORD_CRYPTED',$_POST["fieldpasswordcrypted"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_NAME',$_POST["fieldname"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_FIRSTNAME',$_POST["fieldfirstname"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_MAIL',$_POST["fieldmail"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_PHONE',$_POST["fieldphone"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_MOBILE',$_POST["fieldmobile"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_FAX',$_POST["fieldfax"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_DESCRIPTION',$_POST["fielddescription"],'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_SID',$_POST["fieldsid"],'chaine',0,'',$conf->entity)) $error++;
 
 	if ($error)
 	{
diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php
index cea2b88273e..61ec30c808f 100644
--- a/htdocs/admin/limits.php
+++ b/htdocs/admin/limits.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2007-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2009      Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -44,10 +45,10 @@ if (isset($_POST["action"]) && $_POST["action"] == 'update')
 	}
 	else
 	{
-		dolibarr_set_const($db, "MAIN_MAX_DECIMALS_UNIT",   $_POST["MAIN_MAX_DECIMALS_UNIT"]);
-		dolibarr_set_const($db, "MAIN_MAX_DECIMALS_TOT",    $_POST["MAIN_MAX_DECIMALS_TOT"]);
-		dolibarr_set_const($db, "MAIN_MAX_DECIMALS_SHOWN",  $_POST["MAIN_MAX_DECIMALS_SHOWN"]);
-		dolibarr_set_const($db, "MAIN_DISABLE_PDF_COMPRESSION", $_POST["MAIN_DISABLE_PDF_COMPRESSION"]);
+		dolibarr_set_const($db, "MAIN_MAX_DECIMALS_UNIT",   $_POST["MAIN_MAX_DECIMALS_UNIT"],'chaine',0,'',$conf->entity);
+		dolibarr_set_const($db, "MAIN_MAX_DECIMALS_TOT",    $_POST["MAIN_MAX_DECIMALS_TOT"],'chaine',0,'',$conf->entity);
+		dolibarr_set_const($db, "MAIN_MAX_DECIMALS_SHOWN",  $_POST["MAIN_MAX_DECIMALS_SHOWN"],'chaine',0,'',$conf->entity);
+		dolibarr_set_const($db, "MAIN_DISABLE_PDF_COMPRESSION", $_POST["MAIN_DISABLE_PDF_COMPRESSION"],'chaine',0,'',$conf->entity);
 
 		Header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
 		exit;
diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php
index 54a82d9d9f6..32ac1f6fa2d 100644
--- a/htdocs/admin/livraison.php
+++ b/htdocs/admin/livraison.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2004      Sebastien Di Cintio  <sdicintio@ressource-toi.org>
  * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2007 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -48,7 +48,7 @@ if ($_POST["action"] == 'updateMask')
 {
 	$maskconstdelivery=$_POST['maskconstdelivery'];
 	$maskdelivery=$_POST['maskdelivery'];
-	if ($maskconstdelivery)  dolibarr_set_const($db,$maskconstdelivery,$maskdelivery);
+	if ($maskconstdelivery)  dolibarr_set_const($db,$maskconstdelivery,$maskdelivery,'chaine',0,'',$conf->entity);
 }
 
 if ($_GET["action"] == 'specimen')
@@ -90,7 +90,7 @@ if ($_GET["action"] == 'specimen')
 if ($_GET["action"] == 'set')
 {
 	$type='delivery';
-    $sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type) VALUES ('".$_GET["value"]."','".$type."')";
+    $sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES ('".$_GET["value"]."','".$type."',".$conf->entity.")";
     if ($db->query($sql))
     {
 
@@ -101,7 +101,10 @@ if ($_GET["action"] == 'del')
 {
     $type='delivery';
     $sql = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
-    $sql .= "  WHERE nom = '".$_GET["value"]."' AND type = '".$type."'";
+    $sql.= " WHERE nom = '".$_GET["value"];
+    $sql.= " AND type = '".$type."'";
+    $sql.= " AND entity = ".$conf->entity;
+    
     if ($db->query($sql))
     {
 
@@ -112,7 +115,7 @@ if ($_GET["action"] == 'setdoc')
 {
 	$db->begin();
 
-    if (dolibarr_set_const($db, "LIVRAISON_ADDON_PDF",$_GET["value"]))
+    if (dolibarr_set_const($db, "LIVRAISON_ADDON_PDF",$_GET["value"],'chaine',0,'',$conf->entity))
     {
         $conf->global->LIVRAISON_ADDON_PDF = $_GET["value"];
     }
@@ -120,9 +123,11 @@ if ($_GET["action"] == 'setdoc')
     // On active le modele
     $type='delivery';
     $sql_del = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
-    $sql_del .= "  WHERE nom = '".$_GET["value"]."' AND type = '".$type."'";
+    $sql_del.= " WHERE nom = '".$_GET["value"];
+    $sql_del.= " AND type = '".$type."'";
+    $sql_del.= " AND entity = ".$conf->entity;
     $result1=$db->query($sql_del);
-    $sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom,type) VALUES ('".$_GET["value"]."','".$type."')";
+    $sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom,type,entity) VALUES ('".$_GET["value"]."','".$type."',".$conf->entity.")";
     $result2=$db->query($sql);
     if ($result1 && $result2)
     {
@@ -136,7 +141,7 @@ if ($_GET["action"] == 'setdoc')
 
 if ($_POST["action"] == 'set_DELIVERY_FREE_TEXT')
 {
-    dolibarr_set_const($db, "DELIVERY_FREE_TEXT",trim($_POST["DELIVERY_FREE_TEXT"]));
+    dolibarr_set_const($db, "DELIVERY_FREE_TEXT",trim($_POST["DELIVERY_FREE_TEXT"]),'chaine',0,'',$conf->entity);
 }
 
 if ($_GET["action"] == 'setmod')
@@ -144,7 +149,7 @@ if ($_GET["action"] == 'setmod')
     // \todo Verifier si module numerotation choisi peut etre active
     // par appel methode canBeActivated
 
-	dolibarr_set_const($db, "LIVRAISON_ADDON",$_GET["value"]);
+	dolibarr_set_const($db, "LIVRAISON_ADDON",$_GET["value"],'chaine',0,'',$conf->entity);
 }
 
 
@@ -282,9 +287,12 @@ print_titre($langs->trans("DeliveryOrderModel"));
 // Defini tableau def de modele invoice
 $type="delivery";
 $def = array();
+
 $sql = "SELECT nom";
 $sql.= " FROM ".MAIN_DB_PREFIX."document_model";
 $sql.= " WHERE type = '".$type."'";
+$sql.= " AND entity = ".$conf->entity;
+
 $resql=$db->query($sql);
 if ($resql)
 {
diff --git a/htdocs/admin/mailing.php b/htdocs/admin/mailing.php
index 818bbe8c734..caf9111f828 100644
--- a/htdocs/admin/mailing.php
+++ b/htdocs/admin/mailing.php
@@ -36,7 +36,7 @@ if (!$user->admin)
 
 if ($_POST["action"] == 'setvalue' && $user->admin)
 {
-	$result=dolibarr_set_const($db, "MAILING_EMAIL_FROM",$_POST["email_from"]);
+	$result=dolibarr_set_const($db, "MAILING_EMAIL_FROM",$_POST["email_from"],'chaine',0,'',$conf->entity);
   	if ($result >= 0)
   	{
   		$mesg='<div class="ok">'.$langs->trans("Success").'</div>';
diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index 435ae315191..e2db0e800fd 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -47,13 +47,13 @@ $substitutionarrayfortest=array(
 
 if (isset($_POST["action"]) && $_POST["action"] == 'update')
 {
-	dolibarr_set_const($db, "MAIN_DISABLE_ALL_MAILS",   $_POST["MAIN_DISABLE_ALL_MAILS"]);
-	dolibarr_set_const($db, "MAIN_MAIL_SENDMODE",       $_POST["MAIN_MAIL_SENDMODE"]);
-	dolibarr_set_const($db, "MAIN_MAIL_SMTP_PORT",      $_POST["MAIN_MAIL_SMTP_PORT"]);
-	dolibarr_set_const($db, "MAIN_MAIL_SMTP_SERVER",    $_POST["MAIN_MAIL_SMTP_SERVER"]);
-	dolibarr_set_const($db, "MAIN_MAIL_SMTPS_ID",       $_POST["MAIN_MAIL_SMTPS_ID"]);
-	dolibarr_set_const($db, "MAIN_MAIL_SMTPS_PW",       $_POST["MAIN_MAIL_SMTPS_PW"]);
-	dolibarr_set_const($db, "MAIN_MAIL_EMAIL_FROM",     $_POST["MAIN_MAIL_EMAIL_FROM"]);
+	dolibarr_set_const($db, "MAIN_DISABLE_ALL_MAILS",   $_POST["MAIN_DISABLE_ALL_MAILS"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_MAIL_SENDMODE",       $_POST["MAIN_MAIL_SENDMODE"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_MAIL_SMTP_PORT",      $_POST["MAIN_MAIL_SMTP_PORT"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_MAIL_SMTP_SERVER",    $_POST["MAIN_MAIL_SMTP_SERVER"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_MAIL_SMTPS_ID",       $_POST["MAIN_MAIL_SMTPS_ID"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_MAIL_SMTPS_PW",       $_POST["MAIN_MAIL_SMTPS_PW"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_MAIL_EMAIL_FROM",     $_POST["MAIN_MAIL_EMAIL_FROM"],'chaine',0,'',$conf->entity);
 
 	Header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
 	exit;
diff --git a/htdocs/admin/mantis.php b/htdocs/admin/mantis.php
index 9d6c2142dc6..2846fb0f1af 100644
--- a/htdocs/admin/mantis.php
+++ b/htdocs/admin/mantis.php
@@ -52,11 +52,11 @@ if ($actionsave)
 
     $db->begin();
     
-    $i+=dolibarr_set_const($db,'PHPMANTIS_URL',trim($_POST["phpmantis_url"]),'chaine',0);
-    $i+=dolibarr_set_const($db,'PHPMANTIS_HOST',trim($_POST["phpmantis_host"]),'chaine',0);
-    $i+=dolibarr_set_const($db,'PHPMANTIS_DBNAME',trim($_POST["phpmantis_dbname"]),'chaine',0);
-    $i+=dolibarr_set_const($db,'PHPMANTIS_USER',trim($_POST["phpmantis_user"]),'chaine',0);
-    $i+=dolibarr_set_const($db,'PHPMANTIS_PASS',trim($_POST["phpmantis_pass"]),'chaine',0);
+    $i+=dolibarr_set_const($db,'PHPMANTIS_URL',trim($_POST["phpmantis_url"]),'chaine',0,'',$conf->entity);
+    $i+=dolibarr_set_const($db,'PHPMANTIS_HOST',trim($_POST["phpmantis_host"]),'chaine',0,'',$conf->entity);
+    $i+=dolibarr_set_const($db,'PHPMANTIS_DBNAME',trim($_POST["phpmantis_dbname"]),'chaine',0,'',$conf->entity);
+    $i+=dolibarr_set_const($db,'PHPMANTIS_USER',trim($_POST["phpmantis_user"]),'chaine',0,'',$conf->entity);
+    $i+=dolibarr_set_const($db,'PHPMANTIS_PASS',trim($_POST["phpmantis_pass"]),'chaine',0,'',$conf->entity);
 
     if ($i >= 5)
     {
diff --git a/htdocs/admin/menus.php b/htdocs/admin/menus.php
index ba929ae0dd1..193c463068c 100644
--- a/htdocs/admin/menus.php
+++ b/htdocs/admin/menus.php
@@ -49,11 +49,11 @@ if (isset($_POST["action"]) && $_POST["action"] == 'update')
 {
 	$_SESSION["mainmenu"]="home";   // Le gestionnaire de menu a pu changer
 
-	dolibarr_set_const($db, "MAIN_MENU_BARRETOP",      $_POST["main_menu_barretop"]);
-	dolibarr_set_const($db, "MAIN_MENU_BARRELEFT",     $_POST["main_menu_barreleft"]);
+	dolibarr_set_const($db, "MAIN_MENU_BARRETOP",      $_POST["main_menu_barretop"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_MENU_BARRELEFT",     $_POST["main_menu_barreleft"],'chaine',0,'',$conf->entity);
 	
-	dolibarr_set_const($db, "MAIN_MENUFRONT_BARRETOP", $_POST["main_menufront_barretop"]);
-	dolibarr_set_const($db, "MAIN_MENUFRONT_BARRELEFT",$_POST["main_menufront_barreleft"]);
+	dolibarr_set_const($db, "MAIN_MENUFRONT_BARRETOP", $_POST["main_menufront_barretop"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_MENUFRONT_BARRELEFT",$_POST["main_menufront_barreleft"],'chaine',0,'',$conf->entity);
 	
 	// Define list of menu handlers to initialize
  	$listofmenuhandler=array();
diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php
index 028b87f1774..d0a381a675e 100644
--- a/htdocs/admin/menus/index.php
+++ b/htdocs/admin/menus/index.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2007      Patrick Raguin       <patrick.raguin@gmail.com>
  * Copyright (C) 2007-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2009      Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -58,7 +59,8 @@ if ($_REQUEST["menu_handler"])    $menu_handler=$_REQUEST["menu_handler"];
 
 if (isset($_GET["action"]) && ($_GET["action"] == 'up'))
 {
-	$sql = "SELECT m.rowid, m.position FROM ".MAIN_DB_PREFIX."menu as m";
+	$sql = "SELECT m.rowid, m.position";
+	$sql.= " FROM ".MAIN_DB_PREFIX."menu as m";
 	$sql.= " WHERE m.rowid = ".$_GET["menuId"];
 	$result = $db->query($sql);
 
@@ -74,9 +76,12 @@ if (isset($_GET["action"]) && ($_GET["action"] == 'up'))
 	}
 
 	// Menu top
-	$sql = "SELECT m.rowid, m.position FROM ".MAIN_DB_PREFIX."menu as m";
-	$sql.= " WHERE m.position = ".($precedent['order'] - 1)." AND m.type = 'top'";
-	$sql.= " AND menu_handler='".$menu_handler_top."'";
+	$sql = "SELECT m.rowid, m.position";
+	$sql.= " FROM ".MAIN_DB_PREFIX."menu as m";
+	$sql.= " WHERE m.position = ".($precedent['order'] - 1);
+	$sql.= " AND m.type = 'top'";
+	$sql.= " AND m.menu_handler='".$menu_handler_top."'";
+	$sql.= " AND m.entity = ".$conf->entity;
 	$result = $db->query($sql);
 
 	$num = $db->num_rows($result);
@@ -103,7 +108,9 @@ if (isset($_GET["action"]) && ($_GET["action"] == 'up'))
 if (isset($_GET["action"]) && $_GET["action"] == 'down')
 {
 
-	$sql = "SELECT m.rowid, m.position FROM ".MAIN_DB_PREFIX."menu as m WHERE m.rowid = ".$_GET["menuId"];
+	$sql = "SELECT m.rowid, m.position";
+	$sql.= " FROM ".MAIN_DB_PREFIX."menu as m";
+	$sql.= " WHERE m.rowid = ".$_GET["menuId"];
 	$result = $db->query($sql);
 
 	$num = $db->num_rows($result);
@@ -119,7 +126,9 @@ if (isset($_GET["action"]) && $_GET["action"] == 'down')
 
 	$sql = "SELECT m.rowid, m.position";
 	$sql.= " FROM ".MAIN_DB_PREFIX."menu as m";
-	$sql.= " WHERE m.position = ".($precedent['order'] + 1)." AND type='top'";
+	$sql.= " WHERE m.position = ".($precedent['order'] + 1);
+	$sql.= " AND m.type='top'";
+	$sql.= " AND m.entity = ".$conf->entity;
 	$result = $db->query($sql);
 
 	$num = $db->num_rows($result);
@@ -133,9 +142,13 @@ if (isset($_GET["action"]) && $_GET["action"] == 'down')
 		$i++;
 	}
 
-	$sql = "UPDATE ".MAIN_DB_PREFIX."menu as m SET m.position = ".$suivant['order']." WHERE m.rowid = ".$precedent['rowid'].""; // Monte celui select
+	$sql = "UPDATE ".MAIN_DB_PREFIX."menu as m";
+	$sql.= " SET m.position = ".$suivant['order'];
+	$sql.= " WHERE m.rowid = ".$precedent['rowid'].""; // Monte celui select
 	$db->query($sql);
-	$sql = "UPDATE ".MAIN_DB_PREFIX."menu as m SET m.position = ".$precedent['order']." WHERE m.rowid = ".$suivant['rowid'].""; // Descend celui du dessus
+	$sql = "UPDATE ".MAIN_DB_PREFIX."menu as m";
+	$sql.= " SET m.position = ".$precedent['order'];
+	$sql.= " WHERE m.rowid = ".$suivant['rowid'].""; // Descend celui du dessus
 	$db->query($sql);
 }
 
@@ -143,16 +156,21 @@ if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == 'yes')
 {
 	$db->begin();
 
-	$sql = "SELECT c.rowid, c.fk_constraint FROM ".MAIN_DB_PREFIX."menu_const as c WHERE c.fk_menu = ".$_GET['menuId'];
+	$sql = "SELECT c.rowid, c.fk_constraint";
+	$sql.= " FROM ".MAIN_DB_PREFIX."menu_const as c";
+	$sql.= " WHERE c.fk_menu = ".$_GET['menuId'];
 	$res  = $db->query($sql);
 	if ($res)
 	{
 		while ($obj = $db->fetch_object ($res))
 		{
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX."menu_const WHERE rowid = ".$obj->rowid;
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."menu_const";
+			$sql.= " WHERE rowid = ".$obj->rowid;
 			$db->query($sql);
 
-			$sql = "SELECT count(rowid) as countId FROM ".MAIN_DB_PREFIX."menu_const WHERE fk_constraint = ".$obj->fk_constraint;
+			$sql = "SELECT count(rowid) as countId";
+			$sql.= " FROM ".MAIN_DB_PREFIX."menu_const";
+			$sql.= " WHERE fk_constraint = ".$obj->fk_constraint;
 			$result = $db->query($sql);
 			$objc = $db->fetch_object($result);
 
@@ -164,7 +182,8 @@ if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == 'yes')
 		}
 	}
 
-	$sql = "DELETE FROM ".MAIN_DB_PREFIX."menu WHERE rowid = ".$_GET['menuId'];
+	$sql = "DELETE FROM ".MAIN_DB_PREFIX."menu";
+	$sql.= " WHERE rowid = ".$_GET['menuId'];
 	$resql=$db->query($sql);
 	if ($resql)
 	{
@@ -217,7 +236,9 @@ dol_fiche_head($head, 'editor', $langs->trans("Menus"));
 // Confirmation de la suppression menu
 if ($_GET["action"] == 'delete')
 {
-	$sql = "SELECT m.titre FROM ".MAIN_DB_PREFIX."menu as m WHERE m.rowid = ".$_GET['menuId'];
+	$sql = "SELECT m.titre";
+	$sql.= " FROM ".MAIN_DB_PREFIX."menu as m";
+	$sql.= " WHERE m.rowid = ".$_GET['menuId'];
 	$result = $db->query($sql);
 	$obj = $db->fetch_object($result);
 
@@ -272,7 +293,8 @@ if ($conf->use_javascript_ajax)
 
 	$sql = "SELECT m.rowid, m.fk_menu, m.titre, m.langs";
 	$sql.= " FROM ".MAIN_DB_PREFIX."menu as m";
-	$sql.= " WHERE menu_handler='".$menu_handler."'";
+	$sql.= " WHERE menu_handler = '".$menu_handler."'";
+	$sql.= " AND entity = ".$conf->entity;
 	$sql.= " ORDER BY m.position, m.rowid";
 	$res  = $db->query($sql);
 
diff --git a/htdocs/admin/notification.php b/htdocs/admin/notification.php
index 46028988891..63bf14150ac 100644
--- a/htdocs/admin/notification.php
+++ b/htdocs/admin/notification.php
@@ -38,7 +38,7 @@ if (!$user->admin)
 
 if ($_POST["action"] == 'setvalue' && $user->admin)
 {
-	$result=dolibarr_set_const($db, "NOTIFICATION_EMAIL_FROM",$_POST["email_from"]);
+	$result=dolibarr_set_const($db, "NOTIFICATION_EMAIL_FROM",$_POST["email_from"],'chaine',0,'',$conf->entity);
   	if ($result >= 0)
   	{
   		$mesg='<div class="ok">'.$langs->trans("Success").'</div>';
diff --git a/htdocs/admin/paybox.php b/htdocs/admin/paybox.php
index 3fe98d61596..c0f30e910f2 100644
--- a/htdocs/admin/paybox.php
+++ b/htdocs/admin/paybox.php
@@ -37,14 +37,14 @@ if (!$user->admin)
 
 if ($_POST["action"] == 'setvalue' && $user->admin)
 {
-	//$result=dolibarr_set_const($db, "PAYBOX_IBS_DEVISE",$_POST["PAYBOX_IBS_DEVISE"]);
-	$result=dolibarr_set_const($db, "PAYBOX_CSS_URL",$_POST["PAYBOX_CSS_URL"]);
-	$result=dolibarr_set_const($db, "PAYBOX_CREDITOR",$_POST["PAYBOX_CREDITOR"]);
-	$result=dolibarr_set_const($db, "PAYBOX_CGI_URL_V1",$_POST["PAYBOX_CGI_URL_V1"]);
-	$result=dolibarr_set_const($db, "PAYBOX_CGI_URL_V2",$_POST["PAYBOX_CGI_URL_V2"]);
-	$result=dolibarr_set_const($db, "PAYBOX_IBS_SITE",$_POST["PAYBOX_IBS_SITE"]);
-	$result=dolibarr_set_const($db, "PAYBOX_IBS_RANG",$_POST["PAYBOX_IBS_RANG"]);
-	$result=dolibarr_set_const($db, "PAYBOX_PBX_IDENTIFIANT",$_POST["PAYBOX_PBX_IDENTIFIANT"]);
+	//$result=dolibarr_set_const($db, "PAYBOX_IBS_DEVISE",$_POST["PAYBOX_IBS_DEVISE"],'chaine',0,'',$conf->entity);
+	$result=dolibarr_set_const($db, "PAYBOX_CSS_URL",$_POST["PAYBOX_CSS_URL"],'chaine',0,'',$conf->entity);
+	$result=dolibarr_set_const($db, "PAYBOX_CREDITOR",$_POST["PAYBOX_CREDITOR"],'chaine',0,'',$conf->entity);
+	$result=dolibarr_set_const($db, "PAYBOX_CGI_URL_V1",$_POST["PAYBOX_CGI_URL_V1"],'chaine',0,'',$conf->entity);
+	$result=dolibarr_set_const($db, "PAYBOX_CGI_URL_V2",$_POST["PAYBOX_CGI_URL_V2"],'chaine',0,'',$conf->entity);
+	$result=dolibarr_set_const($db, "PAYBOX_IBS_SITE",$_POST["PAYBOX_IBS_SITE"],'chaine',0,'',$conf->entity);
+	$result=dolibarr_set_const($db, "PAYBOX_IBS_RANG",$_POST["PAYBOX_IBS_RANG"],'chaine',0,'',$conf->entity);
+	$result=dolibarr_set_const($db, "PAYBOX_PBX_IDENTIFIANT",$_POST["PAYBOX_PBX_IDENTIFIANT"],'chaine',0,'',$conf->entity);
 
 	if ($result >= 0)
   	{
diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php
index 33190eeaa1f..cd137a9fb86 100644
--- a/htdocs/admin/perms.php
+++ b/htdocs/admin/perms.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -37,13 +38,17 @@ if (!$user->admin)
 
 if ($_GET["action"] == 'add')
 {
-    $sql = "UPDATE ".MAIN_DB_PREFIX."rights_def SET bydefault=1 WHERE id =".$_GET["pid"];
+    $sql = "UPDATE ".MAIN_DB_PREFIX."rights_def SET bydefault=1";
+    $sql.= " WHERE id = ".$_GET["pid"];
+    $sql.= " AND entity = ".$conf->entity;
     $db->query($sql);
 }
 
 if ($_GET["action"] == 'remove')
 {
-    $sql = "UPDATE ".MAIN_DB_PREFIX."rights_def SET bydefault=0 WHERE id =".$_GET["pid"];
+    $sql = "UPDATE ".MAIN_DB_PREFIX."rights_def SET bydefault=0";
+    $sql.= " WHERE id = ".$_GET["pid"];
+    $sql.= " AND entity = ".$conf->entity;
     $db->query($sql);
 }
 
@@ -101,10 +106,11 @@ $db->commit();
 
 
 // Affiche lignes des permissions
-$sql ="SELECT r.id, r.libelle, r.module, r.perms, r.subperms, r.bydefault";
-$sql.=" FROM ".MAIN_DB_PREFIX."rights_def as r";
-$sql.=" WHERE r.libelle NOT LIKE 'tou%'";    // On ignore droits "tous"
-$sql.=" ORDER BY r.module, r.id";
+$sql = "SELECT r.id, r.libelle, r.module, r.perms, r.subperms, r.bydefault";
+$sql.= " FROM ".MAIN_DB_PREFIX."rights_def as r";
+$sql.= " WHERE r.libelle NOT LIKE 'tou%'";    // On ignore droits "tous"
+$sql.= " AND entity = ".$conf->entity;
+$sql.= " ORDER BY r.module, r.id";
 
 $result = $db->query($sql);
 if ($result)
diff --git a/htdocs/admin/phenix.php b/htdocs/admin/phenix.php
index 80784cce893..5eed93f0009 100644
--- a/htdocs/admin/phenix.php
+++ b/htdocs/admin/phenix.php
@@ -47,19 +47,19 @@ if ($actionsave)
 
     $db->begin();
     
-    $i+=dolibarr_set_const($db,'PHPPHENIX_URL',trim($_POST["phpphenix_url"]),'chaine',0);
-    $i+=dolibarr_set_const($db,'PHPPHENIX_HOST',trim($_POST["phpphenix_host"]),'chaine',0);
-    $i+=dolibarr_set_const($db,'PHPPHENIX_DBNAME',trim($_POST["phpphenix_dbname"]),'chaine',0);
-    $i+=dolibarr_set_const($db,'PHPPHENIX_USER',trim($_POST["phpphenix_user"]),'chaine',0);
-    $i+=dolibarr_set_const($db,'PHPPHENIX_PASS',trim($_POST["phpphenix_pass"]),'chaine',0);
-    $i+=dolibarr_set_const($db,'PHPPHENIX_COOKIE',trim($_POST["phpphenix_cookie"]),'chaine',0);
+    $i+=dolibarr_set_const($db,'PHPPHENIX_URL',trim($_POST["phpphenix_url"]),'chaine',0,'',$conf->entity);
+    $i+=dolibarr_set_const($db,'PHPPHENIX_HOST',trim($_POST["phpphenix_host"]),'chaine',0,'',$conf->entity);
+    $i+=dolibarr_set_const($db,'PHPPHENIX_DBNAME',trim($_POST["phpphenix_dbname"]),'chaine',0,'',$conf->entity);
+    $i+=dolibarr_set_const($db,'PHPPHENIX_USER',trim($_POST["phpphenix_user"]),'chaine',0,'',$conf->entity);
+    $i+=dolibarr_set_const($db,'PHPPHENIX_PASS',trim($_POST["phpphenix_pass"]),'chaine',0,'',$conf->entity);
+    $i+=dolibarr_set_const($db,'PHPPHENIX_COOKIE',trim($_POST["phpphenix_cookie"]),'chaine',0,'',$conf->entity);
 
-    $i+=dolibarr_set_const($db,'PHPPHENIX_SYNCRO',trim($_POST["phpphenix_syncro"]),'chaine',0);
-    $i+=dolibarr_set_const($db,'PHPPHENIX_COMPANYCREATE',trim($_POST["phpphenix_companycreate"]),'chaine',0);
-    $i+=dolibarr_set_const($db,'PHPPHENIX_PROPALSTATUS',trim($_POST["phpphenix_propalstatus"]),'chaine',0);
-    $i+=dolibarr_set_const($db,'PHPPHENIX_CONTRACTSTATUS',trim($_POST["phpphenix_contractstatus"]),'chaine',0);
-    $i+=dolibarr_set_const($db,'PHPPHENIX_BILLSTATUS',trim($_POST["phpphenix_billstatus"]),'chaine',0);
-    $i+=dolibarr_set_const($db,'PHPPHENIX_MEMBERSTATUS',trim($_POST["phpphenix_memberstatus"]),'chaine',0);
+    $i+=dolibarr_set_const($db,'PHPPHENIX_SYNCRO',trim($_POST["phpphenix_syncro"]),'chaine',0,'',$conf->entity);
+    $i+=dolibarr_set_const($db,'PHPPHENIX_COMPANYCREATE',trim($_POST["phpphenix_companycreate"]),'chaine',0,'',$conf->entity);
+    $i+=dolibarr_set_const($db,'PHPPHENIX_PROPALSTATUS',trim($_POST["phpphenix_propalstatus"]),'chaine',0,'',$conf->entity);
+    $i+=dolibarr_set_const($db,'PHPPHENIX_CONTRACTSTATUS',trim($_POST["phpphenix_contractstatus"]),'chaine',0,'',$conf->entity);
+    $i+=dolibarr_set_const($db,'PHPPHENIX_BILLSTATUS',trim($_POST["phpphenix_billstatus"]),'chaine',0,'',$conf->entity);
+    $i+=dolibarr_set_const($db,'PHPPHENIX_MEMBERSTATUS',trim($_POST["phpphenix_memberstatus"]),'chaine',0,'',$conf->entity);
 
     if ($i >= 9)
     {
diff --git a/htdocs/admin/produit.php b/htdocs/admin/produit.php
index f2d02bb5936..2e21a480ce4 100644
--- a/htdocs/admin/produit.php
+++ b/htdocs/admin/produit.php
@@ -1,9 +1,9 @@
 <?php
 /* Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C)      2006 Andre Cianfarani     <acianfa@free.fr>
+ * Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
  * Copyright (C) 2006-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C)      2007 Auguria SARL         <info@auguria.org>
- * Copyright (C) 2005-2008 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2007      Auguria SARL         <info@auguria.org>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -42,11 +42,11 @@ accessforbidden();
 
 if ($_POST["action"] == 'nbprod')
 {
-	dolibarr_set_const($db, "PRODUIT_LIMIT_SIZE", $_POST["value"]);
+	dolibarr_set_const($db, "PRODUIT_LIMIT_SIZE", $_POST["value"],'chaine',0,'',$conf->entity);
 }
 else if ($_POST["action"] == 'multiprix_num')
 {
-	dolibarr_set_const($db, "PRODUIT_MULTIPRICES_LIMIT", $_POST["value"]);
+	dolibarr_set_const($db, "PRODUIT_MULTIPRICES_LIMIT", $_POST["value"],'chaine',0,'',$conf->entity);
 }
 if ($_POST["action"] == 'multiprix')
 {
@@ -63,14 +63,14 @@ if ($_POST["action"] == 'multiprix')
 				exit;
 			}
 		}
-		dolibarr_set_const($db, "PRODUIT_MULTIPRICES", $_POST["activate_multiprix"]);
-		dolibarr_set_const($db, "PRODUIT_MULTIPRICES_LIMIT", "6");
+		dolibarr_set_const($db, "PRODUIT_MULTIPRICES", $_POST["activate_multiprix"],'chaine',0,'',$conf->entity);
+		dolibarr_set_const($db, "PRODUIT_MULTIPRICES_LIMIT", "6",'chaine',0,'',$conf->entity);
 	}
 	else
 	{
 		dol_syslog("Table definition for ".MAIN_DB_PREFIX."societe already ok");
-		dolibarr_set_const($db, "PRODUIT_MULTIPRICES", $_POST["activate_multiprix"]);
-		dolibarr_set_const($db, "PRODUIT_MULTIPRICES_LIMIT", "6");
+		dolibarr_set_const($db, "PRODUIT_MULTIPRICES", $_POST["activate_multiprix"],'chaine',0,'',$conf->entity);
+		dolibarr_set_const($db, "PRODUIT_MULTIPRICES_LIMIT", "6",'chaine',0,'',$conf->entity);
 	}
 }
 else if ($_POST["action"] == 'sousproduits')
@@ -91,22 +91,22 @@ else if ($_POST["action"] == 'sousproduits')
 		}
 		else
 		{
-	  dolibarr_set_const($db, "PRODUIT_SOUSPRODUITS", $_POST["activate_sousproduits"]);
+	  dolibarr_set_const($db, "PRODUIT_SOUSPRODUITS", $_POST["activate_sousproduits"],'chaine',0,'',$conf->entity);
 		}
 	}
 	else
 	{
 		dol_syslog("Table definition already ok");
-		dolibarr_set_const($db, "PRODUIT_SOUSPRODUITS", $_POST["activate_sousproduits"]);
+		dolibarr_set_const($db, "PRODUIT_SOUSPRODUITS", $_POST["activate_sousproduits"],'chaine',0,'',$conf->entity);
 	}
 }
 else if ($_POST["action"] == 'viewProdDescInForm')
 {
-	dolibarr_set_const($db, "PRODUIT_DESC_IN_FORM", $_POST["activate_viewProdDescInForm"]);
+	dolibarr_set_const($db, "PRODUIT_DESC_IN_FORM", $_POST["activate_viewProdDescInForm"],'chaine',0,'',$conf->entity);
 }
 else if ($_POST["action"] == 'confirmDeleteProdLineInForm')
 {
-	dolibarr_set_const($db, "PRODUIT_CONFIRM_DELETE_LINE", $_POST["activate_confirmDeleteProdLineInForm"]);
+	dolibarr_set_const($db, "PRODUIT_CONFIRM_DELETE_LINE", $_POST["activate_confirmDeleteProdLineInForm"],'chaine',0,'',$conf->entity);
 }
 else if ($_POST["action"] == 'ProductCanvasAbility')
 {
@@ -114,11 +114,11 @@ else if ($_POST["action"] == 'ProductCanvasAbility')
 	if (! empty($dolibarr_smarty_compile)) create_exdir($dolibarr_smarty_compile);
 	if (! empty($dolibarr_smarty_cache))   create_exdir($dolibarr_smarty_cache);
 	
-	dolibarr_set_const($db, "MAIN_NEED_SMARTY", $_POST["ProductCanvasAbility"]);
+	dolibarr_set_const($db, "MAIN_NEED_SMARTY", $_POST["ProductCanvasAbility"],'chaine',0,'',$conf->entity);
 }
 else if ($_POST["action"] == 'usesearchtoselectproduct')
 {
-	dolibarr_set_const($db, "PRODUIT_USE_SEARCH_TO_SELECT", $_POST["activate_usesearchtoselectproduct"]);
+	dolibarr_set_const($db, "PRODUIT_USE_SEARCH_TO_SELECT", $_POST["activate_usesearchtoselectproduct"],'chaine',0,'',$conf->entity);
 }
 else if ($_GET["action"] == 'set')
 {
@@ -127,12 +127,12 @@ else if ($_GET["action"] == 'set')
 	if (! empty($dolibarr_smarty_cache))   create_exdir($dolibarr_smarty_cache);
 	
 	$const = "PRODUIT_SPECIAL_".strtoupper($_GET["spe"]);
-	if ($_GET["value"]) dolibarr_set_const($db, $const, $_GET["value"]);
-	else dolibarr_del_const($db, $const);
+	if ($_GET["value"]) dolibarr_set_const($db, $const, $_GET["value"],'chaine',0,'',$conf->entity);
+	else dolibarr_del_const($db, $const,$conf->entity);
 }
 else if ($_POST["action"] == 'useecotaxe')
 {
-	dolibarr_set_const($db, "PRODUIT_USE_ECOTAXE", $_POST["activate_useecotaxe"]);
+	dolibarr_set_const($db, "PRODUIT_USE_ECOTAXE", $_POST["activate_useecotaxe"],'chaine',0,'',$conf->entity);
 }
 
 
diff --git a/htdocs/admin/propale.php b/htdocs/admin/propale.php
index ed0de33d98a..118d151ff46 100644
--- a/htdocs/admin/propale.php
+++ b/htdocs/admin/propale.php
@@ -1,10 +1,10 @@
 <?php
-/* Copyright (C) 2003-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2004      Sebastien Di Cintio  <sdicintio@ressource-toi.org>
- * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
- * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2007 Regis Houssin        <regis@dolibarr.fr>
+/* Copyright (C) 2003-2004 Rodolphe Quiedeville        <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2009 Laurent Destailleur         <eldy@users.sourceforge.net>
+ * Copyright (C) 2004      Sebastien Di Cintio         <sdicintio@ressource-toi.org>
+ * Copyright (C) 2004      Benoit Mortier              <benoit.mortier@opensides.be>
+ * Copyright (C) 2004      Eric Seigne                 <eric.seigne@ryxeo.com>
+ * Copyright (C) 2005-2009 Regis Houssin               <regis@dolibarr.fr>
  * Copyright (C) 2008      Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -50,7 +50,7 @@ if ($_POST["action"] == 'updateMask')
 {
 	$maskconstpropal=$_POST['maskconstpropal'];
 	$maskpropal=$_POST['maskpropal'];
-	if ($maskconstpropal)  dolibarr_set_const($db,$maskconstpropal,$maskpropal);
+	if ($maskconstpropal)  dolibarr_set_const($db,$maskconstpropal,$maskpropal,'chaine',0,'',$conf->entity);
 }
 
 if ($_GET["action"] == 'specimen')
@@ -90,46 +90,32 @@ if ($_GET["action"] == 'specimen')
 
 if ($_POST["action"] == 'set_PROPALE_DRAFT_WATERMARK')
 {
-    dolibarr_set_const($db, "PROPALE_DRAFT_WATERMARK",trim($_POST["PROPALE_DRAFT_WATERMARK"]));
+    dolibarr_set_const($db, "PROPALE_DRAFT_WATERMARK",trim($_POST["PROPALE_DRAFT_WATERMARK"]),'chaine',0,'',$conf->entity);
 }
 
 if ($_POST["action"] == 'set_PROPALE_FREE_TEXT')
 {
-    dolibarr_set_const($db, "PROPALE_FREE_TEXT",trim($_POST["PROPALE_FREE_TEXT"]));
+    dolibarr_set_const($db, "PROPALE_FREE_TEXT",trim($_POST["PROPALE_FREE_TEXT"]),'chaine',0,'',$conf->entity);
 }
 
 if ($_POST["action"] == 'setnbprod')
 {
-    dolibarr_set_const($db, "PROPALE_NEW_FORM_NB_PRODUCT",$_POST["value"]);
+    dolibarr_set_const($db, "PROPALE_NEW_FORM_NB_PRODUCT",$_POST["value"],'chaine',0,'',$conf->entity);
 }
 
 if ($_POST["action"] == 'setdefaultduration')
 {
-    dolibarr_set_const($db, "PROPALE_VALIDITY_DURATION",$_POST["value"]);
+    dolibarr_set_const($db, "PROPALE_VALIDITY_DURATION",$_POST["value"],'chaine',0,'',$conf->entity);
 }
 
-/*
-if ($_POST["action"] == 'setadddeliveryaddress')
-{
-    dolibarr_set_const($db, "PROPALE_ADD_DELIVERY_ADDRESS",$_POST["value"]);
-}
-*/
-
-/*
-if ($_POST["action"] == 'setuseoptionline')
-{
-    dolibarr_set_const($db, "PROPALE_USE_OPTION_LINE",$_POST["value"]);
-}
-*/
-
 if ($_POST["action"] == 'setclassifiedinvoiced')
 {
-    dolibarr_set_const($db, "PROPALE_CLASSIFIED_INVOICED_WITH_ORDER",$_POST["value"]);
+    dolibarr_set_const($db, "PROPALE_CLASSIFIED_INVOICED_WITH_ORDER",$_POST["value"],'chaine',0,'',$conf->entity);
 }
 
 if ($_POST["action"] == 'setusecustomercontactasrecipient')
 {
-    dolibarr_set_const($db, "PROPALE_USE_CUSTOMER_CONTACT_AS_RECIPIENT",$_POST["value"]);
+    dolibarr_set_const($db, "PROPALE_USE_CUSTOMER_CONTACT_AS_RECIPIENT",$_POST["value"],'chaine',0,'',$conf->entity);
 }
 
 
@@ -138,55 +124,60 @@ if ($_POST["action"] == 'setusecustomercontactasrecipient')
 if ($_GET["action"] == 'set')
 {
 	$type='propal';
-    $sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type) VALUES ('".$_GET["value"]."','".$type."')";
-    if ($db->query($sql))
-    {
+	$sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES ('".$_GET["value"]."','".$type."',".$conf->entity.")";
+  if ($db->query($sql))
+  {
 
-    }
+  }
 }
 if ($_GET["action"] == 'del')
 {
-    $type='propal';
-    $sql = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
-    $sql .= "  WHERE nom = '".$_GET["value"]."' AND type = '".$type."'";
-    if ($db->query($sql))
-    {
+	$type='propal';
+  $sql = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
+  $sql.= " WHERE nom = '".$_GET["value"];
+  $sql.= " AND type = '".$type."'";
+  $sql.= " AND entity = ".$conf->entity;
+  
+  if ($db->query($sql))
+  {
 
-    }
+  }
 }
 
 if ($_GET["action"] == 'setdoc')
 {
 	$db->begin();
-
-    if (dolibarr_set_const($db, "PROPALE_ADDON_PDF",$_GET["value"]))
-    {
-        $conf->global->PROPALE_ADDON_PDF = $_GET["value"];
-    }
-
-    // On active le modele
-    $type='propal';
-    $sql_del = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
-    $sql_del .= "  WHERE nom = '".$_GET["value"]."' AND type = '".$type."'";
-    $result1=$db->query($sql_del);
-    $sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom,type) VALUES ('".$_GET["value"]."','".$type."')";
-    $result2=$db->query($sql);
-    if ($result1 && $result2)
-    {
-		$db->commit();
-    }
-    else
-    {
-    	$db->rollback();
-    }
+	
+	if (dolibarr_set_const($db, "PROPALE_ADDON_PDF",$_GET["value"],'chaine',0,'',$conf->entity))
+  {
+  	$conf->global->PROPALE_ADDON_PDF = $_GET["value"];
+  }
+  
+  // On active le modele
+  $type='propal';
+  $sql_del = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
+  $sql_del.= " WHERE nom = '".$_GET["value"];
+  $sql_del.= " AND type = '".$type."'";
+  $sql_del.= " AND entity = ".$conf->entity;
+  $result1=$db->query($sql_del);
+  $sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom,type,entity) VALUES ('".$_GET["value"]."','".$type."',".$conf->entity.")";
+  $result2=$db->query($sql);
+  if ($result1 && $result2)
+  {
+  	$db->commit();
+  }
+  else
+  {
+  	$db->rollback();
+  }
 }
 
 if ($_GET["action"] == 'setmod')
 {
-    // \todo Verifier si module numerotation choisi peut etre activ�
+    // \todo Verifier si module numerotation choisi peut etre active
     // par appel methode canBeActivated
 
-	dolibarr_set_const($db, "PROPALE_ADDON",$_GET["value"]);
+	dolibarr_set_const($db, "PROPALE_ADDON",$_GET["value"],'chaine',0,'',$conf->entity);
 }
 
 
@@ -304,6 +295,7 @@ $def = array();
 $sql = "SELECT nom";
 $sql.= " FROM ".MAIN_DB_PREFIX."document_model";
 $sql.= " WHERE type = 'propal'";
+$sql.= " AND entity = ".$conf->entity;
 $resql=$db->query($sql);
 if ($resql)
 {
@@ -443,18 +435,6 @@ print '<td align="right"><input type="submit" class="button" value="'.$langs->tr
 print '</tr>';
 print '</form>';
 
-/*
-$var=!$var;
-print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
-print "<input type=\"hidden\" name=\"action\" value=\"setadddeliveryaddress\">";
-print "<tr ".$bc[$var].">";
-print '<td>'.$langs->trans("AddDeliveryAddressAbility").'</td>';
-print '<td width="60" align="center">'.$html->selectyesno('value',$conf->global->PROPALE_ADD_DELIVERY_ADDRESS,1).'</td>';
-print '<td align="right"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
-print '</tr>';
-print '</form>';
-*/
-
 $var=! $var;
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="action" value="setusecustomercontactasrecipient">';
@@ -467,20 +447,6 @@ print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">'
 print "</td></tr>\n";
 print '</form>';
 
-/*
-$var=! $var;
-print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
-print '<input type="hidden" name="action" value="setuseoptionline">';
-print '<tr '.$bc[$var].'><td>';
-print $langs->trans("UseOptionLineIfNoQuantity");
-print '</td><td width="60" align="center">';
-print $html->selectyesno("value",$conf->global->PROPALE_USE_OPTION_LINE,1);
-print '</td><td align="right">';
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-print "</td></tr>\n";
-print '</form>';
-*/
-
 if ($conf->commande->enabled)
 {
 	$var=!$var;
diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php
index 60eabffa57f..0ebcd584314 100644
--- a/htdocs/admin/security.php
+++ b/htdocs/admin/security.php
@@ -45,7 +45,7 @@ $mesg = '';
  */
 if ($_GET["action"] == 'setgeneraterule')
 {
-	if (! dolibarr_set_const($db, 'USER_PASSWORD_GENERATED',$_GET["value"]))
+	if (! dolibarr_set_const($db, 'USER_PASSWORD_GENERATED',$_GET["value"],'chaine',0,'',$conf->entity))
 	{
 		dol_print_error($db);
 	}
@@ -60,7 +60,7 @@ if ($_GET["action"] == 'activate_encrypt')
 {
 	$db->begin();
 
-    dolibarr_set_const($db, "DATABASE_PWD_ENCRYPTED", "1");
+    dolibarr_set_const($db, "DATABASE_PWD_ENCRYPTED", "1",'chaine',0,'',$conf->entity);
 
     $sql = "UPDATE ".MAIN_DB_PREFIX."user as u";
 	$sql.= " SET u.pass_crypted = MD5(u.pass), u.pass = NULL";
@@ -87,7 +87,7 @@ else if ($_GET["action"] == 'disable_encrypt')
 	//Do not allow "disable encryption" as passwords cannot be decrypted
 	if ($allow_disable_encryption)
 	{
-		dolibarr_del_const($db, "DATABASE_PWD_ENCRYPTED");
+		dolibarr_del_const($db, "DATABASE_PWD_ENCRYPTED",$conf->entity);
     }
 	Header("Location: security.php");
     exit;
@@ -114,7 +114,7 @@ else if ($_GET["action"] == 'disable_encryptdbpassconf')
 	if ($result > 0)
 	{
 		// database value not required
-		//dolibarr_del_const($db, "MAIN_DATABASE_PWD_CONFIG_ENCRYPTED");
+		//dolibarr_del_const($db, "MAIN_DATABASE_PWD_CONFIG_ENCRYPTED",$conf->entity);
 		Header("Location: security.php");
 		exit;
 	}
@@ -126,26 +126,26 @@ else if ($_GET["action"] == 'disable_encryptdbpassconf')
 
 if ($_GET["action"] == 'activate_pdfsecurity')
 {
-	dolibarr_set_const($db, "PDF_SECURITY_ENCRYPTION", "1");
+	dolibarr_set_const($db, "PDF_SECURITY_ENCRYPTION", "1",'chaine',0,'',$conf->entity);
 	Header("Location: security.php");
 	exit;
 }
 else if ($_GET["action"] == 'disable_pdfsecurity')
 {
-	dolibarr_del_const($db, "PDF_SECURITY_ENCRYPTION");
+	dolibarr_del_const($db, "PDF_SECURITY_ENCRYPTION",$conf->entity);
 	Header("Location: security.php");
 	exit;
 }
 
 if ($_GET["action"] == 'activate_MAIN_SECURITY_DISABLEFORGETPASSLINK')
 {
-	dolibarr_set_const($db, "MAIN_SECURITY_DISABLEFORGETPASSLINK", '1');
+	dolibarr_set_const($db, "MAIN_SECURITY_DISABLEFORGETPASSLINK", '1','chaine',0,'',$conf->entity);
 	Header("Location: security.php");
 	exit;
 }
 else if ($_GET["action"] == 'disable_MAIN_SECURITY_DISABLEFORGETPASSLINK')
 {
-	dolibarr_del_const($db, "MAIN_SECURITY_DISABLEFORGETPASSLINK");
+	dolibarr_del_const($db, "MAIN_SECURITY_DISABLEFORGETPASSLINK",$conf->entity);
 	Header("Location: security.php");
 	exit;
 }
diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php
index d49b16068c8..5c8006d730a 100644
--- a/htdocs/admin/security_other.php
+++ b/htdocs/admin/security_other.php
@@ -38,7 +38,7 @@ if (!$user->admin) accessforbidden();
  */
 if ($_GET["action"] == 'set_main_upload_doc')
 {
-	if (! dolibarr_set_const($db, 'MAIN_UPLOAD_DOC',$_POST["MAIN_UPLOAD_DOC"]))
+	if (! dolibarr_set_const($db, 'MAIN_UPLOAD_DOC',$_POST["MAIN_UPLOAD_DOC"],'chaine',0,'',$conf->entity))
 	{
 		dol_print_error($db);
 	}
@@ -51,40 +51,40 @@ if ($_GET["action"] == 'set_main_upload_doc')
 
 if ($_GET["action"] == 'activate_captcha')
 {
-	dolibarr_set_const($db, "MAIN_SECURITY_ENABLECAPTCHA", '1');
+	dolibarr_set_const($db, "MAIN_SECURITY_ENABLECAPTCHA", '1','chaine',0,'',$conf->entity);
 	Header("Location: security_other.php");
 	exit;
 }
 else if ($_GET["action"] == 'disable_captcha')
 {
-	dolibarr_del_const($db, "MAIN_SECURITY_ENABLECAPTCHA");
+	dolibarr_del_const($db, "MAIN_SECURITY_ENABLECAPTCHA",$conf->entity);
 	Header("Location: security_other.php");
 	exit;
 }
 
 if ($_GET["action"] == 'MAIN_SESSION_TIMEOUT')
 {
-	dolibarr_set_const($db, "MAIN_SESSION_TIMEOUT", $_POST["MAIN_SESSION_TIMEOUT"]);
+	dolibarr_set_const($db, "MAIN_SESSION_TIMEOUT", $_POST["MAIN_SESSION_TIMEOUT"],'chaine',0,'',$conf->entity);
 	Header("Location: security_other.php");
 	exit;
 }
 
 if ($_GET["action"] == 'MAIN_UMASK')
 {
-	dolibarr_set_const($db, "MAIN_UMASK", $_POST["MAIN_UMASK"]);
+	dolibarr_set_const($db, "MAIN_UMASK", $_POST["MAIN_UMASK"],'chaine',0,'',$conf->entity);
 	Header("Location: security_other.php");
 	exit;
 }
 
 if ($_GET["action"] == 'activate_avscan')
 {
-	dolibarr_set_const($db, "MAIN_USE_AVSCAN", '1');
+	dolibarr_set_const($db, "MAIN_USE_AVSCAN", '1','chaine',0,'',$conf->entity);
 	Header("Location: security_other.php");
 	exit;
 }
 else if ($_GET["action"] == 'disable_avscan')
 {
-	dolibarr_del_const($db, "MAIN_USE_AVSCAN");
+	dolibarr_del_const($db, "MAIN_USE_AVSCAN",$conf->entity);
 	Header("Location: security_other.php");
 	exit;
 }
diff --git a/htdocs/admin/societe.php b/htdocs/admin/societe.php
index 341fc9401ae..07bac4d97d8 100644
--- a/htdocs/admin/societe.php
+++ b/htdocs/admin/societe.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2005-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2007 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,7 +40,7 @@ accessforbidden();
  */
 if ($_GET["action"] == 'setcodeclient')
 {
-	if (dolibarr_set_const($db, "SOCIETE_CODECLIENT_ADDON",$_GET["value"]) > 0)
+	if (dolibarr_set_const($db, "SOCIETE_CODECLIENT_ADDON",$_GET["value"],'chaine',0,'',$conf->entity) > 0)
 	{
 		Header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
@@ -53,7 +53,7 @@ if ($_GET["action"] == 'setcodeclient')
 
 if ($_GET["action"] == 'setcodecompta')
 {
-	if (dolibarr_set_const($db, "SOCIETE_CODECOMPTA_ADDON",$_GET["value"]) > 0)
+	if (dolibarr_set_const($db, "SOCIETE_CODECOMPTA_ADDON",$_GET["value"],'chaine',0,'',$conf->entity) > 0)
 	{
 		Header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
@@ -66,7 +66,7 @@ if ($_GET["action"] == 'setcodecompta')
 
 if ($_POST["action"] == 'usesearchtoselectcompany')
 {
-	if (dolibarr_set_const($db, "COMPANY_USE_SEARCH_TO_SELECT", $_POST["activate_usesearchtoselectcompany"]))
+	if (dolibarr_set_const($db, "COMPANY_USE_SEARCH_TO_SELECT", $_POST["activate_usesearchtoselectcompany"],'chaine',0,'',$conf->entity))
 	{
 		Header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
@@ -80,8 +80,8 @@ if ($_POST["action"] == 'usesearchtoselectcompany')
 // define constants for tigre model
 if ($_POST["action"] == 'updateMask')
 {
-	dolibarr_set_const($db, "COMPANY_ELEPHANT_MASK_CUSTOMER",$_POST["maskcustomer"]);
-	dolibarr_set_const($db, "COMPANY_ELEPHANT_MASK_SUPPLIER",$_POST["masksupplier"]);
+	dolibarr_set_const($db, "COMPANY_ELEPHANT_MASK_CUSTOMER",$_POST["maskcustomer"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "COMPANY_ELEPHANT_MASK_SUPPLIER",$_POST["masksupplier"],'chaine',0,'',$conf->entity);
 }
 
 
diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php
index 297c3e7fdc0..0742d63722d 100644
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -1,6 +1,7 @@
 <?php
-/* Copyright (C) 2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2006      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2008      Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -39,18 +40,18 @@ accessforbidden();
  */
 if ($_POST["action"] == 'STOCK_USERSTOCK')
 {
-	dolibarr_set_const($db, "STOCK_USERSTOCK", $_POST["STOCK_USERSTOCK"]);
+	dolibarr_set_const($db, "STOCK_USERSTOCK", $_POST["STOCK_USERSTOCK"],'chaine',0,'',$conf->entity);
 	//On desactive l'autocreation si l'option "stock personnel" est desactivee
 	if ($_POST["STOCK_USERSTOCK"] == 0)
 	{
-		dolibarr_set_const($db, "STOCK_USERSTOCK_AUTOCREATE", 0);
+		dolibarr_set_const($db, "STOCK_USERSTOCK_AUTOCREATE", 0,'chaine',0,'',$conf->entity);
 	}
 	Header("Location: stock.php");
 	exit;
 }
 elseif ($_POST["action"] == 'STOCK_USERSTOCK_AUTOCREATE')
 {
-	dolibarr_set_const($db, "STOCK_USERSTOCK_AUTOCREATE", $_POST["STOCK_USERSTOCK_AUTOCREATE"]);
+	dolibarr_set_const($db, "STOCK_USERSTOCK_AUTOCREATE", $_POST["STOCK_USERSTOCK_AUTOCREATE"],'chaine',0,'',$conf->entity);
 	Header("Location: stock.php");
 	exit;
 }
@@ -61,12 +62,12 @@ if ($_POST["action"] == 'STOCK_CALCULATE_ON_BILL'
 {
 	$count=0;
 	$db->begin();
-	$count+=dolibarr_set_const($db, "STOCK_CALCULATE_ON_BILL", '');
-	$count+=dolibarr_set_const($db, "STOCK_CALCULATE_ON_VALIDATE_ORDER", '');
-	$count+=dolibarr_set_const($db, "STOCK_CALCULATE_ON_SHIPMENT", '');
-	if ($_POST["action"] == 'STOCK_CALCULATE_ON_BILL')           $count+=dolibarr_set_const($db, "STOCK_CALCULATE_ON_BILL", $_POST["STOCK_CALCULATE_ON_BILL"]);
-	if ($_POST["action"] == 'STOCK_CALCULATE_ON_VALIDATE_ORDER') $count+=dolibarr_set_const($db, "STOCK_CALCULATE_ON_VALIDATE_ORDER", $_POST["STOCK_CALCULATE_ON_VALIDATE_ORDER"]);
-	if ($_POST["action"] == 'STOCK_CALCULATE_ON_SHIPMENT')       $count+=dolibarr_set_const($db, "STOCK_CALCULATE_ON_SHIPMENT", $_POST["STOCK_CALCULATE_ON_SHIPMENT"]);
+	$count+=dolibarr_set_const($db, "STOCK_CALCULATE_ON_BILL", '','chaine',0,'',$conf->entity);
+	$count+=dolibarr_set_const($db, "STOCK_CALCULATE_ON_VALIDATE_ORDER", '','chaine',0,'',$conf->entity);
+	$count+=dolibarr_set_const($db, "STOCK_CALCULATE_ON_SHIPMENT", '','chaine',0,'',$conf->entity);
+	if ($_POST["action"] == 'STOCK_CALCULATE_ON_BILL')           $count+=dolibarr_set_const($db, "STOCK_CALCULATE_ON_BILL", $_POST["STOCK_CALCULATE_ON_BILL"],'chaine',0,'',$conf->entity);
+	if ($_POST["action"] == 'STOCK_CALCULATE_ON_VALIDATE_ORDER') $count+=dolibarr_set_const($db, "STOCK_CALCULATE_ON_VALIDATE_ORDER", $_POST["STOCK_CALCULATE_ON_VALIDATE_ORDER"],'chaine',0,'',$conf->entity);
+	if ($_POST["action"] == 'STOCK_CALCULATE_ON_SHIPMENT')       $count+=dolibarr_set_const($db, "STOCK_CALCULATE_ON_SHIPMENT", $_POST["STOCK_CALCULATE_ON_SHIPMENT"],'chaine',0,'',$conf->entity);
 	if ($count == 4)
 	{
 		$db->commit();
@@ -85,10 +86,10 @@ if ($_POST["action"] == 'STOCK_CALCULATE_ON_SUPPLIER_BILL'
 {
 	$count=0;
 	$db->begin();
-	$count+=dolibarr_set_const($db, "STOCK_CALCULATE_ON_SUPPLIER_BILL", '');
-	$count+=dolibarr_set_const($db, "STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER", '');
-	if ($_POST["action"] == 'STOCK_CALCULATE_ON_SUPPLIER_BILL')           $count+=dolibarr_set_const($db, "STOCK_CALCULATE_ON_SUPPLIER_BILL", $_POST["STOCK_CALCULATE_ON_SUPPLIER_BILL"]);
-	if ($_POST["action"] == 'STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER') $count+=dolibarr_set_const($db, "STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER", $_POST["STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER"]);
+	$count+=dolibarr_set_const($db, "STOCK_CALCULATE_ON_SUPPLIER_BILL", '','chaine',0,'',$conf->entity);
+	$count+=dolibarr_set_const($db, "STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER", '','chaine',0,'',$conf->entity);
+	if ($_POST["action"] == 'STOCK_CALCULATE_ON_SUPPLIER_BILL')           $count+=dolibarr_set_const($db, "STOCK_CALCULATE_ON_SUPPLIER_BILL", $_POST["STOCK_CALCULATE_ON_SUPPLIER_BILL"],'chaine',0,'',$conf->entity);
+	if ($_POST["action"] == 'STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER') $count+=dolibarr_set_const($db, "STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER", $_POST["STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER"],'chaine',0,'',$conf->entity);
 	if ($count == 3)
 	{
 		$db->commit();
diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php
index 55020ea9cb5..403f7d0c1d2 100644
--- a/htdocs/admin/syslog.php
+++ b/htdocs/admin/syslog.php
@@ -39,7 +39,7 @@ $langs->load("other");
  */
 if (! empty($_POST["action"]) && $_POST["action"] == 'setlevel')
 {
-	dolibarr_set_const($db,"SYSLOG_LEVEL",$_POST["level"]);
+	dolibarr_set_const($db,"SYSLOG_LEVEL",$_POST["level"],'chaine',0,'',$conf->entity);
 	dol_syslog("admin/syslog: level ".$_POST["level"]);
 }
 
@@ -53,8 +53,8 @@ if (! empty($_POST["action"]) && $_POST["action"] == 'set')
 			// Only LOG_USER supported on Windows
 			if (! empty($_SERVER["WINDIR"])) $_POST["facility"]='LOG_USER';
 
-			dolibarr_del_const($db,"SYSLOG_FILE");
-			dolibarr_set_const($db,"SYSLOG_FACILITY",$_POST["facility"]);
+			dolibarr_del_const($db,"SYSLOG_FILE",$conf->entity);
+			dolibarr_set_const($db,"SYSLOG_FACILITY",$_POST["facility"],'chaine',0,'',$conf->entity);
 			dol_syslog("admin/syslog: facility ".$_POST["facility"]);
 		}
 		else
@@ -70,8 +70,8 @@ if (! empty($_POST["action"]) && $_POST["action"] == 'set')
 		if ($file)
 		{
 			fclose($file);
-			dolibarr_del_const($db,"SYSLOG_FACILITY");
-			dolibarr_set_const($db,"SYSLOG_FILE",$_POST["filename"]);
+			dolibarr_del_const($db,"SYSLOG_FACILITY",$conf->entity);
+			dolibarr_set_const($db,"SYSLOG_FILE",$_POST["filename"],'chaine',0,'',$conf->entity);
 			dol_syslog("admin/syslog: file ".$_POST["filename"]);
 		}
 		else
diff --git a/htdocs/admin/taxes.php b/htdocs/admin/taxes.php
index 6c583b74dbd..aeb4027c9ce 100644
--- a/htdocs/admin/taxes.php
+++ b/htdocs/admin/taxes.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -47,12 +48,12 @@ $tax_mode = defined('TAX_MODE')?TAX_MODE:0;
 if ($_POST['action'] == 'settaxmode')
 {
   $tax_mode = $_POST['tax_mode'];
-  if (! dolibarr_set_const($db, 'TAX_MODE', $tax_mode)) { print $db->error(); }
+  if (! dolibarr_set_const($db, 'TAX_MODE', $tax_mode,'chaine',0,'',$conf->entity)) { print $db->error(); }
 }
 
 if ($_POST['action'] == 'update' || $_POST['action'] == 'add')
 {
-	if (! dolibarr_set_const($db, $_POST['constname'], $_POST['constvalue'], $typeconst[$_POST['consttype']], 0, isset($_POST['constnote']) ? $_POST['constnote'] : ''));
+	if (! dolibarr_set_const($db, $_POST['constname'], $_POST['constvalue'], $typeconst[$_POST['consttype']], 0, isset($_POST['constnote']) ? $_POST['constnote'] : '',$conf->entity));
 	{
 	  	print $db->error();
 	}
@@ -60,7 +61,7 @@ if ($_POST['action'] == 'update' || $_POST['action'] == 'add')
 
 if ($_GET['action'] == 'delete')
 {
-	if (! dolibarr_del_const($db, $_GET['constname']));
+	if (! dolibarr_del_const($db, $_GET['constname'],$conf->entity));
 	{
 	  	print $db->error();
 	}
diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php
index c8f21f162d2..53aa1569f32 100644
--- a/htdocs/admin/tools/export.php
+++ b/htdocs/admin/tools/export.php
@@ -83,7 +83,7 @@ if ($what == 'mysql')
 	$mysqldump=$_POST["mysqldump"];
 	if ($mysqldump)
 	{
-		dolibarr_set_const($db, 'SYSTEMTOOLS_MYSQLDUMP', $mysqldump, $type='chaine');
+		dolibarr_set_const($db, 'SYSTEMTOOLS_MYSQLDUMP', $mysqldump,'chaine',0,'',$conf->entity);
 	}
 
 	create_exdir(DOL_DATA_ROOT.'/admin/temp');
diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php
index 418c7f348b7..15db5aef633 100644
--- a/htdocs/admin/tools/listevents.php
+++ b/htdocs/admin/tools/listevents.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -56,7 +57,8 @@ $pagenext = $page + 1;
 // Purge audit events
 if ($_POST['action'] == 'confirm_purge' && $_POST['confirm'] == 'yes' && $user->admin)
 {
-	$sql="DELETE FROM ".MAIN_DB_PREFIX."events";
+	$sql = "DELETE FROM ".MAIN_DB_PREFIX."events";
+	$sql.= " WHERE entity = ".$conf->entity;
 	$resql = $db->query($sql);
 	if (! $resql)
 	{
@@ -82,7 +84,7 @@ $sql.= " e.fk_user, e.description,";
 $sql.= " u.login";
 $sql.= " FROM ".MAIN_DB_PREFIX."events as e";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid = e.fk_user";
-$sql.= " WHERE 1=1";
+$sql.= " WHERE e.entity = ".$conf->entity;
 if ($_GET["search_code"]) { $usefilter++; $sql.=" AND e.type like '%".$_GET["search_code"]."%'"; }
 if ($_GET["search_ip"])   { $usefilter++; $sql.=" AND e.ip like '%".$_GET["search_ip"]."%'"; }
 if ($_GET["search_user"]) { $usefilter++; $sql.=" AND u.login like '%".$_GET["search_user"]."%'"; }
diff --git a/htdocs/admin/webcalendar.php b/htdocs/admin/webcalendar.php
index 750608716ff..7d7ac139259 100644
--- a/htdocs/admin/webcalendar.php
+++ b/htdocs/admin/webcalendar.php
@@ -50,19 +50,19 @@ if ($actionsave)
 
     $db->begin();
     
-    $i+=dolibarr_set_const($db,'PHPWEBCALENDAR_URL',trim($_POST["phpwebcalendar_url"]),'chaine',0);
-    $i+=dolibarr_set_const($db,'PHPWEBCALENDAR_HOST',trim($_POST["phpwebcalendar_host"]),'chaine',0);
-    $i+=dolibarr_set_const($db,'PHPWEBCALENDAR_DBNAME',trim($_POST["phpwebcalendar_dbname"]),'chaine',0);
-    $i+=dolibarr_set_const($db,'PHPWEBCALENDAR_USER',trim($_POST["phpwebcalendar_user"]),'chaine',0);
-    $i+=dolibarr_set_const($db,'PHPWEBCALENDAR_PASS',trim($_POST["phpwebcalendar_pass"]),'chaine',0);
-    $i+=dolibarr_set_const($db,'PHPWEBCALENDAR_PASSWORD_VCALEXPORT',trim($_POST["PHPWEBCALENDAR_PASSWORD_VCALEXPORT"]),'chaine',0);
+    $i+=dolibarr_set_const($db,'PHPWEBCALENDAR_URL',trim($_POST["phpwebcalendar_url"]),'chaine',0,'',$conf->entity);
+    $i+=dolibarr_set_const($db,'PHPWEBCALENDAR_HOST',trim($_POST["phpwebcalendar_host"]),'chaine',0,'',$conf->entity);
+    $i+=dolibarr_set_const($db,'PHPWEBCALENDAR_DBNAME',trim($_POST["phpwebcalendar_dbname"]),'chaine',0,'',$conf->entity);
+    $i+=dolibarr_set_const($db,'PHPWEBCALENDAR_USER',trim($_POST["phpwebcalendar_user"]),'chaine',0,'',$conf->entity);
+    $i+=dolibarr_set_const($db,'PHPWEBCALENDAR_PASS',trim($_POST["phpwebcalendar_pass"]),'chaine',0,'',$conf->entity);
+    $i+=dolibarr_set_const($db,'PHPWEBCALENDAR_PASSWORD_VCALEXPORT',trim($_POST["PHPWEBCALENDAR_PASSWORD_VCALEXPORT"]),'chaine',0,'',$conf->entity);
 
-    $i+=dolibarr_set_const($db,'PHPWEBCALENDAR_SYNCRO',trim($_POST["phpwebcalendar_syncro"]),'chaine',0);
-    $i+=dolibarr_set_const($db,'PHPWEBCALENDAR_COMPANYCREATE',trim($_POST["phpwebcalendar_companycreate"]),'chaine',0);
-    $i+=dolibarr_set_const($db,'PHPWEBCALENDAR_PROPALSTATUS',trim($_POST["phpwebcalendar_propalstatus"]),'chaine',0);
-    $i+=dolibarr_set_const($db,'PHPWEBCALENDAR_CONTRACTSTATUS',trim($_POST["phpwebcalendar_contractstatus"]),'chaine',0);
-    $i+=dolibarr_set_const($db,'PHPWEBCALENDAR_BILLSTATUS',trim($_POST["phpwebcalendar_billstatus"]),'chaine',0);
-    $i+=dolibarr_set_const($db,'PHPWEBCALENDAR_MEMBERSTATUS',trim($_POST["phpwebcalendar_memberstatus"]),'chaine',0);
+    $i+=dolibarr_set_const($db,'PHPWEBCALENDAR_SYNCRO',trim($_POST["phpwebcalendar_syncro"]),'chaine',0,'',$conf->entity);
+    $i+=dolibarr_set_const($db,'PHPWEBCALENDAR_COMPANYCREATE',trim($_POST["phpwebcalendar_companycreate"]),'chaine',0,'',$conf->entity);
+    $i+=dolibarr_set_const($db,'PHPWEBCALENDAR_PROPALSTATUS',trim($_POST["phpwebcalendar_propalstatus"]),'chaine',0,'',$conf->entity);
+    $i+=dolibarr_set_const($db,'PHPWEBCALENDAR_CONTRACTSTATUS',trim($_POST["phpwebcalendar_contractstatus"]),'chaine',0,'',$conf->entity);
+    $i+=dolibarr_set_const($db,'PHPWEBCALENDAR_BILLSTATUS',trim($_POST["phpwebcalendar_billstatus"]),'chaine',0,'',$conf->entity);
+    $i+=dolibarr_set_const($db,'PHPWEBCALENDAR_MEMBERSTATUS',trim($_POST["phpwebcalendar_memberstatus"]),'chaine',0,'',$conf->entity);
 
     if ($i >= 9)
     {
@@ -96,7 +96,7 @@ elseif ($actiontest)
     
     if ($webcal->localdb->connected == 1 && $webcal->localdb->database_selected == 1)
     {
-        // V�rifie si bonne base
+        // Verifie si bonne base
         $sql="SELECT cal_value FROM webcal_config WHERE cal_setting='application_name'";
         $resql=$webcal->localdb->query($sql);
         if ($resql) {
diff --git a/htdocs/ajaxbox.php b/htdocs/ajaxbox.php
index 73cd283a723..1a64570b8c2 100644
--- a/htdocs/ajaxbox.php
+++ b/htdocs/ajaxbox.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2005-2007 Regis Houssin        <regis@dolibarr.fr>
+/* Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  * Copyright (C) 2007-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -30,6 +30,10 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
 // This is to make Dolibarr working with Plesk
 set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs');
 
+// Retrieve the entity in the cookie
+$entityCookieName = "DOLENTITYID_dolibarr";
+if (isset($_COOKIE[$entityCookieName])) $_SESSION["dol_entity"] = $_COOKIE[$entityCookieName];
+
 require('master.inc.php');
 require_once(DOL_DOCUMENT_ROOT."/boxes.php");
 
diff --git a/htdocs/boxes.php b/htdocs/boxes.php
index ac5a47c99e5..8341c6c8fa9 100644
--- a/htdocs/boxes.php
+++ b/htdocs/boxes.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -69,6 +70,7 @@ class InfoBox
 			$sql.= " d.file, d.note";
 			$sql.= " FROM ".MAIN_DB_PREFIX."boxes as b, ".MAIN_DB_PREFIX."boxes_def as d";
 			$sql.= " WHERE b.box_id = d.rowid";
+			$sql.= " AND d.entity = ".$conf->entity;
 			$sql.= " AND b.position = ".$zone;
 			$sql.= " AND b.fk_user = ".$user->id;
 			$sql.= " ORDER BY b.box_order";
@@ -116,6 +118,7 @@ class InfoBox
 			$sql.= " d.file, d.note";
 			$sql.= " FROM ".MAIN_DB_PREFIX."boxes as b, ".MAIN_DB_PREFIX."boxes_def as d";
 			$sql.= " WHERE b.box_id = d.rowid";
+			$sql.= " AND d.entity = ".$conf->entity;
 			$sql.= " AND b.position = ".$zone;
 			$sql.= " AND b.fk_user = 0";
 			$sql.= " ORDER BY b.box_order";
@@ -170,6 +173,8 @@ class InfoBox
 	 */
 	function saveboxorder($zone,$boxorder,$userid=0)
 	{
+		global $conf;
+		
 		require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
 
 		dol_syslog("InfoBoxes::saveboxorder zone=".$zone." user=".$userid);
@@ -183,16 +188,19 @@ class InfoBox
 		// Sauve parametre indiquant que le user a une
 		$confuserzone='MAIN_BOXES_'.$zone;
 		$tab[$confuserzone]=1;
-		if (dol_set_user_param($this->db, $user, $tab) < 0)
+		if (dol_set_user_param($this->db, $conf, $user, $tab) < 0)
 		{
 			$this->error=$this->db->lasterror();
 			$this->db->rollback();
 			return -3;
 		}
 
-		$sql ="DELETE FROM ".MAIN_DB_PREFIX."boxes";
-		$sql.=" WHERE fk_user = ".$userid;
-		$sql.=" AND position = ".$zone;
+		$sql = "DELETE ".MAIN_DB_PREFIX."boxes";
+		$sql.= " FROM ".MAIN_DB_PREFIX."boxes, ".MAIN_DB_PREFIX."boxes_def";
+		$sql.= " WHERE ".MAIN_DB_PREFIX."boxes.box_id = ".MAIN_DB_PREFIX."boxes_def.rowid";
+		$sql.= " AND ".MAIN_DB_PREFIX."boxes_def.entity = ".$conf->entity;
+		$sql.= " AND ".MAIN_DB_PREFIX."boxes.fk_user = ".$userid;
+		$sql.= " AND ".MAIN_DB_PREFIX."boxes.position = ".$zone;
 
 		dol_syslog("InfoBox::saveboxorder sql=".$sql);
 		$result = $this->db->query($sql);
diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php
index 938dce0aa78..2ddb61e39a3 100644
--- a/htdocs/categories/categorie.php
+++ b/htdocs/categories/categorie.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2005      Brice Davoleau       <brice.davoleau@gmail.com>
- * Copyright (C) 2005-2007 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  * Copyright (C) 2006-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2007      Patrick Raguin  		  <patrick.raguin@gmail.com>
  *
@@ -34,6 +34,7 @@ $langs->load("categories");
 
 $mesg=isset($_GET["mesg"])?'<div class="ok">'.$_GET["mesg"].'</div>':'';
 
+$dbtablename = '';
 if ($_REQUEST["socid"])
 {
 	if ($_REQUEST["typeid"] == 1) { $type = 'fournisseur'; $socid = isset($_REQUEST["socid"])?$_REQUEST["socid"]:''; }
@@ -43,11 +44,12 @@ if ($_REQUEST["socid"])
 else if ($_REQUEST["id"] || $_REQUEST["ref"])
 {
 	$type = 'produit';
+	$dbtablename = 'product';
 }
 
 // Security check
 if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, $type, $objectid);
+$result = restrictedArea($user, $type, $objectid, $dbtablename);
 
 
 
diff --git a/htdocs/client.class.php b/htdocs/client.class.php
index f47ccc05bb7..a096fa14303 100644
--- a/htdocs/client.class.php
+++ b/htdocs/client.class.php
@@ -1,5 +1,6 @@
 <?php
-/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+/* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -39,7 +40,7 @@ class Client extends Societe
     
     /**
      *    \brief  Constructeur de la classe
-     *    \param  DB     handler accès base de données
+     *    \param  DB     handler acces base de donnees
      *    \param  id     id societe (0 par defaut)
      */
     function Client($DB, $id=0)
@@ -100,7 +101,9 @@ class Client extends Societe
         	$clause = "AND";
         }
         $sql.= " ".$clause." s.client in (1,2)";
+        $sql.= " AND s.entity = ".$conf->entity;
         $sql.= " GROUP BY s.client";
+        
         $resql=$this->db->query($sql);
         if ($resql)
         {
diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php
index 0ef4a4823db..f42da946959 100644
--- a/htdocs/comm/action/listactions.php
+++ b/htdocs/comm/action/listactions.php
@@ -109,9 +109,8 @@ $sql.= " ua.login as loginauthor, ua.rowid as useridauthor,";
 $sql.= " ut.login as logintodo, ut.rowid as useridtodo,";
 $sql.= " ud.login as logindone, ud.rowid as useriddone,";
 $sql.= " sp.name, sp.firstname";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
 $sql.= " FROM ".MAIN_DB_PREFIX."c_actioncomm as c,";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " ".MAIN_DB_PREFIX."societe_commerciaux as sc,";
+if (!$user->rights->societe->client->voir && !$socid) $sql.= " ".MAIN_DB_PREFIX."societe_commerciaux as sc,";
 $sql.= " ".MAIN_DB_PREFIX."actioncomm as a";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON a.fk_contact = sp.rowid";
@@ -119,22 +118,11 @@ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as ua ON a.fk_user_author = ua.rowid";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as ut ON a.fk_user_action = ut.rowid";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as ud ON a.fk_user_done = ud.rowid";
 $sql.= " WHERE c.id = a.fk_action";
-if ($_GET["type"])
-{
-  $sql .= " AND c.id = ".$_GET["type"];
-}
-if ($_REQUEST["time"] == "today")
-{
-  $sql .= " AND date_format(a.datep, '%d%m%Y') = ".strftime("%d%m%Y",time());
-}
-if ($socid) 
-{
-  $sql .= " AND s.rowid = ".$socid;
-}
-if (!$user->rights->societe->client->voir && !$socid) //restriction
-{
-	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-}
+$sql.= " AND s.entity = ".$conf->entity;
+if (!$user->rights->societe->client->voir && !$socid)	$sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+if ($socid) $sql.= " AND s.rowid = ".$socid;
+if ($_GET["type"]) $sql.= " AND c.id = ".$_GET["type"];
+if ($_REQUEST["time"] == "today") $sql.= " AND date_format(a.datep, '%d%m%Y') = ".strftime("%d%m%Y",time());
 if ($status == 'done') { $sql.= " AND a.percent = 100"; }
 if ($status == 'todo') { $sql.= " AND a.percent < 100"; }
 if ($filtera > 0 || $filtert > 0 || $filterd > 0) 
diff --git a/htdocs/comm/clients.php b/htdocs/comm/clients.php
index 2a240bd5e8c..5ee074c63ea 100644
--- a/htdocs/comm/clients.php
+++ b/htdocs/comm/clients.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -53,23 +54,24 @@ $search_code=isset($_GET["search_code"])?$_GET["search_code"]:$_POST["search_cod
 llxHeader();
 
 
-$sql = "SELECT s.rowid, s.nom, s.ville, ".$db->pdate("s.datec")." as datec, ".$db->pdate("s.datea")." as datea, st.libelle as stcomm, s.prefix_comm, s.code_client";
-if (!$user->rights->societe->client->voir) $sql .= ", sc.fk_soc, sc.fk_user";
-$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."c_stcomm as st";
-if (!$user->rights->societe->client->voir) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-$sql .= " WHERE s.fk_stcomm = st.id AND s.client=1";
+$sql = "SELECT s.rowid, s.nom, s.ville, st.libelle as stcomm, s.prefix_comm, s.code_client";
+$sql.= ", ".$db->pdate("s.datec")." as datec, ".$db->pdate("s.datea")." as datea";
+$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+$sql.= ", ".MAIN_DB_PREFIX."c_stcomm as st";
+if (!$user->rights->societe->client->voir) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+$sql.= " WHERE s.fk_stcomm = st.id";
+$sql.= " AND s.client=1";
+$sql.= " AND s.entity = ".$conf->entity;
+if (!$user->rights->societe->client->voir) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+if ($socid) $sql.= " AND s.rowid = ".$socid;
 
-if ($socid)           $sql .= " AND s.rowid = ".$socid;
-if ($user->societe_id) $sql .= " AND s.rowid = " .$user->societe_id;
-if (!$user->rights->societe->client->voir) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-
-if ($search_nom)   $sql .= " AND s.nom like '%".addslashes(strtolower($search_nom))."%'";
-if ($search_ville) $sql .= " AND s.ville like '%".addslashes(strtolower($search_ville))."%'";
-if ($search_code)  $sql .= " AND s.code_client like '%".addslashes(strtolower($search_code))."%'";
+if ($search_nom)   $sql.= " AND s.nom like '%".addslashes(strtolower($search_nom))."%'";
+if ($search_ville) $sql.= " AND s.ville like '%".addslashes(strtolower($search_ville))."%'";
+if ($search_code)  $sql.= " AND s.code_client like '%".addslashes(strtolower($search_code))."%'";
 
 if ($socname)
 {
-	$sql .= " AND s.nom like '%".addslashes(strtolower($socname))."%'";
+	$sql.= " AND s.nom like '%".addslashes(strtolower($socname))."%'";
 	$sortfield = "s.nom";
 	$sortorder = "ASC";
 }
diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php
index 100c31c3626..dfa257bc2d7 100644
--- a/htdocs/comm/contact.php
+++ b/htdocs/comm/contact.php
@@ -74,56 +74,52 @@ if ($type == "f")
  */
 
 $sql = "SELECT s.rowid, s.nom,  st.libelle as stcomm";
-$sql .= ", p.rowid as cidp, p.name, p.firstname, p.email, p.phone";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
-$sql .= " FROM ".MAIN_DB_PREFIX."c_stcomm as st,";
+$sql.= ", p.rowid as cidp, p.name, p.firstname, p.email, p.phone";
+$sql.= " FROM ".MAIN_DB_PREFIX."c_stcomm as st,";
 if (!$user->rights->societe->client->voir && !$socid) $sql .= " ".MAIN_DB_PREFIX."societe_commerciaux as sc,";
-$sql .= " ".MAIN_DB_PREFIX."socpeople as p";
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = p.fk_soc";
-$sql .= " WHERE s.fk_stcomm = st.id";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-if ($type == "c") $sql .= " AND s.client = 1";
-if ($type == "p") $sql .= " AND s.client = 2";
-if ($type == "f") $sql .= " AND s.fournisseur = 1";
-
+$sql.= " ".MAIN_DB_PREFIX."socpeople as p";
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = p.fk_soc";
+$sql.= " WHERE s.fk_stcomm = st.id";
+$sql.= " AND p.entity = ".$conf->entity;
+if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+if ($type == "c") $sql.= " AND s.client = 1";
+if ($type == "p") $sql.= " AND s.client = 2";
+if ($type == "f") $sql.= " AND s.fournisseur = 1";
+if ($socid) $sql.= " AND s.rowid = ".$socid;
 
 if (strlen($stcomm))
 {
-  $sql .= " AND s.fk_stcomm=$stcomm";
+  $sql.= " AND s.fk_stcomm=$stcomm";
 }
 
 if (strlen($begin)) // filtre sur la premiere lettre du nom
 {
-  $sql .= " AND upper(p.name) like '$begin%'";
+  $sql.= " AND upper(p.name) like '$begin%'";
 }
 
 if (trim($_GET["search_nom"]))
 {
-  $sql .= " AND p.name like '%".trim($_GET["search_nom"])."%'";
+  $sql.= " AND p.name like '%".trim($_GET["search_nom"])."%'";
 }
 
 if (trim($_GET["search_prenom"]))
 {
-  $sql .= " AND p.firstname like '%".trim($_GET["search_prenom"])."%'";
+  $sql.= " AND p.firstname like '%".trim($_GET["search_prenom"])."%'";
 }
 
 if (trim($_GET["search_societe"]))
 {
-  $sql .= " AND s.nom like '%".trim($_GET["search_societe"])."%'";
+  $sql.= " AND s.nom like '%".trim($_GET["search_societe"])."%'";
 }
 
 if ($_GET["contactname"]) // acces a partir du module de recherche
 {
-  $sql .= " AND ( p.name like '%".strtolower($_GET[contactname])."%' OR lower(p.firstname) like '%".strtolower($_GET[contactname])."%') ";
+  $sql.= " AND ( p.name like '%".strtolower($_GET[contactname])."%' OR lower(p.firstname) like '%".strtolower($_GET[contactname])."%') ";
   $sortfield = "p.name";
   $sortorder = "ASC";
 }
 
-if ($socid) {
-  $sql .= " AND s.rowid = ".$socid;
-}
-
-$sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($limit+1, $offset);
+$sql.= " ORDER BY $sortfield $sortorder " . $db->plimit($limit+1, $offset);
 
 $resql = $db->query($sql);
 if ($resql)
diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php
index a1c31c22fad..d26849d8959 100644
--- a/htdocs/comm/fiche.php
+++ b/htdocs/comm/fiche.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
- * Copyright (C) 2005-2007 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  * Copyright (C) 2008      Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -47,7 +47,7 @@ if (!empty($conf->global->MAIN_MODULE_CHRONODOCS)) $langs->load("chronodocs");
 // Security check
 $socid = isset($_GET["socid"])?$_GET["socid"]:'';
 if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'societe',$socid,'');
+$result = restrictedArea($user,'societe',$socid,'');
 
 $sortorder=$_GET["sortorder"];
 $sortfield=$_GET["sortfield"];
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index 55fea480e00..51ec459ce9f 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -39,7 +39,7 @@ accessforbidden();
 $langs->load("commercial");
 $langs->load("orders");
 
-// S�curit� acc�s clien
+// Securite acces client
 $socid='';
 if ($_GET["socid"]) { $socid=$_GET["socid"]; }
 if ($user->societe_id > 0)
@@ -139,16 +139,15 @@ if ($conf->contrat->enabled && $user->rights->contrat->lire)
 if ($conf->propal->enabled && $user->rights->propale->lire)
 {
 	$sql = "SELECT p.rowid, p.ref, p.total_ht, s.rowid as socid, s.nom, s.client";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
-	$sql.= " FROM ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql.= " WHERE p.fk_statut = 0 and p.fk_soc = s.rowid";
-	if ($socid)
-	{
-		$sql .= " AND s.rowid = ".$socid;
-	}
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-
+	$sql.= " FROM ".MAIN_DB_PREFIX."propal as p";
+	$sql.= ", ".MAIN_DB_PREFIX."societe as s";
+	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	$sql.= " WHERE p.fk_statut = 0";
+	$sql.= " AND p.fk_soc = s.rowid";
+	$sql.= " AND s.entity = ".$conf->entity;
+	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+	if ($socid)	$sql.= " AND s.rowid = ".$socid;
+	
 	$resql=$db->query($sql);
 	if ($resql)
 	{
@@ -204,15 +203,14 @@ if ($conf->commande->enabled && $user->rights->commande->lire)
 {
 	$langs->load("orders");
 	$sql = "SELECT c.rowid, c.ref, c.total_ttc, s.rowid as socid, s.nom, s.client";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
-	$sql.= " FROM ".MAIN_DB_PREFIX."commande as c, ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql.= " WHERE c.fk_soc = s.rowid AND c.fk_statut = 0";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-	if ($socid)
-	{
-		$sql .= " AND c.fk_soc = ".$socid;
-	}
+	$sql.= " FROM ".MAIN_DB_PREFIX."commande as c";
+	$sql.= ", ".MAIN_DB_PREFIX."societe as s";
+	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	$sql.= " WHERE c.fk_soc = s.rowid";
+	$sql.= " AND c.fk_statut = 0";
+	$sql.= " AND s.entity = ".$conf->entity;
+	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+	if ($socid)	$sql.= " AND c.fk_soc = ".$socid;
 
 	$resql = $db->query($sql);
 	if ($resql)
@@ -268,18 +266,16 @@ if ($conf->propal->enabled && $user->rights->propale->lire)
 {
 
 	$sql = "SELECT s.nom, s.rowid, p.rowid as propalid, p.total_ht, p.ref, p.fk_statut, ".$db->pdate("p.datep")." as dp";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
-	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql .= " WHERE p.fk_soc = s.rowid";
-	//$sql .= " AND p.fk_statut > 1";
-	if ($socid)
-	{
-		$sql .= " AND s.rowid = ".$socid;
-	}
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-	$sql .= " ORDER BY p.datec DESC";
-	$sql .= $db->plimit($NBMAX, 0);
+	$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+	$sql.= ", ".MAIN_DB_PREFIX."propal as p";
+	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	$sql.= " WHERE p.fk_soc = s.rowid";
+	$sql.= " AND s.entity = ".$conf->entity;
+	//$sql.= " AND p.fk_statut > 1";
+	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+	if ($socid)	$sql.= " AND s.rowid = ".$socid;
+	$sql.= " ORDER BY p.datec DESC";
+	$sql.= $db->plimit($NBMAX, 0);
 
 	if ( $db->query($sql) )
 	{
@@ -338,18 +334,12 @@ if ($conf->propal->enabled && $user->rights->propale->lire)
 if ($user->rights->societe->lire)
 {
 	$sql = "SELECT s.rowid,s.nom,s.client,s.tms";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
 	$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql.= " WHERE s.client in (1,2)";
-	if ($socid)
-	{
-		$sql .= " AND s.rowid = $socid";
-	}
-	if (!$user->rights->societe->client->voir && !$socid) //restriction
-	{
-		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-	}
+	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	$sql.= " WHERE s.client IN (1,2)";
+	$sql.= " AND s.entity = ".$conf->entity;
+	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+	if ($socid)	$sql.= " AND s.rowid = $socid";
 	$sql .= " ORDER BY s.tms DESC";
 	$sql .= $db->plimit($max, 0);
 
@@ -419,20 +409,17 @@ if ($conf->contrat->enabled && $user->rights->contrat->lire && 0) // \todo A REF
 	$langs->load("contracts");
 
 	$sql = "SELECT s.nom, s.rowid, c.statut, c.rowid as contratid, p.ref, c.mise_en_service as datemes, c.fin_validite as datefin, c.date_cloture as dateclo";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
-	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."product as p";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql .= " WHERE c.fk_soc = s.rowid and c.fk_product = p.rowid";
-	if ($socid)
-	{
-		$sql .= " AND s.rowid = ".$socid;
-	}
-	if (!$user->rights->societe->client->voir && !$socid) //restriction
-	{
-		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-	}
-	$sql .= " ORDER BY c.tms DESC";
-	$sql .= $db->plimit(5, 0);
+	$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+	$sql.= ", ".MAIN_DB_PREFIX."contrat as c";
+	$sql.= ", ".MAIN_DB_PREFIX."product as p";
+	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	$sql.= " WHERE c.fk_soc = s.rowid";
+	$sql.= " AND s.entity = ".$conf->entity;
+	$sql.= " AND c.fk_product = p.rowid";
+	if (!$user->rights->societe->client->voir && !$socid)	$sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+	if ($socid) $sql.= " AND s.rowid = ".$socid;
+	$sql.= " ORDER BY c.tms DESC";
+	$sql.= $db->plimit(5, 0);
 
 	if ( $db->query($sql) )
 	{
@@ -474,13 +461,15 @@ if ($conf->propal->enabled && $user->rights->propale->lire)
 	$langs->load("propal");
 
 	$sql = "SELECT s.nom, s.rowid, p.rowid as propalid, p.total as total_ttc, p.total_ht, p.ref, p.fk_statut, ".$db->pdate("p.datep")." as dp";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
-	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql .= " WHERE p.fk_soc = s.rowid AND p.fk_statut = 1";
-	if ($socid) $sql .= " AND s.rowid = ".$socid;
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-	$sql .= " ORDER BY p.rowid DESC";
+	$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+	$sql.= ", ".MAIN_DB_PREFIX."propal as p";
+	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	$sql.= " WHERE p.fk_soc = s.rowid";
+	$sql.= " AND s.entity = ".$conf->entity;
+	$sql.= " AND p.fk_statut = 1";
+	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+	if ($socid) $sql.= " AND s.rowid = ".$socid;
+	$sql.= " ORDER BY p.rowid DESC";
 
 	$result=$db->query($sql);
 	if ($result)
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 8da1ac34542..22b4ec6c3fa 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2009 Laurent Destailleur   <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Eric Seigne           <eric.seigne@ryxeo.com>
  * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
- * Copyright (C) 2005-2007 Regis Houssin         <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin         <regis@dolibarr.fr>
  * Copyright (C) 2006      Andre Cianfarani      <acianfa@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -731,7 +731,7 @@ if ($_POST['action'] == 'updateligne' && $user->rights->propale->creer && $_POST
 	$vat_rate=$_POST['tva_tx'];
 	$vat_rate=eregi_replace('\*','',$vat_rate);
 
-	// On v�rifie que le prix minimum est respect�
+	// On verifie que le prix minimum est respecte
 	$productid = $_POST['productid'] ;
 	if ($productid)
 	{
@@ -1992,47 +1992,48 @@ else
 	if ($sall) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'propaldet as pd ON p.rowid=pd.fk_propal';
 	$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as u ON p.fk_user_author = u.rowid';
 	$sql.= ' WHERE p.fk_soc = s.rowid';
+	$sql.= ' AND s.entity = '.$conf->entity;
 
 	if (!$user->rights->societe->client->voir && !$socid) //restriction
 	{
-		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+		$sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 	}
 	if (!empty($_GET['search_ref']))
 	{
-		$sql .= " AND p.ref LIKE '%".addslashes($_GET['search_ref'])."%'";
+		$sql.= " AND p.ref LIKE '%".addslashes($_GET['search_ref'])."%'";
 	}
 	if (!empty($_GET['search_societe']))
 	{
-		$sql .= " AND s.nom LIKE '%".addslashes($_GET['search_societe'])."%'";
+		$sql.= " AND s.nom LIKE '%".addslashes($_GET['search_societe'])."%'";
 	}
 	if (!empty($_GET['search_montant_ht']))
 	{
-		$sql .= " AND p.total_ht='".addslashes($_GET['search_montant_ht'])."'";
+		$sql.= " AND p.total_ht='".addslashes($_GET['search_montant_ht'])."'";
 	}
 	if ($sall) $sql.= " AND (s.nom like '%".addslashes($sall)."%' OR p.note like '%".addslashes($sall)."%' OR pd.description like '%".addslashes($sall)."%')";
-	if ($socid) $sql .= ' AND s.rowid = '.$socid;
+	if ($socid) $sql.= ' AND s.rowid = '.$socid;
 	if ($viewstatut <> '')
 	{
-		$sql .= ' AND p.fk_statut in ('.$viewstatut.')';
+		$sql.= ' AND p.fk_statut in ('.$viewstatut.')';
 	}
 	if ($month > 0)
 	{
 		if ($year > 0)
-		$sql .= " AND date_format(p.datep, '%Y-%m') = '$year-$month'";
+		$sql.= " AND date_format(p.datep, '%Y-%m') = '$year-$month'";
 		else
-		$sql .= " AND date_format(p.datep, '%m') = '$month'";
+		$sql.= " AND date_format(p.datep, '%m') = '$month'";
 	}
 	if ($year > 0)
 	{
-		$sql .= " AND date_format(p.datep, '%Y') = $year";
+		$sql.= " AND date_format(p.datep, '%Y') = $year";
 	}
 	if (strlen($_POST['sf_ref']) > 0)
 	{
-		$sql .= " AND p.ref like '%".addslashes($_POST["sf_ref"]) . "%'";
+		$sql.= " AND p.ref like '%".addslashes($_POST["sf_ref"]) . "%'";
 	}
 
-	$sql .= ' ORDER BY '.$sortfield.' '.$sortorder.', p.ref DESC';
-	$sql .= $db->plimit($limit + 1,$offset);
+	$sql.= ' ORDER BY '.$sortfield.' '.$sortorder.', p.ref DESC';
+	$sql.= $db->plimit($limit + 1,$offset);
 	$result=$db->query($sql);
 
 	if ($result)
diff --git a/htdocs/comm/propal/apercu.php b/htdocs/comm/propal/apercu.php
index 202eb30f329..f2e9a3c8a37 100644
--- a/htdocs/comm/propal/apercu.php
+++ b/htdocs/comm/propal/apercu.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004      Éric Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2004-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005      Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,9 +29,7 @@
 require("./pre.inc.php");
 require_once(DOL_DOCUMENT_ROOT.'/propal.class.php');
 require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php");
-if ($conf->projet->enabled) {
-	require_once(DOL_DOCUMENT_ROOT."/project.class.php");
-}
+if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/project.class.php");
 
 $langs->load('propal');
 $langs->load("bills");
@@ -76,8 +74,10 @@ if ($_GET["propalid"] > 0)
 		*/
 		$sql = 'SELECT s.nom, s.rowid, p.price, p.fk_projet, p.remise, p.tva, p.total, p.ref, p.fk_statut, '.$db->pdate('p.datep').' as dp, p.note,';
 		$sql.= ' p.fk_user_author, p.fk_user_valid, p.fk_user_cloture, p.datec, p.date_valid, p.date_cloture';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s, '.MAIN_DB_PREFIX.'propal as p';
-		$sql.= ' WHERE p.fk_soc = s.rowid AND p.rowid = '.$propal->id;
+		$sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s';
+		$sql.= ', '.MAIN_DB_PREFIX.'propal as p';
+		$sql.= ' WHERE p.fk_soc = s.rowid'
+		$sql.= ' AND p.rowid = '.$propal->id;
 
 		$result = $db->query($sql);
 
@@ -239,11 +239,8 @@ elseif (file_exists($fileimagebis))
 	}
 }
 
-
 print '</div>';
 
-
-
 $db->close();
 
 llxFooter('$Date$ - $Revision$');
diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php
index cd95ae9ca5f..b785f7a6367 100644
--- a/htdocs/comm/propal/note.php
+++ b/htdocs/comm/propal/note.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2005 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2007 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -108,16 +108,16 @@ if ($_GET['propalid'])
 		{
 			$head = propal_prepare_head($propal);
 			dol_fiche_head($head, 'note', $langs->trans('Proposal'));
+			
+			print '<table class="border" width="100%">';
 
-            print '<table class="border" width="100%">';
-
-	        print '<tr><td width="25%">'.$langs->trans('Ref').'</td><td colspan="3">'.$propal->ref.'</td></tr>';
-
-            // Soci�t�
-            print '<tr><td>'.$langs->trans('Company').'</td><td colspan="3">'.$societe->getNomUrl(1).'</td></tr>';
+	    print '<tr><td width="25%">'.$langs->trans('Ref').'</td><td colspan="3">'.$propal->ref.'</td></tr>';
+	    
+	    // Societe
+      print '<tr><td>'.$langs->trans('Company').'</td><td colspan="3">'.$societe->getNomUrl(1).'</td></tr>';
             
 			// Ligne info remises tiers
-            print '<tr><td>'.$langs->trans('Discounts').'</td><td colspan="3">';
+      print '<tr><td>'.$langs->trans('Discounts').'</td><td colspan="3">';
 			if ($societe->remise_client) print $langs->trans("CompanyHasRelativeDiscount",$societe->remise_client);
 			else print $langs->trans("CompanyHasNoRelativeDiscount");
 			$absolute_discount=$societe->getAvailableDiscounts();
@@ -128,64 +128,64 @@ if ($_GET['propalid'])
 			print '</td></tr>';
     
 			// Date
-            print '<tr><td>'.$langs->trans('Date').'</td><td colspan="3">';
-            print dol_print_date($propal->date,'daytext');
-            print '</td>';
-    		print '</tr>';
+      print '<tr><td>'.$langs->trans('Date').'</td><td colspan="3">';
+      print dol_print_date($propal->date,'daytext');
+      print '</td>';
+    	print '</tr>';
     		
-    		// Date fin propal
-            print '<tr>';
-            print '<td>'.$langs->trans('DateEndPropal').'</td><td colspan="3">';
-            if ($propal->fin_validite)
-            {
-                print dol_print_date($propal->fin_validite,'daytext');
-                if ($propal->statut == 1 && $propal->fin_validite < ($now - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late"));
-            }
-            else
-            {
-                print $langs->trans("Unknown");
-            }
-            print '</td>';
-            print '</tr>';
+    	// Date fin propal
+      print '<tr>';
+      print '<td>'.$langs->trans('DateEndPropal').'</td><td colspan="3">';
+      if ($propal->fin_validite)
+      {
+      	print dol_print_date($propal->fin_validite,'daytext');
+        if ($propal->statut == 1 && $propal->fin_validite < ($now - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late"));
+      }
+      else
+      {
+      	print $langs->trans("Unknown");
+      }
+      print '</td>';
+      print '</tr>';
 
 			// Note publique
-		    print '<tr><td valign="top">'.$langs->trans("NotePublic").' :</td>';
+		  print '<tr><td valign="top">'.$langs->trans("NotePublic").' :</td>';
 			print '<td valign="top" colspan="3">';
-		    if ($_GET["action"] == 'edit')
-		    {
-		        print '<form method="post" action="note.php?propalid='.$propal->id.'">';
-		        print '<input type="hidden" name="action" value="update_public">';
-		        print '<textarea name="note_public" cols="80" rows="8">'.$propal->note_public."</textarea><br>";
-		        print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
-		        print '</form>';
-		    }
-		    else
-		    {
-			    print ($propal->note_public?nl2br($propal->note_public):"&nbsp;");
-		    }
+		  if ($_GET["action"] == 'edit')
+		  {
+		  	print '<form method="post" action="note.php?propalid='.$propal->id.'">';
+		    print '<input type="hidden" name="action" value="update_public">';
+		    print '<textarea name="note_public" cols="80" rows="8">'.$propal->note_public."</textarea><br>";
+		    print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
+		    print '</form>';
+		  }
+		  else
+		  {
+		  	print ($propal->note_public?nl2br($propal->note_public):"&nbsp;");
+		  }
 			print "</td></tr>";
 		
-			// Note priv�e
+			// Note privee
 			if (! $user->societe_id)
 			{
-			    print '<tr><td valign="top">'.$langs->trans("NotePrivate").' :</td>';
+				print '<tr><td valign="top">'.$langs->trans("NotePrivate").' :</td>';
 				print '<td valign="top" colspan="3">';
-			    if ($_GET["action"] == 'edit')
-			    {
-			        print '<form method="post" action="note.php?propalid='.$propal->id.'">';
-			        print '<input type="hidden" name="action" value="update">';
-			        print '<textarea name="note" cols="80" rows="8">'.$propal->note."</textarea><br>";
-			        print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
-			        print '</form>';
-			    }
+			  if ($_GET["action"] == 'edit')
+			  {
+			  	print '<form method="post" action="note.php?propalid='.$propal->id.'">';
+			    print '<input type="hidden" name="action" value="update">';
+			    print '<textarea name="note" cols="80" rows="8">'.$propal->note."</textarea><br>";
+			    print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
+			    print '</form>';
+			  }
 				else
 				{
-				    print ($propal->note?nl2br($propal->note):"&nbsp;");
+					print ($propal->note?nl2br($propal->note):"&nbsp;");
 				}
 				print "</td></tr>";
 			}
 			
-		    print "</table>";
+			print "</table>";
 
 			print '</div>';
 
@@ -200,8 +200,9 @@ if ($_GET['propalid'])
 			}
 			print '</div>';
 		}
-    }
+  }
 }
 $db->close();
+
 llxFooter('$Date$ - $Revision: 1.15 ');
 ?>
diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php
index 9bec6d086a8..a54b8a72ee7 100644
--- a/htdocs/comm/propal/stats/index.php
+++ b/htdocs/comm/propal/stats/index.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -77,7 +78,7 @@ $px = new DolGraph();
 $mesg = $px->isGraphKo();
 if (! $mesg)
 {
-    $px->SetData($data);
+	$px->SetData($data);
 	$px->SetPrecisionY(0);
 	$i=$startyear;
 	while ($i <= $endyear)
@@ -85,11 +86,11 @@ if (! $mesg)
 		$legend[]=$i;
 		$i++;
 	}
-    $px->SetLegend($legend);
-    $px->SetMaxValue($px->GetCeilMaxValue());
+	$px->SetLegend($legend);
+  $px->SetMaxValue($px->GetCeilMaxValue());
 	$px->SetMinValue(min(0,$px->GetFloorMinValue()));
-    $px->SetWidth($WIDTH);
-    $px->SetHeight($HEIGHT);
+  $px->SetWidth($WIDTH);
+  $px->SetHeight($HEIGHT);
 	$px->SetYLabel($langs->trans("NbOfProposals"));
 	$px->SetShading(3);
 	$px->SetHorizTickIncrement(1);
@@ -97,7 +98,7 @@ if (! $mesg)
 	$px->mode='depth';
 	$px->SetTitle($langs->trans("NumberOfProposalsByMonth"));
 
-    $px->draw($filenamenb);
+  $px->draw($filenamenb);
 }
 
 // Build graphic amount of object
diff --git a/htdocs/comm/propal/stats/propalestats.class.php b/htdocs/comm/propal/stats/propalestats.class.php
index 885e570640a..69f54426353 100644
--- a/htdocs/comm/propal/stats/propalestats.class.php
+++ b/htdocs/comm/propal/stats/propalestats.class.php
@@ -1,6 +1,7 @@
 <?php
-/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (c) 2005 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (c) 2005      Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -52,16 +53,20 @@ class PropaleStats extends Stats
 	 */
 	function PropaleStats($DB, $socid=0)
 	{
-		global $user;
+		global $user, $conf;
 		
 		$this->db = $DB;
 
 		$object=new Propal($this->db);
-		$this->table_element=$object->table_element;
+
+		$this->from = MAIN_DB_PREFIX.$object->table_element." as p";
+		$this->from.= ", ".MAIN_DB_PREFIX."societe as s";
+		
 		$this->field='total';
 		
 		$this->socid = $socid;
 		$this->where.= " fk_statut > 0";
+		$this->where.= " AND p.fk_soc = s.rowid AND s.entity = ".$conf->entity;
 		if (!$user->rights->societe->client->voir && !$user->societe_id) $this->where .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		if($this->socid)
 		{
@@ -79,12 +84,11 @@ class PropaleStats extends Stats
 		global $user;
 
 		$sql = "SELECT date_format(p.datep,'%m') as dm, count(*)";
-		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", sc.fk_soc, sc.fk_user";
-		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as p";
-		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql .= " WHERE date_format(p.datep,'%Y') = ".$year;
+		$sql.= " FROM ".$this->from;
+		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		$sql.= " WHERE date_format(p.datep,'%Y') = ".$year;
 		$sql.= " AND ".$this->where;
-		$sql .= " GROUP BY dm DESC";
+		$sql.= " GROUP BY dm DESC";
 
 		return $this->_getNbByMonth($year, $sql);
 	}
@@ -98,9 +102,8 @@ class PropaleStats extends Stats
 		global $user;
 		 
 		$sql = "SELECT date_format(p.datep,'%Y') as dm, count(*)";
-		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", sc.fk_soc, sc.fk_user";
-		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element." as p";
-		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		$sql.= " FROM ".$this->from;
+		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql.= " WHERE ".$this->where;
 		$sql.= " GROUP BY dm DESC";
 
@@ -115,9 +118,8 @@ class PropaleStats extends Stats
 		global $user;
 		 
 		$sql = "SELECT date_format(p.datep,'%m') as dm, sum(p.".$this->field.")";
-		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", sc.fk_soc, sc.fk_user";
-		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element." as p";
-		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		$sql.= " FROM ".$this->from;
+		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql.= " WHERE date_format(p.datep,'%Y') = ".$year;
 		$sql.= " AND ".$this->where;
 		$sql.= " GROUP BY dm DESC";
@@ -133,9 +135,8 @@ class PropaleStats extends Stats
 		global $user;
 		 
 		$sql = "SELECT date_format(p.datep,'%m') as dm, avg(p.".$this->field.")";
-		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", sc.fk_soc, sc.fk_user";
-		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element." as p";
-		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		$sql.= " FROM ".$this->from;
+		if (!$user->rights->societe->client->voir && !$this->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql.= " WHERE date_format(p.datep,'%Y') = ".$year;
 		$sql.= " AND ".$this->where;
 		$sql.= " GROUP BY dm DESC";
@@ -153,9 +154,8 @@ class PropaleStats extends Stats
 		global $user;
 		
 		$sql = "SELECT date_format(p.datep,'%Y') as year, count(*) as nb, sum(".$this->field.") as total, avg(".$this->field.") as avg";
-		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", sc.fk_soc, sc.fk_user";
-		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element." as p";
-		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		$sql.= " FROM ".$this->from;
+		if (!$user->rights->societe->client->voir && !$this->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql.= " WHERE ".$this->where;
 		$sql.= " GROUP BY year DESC";
 
diff --git a/htdocs/comm/prospect/index.php b/htdocs/comm/prospect/index.php
index 0f6e48d72b8..b5c9abdab4e 100644
--- a/htdocs/comm/prospect/index.php
+++ b/htdocs/comm/prospect/index.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2006 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -70,12 +70,13 @@ if ($conf->propal->enabled)
 
 $sql = "SELECT count(*) as cc, st.libelle, st.id";
 if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
-$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."c_stcomm as st ";
+$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."c_stcomm as st ";
 if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-$sql .= " WHERE s.fk_stcomm = st.id AND s.client=2";
+$sql.= " WHERE s.fk_stcomm = st.id AND s.client=2";
+$sql.= " AND s.entity = ".$conf->entity;
 if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-$sql .= " GROUP BY st.id";
-$sql .= " ORDER BY st.id";
+$sql.= " GROUP BY st.id";
+$sql.= " ORDER BY st.id";
 
 $resql=$db->query($sql);
 if ($resql)
@@ -111,9 +112,10 @@ if ($conf->propal->enabled && $user->rights->propale->lire)
 {
     $sql = "SELECT p.rowid, p.ref, p.price, s.nom";
     if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
-    $sql .= " FROM ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."societe as s";
+    $sql.= " FROM ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."societe as s";
     if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-    $sql .= " WHERE p.fk_statut = 0 and p.fk_soc = s.rowid";
+    $sql.= " WHERE p.fk_statut = 0 and p.fk_soc = s.rowid";
+    $sql.= " AND s.entity = ".$conf->entity;
     if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 
     $resql=$db->query($sql);
@@ -168,13 +170,14 @@ if ($conf->propal->enabled && $user->rights->propale->lire)
 {
     $sql = "SELECT s.nom, s.rowid as socid, p.rowid as propalid, p.total as total_ttc, p.ref,".$db->pdate("p.datep")." as dp, c.label as statut, c.id as statutid";
     if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
-    $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."c_propalst as c";
+    $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."c_propalst as c";
     if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-    $sql .= " WHERE p.fk_soc = s.rowid AND p.fk_statut = c.id AND p.fk_statut = 1";
+    $sql.= " WHERE p.fk_soc = s.rowid AND p.fk_statut = c.id AND p.fk_statut = 1";
+    $sql.= " AND s.entity = ".$conf->entity;
     if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
     if ($socid) $sql .= " AND s.rowid = ".$socid;
-    $sql .= " ORDER BY p.rowid DESC";
-    $sql .= $db->plimit(5, 0);
+    $sql.= " ORDER BY p.rowid DESC";
+    $sql.= $db->plimit(5, 0);
     
     $resql=$db->query($sql);
     if ($resql)
@@ -216,17 +219,18 @@ if ($conf->propal->enabled && $user->rights->propale->lire)
 }
 
 /*
- * Soci�t�s � contacter
+ * Societes a contacter
  *
  */
 $sql = "SELECT s.nom, s.rowid";
 if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
-$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-$sql .= " WHERE s.fk_stcomm = 1";
+$sql.= " WHERE s.fk_stcomm = 1";
+$sql.= " AND s.entity = ".$conf->entity;
 if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-$sql .= " ORDER BY s.tms ASC";
-$sql .= $db->plimit(15, 0);
+$sql.= " ORDER BY s.tms ASC";
+$sql.= $db->plimit(15, 0);
 
 if ( $db->query($sql) )
 {
diff --git a/htdocs/comm/prospect/prospects.php b/htdocs/comm/prospect/prospects.php
index 725e053894a..f216debe421 100644
--- a/htdocs/comm/prospect/prospects.php
+++ b/htdocs/comm/prospect/prospects.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -165,25 +166,20 @@ if ($search_sale) $sql .= ", sc.fk_soc, sc.fk_user";
 if ($search_categ) $sql .= ", cs.fk_categorie, cs.fk_societe";
 $sql .= " FROM ".MAIN_DB_PREFIX."c_stcomm as st";
 // We'll need this table joined to the select in order to filter by sale
-if ($search_sale) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if ($search_sale) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 // We'll need this table joined to the select in order to filter by categ
-if ($search_categ) $sql .= ", ".MAIN_DB_PREFIX."categorie_societe as cs";
+if ($search_categ) $sql.= ", ".MAIN_DB_PREFIX."categorie_societe as cs";
 $sql.= ", ".MAIN_DB_PREFIX."societe as s";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as d on (d.rowid = s.fk_departement)";
-$sql.= " WHERE s.fk_stcomm = st.id AND s.client = 2";
+$sql.= " WHERE s.fk_stcomm = st.id";
+$sql.= " AND s.client = 2";
+$sql.= " AND s.entity = ".$conf->entity;
+if ($user->societe_id) $sql.= " AND s.rowid = " .$user->societe_id;
 // Join for the needed table to filter by sale
-if ($search_sale) $sql .= " AND s.rowid = sc.fk_soc";
+if ($search_sale) $sql.= " AND s.rowid = sc.fk_soc";
 // Join for the needed table to filter by categ
-if ($search_categ) $sql .= " AND s.rowid = cs.fk_societe";
-
-if (isset($stcomm) && $stcomm != '')
-{
-	$sql .= " AND s.fk_stcomm=".$stcomm;
-}
-if ($user->societe_id)
-{
-	$sql .= " AND s.rowid = " .$user->societe_id;
-}
+if ($search_categ) $sql.= " AND s.rowid = cs.fk_societe";
+if (isset($stcomm) && $stcomm != '') $sql.= " AND s.fk_stcomm=".$stcomm;
 
 if ($_GET["search_nom"])   $sql .= " AND s.nom like '%".addslashes(strtolower($_GET["search_nom"]))."%'";
 if ($_GET["search_ville"]) $sql .= " AND s.ville like '%".addslashes(strtolower($_GET["search_ville"]))."%'";
@@ -287,8 +283,9 @@ if ($resql)
  		print '<option value="">'.$langs->trans('All').'</option>';
  		
  		$sql_usr = "SELECT u.rowid, u.name, u.firstname, u.login";
- 		$sql_usr .= " FROM ".MAIN_DB_PREFIX."user as u";
- 		$sql_usr .= " ORDER BY u.name ASC ";
+ 		$sql_usr.= " FROM ".MAIN_DB_PREFIX."user as u";
+ 		$sql_usr.= " WHERE u.entity IN (0,".$conf->entity.")";
+ 		$sql_usr.= " ORDER BY u.name ASC ";
  	    
  		$resql_usr = $db->query($sql_usr);
  		if ($resql_usr)
diff --git a/htdocs/commande/apercu.php b/htdocs/commande/apercu.php
index 278a20b2c78..9c591717876 100644
--- a/htdocs/commande/apercu.php
+++ b/htdocs/commande/apercu.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004      Éric Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2004-2005 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2006 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,9 +31,11 @@
 
 require("./pre.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php");
+require_once(DOL_DOCUMENT_ROOT.'/commande/commande.class.php');
+if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT.'/propal.class.php');
+if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/project.class.php");
 
-if (!$user->rights->commande->lire)
-	accessforbidden();
+if (!$user->rights->commande->lire)	accessforbidden();
 
 $langs->load('orders');
 $langs->load('propal');
@@ -41,24 +43,12 @@ $langs->load("bills");
 $langs->load('compta');
 $langs->load('sendings');
 
+// Security check
+$socid=0;
+$comid = isset($_GET["id"])?$_GET["id"]:'';
+if ($user->societe_id) $socid=$user->societe_id;
+$result=restrictedArea($user,'commande',$comid,'');
 
-require_once(DOL_DOCUMENT_ROOT.'/commande/commande.class.php');
-require_once(DOL_DOCUMENT_ROOT.'/propal.class.php');
-
-if ($conf->projet->enabled)
-{
-	require_once(DOL_DOCUMENT_ROOT."/project.class.php");
-}
-
-
-/*
- * Sécurité accés client
-*/
-if ($user->societe_id > 0)
-{
-	$action = '';
-	$socid = $user->societe_id;
-}
 
 llxHeader();
 
@@ -88,7 +78,8 @@ if ($_GET["id"] > 0) {
 		 */
 		$sql = 'SELECT s.nom, s.rowid, c.amount_ht, c.fk_projet, c.remise, c.tva, c.total_ttc, c.ref, c.fk_statut, '.$db->pdate('c.date_commande').' as dp, c.note,';
 		$sql.= ' c.fk_user_author, c.fk_user_valid, c.fk_user_cloture, c.date_creation, c.date_valid, c.date_cloture';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s, '.MAIN_DB_PREFIX.'commande as c';
+		$sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s';
+		$sql.= ', '.MAIN_DB_PREFIX.'commande as c';
 		$sql.= ' WHERE c.fk_soc = s.rowid';
 		$sql.= ' AND c.rowid = '.$commande->id;
 		if ($socid) $sql .= ' AND s.rowid = '.$socid;
diff --git a/htdocs/commande/commande.class.php b/htdocs/commande/commande.class.php
index 7d866012ac2..11e014f14d6 100644
--- a/htdocs/commande/commande.class.php
+++ b/htdocs/commande/commande.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2003-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2008 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  * Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -1858,18 +1858,22 @@ class Commande extends CommonObject
 		$now=gmmktime();
 
 		$this->nbtodo=$this->nbtodolate=0;
-		$clause = "WHERE";
+		$clause = " WHERE";
 
-		$sql = 'SELECT c.rowid, c.date_creation as datec';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.'commande as c';
+		$sql = "SELECT c.rowid, c.date_creation as datec";
+		$sql.= " FROM ".MAIN_DB_PREFIX."commande as c";
+		$sql.= ", ".MAIN_DB_PREFIX."societe as s";
 		if (!$user->rights->societe->client->voir && !$user->societe_id)
 		{
 			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON c.fk_soc = sc.fk_soc";
 			$sql.= " WHERE sc.fk_user = " .$user->id;
-			$clause = "AND";
+			$clause = " AND";
 		}
-		$sql.= ' '.$clause.' (c.fk_statut BETWEEN 1 AND 2 or (c.fk_statut = 3 AND c.facture = 0))';
-		if ($user->societe_id) $sql.=' AND c.fk_soc = '.$user->societe_id;
+		$sql.= $clause." c.fk_soc = s.rowid";
+		$sql.= " AND s.entity = ".$conf->entity;
+		$sql.= " AND (c.fk_statut BETWEEN 1 AND 2 or (c.fk_statut = 3 AND c.facture = 0))";
+		if ($user->societe_id) $sql.=" AND c.fk_soc = ".$user->societe_id;
+
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -2154,15 +2158,19 @@ class Commande extends CommonObject
 		global $conf, $user;
 
 		$this->nb=array();
+		$clause = "WHERE";
 
 		$sql = "SELECT count(co.rowid) as nb";
 		$sql.= " FROM ".MAIN_DB_PREFIX."commande as co";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON co.fk_soc = s.rowid";
 		if (!$user->rights->societe->client->voir && !$user->societe_id)
 		{
-			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON co.fk_soc = s.rowid";
 			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
 			$sql.= " WHERE sc.fk_user = " .$user->id;
+			$clause = "AND";
 		}
+		$sql.= " ".$clause." s.entity = ".$conf->entity;
+		
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
diff --git a/htdocs/commande/contact.php b/htdocs/commande/contact.php
index 1ccc5688496..1562fe17a2f 100644
--- a/htdocs/commande/contact.php
+++ b/htdocs/commande/contact.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2005      Patrick Rouillon     <patrick@rouillon.net>
- * Copyright (C) 2005-2009 Destailleur Laurent  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,11 +36,11 @@ $langs->load("orders");
 $langs->load("sendings");
 $langs->load("companies");
 
-$commandeid = isset($_GET["id"])?$_GET["id"]:'';
+$comid = isset($_GET["id"])?$_GET["id"]:'';
 
 // Security check
 if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'commande', $commandeid);
+$result = restrictedArea($user, 'commande', $comid,'');
 
 
 /*
diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php
index 01d2e742a98..be17613f6b4 100644
--- a/htdocs/commande/document.php
+++ b/htdocs/commande/document.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2003-2007 Rodolphe Quiedeville  <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2008 Laurent Destailleur   <eldy@users.sourceforge.net>
  * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
- * Copyright (C) 2005      Regis Houssin         <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin         <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,8 +31,7 @@ require_once(DOL_DOCUMENT_ROOT.'/lib/order.lib.php');
 require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
 
-if (!$user->rights->commande->lire)
-accessforbidden();
+if (!$user->rights->commande->lire) accessforbidden();
 
 $langs->load('companies');
 //$langs->load("bills");
@@ -42,12 +41,10 @@ $id=empty($_GET['id']) ? 0 : intVal($_GET['id']);
 $action=empty($_GET['action']) ? (empty($_POST['action']) ? '' : $_POST['action']) : $_GET['action'];
 
 // Security check
-if ($user->societe_id > 0)
-{
-	unset($_GET["action"]);
-	$action='';
-	$socid = $user->societe_id;
-}
+$socid=0;
+$comid = isset($_GET["id"])?$_GET["id"]:'';
+if ($user->societe_id) $socid=$user->societe_id;
+$result=restrictedArea($user,'commande',$comid,'');
 
 // Get parameters
 $page=$_GET["page"];
diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
index 825dfee37cd..0cbc1056caf 100644
--- a/htdocs/commande/fiche.php
+++ b/htdocs/commande/fiche.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2003-2006 Rodolphe Quiedeville  <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2009 Laurent Destailleur   <eldy@users.sourceforge.net>
  * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
- * Copyright (C) 2005-2008 Regis Houssin         <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin         <regis@dolibarr.fr>
  * Copyright (C) 2006      Andre Cianfarani      <acianfa@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -39,6 +39,8 @@ if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/project.class.php')
 if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/lib/project.lib.php');
 if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT.'/propal.class.php');
 
+if (!$user->rights->commande->lire) accessforbidden();
+
 $langs->load('orders');
 $langs->load('sendings');
 $langs->load('companies');
@@ -47,14 +49,11 @@ $langs->load('propal');
 $langs->load('deliveries');
 $langs->load('products');
 
-if (!$user->rights->commande->lire) accessforbidden();
-
-
 // Security check
 $socid=0;
-$contratid = isset($_GET["id"])?$_GET["id"]:'';
+$comid = isset($_GET["id"])?$_GET["id"]:'';
 if ($user->societe_id) $socid=$user->societe_id;
-$result=restrictedArea($user,'commande',$contratid,'commande');
+$result=restrictedArea($user,'commande',$comid,'');
 
 $usehm=$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE;
 
diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index 6d8da82a362..29d90669b01 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2003-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -77,12 +78,14 @@ print "</form></table><br>\n";
  * Commandes brouillons
  */
 $sql = "SELECT c.rowid, c.ref, s.nom, s.rowid as socid";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
-$sql .= " FROM ".MAIN_DB_PREFIX."commande as c, ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-$sql .= " WHERE c.fk_soc = s.rowid AND c.fk_statut = 0";
-if ($socid) $sql .= " AND c.fk_soc = ".$socid;
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+$sql.= " FROM ".MAIN_DB_PREFIX."commande as c";
+$sql.= ", ".MAIN_DB_PREFIX."societe as s";
+if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+$sql.= " WHERE c.fk_soc = s.rowid";
+$sql.= " WHERE s.entity = ".$conf->entity;
+$sql.= " AND c.fk_statut = 0";
+if ($socid) $sql.= " AND c.fk_soc = ".$socid;
+if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 
 if ( $db->query($sql) )
 {
@@ -113,13 +116,15 @@ if ( $db->query($sql) )
  * Commandes à traiter
  */
 $sql = "SELECT c.rowid, c.ref, s.nom, s.rowid as socid";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
-$sql .=" FROM ".MAIN_DB_PREFIX."commande as c, ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-$sql .= " WHERE c.fk_soc = s.rowid AND c.fk_statut = 1";
-if ($socid) $sql .= " AND c.fk_soc = ".$socid;
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-$sql .= " ORDER BY c.rowid DESC";
+$sql.=" FROM ".MAIN_DB_PREFIX."commande as c";
+$sql.= ", ".MAIN_DB_PREFIX."societe as s";
+if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+$sql.= " WHERE c.fk_soc = s.rowid";
+$sql.= " WHERE s.entity = ".$conf->entity;
+$sql.= " AND c.fk_statut = 1";
+if ($socid) $sql.= " AND c.fk_soc = ".$socid;
+if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+$sql.= " ORDER BY c.rowid DESC";
 
 if ( $db->query($sql) )
 {
@@ -175,13 +180,15 @@ print '</td><td valign="top" width="70%" class="notopnoleftnoright">';
  * Commandes en cours
  */
 $sql = "SELECT c.rowid, c.ref, c.fk_statut, c.facture, s.nom, s.rowid as socid";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
-$sql .= " FROM ".MAIN_DB_PREFIX."commande as c, ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-$sql .= " WHERE c.fk_soc = s.rowid AND c.fk_statut = 2 ";
-if ($socid) $sql .= " AND c.fk_soc = ".$socid;
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-$sql .= " ORDER BY c.rowid DESC";
+$sql.= " FROM ".MAIN_DB_PREFIX."commande as c";
+$sql.= ", ".MAIN_DB_PREFIX."societe as s";
+if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+$sql.= " WHERE c.fk_soc = s.rowid";
+$sql.= " WHERE s.entity = ".$conf->entity;
+$sql.= " AND c.fk_statut = 2 ";
+if ($socid) $sql.= " AND c.fk_soc = ".$socid;
+if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+$sql.= " ORDER BY c.rowid DESC";
 
 if ( $db->query($sql) )
 {
@@ -239,12 +246,14 @@ $max=5;
 
 $sql = "SELECT c.rowid, c.ref, c.fk_statut, c.facture, s.nom, s.rowid as socid,";
 $sql.= " ".$db->pdate("date_cloture")." as datec";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
-$sql.= " FROM ".MAIN_DB_PREFIX."commande as c, ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-$sql.= " WHERE c.fk_soc = s.rowid and c.fk_statut > 2";
+$sql.= " FROM ".MAIN_DB_PREFIX."commande as c";
+$sql.= ", ".MAIN_DB_PREFIX."societe as s";
+if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+$sql.= " WHERE c.fk_soc = s.rowid";
+$sql.= " WHERE s.entity = ".$conf->entity;
+$sql.= " AND c.fk_statut > 2";
 if ($socid) $sql .= " AND c.fk_soc = ".$socid;
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 $sql.= " ORDER BY c.tms DESC";
 $sql.= $db->plimit($max, 0);
 
diff --git a/htdocs/commande/info.php b/htdocs/commande/info.php
index bb038c8c87c..d4774e15314 100644
--- a/htdocs/commande/info.php
+++ b/htdocs/commande/info.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2005-2006 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2006 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,11 +29,16 @@ require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php");
 
+if (!$user->rights->commande->lire)	accessforbidden();
+
 $langs->load("orders");
 $langs->load("sendings");
 
-if (!$user->rights->commande->lire)
-	accessforbidden();
+// Security check
+$socid=0;
+$comid = isset($_GET["id"])?$_GET["id"]:'';
+if ($user->societe_id) $socid=$user->societe_id;
+$result=restrictedArea($user,'commande',$comid,'');
 
 
 /*
diff --git a/htdocs/commande/liste.php b/htdocs/commande/liste.php
index e8b4818c860..1a40023516a 100644
--- a/htdocs/commande/liste.php
+++ b/htdocs/commande/liste.php
@@ -1,8 +1,8 @@
 <?php
-/* Copyright (C) 2001-2005 Rodolphe Quiedeville  <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2008 Laurent Destailleur   <eldy@users.sourceforge.net>
- * Copyright (C)      2005 Marc Barilley / Ocebo <marc@ocebo.com>
- * Copyright (C) 2005-2007 Regis Houssin         <regis@dolibarr.fr>
+/* Copyright (C) 2001-2005 Rodolphe Quiedeville   <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2008 Laurent Destailleur    <eldy@users.sourceforge.net>
+ * Copyright (C) 2005      Marc Barilley / Ocebo  <marc@ocebo.com>
+ * Copyright (C) 2005-2009 Regis Houssin          <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -71,39 +71,34 @@ $offset = $limit * $_GET['page'] ;
 
 $sql = 'SELECT s.nom, s.rowid as socid, c.rowid, c.ref, c.total_ht, c.ref_client,';
 $sql.= ' '.$db->pdate('c.date_commande').' as date_commande, c.fk_statut, c.facture as facturee';
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
-$sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s, '.MAIN_DB_PREFIX.'commande as c';
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+$sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s';
+$sql.= ', '.MAIN_DB_PREFIX.'commande as c';
+if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= ' WHERE c.fk_soc = s.rowid';
-if (!$user->rights->societe->client->voir && !$socid) //restriction
-{
-	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-}
+$sql.= ' AND s.entity = '.$conf->entity;
+if ($socid)	$sql.= ' AND s.rowid = '.$socid;
+if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 if ($sref)
 {
-	$sql .= " AND c.ref like '%".addslashes($sref)."%'";
+	$sql.= " AND c.ref like '%".addslashes($sref)."%'";
 }
 if ($sall)
 {
-	$sql .= " AND (c.ref like '%".addslashes($sall)."%' OR c.note like '%".addslashes($sall)."%')";
-}
-if ($socid)
-{
-	$sql .= ' AND s.rowid = '.$socid;
+	$sql.= " AND (c.ref like '%".addslashes($sall)."%' OR c.note like '%".addslashes($sall)."%')";
 }
 if ($viewstatut <> '')
 {
 	if ($viewstatut < 4 && $viewstatut > -2)
 	{
-		$sql .= ' AND c.fk_statut ='.$viewstatut; // brouillon, valid�e, en cours, annul�e
+		$sql.= ' AND c.fk_statut ='.$viewstatut; // brouillon, validee, en cours, annulee
 		if ($viewstatut == 3)
 		{
-			$sql .= ' AND c.facture = 0'; // � facturer
+			$sql.= ' AND c.facture = 0'; // a facturer
 		}
 	}
 	if ($viewstatut == 4)
 	{
-		$sql .= ' AND c.facture = 1'; // factur�e
+		$sql.= ' AND c.facture = 1'; // factur�e
 	}
 	if ($viewstatut == -2)
 	{
@@ -112,27 +107,27 @@ if ($viewstatut <> '')
 }
 if ($_GET['month'] > 0)
 {
-	$sql .= " AND date_format(c.date_commande, '%Y-%m') = '$year-$month'";
+	$sql.= " AND date_format(c.date_commande, '%Y-%m') = '$year-$month'";
 }
 if ($_GET['year'] > 0)
 {
-	$sql .= " AND date_format(c.date_commande, '%Y') = $year";
+	$sql.= " AND date_format(c.date_commande, '%Y') = $year";
 }
 if (strlen($_POST['sf_ref']) > 0)
 {
-	$sql .= " AND c.ref like '%".addslashes($_POST['sf_ref']) . "%'";
+	$sql.= " AND c.ref like '%".addslashes($_POST['sf_ref']) . "%'";
 }
 if (!empty($snom))
 {
-	$sql .= ' AND s.nom like \'%'.addslashes($snom).'%\'';
+	$sql.= ' AND s.nom like \'%'.addslashes($snom).'%\'';
 }
 if (!empty($sref_client))
 {
-	$sql .= ' AND c.ref_client like \'%'.addslashes($sref_client).'%\'';
+	$sql.= ' AND c.ref_client like \'%'.addslashes($sref_client).'%\'';
 }
 
-$sql .= ' ORDER BY '.$sortfield.' '.$sortorder;
-$sql .= $db->plimit($limit + 1,$offset);
+$sql.= ' ORDER BY '.$sortfield.' '.$sortorder;
+$sql.= $db->plimit($limit + 1,$offset);
 
 $resql = $db->query($sql);
 
diff --git a/htdocs/commande/note.php b/htdocs/commande/note.php
index 2f63397adf2..d73468cc269 100644
--- a/htdocs/commande/note.php
+++ b/htdocs/commande/note.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2008 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,19 +30,17 @@ require_once(DOL_DOCUMENT_ROOT.'/lib/order.lib.php');
 
 $socid=isset($_GET["socid"])?$_GET["socid"]:isset($_POST["socid"])?$_POST["socid"]:"";
 
-if (!$user->rights->commande->lire)
-accessforbidden();
+if (!$user->rights->commande->lire) accessforbidden();
 
 $langs->load("companies");
 $langs->load("bills");
 $langs->load("orders");
 
-// Sécurité accés
-if ($user->societe_id > 0)
-{
-	unset($_GET["action"]);
-	$socid = $user->societe_id;
-}
+// Security check
+$socid=0;
+$comid = isset($_GET["id"])?$_GET["id"]:'';
+if ($user->societe_id) $socid=$user->societe_id;
+$result=restrictedArea($user,'commande',$comid,'');
 
 
 $id = $_GET['id'];
diff --git a/htdocs/commande/stats/commandestats.class.php b/htdocs/commande/stats/commandestats.class.php
index 16e82b9414c..c8f1460d42d 100644
--- a/htdocs/commande/stats/commandestats.class.php
+++ b/htdocs/commande/stats/commandestats.class.php
@@ -1,6 +1,7 @@
 <?php
-/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (c) 2005 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (c) 2005      Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -53,7 +54,7 @@ class CommandeStats extends Stats
 	 */
 	function CommandeStats($DB, $socid=0, $mode)
 	{
-		global $user;
+		global $user, $conf;
 		
 		$this->db = $DB;
 		
@@ -62,17 +63,20 @@ class CommandeStats extends Stats
 		if ($mode == 'customer')
 		{
 			$object=new Commande($this->db);
-			$this->table_element=$object->table_element;
+			$this->from = MAIN_DB_PREFIX.$object->table_element." as c";
+			$this->from.= ", ".MAIN_DB_PREFIX."societe as s";
 			$this->field='total_ht';
 			$this->where.= " c.fk_statut > 0";
 		}
 		if ($mode == 'supplier')
 		{
 			$object=new CommandeFournisseur($this->db);
-			$this->table_element=$object->table_element;
+			$this->from = MAIN_DB_PREFIX.$object->table_element." as c";
+			$this->from.= ", ".MAIN_DB_PREFIX."societe as s";
 			$this->field='total_ht';
 			$this->where.= " c.fk_statut >= 3 AND c.date_commande IS NOT NULL";
 		}
+		$this->where.= " AND c.fk_soc = s.rowid AND s.entity = ".$conf->entity;
 				
 		if (!$user->rights->societe->client->voir && !$this->socid) $this->where .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		if($this->socid)
@@ -92,7 +96,7 @@ class CommandeStats extends Stats
 		global $user;
 		 
 		$sql = "SELECT date_format(c.date_commande,'%m') as dm, count(*) nb";
-		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element." as c";
+		$sql.= " FROM ".$this->from;
 		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql.= " WHERE date_format(c.date_commande,'%Y') = ".$year;
 		$sql.= " AND ".$this->where;
@@ -111,7 +115,7 @@ class CommandeStats extends Stats
 		global $user;
 		 
 		$sql = "SELECT date_format(c.date_commande,'%Y') as dm, count(*), sum(c.".$this->field.")";
-		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element." as c";
+		$sql.= " FROM ".$this->from;
 		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql.= " WHERE ".$this->where;
 		$sql.= " GROUP BY dm DESC";
@@ -129,7 +133,7 @@ class CommandeStats extends Stats
 		global $user;
 		 
 		$sql = "SELECT date_format(c.date_commande,'%m') as dm, sum(c.".$this->field.")";
-		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element." as c";
+		$sql.= " FROM ".$this->from;
 		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql.= " WHERE date_format(c.date_commande,'%Y') = ".$year;
 		$sql.= " AND ".$this->where;
@@ -148,7 +152,7 @@ class CommandeStats extends Stats
 		global $user;
 		 
 		$sql = "SELECT date_format(c.date_commande,'%m') as dm, avg(c.".$this->field.")";
-		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element." as c";
+		$sql.= " FROM ".$this->from;
 		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql.= " WHERE date_format(c.date_commande,'%Y') = ".$year;
 		$sql.= " AND ".$this->where;
@@ -167,8 +171,7 @@ class CommandeStats extends Stats
 		global $user;
 		
 		$sql = "SELECT date_format(c.date_commande,'%Y') as year, count(*) as nb, sum(c.".$this->field.") as total, avg(".$this->field.") as avg";
-		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", sc.fk_soc, sc.fk_user";
-		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element." as c";
+		$sql.= " FROM ".$this->from;
 		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql.= " WHERE ".$this->where;
 		$sql.= " GROUP BY year DESC";
diff --git a/htdocs/commande/stats/month.php b/htdocs/commande/stats/month.php
index d72cb9bf042..58aa6374894 100644
--- a/htdocs/commande/stats/month.php
+++ b/htdocs/commande/stats/month.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (c) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/htdocs/commonobject.class.php b/htdocs/commonobject.class.php
index 2b98d8ca101..85ed93524d4 100644
--- a/htdocs/commonobject.class.php
+++ b/htdocs/commonobject.class.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2006-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -45,7 +46,7 @@ class CommonObject
 
 		dol_syslog("CommonObject::add_contact $fk_socpeople, $type_contact, $source");
 
-		// V�rification parametres
+		// Verification parametres
 		if ($fk_socpeople <= 0)
 		{
 			$this->error=$langs->trans("ErrorWrongValueForParameter","1");
@@ -162,8 +163,8 @@ class CommonObject
 	}
 
 	/**
-	 *    \brief      R�cup�re les lignes de contact de l'objet
-	 *    \param      statut        Statut des lignes detail � r�cup�rer
+	 *    \brief      Recupere les lignes de contact de l'objet
+	 *    \param      statut        Statut des lignes detail a recuperer
 	 *    \param      source        Source du contact external (llx_socpeople) ou internal (llx_user)
 	 *    \return     array         Tableau des rowid des contacts
 	 */
@@ -412,10 +413,11 @@ class CommonObject
 
 		$sql = "SELECT MAX(".$fieldid.")";
 		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+		if ($this->table_optional) $sql.= ", ".MAIN_DB_PREFIX.$this->table_optional;
 		$sql.= " WHERE ".$fieldid." < '".addslashes($this->ref)."'";
 		if (isset($filter)) $sql.=" AND ".$filter;
 
-		//print $sql;
+		//print $sql."<br>";
 		$result = $this->db->query($sql) ;
 		if (! $result)
 		{
@@ -428,11 +430,12 @@ class CommonObject
 
 		$sql = "SELECT MIN(".$fieldid.")";
 		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+		if ($this->table_optional) $sql.= ", ".MAIN_DB_PREFIX.$this->table_optional;
 		$sql.= " WHERE ".$fieldid." > '".addslashes($this->ref)."'";
 		if (isset($filter)) $sql.=" AND ".$filter;
 		// Rem: Bug in some mysql version: SELECT rowid FROM llx_socpeople WHERE rowid > 1 when one row in database with rowid=1, returns 1 instead of null
 
-		//print $sql;
+		//print $sql."<br>";
 		$result = $this->db->query($sql) ;
 		if (! $result)
 		{
@@ -447,7 +450,7 @@ class CommonObject
 
 
 	/**
-	 *      \brief      On r�cup�re les id de liste_contact
+	 *      \brief      On recupere les id de liste_contact
 	 *      \param      source      Source du contact external (llx_socpeople) ou internal (llx_user)
 	 *      \return     array
 	 */
diff --git a/htdocs/compta/bank/account.class.php b/htdocs/compta/bank/account.class.php
index d7a49bc18a5..f70a080dc77 100644
--- a/htdocs/compta/bank/account.class.php
+++ b/htdocs/compta/bank/account.class.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2003      Jean-Louis Bergamo   <jlb@j1b.org>
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Christophe Combelles <ccomb@free.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -699,8 +700,11 @@ class Account extends CommonObject
 
 		$this->nbtodo=$this->nbtodolate=0;
 		$sql = "SELECT b.rowid, b.datev as datefin";
-		$sql.= " FROM ".MAIN_DB_PREFIX."bank as b, ".MAIN_DB_PREFIX."bank_account as ba";
-		$sql.= " WHERE b.rappro=0 AND b.fk_account = ba.rowid";
+		$sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
+		$sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
+		$sql.= " WHERE b.rappro=0";
+		$sql.= " AND b.fk_account = ba.rowid";
+		$sql.= " AND ba.entity = ".$conf->entity;
 		$sql.= " AND (ba.rappro = 1 AND ba.courant != 2)";	// Compte rapprochable
 		if ($filteraccountid) $sql.=" AND ba.rowid = ".$filteraccountid;
 
diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php
index 8d590ba7317..4ab7c79083a 100644
--- a/htdocs/compta/charges/index.php
+++ b/htdocs/compta/charges/index.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,8 +29,8 @@ require("./pre.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/tva/tva.class.php");
 
 // Security check
-if (!$user->admin && !$user->rights->tax->charges->lire)
-  accessforbidden();
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'tax', '', '', 'charges');
 
 $year=$_GET["year"];
 $filtre=$_GET["filtre"];
@@ -61,9 +62,11 @@ print "</tr>\n";
 
 $sql = "SELECT c.id, c.libelle as lib, s.fk_type as type,";
 $sql.=" count(s.rowid) as nb, sum(s.amount) as total, sum(pc.amount) as totalpaye";
-$sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."chargesociales as s";
+$sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
+$sql.= ", ".MAIN_DB_PREFIX."chargesociales as s";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiementcharge as pc ON pc.fk_charge = s.rowid";
 $sql.= " WHERE s.fk_type = c.id";
+$sql.= " AND s.entity = ".$conf->entity;
 if ($year > 0)
 {
 	$sql .= " AND (";
@@ -122,15 +125,16 @@ if (empty($_GET["mode"]) || $_GET["mode"] != 'sconly')
 
 	print_titre($langs->trans("VATPayments"));
 
-	$sql = "SELECT rowid, amount, label, ".$db->pdate("f.datev")." as dm";
-	$sql .= " FROM ".MAIN_DB_PREFIX."tva as f ";
+	$sql = "SELECT f.rowid, f.amount, f.label, ".$db->pdate("f.datev")." as dm";
+	$sql.= " FROM ".MAIN_DB_PREFIX."tva as f ";
+	$sql.= " WHERE f.entity = ".$conf->entity;
 	if ($year > 0)
 	{
 		// Si period renseigné on l'utilise comme critere de date, sinon on prend date échéance,
 		// ceci afin d'etre compatible avec les cas ou la période n'etait pas obligatoire
-		$sql .= " WHERE date_format(f.datev, '%Y') = ".$year;
+		$sql.= " AND date_format(f.datev, '%Y') = ".$year;
 	}
-	$sql .= " ORDER BY dm DESC";
+	$sql.= " ORDER BY dm DESC";
 
 	$result = $db->query($sql);
 	if ($result)
diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php
index f002f7b2657..69acccc52eb 100644
--- a/htdocs/compta/clients.php
+++ b/htdocs/compta/clients.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -73,7 +74,8 @@ if ($action == 'note')
 if ($mode == 'search') {
 	if ($mode-search == 'soc') {
 		$sql = "SELECT s.rowid FROM ".MAIN_DB_PREFIX."societe as s ";
-		$sql .= " WHERE lower(s.nom) like '%".addslashes(strtolower($socname))."%'";
+		$sql.= " WHERE lower(s.nom) like '%".addslashes(strtolower($socname))."%'";
+		$sql.= " AND s.entity = ".$conf->entity;
 	}
 
 	if ( $db->query($sql) ) {
@@ -93,51 +95,52 @@ if ($mode == 'search') {
  */
 
 $sql = "SELECT s.rowid, s.nom, s.ville, ".$db->pdate("s.datec")." as datec, ".$db->pdate("s.datea")." as datea";
-$sql .= ", st.libelle as stcomm, s.prefix_comm, s.code_client, s.code_compta ";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
-$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."c_stcomm as st";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-$sql .= " WHERE s.fk_stcomm = st.id AND s.client=1";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+$sql.= ", st.libelle as stcomm, s.prefix_comm, s.code_client, s.code_compta ";
+if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user ";
+$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."c_stcomm as st";
+if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+$sql.= " WHERE s.fk_stcomm = st.id AND s.client=1";
+$sql.= " AND s.entity = ".$conf->entity;
+if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 
 if (strlen($stcomm))
 {
-	$sql .= " AND s.fk_stcomm=$stcomm";
+	$sql.= " AND s.fk_stcomm=$stcomm";
 }
 
 if ($socname)
 {
-	$sql .= " AND s.nom like '%".addslashes(strtolower($socname))."%'";
+	$sql.= " AND s.nom like '%".addslashes(strtolower($socname))."%'";
 	$sortfield = "s.nom";
 	$sortorder = "ASC";
 }
 
 if ($_GET["search_nom"])
 {
-	$sql .= " AND s.nom like '%".addslashes(strtolower($_GET["search_nom"]))."%'";
+	$sql.= " AND s.nom like '%".addslashes(strtolower($_GET["search_nom"]))."%'";
 }
 
 if ($_GET["search_compta"])
 {
-	$sql .= " AND s.code_compta like '%".addslashes($_GET["search_compta"])."%'";
+	$sql.= " AND s.code_compta like '%".addslashes($_GET["search_compta"])."%'";
 }
 
 if ($_GET["search_code_client"])
 {
-	$sql .= " AND s.code_client like '%".addslashes($_GET["search_code_client"])."%'";
+	$sql.= " AND s.code_client like '%".addslashes($_GET["search_code_client"])."%'";
 }
 
 if (strlen($begin))
 {
-	$sql .= " AND s.nom like '".addslashes($begin)."'";
+	$sql.= " AND s.nom like '".addslashes($begin)."'";
 }
 
 if ($socid)
 {
-	$sql .= " AND s.rowid = ".$socid;
+	$sql.= " AND s.rowid = ".$socid;
 }
 
-$sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit+1, $offset);
+$sql.= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit+1, $offset);
 
 $result = $db->query($sql);
 if ($result)
diff --git a/htdocs/compta/commande/fiche.php b/htdocs/compta/commande/fiche.php
index 87e032361b5..d6e0b84f546 100644
--- a/htdocs/compta/commande/fiche.php
+++ b/htdocs/compta/commande/fiche.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2008 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,20 +32,22 @@ require_once(DOL_DOCUMENT_ROOT."/lib/sendings.lib.php");
 if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/propal.class.php");
 if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/project.class.php");
 
+if (! $user->rights->commande->lire) accessforbidden();
+
 $langs->load("orders");
 $langs->load("companies");
 $langs->load("bills");
 $langs->load('deliveries');
 $langs->load('sendings');
 
-if (! $user->rights->commande->lire) accessforbidden();
+$id=empty($_GET['id']) ? 0 : intVal($_GET['id']);
+$action=empty($_GET['action']) ? (empty($_POST['action']) ? '' : $_POST['action']) : $_GET['action'];
 
-// Sécurité accès client
-if ($user->societe_id > 0)
-{
-	$action = '';
-	$socid = $user->societe_id;
-}
+// Security check
+$socid=0;
+$comid = isset($_GET["id"])?$_GET["id"]:'';
+if ($user->societe_id) $socid=$user->societe_id;
+$result=restrictedArea($user,'commande',$comid,'');
 
 
 /*
diff --git a/htdocs/compta/commande/liste.php b/htdocs/compta/commande/liste.php
index c0773de49b4..02fdb4ad199 100644
--- a/htdocs/compta/commande/liste.php
+++ b/htdocs/compta/commande/liste.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2006 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2006 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,7 +31,12 @@
 require("./pre.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
 
-if (!$user->rights->commande->lire) accessforbidden();
+$langs->load('companies');
+
+// Security check
+$orderid = isset($_GET["orderid"])?$_GET["orderid"]:'';
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'commande',$orderid,'');
 
 $begin=$_GET["begin"];
 $sortorder=$_GET["sortorder"];
@@ -42,20 +47,10 @@ if (! $sortorder) $sortorder="DESC";
 $limit = $conf->liste_limit;
 $offset = $limit * $_GET["page"] ;
 
-// Security check
-$orderid = isset($_GET["orderid"])?$_GET["orderid"]:'';
-if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'commande',$orderid,'');
-
-
-$langs->load('companies');
-
-
 $html = new Form($db);
 $formfile = new FormFile($db);
 
 
-
 /*
  * View
  */
@@ -67,37 +62,36 @@ llxHeader();
 $sql = "SELECT s.nom, s.rowid as socid,";
 $sql.= " c.rowid, c.ref, c.total_ht,".$db->pdate("c.date_commande")." as date_commande,";
 $sql.= " c.fk_statut, c.facture";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
-$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as c";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-$sql .= " WHERE c.fk_soc = s.rowid";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-if ($socid)
-{
-    $sql .= " AND s.rowid = ".$socid;
-}
+$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+$sql.= ", ".MAIN_DB_PREFIX."commande as c";
+if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+$sql.= " WHERE c.fk_soc = s.rowid";
+$sql.= " AND s.entity = ".$conf->entity;
+if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+if ($socid) $sql.= " AND s.rowid = ".$socid;
 if ($_GET["month"] > 0)
 {
-    $sql .= " AND date_format(c.date_commande, '%Y-%m') = '".$_GET["year"]."-".$_GET["month"]."'";
+    $sql.= " AND date_format(c.date_commande, '%Y-%m') = '".$_GET["year"]."-".$_GET["month"]."'";
 }
 if ($_GET["year"] > 0)
 {
-    $sql .= " AND date_format(c.date_commande, '%Y') = '".$_GET["year"]."'";
+    $sql.= " AND date_format(c.date_commande, '%Y') = '".$_GET["year"]."'";
 }
 if (isset($_GET["status"]))
 {
-    $sql .= " AND fk_statut = ".$_GET["status"];
+    $sql.= " AND fk_statut = ".$_GET["status"];
 }
 if (isset($_GET["afacturer"]) && $_GET['afacturer'] == 1)
 {
-    $sql .= " AND fk_statut >=1	AND c.facture = 0";
+    $sql.= " AND fk_statut >=1	AND c.facture = 0";
 }
 if (strlen($_POST["sf_ref"]) > 0)
 {
-    $sql .= " AND c.ref like '%".$_POST["sf_ref"] . "%'";
+    $sql.= " AND c.ref like '%".$_POST["sf_ref"] . "%'";
 }
-$sql .= " ORDER BY $sortfield $sortorder";
-$sql .= $db->plimit($limit + 1,$offset);
+$sql.= " ORDER BY $sortfield $sortorder";
+$sql.= $db->plimit($limit + 1,$offset);
+
 $resql = $db->query($sql);
 
 if ($resql)
diff --git a/htdocs/compta/deplacement/fiche.php b/htdocs/compta/deplacement/fiche.php
index 988e66baa00..9cb129e313c 100644
--- a/htdocs/compta/deplacement/fiche.php
+++ b/htdocs/compta/deplacement/fiche.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,7 +32,6 @@ $id=isset($_GET["id"])?$_GET["id"]:$_POST["id"];
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'deplacement', $id,'');
 
-
 $mesg = '';
 
 
diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php
index 4638173502e..ff52ca0bb90 100644
--- a/htdocs/compta/deplacement/index.php
+++ b/htdocs/compta/deplacement/index.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2006 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,6 +33,7 @@ $langs->load("users");
 $langs->load("trips");
 
 // Security check
+$socid = $_GET["socid"]?$_GET["socid"]:'';
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'deplacement','','');
 
@@ -54,28 +55,19 @@ $offset = $limit * $page ;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-// Sécurité accés client
-$socid = $_GET["socid"];
-if ($user->societe_id > 0)
-{
-    $action = '';
-    $socid = $user->societe_id;
-}
 
 $sql = "SELECT s.nom, s.rowid as socid,";                       // Ou
 $sql.= " d.rowid, d.type, ".$db->pdate("d.dated")." as dd, d.km, ";     // Comment
 $sql.= " u.name, u.firstname";                                  // Qui
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
-$sql.= " FROM ".MAIN_DB_PREFIX."user as u, ".MAIN_DB_PREFIX."deplacement as d";
+$sql.= " FROM ".MAIN_DB_PREFIX."user as u";
+$sql.= ", ".MAIN_DB_PREFIX."deplacement as d";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on d.fk_soc = s.rowid"; 
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= " WHERE d.fk_user = u.rowid";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-if ($socid)
-{
-  $sql .= " AND s.rowid = ".$socid;
-}
-$sql .= " ORDER BY $sortfield $sortorder " . $db->plimit( $limit + 1 ,$offset);
+$sql.= " AND s.entity = ".$conf->entity;
+if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+if ($socid) $sql.= " AND s.rowid = ".$socid;
+$sql.= " ORDER BY $sortfield $sortorder " . $db->plimit( $limit + 1 ,$offset);
 
 //print $sql;
 $resql=$db->query($sql);
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 97f79ad2f86..ca4cfa22b94 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -56,7 +56,7 @@ $projetid=isset($_GET['projetid'])?$_GET['projetid']:0;
 
 // Security check
 $socid=isset($_GET['socid'])?$_GET['socid']:$_POST['socid'];
-$facid = isset($_GET["id"])?$_GET["id"]:'';
+$facid = isset($_GET["facid"])?$_GET["facid"]:'';
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'facture', $facid,'');
 
@@ -3638,18 +3638,15 @@ else
 		$sql.= ' f.paye as paye, f.fk_statut,';
 		$sql.= ' s.nom, s.rowid as socid';
 		if (! $sall) $sql.= ' ,sum(pf.amount) as am';
-		if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
 		$sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s';
-		if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql.= ', '.MAIN_DB_PREFIX.'facture as f';
 		if (! $sall) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiement_facture as pf ON pf.fk_facture = f.rowid';
 		if ($sall) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'facturedet as fd ON fd.fk_facture = f.rowid';
 		$sql.= ' WHERE f.fk_soc = s.rowid';
-		if (!$user->rights->societe->client->voir && !$socid) //restriction
-		{
-			$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-		}
-		if ($socid) $sql .= ' AND s.rowid = '.$socid;
+		$sql.= " AND s.entity = ".$conf->entity;
+		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+		if ($socid) $sql.= ' AND s.rowid = '.$socid;
 		if ($_GET['filtre'])
 		{
 			$filtrearr = split(',', $_GET['filtre']);
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index a9c5280c589..761b35795fa 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,8 +33,11 @@ require_once(DOL_DOCUMENT_ROOT."/product.class.php");
 if (!$user->rights->facture->lire)
 accessforbidden();
 
+// Security check
 $facid=isset($_GET["facid"])?$_GET["facid"]:$_POST["facid"];
 $action=isset($_GET["action"])?$_GET["action"]:$_POST["action"];
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'facture', $facid,'facture_rec');
 
 if ($page == -1)
 {
@@ -49,14 +53,6 @@ if ($sortfield == "")
 $sortfield="f.datef";
 
 
-// Sécurité accés client
-if ($user->societe_id > 0)
-{
-	$action = '';
-	$socid = $user->societe_id;
-}
-
-
 /*
  * Actions
  */
@@ -165,7 +161,9 @@ if ($_GET["action"] == 'create')
 		print '<tr><td colspan="3">';
 
 		$sql = "SELECT l.fk_product, l.description, l.price, l.qty, l.rowid, l.tva_taux, l.remise_percent, l.subprice";
-		$sql .= " FROM ".MAIN_DB_PREFIX."facturedet as l WHERE l.fk_facture = $facture->id ORDER BY l.rowid";
+		$sql.= " FROM ".MAIN_DB_PREFIX."facturedet as l";
+		$sql.= " WHERE l.fk_facture = ".$facture->id;
+		$sql.= " ORDER BY l.rowid";
 
 		$result = $db->query($sql);
 		if ($result)
@@ -409,6 +407,7 @@ else
 			$sql = "SELECT s.nom, s.rowid as socid, f.titre, f.total, f.rowid as facid";
 			$sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture_rec as f";
 			$sql.= " WHERE f.fk_soc = s.rowid";
+			$sql.= " AND s.entity = ".$conf->entity;
 
 			if ($socid)
 			$sql .= " AND s.rowid = ".$socid;
diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/impayees.php
index 10f0af75c37..9fd4f35a330 100644
--- a/htdocs/compta/facture/impayees.php
+++ b/htdocs/compta/facture/impayees.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -170,6 +171,7 @@ if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", ".MAIN_DB_PRE
 $sql.= ",".MAIN_DB_PREFIX."facture as f";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid=pf.fk_facture ";
 $sql.= " WHERE f.fk_soc = s.rowid";
+$sql.= " AND s.entity = ".$conf->entity;
 $sql.= " AND f.type in (0,1) AND f.fk_statut = 1";
 $sql.= " AND f.paye = 0";
 if ($option == 'late')
diff --git a/htdocs/compta/facture/stats/facturestats.class.php b/htdocs/compta/facture/stats/facturestats.class.php
index 3d5b23b2e6c..ec8ff78d3a6 100644
--- a/htdocs/compta/facture/stats/facturestats.class.php
+++ b/htdocs/compta/facture/stats/facturestats.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (c) 2005-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -51,22 +52,25 @@ class FactureStats extends Stats
 	 */
 	function FactureStats($DB, $socid=0, $mode)
 	{
+		global $conf;
+		
 		$this->db = $DB;
 		if ($mode == 'customer')
 		{
 			$object=new Facture($this->db);
-			$this->table_element=$object->table_element;
+			$this->from = MAIN_DB_PREFIX.$object->table_element." as p, ".MAIN_DB_PREFIX."societe as s";
 			$this->field='total';
 		}
 		if ($mode == 'supplier')
 		{
 			$object=new FactureFournisseur($this->db);
-			$this->table_element=$object->table_element;
+			$this->from = MAIN_DB_PREFIX.$object->table_element." as p, ".MAIN_DB_PREFIX."societe as s";
 			$this->field='total_ht';
 		}
 		
 		$this->socid = $socid;
 		$this->where =" fk_statut > 0";
+		$this->where.= " AND p.fk_soc = s.rowid AND s.entity = ".$conf->entity;
 		if ($mode == 'customer') $this->where.=" AND (fk_statut != 3 OR close_code != 'replaced')";	// Exclude replaced invoices
 		if ($this->socid)
 		{
@@ -83,7 +87,7 @@ class FactureStats extends Stats
 	function getNbByYear()
 	{
 		$sql = "SELECT YEAR(datef) as dm, count(*)";
-		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql.= " FROM ".$this->from;
 		$sql.= " GROUP BY dm DESC";
 		$sql.= " WHERE ".$this->where;
 		
@@ -99,7 +103,7 @@ class FactureStats extends Stats
 	function getNbByMonth($year)
 	{
 		$sql = "SELECT MONTH(datef) as dm, count(*)";
-		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql.= " FROM ".$this->from;
 		$sql.= " WHERE YEAR(datef) = ".$year;
 		$sql.= " AND ".$this->where;
 		$sql.= " GROUP BY dm DESC";
@@ -118,7 +122,7 @@ class FactureStats extends Stats
 	function getAmountByMonth($year)
 	{
 		$sql = "SELECT date_format(datef,'%m') as dm, sum(".$this->field.")";
-		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql.= " FROM ".$this->from;
 		$sql.= " WHERE date_format(datef,'%Y') = ".$year;
 		$sql.= " AND ".$this->where;
 		$sql.= " GROUP BY dm DESC";
@@ -136,7 +140,7 @@ class FactureStats extends Stats
 	function getAverageByMonth($year)
 	{
 		$sql = "SELECT date_format(datef,'%m') as dm, avg(".$this->field.")";
-		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql.= " FROM ".$this->from;
 		$sql.= " WHERE date_format(datef,'%Y') = ".$year;
 		$sql.= " AND ".$this->where;
 		$sql.= " GROUP BY dm DESC";
@@ -151,7 +155,7 @@ class FactureStats extends Stats
 	function getAllByYear()
 	{
 		$sql = "SELECT date_format(datef,'%Y') as year, count(*) as nb, sum(".$this->field.") as total, avg(".$this->field.") as avg";
-		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql.= " FROM ".$this->from;
 		$sql.= " WHERE ".$this->where;
 		$sql.= " GROUP BY year DESC";
 
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index 09c357a4343..7f9df5d7ccd 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2008 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -138,11 +138,12 @@ if ($conf->facture->enabled && $user->rights->facture->lire)
 {
 	$sql  = "SELECT f.facnumber, f.rowid, f.total_ttc, f.type,";
 	$sql.= " s.nom, s.rowid as socid";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
-	$sql .= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql .= " WHERE s.rowid = f.fk_soc AND f.fk_statut = 0";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user ";
+	$sql.= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s";
+	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	$sql.= " WHERE s.rowid = f.fk_soc AND f.fk_statut = 0";
+	$sql.= " AND s.entity = ".$conf->entity;
+	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 
 	if ($socid)
 	{
@@ -211,11 +212,12 @@ if ($conf->facture->enabled && $user->rights->facture->lire)
 {
 	$sql  = "SELECT f.facnumber, f.rowid, f.total_ttc, f.type,";
 	$sql.= " s.nom, s.rowid as socid";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
-	$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f, ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql .= " WHERE s.rowid = f.fk_soc AND f.fk_statut = 0";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user ";
+	$sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn as f, ".MAIN_DB_PREFIX."societe as s";
+	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	$sql.= " WHERE s.rowid = f.fk_soc AND f.fk_statut = 0";
+	$sql.= " AND s.entity = ".$conf->entity;
+	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 
 	if ($socid)
 	{
@@ -288,11 +290,11 @@ if ($conf->societe->enabled && $user->rights->societe->lire)
 	$max=3;
 
 	$sql = "SELECT s.nom, s.rowid, ".$db->pdate("s.datec")." as dc";
-	if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", sc.fk_soc, sc.fk_user";
-	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql .= " WHERE s.client = 1";
-	if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+	$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+	if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	$sql.= " WHERE s.client = 1";
+	$sql.= " AND s.entity = ".$conf->entity;
+	if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 	if ($user->societe_id > 0)
 	{
 		$sql .= " AND s.rowid = ".$user->societe_id;
@@ -351,11 +353,11 @@ if ($conf->fournisseur->enabled && $user->rights->societe->lire)
 	$max=3;
 
 	$sql = "SELECT s.nom, s.rowid, ".$db->pdate("s.datec")." as dc";
-	if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", sc.fk_soc, sc.fk_user";
-	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql .= " WHERE s.fournisseur = 1";
-	if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+	$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+	if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	$sql.= " WHERE s.fournisseur = 1";
+	$sql.= " AND s.entity = ".$conf->entity;
+	if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 	if ($user->societe_id > 0)
 	{
 		$sql .= " AND s.rowid = ".$user->societe_id;
@@ -487,14 +489,15 @@ if ($conf->facture->enabled && $conf->commande->enabled && $user->rights->comman
 	$sql = "SELECT sum(f.total) as tot_fht, sum(f.total_ttc) as tot_fttc,";
 	$sql.= " s.nom, s.rowid as socid,";
 	$sql.= " p.rowid, p.ref, p.facture, p.fk_statut, p.total_ht, p.total_ttc";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
+	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user ";
 	$sql.= " FROM ".MAIN_DB_PREFIX."societe AS s";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql.= ", ".MAIN_DB_PREFIX."commande AS p";
 	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."co_fa AS co_fa ON co_fa.fk_commande = p.rowid";
 	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture AS f ON co_fa.fk_facture = f.rowid";
 	$sql.= " WHERE p.fk_soc = s.rowid";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+	$sql.= " AND s.entity = ".$conf->entity;
+	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 	if ($socid)
 	{
 		$sql.= " AND p.fk_soc = ".$socid;
@@ -588,12 +591,13 @@ if ($conf->facture->enabled && $user->rights->facture->lire)
 	$sql.= $db->pdate("f.date_lim_reglement")." as datelimite,";
 	$sql.= " sum(pf.amount) as am,";
 	$sql.= " s.nom, s.rowid as socid";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
+	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user ";
 	$sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
 	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf on f.rowid=pf.fk_facture";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql.= " WHERE s.rowid = f.fk_soc AND f.paye = 0 AND f.fk_statut = 1";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+	$sql.= " AND s.entity = ".$conf->entity;
+	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 	if ($socid) $sql .= " AND f.fk_soc = ".$socid;
 	$sql.= " GROUP BY f.rowid, f.facnumber, f.fk_statut, f.total, f.total_ttc, s.nom, s.rowid";
 	$sql.= " ORDER BY f.datef ASC, f.facnumber ASC";
@@ -686,13 +690,14 @@ if ($conf->facture->enabled && $user->rights->facture->lire)
 	$sql = "SELECT ff.rowid, ff.facnumber, ff.fk_statut, ff.fk_statut, ff.libelle, ff.total_ht, ff.total_ttc,";
 	$sql.= " sum(pf.amount) as am,";
 	$sql.= " s.nom, s.rowid as socid";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
+	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user ";
 	$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_fourn as ff";
 	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf on ff.rowid=pf.fk_facturefourn";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql.= " WHERE s.rowid = ff.fk_soc";
+	$sql.= " AND s.entity = ".$conf->entity;
 	$sql.= " AND ff.paye=0 AND ff.fk_statut = 1";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 	if ($socid) $sql .= " AND ff.fk_soc = ".$socid;
 	$sql.= " GROUP BY ff.rowid, ff.facnumber, ff.fk_statut, ff.total, ff.total_ttc, s.nom, s.rowid";
 
diff --git a/htdocs/compta/paiement/cheque/remisecheque.class.php b/htdocs/compta/paiement/cheque/remisecheque.class.php
index 9c79a70a019..1e065a4b7c7 100644
--- a/htdocs/compta/paiement/cheque/remisecheque.class.php
+++ b/htdocs/compta/paiement/cheque/remisecheque.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2006      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2007-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -379,9 +380,14 @@ class RemiseCheque extends CommonObject
 		$now=gmmktime();
 
 		$this->nbtodo=$this->nbtodolate=0;
+		
 		$sql = "SELECT b.rowid, b.datev as datefin";
 		$sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
-		$sql.= " WHERE b.fk_type = 'CHQ' AND b.fk_bordereau = 0";
+		$sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
+		$sql.= " WHERE b.fk_account = ba.rowid";
+		$sql.= " AND ba.entity = ".$conf->entity;
+		$sql.= " AND b.fk_type = 'CHQ'";
+		$sql.= " AND b.fk_bordereau = 0";
 		$sql.= " AND b.amount > 0";
 
 		$resql=$this->db->query($sql);
diff --git a/htdocs/compta/paiement/fiche.php b/htdocs/compta/paiement/fiche.php
index 63ba8b5d21b..cc97fe3c89c 100644
--- a/htdocs/compta/paiement/fiche.php
+++ b/htdocs/compta/paiement/fiche.php
@@ -1,7 +1,8 @@
 <?php
-/* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C)      2005 Marc Barilley / Ocebo <marc@ocebo.com>
+/* Copyright (C) 2004      Rodolphe Quiedeville  <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2008 Laurent Destailleur   <eldy@users.sourceforge.net>
+ * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
+ * Copyright (C) 2005-2009 Regis Houssin         <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,6 +37,13 @@ $langs->load('bills');
 $langs->load('banks');
 $langs->load('companies');
 
+// Security check
+$id=isset($_GET["id"])?$_GET["id"]:$_POST["id"];
+$action=isset($_GET["action"])?$_GET["action"]:$_POST["action"];
+if ($user->societe_id) $socid=$user->societe_id;
+// TODO ajouter règle pour restreindre acces paiement
+//$result = restrictedArea($user, 'facture', $id,'');
+
 $mesg='';
 
 
@@ -202,9 +210,11 @@ print '</table>';
  */
 $allow_delete = 1 ;
 $sql = 'SELECT f.rowid as facid, f.facnumber, f.type, f.total_ttc, f.paye, f.fk_statut, pf.amount, s.nom, s.rowid as socid';
-$sql .= ' FROM '.MAIN_DB_PREFIX.'paiement_facture as pf,'.MAIN_DB_PREFIX.'facture as f,'.MAIN_DB_PREFIX.'societe as s';
-$sql .= ' WHERE pf.fk_facture = f.rowid AND f.fk_soc = s.rowid';
-$sql .= ' AND pf.fk_paiement = '.$paiement->id;
+$sql.= ' FROM '.MAIN_DB_PREFIX.'paiement_facture as pf,'.MAIN_DB_PREFIX.'facture as f,'.MAIN_DB_PREFIX.'societe as s';
+$sql.= ' WHERE pf.fk_facture = f.rowid';
+$sql.= ' AND f.fk_soc = s.rowid';
+$sql.= ' AND s.entity = '.$conf->entity;
+$sql.= ' AND pf.fk_paiement = '.$paiement->id;
 $resql=$db->query($sql);
 if ($resql)
 {
diff --git a/htdocs/compta/paiement/liste.php b/htdocs/compta/paiement/liste.php
index 50ba64f93ec..cf42a7761fc 100644
--- a/htdocs/compta/paiement/liste.php
+++ b/htdocs/compta/paiement/liste.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -74,6 +75,7 @@ if (!$user->rights->societe->client->voir && !$socid)
 	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
 }
 $sql.= " WHERE p.fk_paiement = c.id";
+$sql.= " AND s.entity = ".$conf->entity;
 if (!$user->rights->societe->client->voir && !$socid)
 {
 	$sql.= " AND sc.fk_user = " .$user->id;
@@ -99,7 +101,9 @@ if ($_GET["orphelins"])     // Option for debugging purpose only
   $sql.= " ".MAIN_DB_PREFIX."c_paiement as c";
   $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON p.rowid = pf.fk_paiement";
   $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON f.fk_soc = s.rowid";
-  $sql.= " WHERE p.fk_paiement = c.id AND pf.rowid IS NULL";
+  $sql.= " WHERE p.fk_paiement = c.id";
+  $sql.= " AND s.entity = ".$conf->entity;
+  $sql.= " AND pf.rowid IS NULL";
 }
 $sql.= " ORDER BY ".$sortfield." ".$sortorder;
 //$sql.= ", facnumber ASC";
diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php
index 13d2adaaed8..7a46a00b0b7 100644
--- a/htdocs/compta/prelevement/bons.php
+++ b/htdocs/compta/prelevement/bons.php
@@ -1,6 +1,7 @@
 <?PHP
 /* Copyright (C) 2005      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2005-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,24 +27,19 @@
 
 require("./pre.inc.php");
 
-if (!$user->rights->prelevement->bons->lire)
-  accessforbidden();
+$langs->load("widthdrawals");
+
+// Security check
+$socid = isset($_GET["socid"])?$_GET["socid"]:'';
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'prelevement','','','bons');
 
 $page = $_GET["page"];
 $sortorder = $_GET["sortorder"];
 $sortfield = $_GET["sortfield"];
 
 
-llxHeader('','Prélèvements - Bons');
-
-/*
- * Sécurité accés client
- */
-if ($user->societe_id > 0) 
-{
-  $action = '';
-  $socid = $user->societe_id;
-}
+llxHeader('',$langs->trans("WithdrawalsReceipts"));
 
 
 if ($page == -1) { $page = 0 ; }
@@ -58,11 +54,10 @@ if (! $sortfield) $sortfield="p.datec";
  * Mode Liste
  *
  */
-$sql = "SELECT p.rowid, p.ref, p.amount,".$db->pdate("p.datec")." as datec";
-$sql .= ", p.statut";
-$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
-
-$sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit+1, $offset);
+$sql = "SELECT p.rowid, p.ref, p.amount, p.statut";
+$sql.= ", ".$db->pdate("p.datec")." as datec";
+$sql.= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
+$sql.= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit+1, $offset);
 
 $result = $db->query($sql);
 if ($result)
diff --git a/htdocs/compta/prelevement/config.php b/htdocs/compta/prelevement/config.php
index 6ec41cc2c29..4b6c4b235af 100644
--- a/htdocs/compta/prelevement/config.php
+++ b/htdocs/compta/prelevement/config.php
@@ -1,6 +1,7 @@
 <?PHP
-/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2005 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2005      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2005      Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,16 +28,16 @@
 require("./pre.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
-
-if (!$user->rights->prelevement->bons->lire)
-accessforbidden();
+// Security check
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'prelevement', '', '', 'bons');
 
 
 if ($_GET["action"] == "set" && $user->rights->prelevement->bons->configurer)
 {
 	for ($i = 1 ; $i < 7 ; $i++)
 	{
-		dolibarr_set_const($db, $_POST["nom$i"], $_POST["value$i"], $type='chaine');
+		dolibarr_set_const($db, $_POST["nom$i"], $_POST["value$i"],'chaine',0,'',$conf->entity);
 	}
 
 	Header("Location: config.php");
@@ -134,8 +135,10 @@ if ($user->rights->prelevement->bons->configurer)
 	print '<td align="left">';
 	print '<input type="hidden" name="nom6" value="PRELEVEMENT_USER">';
 	print '<select name="value6">';
-	$sql = "SELECT rowid, name, firstname";
-	$sql .= " FROM ".MAIN_DB_PREFIX."user";
+	
+	$sql = "SELECT u.rowid, u.name, u.firstname";
+	$sql.= " FROM ".MAIN_DB_PREFIX."user as u";
+	$sql.= " WHERE u.entity IN (0,".$conf->entity.")"; 
 
 	if ($db->query($sql))
 	{
@@ -204,9 +207,10 @@ if ($conf->global->MAIN_MODULE_NOTIFICATION)
 		print '<tr class="impair"><td align="left">';
 		print '<input type="hidden" name="nom6" value="PRELEVEMENT_USER">';
 		print '<select name="user">';
-		$sql = "SELECT rowid, name, firstname";
-		$sql .= " FROM ".MAIN_DB_PREFIX."user";
-		$sql .= " ORDER BY name ASC";
+		$sql = "SELECT u.rowid, u.name, u.firstname";
+		$sql.= " FROM ".MAIN_DB_PREFIX."user as u";
+		$sql.= " WHERE u.entity IN (0,".$conf->entity.")";
+		$sql.= " ORDER BY u.name ASC";
 
 		if ($db->query($sql))
 		{
@@ -235,10 +239,12 @@ if ($conf->global->MAIN_MODULE_NOTIFICATION)
 	}
 
 
-	$sql = "SELECT u.name, u.firstname, pn.action, pn.rowid";
-	$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
-	$sql .= " , ".MAIN_DB_PREFIX."prelevement_notifications as pn";
-	$sql .= " WHERE u.rowid = pn.fk_user";
+	$sql = "SELECT u.name, u.firstname";
+	$sql.= ", pn.action, pn.rowid";
+	$sql.= " FROM ".MAIN_DB_PREFIX."user as u";
+	$sql.= ", ".MAIN_DB_PREFIX."prelevement_notifications as pn";
+	$sql.= " WHERE u.rowid = pn.fk_user";
+	$sql.= " AND u.entity IN (0,".$conf->entity.")"; 
 
 	$resql = $db->query($sql);
 	if ($resql)
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index db9a15dec0d..3f1444d8d6b 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -1,5 +1,6 @@
 <?php
-/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+/* Copyright (C) 2005      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,9 +33,9 @@ $langs->load("companies");
 $langs->load("banks");
 $langs->load("bills");
 
-
-if (!$user->rights->prelevement->bons->creer)
-accessforbidden();
+// Security check
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'prelevement', '', '', 'bons');
 
 
 /*
@@ -64,7 +65,7 @@ $thirdpartystatic=new Societe($db);
 $invoicestatic=new Facture($db);
 $bprev = new BonPrelevement($db);
 
-llxHeader();
+llxHeader('', $langs->trans("NewStandingOrder"));
 
 $h=0;
 $head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/create.php';
@@ -129,8 +130,8 @@ print '<br>';
  */
 $limit=5;
 
-$sql = "SELECT p.rowid, p.ref, p.amount,".$db->pdate("p.datec")." as datec";
-$sql.= ", p.statut";
+$sql = "SELECT p.rowid, p.ref, p.amount, p.statut";
+$sql.= ", ".$db->pdate("p.datec")." as datec";
 $sql.= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
 $sql.= " ORDER BY datec DESC";
 $sql.=$db->plimit($limit);
@@ -181,15 +182,14 @@ else
  *
  */
 $sql = "SELECT f.facnumber, f.rowid, s.nom, s.rowid as socid";
-$sql .= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s";
-$sql .= " , ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
-$sql .= " WHERE s.rowid = f.fk_soc";
-$sql .= " AND pfd.traite = 0 AND pfd.fk_facture = f.rowid";
-
-if ($socid)
-{
-	$sql .= " AND f.fk_soc = $socid";
-}
+$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
+$sql.= ", ".MAIN_DB_PREFIX."societe as s";
+$sql.= ", ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
+$sql.= " WHERE s.rowid = f.fk_soc";
+$sql.= " AND s.entity = ".$conf->entity;
+$sql.= " AND pfd.traite = 0";
+$sql.= " AND pfd.fk_facture = f.rowid";
+if ($socid) $sql.= " AND f.fk_soc = ".$socid;
 
 if ( $db->query($sql) )
 {
diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php
index f6b24c5903b..21f7dfb50f3 100644
--- a/htdocs/compta/prelevement/demandes.php
+++ b/htdocs/compta/prelevement/demandes.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2004-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2005-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2006 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,7 +35,7 @@ $langs->load("companies");
 // Security check
 $socid = isset($_GET["socid"])?$_GET["socid"]:'';
 if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'prelevement','','');
+$result = restrictedArea($user, 'prelevement','','','bons');
 
 
 /*
@@ -67,31 +67,29 @@ if (! $sortfield) $sortfield="f.facnumber";
 $sql= "SELECT f.facnumber, f.rowid, s.nom, s.rowid as socid";
 $sql.= " , ".$db->pdate("pfd.date_demande")." as date_demande";
 $sql.= " , pfd.fk_user_demande";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
-$sql.= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s";
-$sql.= " , ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+$sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
+$sql.= ", ".MAIN_DB_PREFIX."societe as s";
+$sql.= ", ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
+if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= " WHERE s.rowid = f.fk_soc";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-if (! $statut) $sql.= " AND pfd.traite = 0";
+$sql.= " AND s.entity = ".$conf->entity;
+if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+if ($socid) $sql.= " AND f.fk_soc = ".$socid;
+if (!$statut) $sql.= " AND pfd.traite = 0";
 if ($statut) $sql.= " AND pfd.traite = ".$statut;
 $sql.= " AND pfd.fk_facture = f.rowid";
 if (strlen(trim($_GET["search_societe"])))
 {
-	$sql .= " AND s.nom LIKE '%".$_GET["search_societe"]."%'";
+	$sql.= " AND s.nom LIKE '%".$_GET["search_societe"]."%'";
 }
-if ($socid)
-{
-	$sql .= " AND f.fk_soc = $socid";
-}
-$sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit+1, $offset);
+$sql.= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit+1, $offset);
 
 if ( $db->query($sql) )
 {
 	$num = $db->num_rows();
 	$i = 0;
 
-	if (! $statut)
+	if (!$statut)
 	{
 		print_barre_liste($langs->trans("RequestStandingOrderToTreat"), $page, "demandes.php", $urladd, $sortfield, $sortorder, '', $num);
 	}
diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php
index 5374f7e0d4d..72617b36d27 100644
--- a/htdocs/compta/prelevement/index.php
+++ b/htdocs/compta/prelevement/index.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2004-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2005-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2006 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -76,14 +76,16 @@ print '</td><td valign="top" width="70%">';
  * Factures
  */
 $sql = "SELECT f.facnumber, f.rowid, s.nom, s.rowid as socid";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
-$sql .= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-$sql .= " , ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
-$sql .= " WHERE s.rowid = f.fk_soc";
-$sql .= " AND pfd.traite = 0 AND pfd.fk_facture = f.rowid";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-if ($socid) $sql .= " AND f.fk_soc = $socid";
+$sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
+$sql.= ", ".MAIN_DB_PREFIX."societe as s";
+if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+$sql.= " , ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
+$sql.= " WHERE s.rowid = f.fk_soc";
+$sql.= " AND s.entity = ".$conf->entity;
+$sql.= " AND pfd.traite = 0 AND pfd.fk_facture = f.rowid";
+if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+if ($socid) $sql.= " AND f.fk_soc = ".$socid;
+
 $resql=$db->query($sql);
 if ($resql)
 {
diff --git a/htdocs/compta/prelevement/liste.php b/htdocs/compta/prelevement/liste.php
index d76db5b050f..ef9b1fdd760 100644
--- a/htdocs/compta/prelevement/liste.php
+++ b/htdocs/compta/prelevement/liste.php
@@ -1,6 +1,7 @@
 <?PHP
-/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2005 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2005      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2005      Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,18 +27,13 @@
 
 require("./pre.inc.php");
 
-if (!$user->rights->prelevement->bons->lire)
-  accessforbidden();
-
 $langs->load("withdrawals");
 $langs->load("companies");
 
-// Sécurité accés client
-if ($user->societe_id > 0) 
-{
-  $action = '';
-  $socid = $user->societe_id;
-}
+// Security check
+$socid = isset($_GET["socid"])?$_GET["socid"]:'';
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'prelevement','','','bons');
 
 
 /*
@@ -54,27 +50,28 @@ $sortfield = (empty($_GET["sortfield"])) ? "p.datec" : $_GET["sortfield"];
 $offset = $conf->liste_limit * $page ;
 
 $sql = "SELECT p.rowid, p.statut, p.ref, pl.amount,".$db->pdate("p.datec")." as datec";
-$sql .= " , s.nom, s.code_client";
-$sql .= " , pl.rowid as rowid_ligne, pl.statut as statut_ligne";
-$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
-$sql .= " , ".MAIN_DB_PREFIX."prelevement_lignes as pl";
-$sql .= " , ".MAIN_DB_PREFIX."societe as s";
-$sql .= " WHERE pl.fk_prelevement_bons = p.rowid";
-$sql .= " AND s.rowid = pl.fk_soc";
-
+$sql.= " , s.nom, s.code_client";
+$sql.= " , pl.rowid as rowid_ligne, pl.statut as statut_ligne";
+$sql.= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
+$sql.= " , ".MAIN_DB_PREFIX."prelevement_lignes as pl";
+$sql.= " , ".MAIN_DB_PREFIX."societe as s";
+$sql.= " WHERE pl.fk_prelevement_bons = p.rowid";
+$sql.= " AND s.rowid = pl.fk_soc";
+$sql.= " AND s.entity = ".$conf->entity;
+if ($socid) $sql.= " AND pl.fk_soc = ".$socid;
 if ($_GET["search_ligne"])
 {
-  $sql .= " AND pl.rowid = '".$_GET["search_ligne"]."'";
+  $sql.= " AND pl.rowid = '".$_GET["search_ligne"]."'";
 }
 
 if ($_GET["search_bon"])
 {
-  $sql .= " AND p.ref LIKE '%".$_GET["search_bon"]."%'";
+  $sql.= " AND p.ref LIKE '%".$_GET["search_bon"]."%'";
 }
 
 if ($_GET["search_code"])
 {
-  $sql .= " AND s.code_client LIKE '%".$_GET["search_code"]."%'";
+  $sql.= " AND s.code_client LIKE '%".$_GET["search_code"]."%'";
 }
 
 if ($_GET["search_societe"])
@@ -83,7 +80,7 @@ if ($_GET["search_societe"])
   $sql .= " AND s.nom LIKE '%".$sel."%'";
 }
 
-$sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit+1, $offset);
+$sql.= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit+1, $offset);
 
 $result = $db->query($sql);
 
diff --git a/htdocs/compta/prelevement/liste_factures.php b/htdocs/compta/prelevement/liste_factures.php
index 291032f20c7..2ed95447cd7 100644
--- a/htdocs/compta/prelevement/liste_factures.php
+++ b/htdocs/compta/prelevement/liste_factures.php
@@ -1,6 +1,7 @@
 <?PHP
-/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2005 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2005      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2005      Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,11 +29,14 @@ require("./pre.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/rejet-prelevement.class.php");
 require_once(DOL_DOCUMENT_ROOT."/paiement.class.php");
 
-// Sécurité accés client
-if ($user->societe_id > 0) accessforbidden();
-
+$langs->load("withdrawals");
 $langs->load("companies");
 
+// Security check
+$socid = isset($_GET["socid"])?$_GET["socid"]:'';
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'prelevement','','','bons');
+
 
 /*
  * View
@@ -51,35 +55,33 @@ $offset = $conf->liste_limit * $page ;
  *
  */
 $sql = "SELECT p.rowid, p.ref, p.statut";
-$sql .= " ,f.rowid as facid, f.facnumber, f.total_ttc";
-$sql .= " , s.rowid as socid, s.nom";
-$sql .= " , pl.statut as statut_ligne, pl.rowid as rowid_ligne";
-$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
-$sql .= " , ".MAIN_DB_PREFIX."prelevement_lignes as pl";
-$sql .= " , ".MAIN_DB_PREFIX."prelevement_facture as pf";
-$sql .= " , ".MAIN_DB_PREFIX."facture as f";
-$sql .= " , ".MAIN_DB_PREFIX."societe as s";
-$sql .= " WHERE pf.fk_prelevement_lignes = pl.rowid";
-$sql .= " AND pl.fk_prelevement_bons = p.rowid";
-$sql .= " AND f.fk_soc = s.rowid";
-$sql .= " AND pf.fk_facture = f.rowid";
+$sql.= " ,f.rowid as facid, f.facnumber, f.total_ttc";
+$sql.= " , s.rowid as socid, s.nom";
+$sql.= " , pl.statut as statut_ligne, pl.rowid as rowid_ligne";
+$sql.= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
+$sql.= " , ".MAIN_DB_PREFIX."prelevement_lignes as pl";
+$sql.= " , ".MAIN_DB_PREFIX."prelevement_facture as pf";
+$sql.= " , ".MAIN_DB_PREFIX."facture as f";
+$sql.= " , ".MAIN_DB_PREFIX."societe as s";
+$sql.= " WHERE pf.fk_prelevement_lignes = pl.rowid";
+$sql.= " AND pl.fk_prelevement_bons = p.rowid";
+$sql.= " AND f.fk_soc = s.rowid";
+$sql.= " AND s.entity = ".$conf->entity;
+$sql.= " AND pf.fk_facture = f.rowid";
 
-if ($_GET["socid"])
-{
-  $sql .= " AND s.rowid = ".$_GET["socid"];
-}
+if ($socid) $sql .= " AND s.rowid = ".$socid;
 
 if ($_GET["search_fac"])
 {
-  $sql .= " AND f.facnumber like '%".$_GET["search_fac"]."%'";
+  $sql.= " AND f.facnumber like '%".$_GET["search_fac"]."%'";
 }
 
 if ($_GET["search_nom"])
 {
-  $sql .= " AND s.nom like '%".$_GET["search_nom"]."%'";
+  $sql.= " AND s.nom like '%".$_GET["search_nom"]."%'";
 }
 
-$sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit+1, $offset);
+$sql.= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit+1, $offset);
 
 $result = $db->query($sql);
 
diff --git a/htdocs/compta/prelevement/rejets.php b/htdocs/compta/prelevement/rejets.php
index 0194313ed6a..11a254dbb87 100644
--- a/htdocs/compta/prelevement/rejets.php
+++ b/htdocs/compta/prelevement/rejets.php
@@ -1,5 +1,6 @@
 <?PHP
-/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+/* Copyright (C) 2005      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,20 +25,20 @@ require("./pre.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/rejet-prelevement.class.php");
 require_once(DOL_DOCUMENT_ROOT."/paiement.class.php");
 
+$langs->load("withdrawals");
 $langs->load("companies");
 
+// Security check
+$socid = isset($_GET["socid"])?$_GET["socid"]:'';
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'prelevement','','','bons');
 
-if (!$user->rights->prelevement->bons->lire)
-  accessforbidden();
-
-// Sécurité accés client
-if ($user->societe_id > 0) accessforbidden();
 
 /*
  * View
  */
 
-llxHeader('','Bon de prélèvement - Rejet');
+llxHeader('',$langs->trans("WithdrawsRefused"));
 
 $h = 0;
 $head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/fiche.php?id='.$_GET["id"];
@@ -77,20 +78,16 @@ $rej = new RejetPrelevement($db, $user);
  *
  */
 $sql = "SELECT pl.rowid, pr.motif, p.ref, pl.statut";
-$sql .= " , s.rowid as socid, s.nom";
-$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
-$sql .= " , ".MAIN_DB_PREFIX."prelevement_rejet as pr";
-$sql .= " , ".MAIN_DB_PREFIX."prelevement_lignes as pl";
-$sql .= " , ".MAIN_DB_PREFIX."societe as s";
-$sql .= " WHERE pr.fk_prelevement_lignes = pl.rowid";
-$sql .= " AND pl.fk_prelevement_bons = p.rowid";
-$sql .= " AND pl.fk_soc = s.rowid";
-
-if ($_GET["socid"])
-{
-  $sql .= " AND s.rowid = ".$_GET["socid"];
-}
-
+$sql.= " , s.rowid as socid, s.nom";
+$sql.= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
+$sql.= " , ".MAIN_DB_PREFIX."prelevement_rejet as pr";
+$sql.= " , ".MAIN_DB_PREFIX."prelevement_lignes as pl";
+$sql.= " , ".MAIN_DB_PREFIX."societe as s";
+$sql.= " WHERE pr.fk_prelevement_lignes = pl.rowid";
+$sql.= " AND pl.fk_prelevement_bons = p.rowid";
+$sql.= " AND pl.fk_soc = s.rowid";
+$sql.= " AND s.entity = ".$conf->entity;
+if ($socid) $sql.= " AND s.rowid = ".$socid;
 $sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit+1, $offset);
 
 $result = $db->query($sql);
diff --git a/htdocs/compta/prelevement/stats.php b/htdocs/compta/prelevement/stats.php
index 83ded0a16ec..e5551f9211c 100644
--- a/htdocs/compta/prelevement/stats.php
+++ b/htdocs/compta/prelevement/stats.php
@@ -1,6 +1,7 @@
 <?PHP
-/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2005 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2005      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2005      Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,14 +26,16 @@
 
 require("./pre.inc.php");
 
-if (!$user->rights->prelevement->bons->lire)
-  accessforbidden();
+$langs->load("withdrawals");
+$langs->load("companies");
 
-// Sécurité accés client
-if ($user->societe_id > 0) accessforbidden();
+// Security check
+$socid = isset($_GET["socid"])?$_GET["socid"]:'';
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'prelevement','','','bons');
 
 
-llxHeader('','Statistiques prélèvements');
+llxHeader('',$langs->trans("WithdrawStatistics"));
 
 /*
  *
@@ -44,7 +47,10 @@ print_titre($langs->trans("WithdrawStatistics"));
 
 
 $sql = "SELECT sum(pl.amount), count(pl.amount)";
-$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_lignes as pl";
+$sql.= " FROM ".MAIN_DB_PREFIX."prelevement_lignes as pl";
+$sql.= ", ".MAIN_DB_PREFIX."societe as s";
+$sql.= " WHERE pl.fk_soc = s.rowid";
+$sql.= " AND s.entity = ".$conf->entity;
 
 if ($db->query($sql))
 {
@@ -64,8 +70,11 @@ if ($db->query($sql))
  *
  */
 $sql = "SELECT sum(pl.amount), count(pl.amount), pl.statut";
-$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_lignes as pl";
-$sql .= " GROUP BY pl.statut";
+$sql.= " FROM ".MAIN_DB_PREFIX."prelevement_lignes as pl";
+$sql.= ", ".MAIN_DB_PREFIX."societe as s";
+$sql.= " WHERE pl.fk_soc = s.rowid";
+$sql.= " AND s.entity = ".$conf->entity;
+$sql.= " GROUP BY pl.statut";
 
 if ($db->query($sql))
 {
@@ -133,8 +142,11 @@ print_titre($langs->trans("WithdrawRejectStatistics"));
 
 
 $sql = "SELECT sum(pl.amount), count(pl.amount)";
-$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_lignes as pl";
-$sql .= " WHERE pl.statut = 3";
+$sql.= " FROM ".MAIN_DB_PREFIX."prelevement_lignes as pl";
+$sql.= ", ".MAIN_DB_PREFIX."societe as s";
+$sql.= " WHERE pl.fk_soc = s.rowid";
+$sql.= " AND s.entity = ".$conf->entity;
+$sql.= " WHERE pl.statut = 3";
 if ($db->query($sql))
 {
   $num = $db->num_rows();
@@ -153,12 +165,15 @@ if ($db->query($sql))
  *
  */
 $sql = "SELECT sum(pl.amount), count(pl.amount) as cc, pr.motif";
-$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_lignes as pl";
-$sql .= " , ".MAIN_DB_PREFIX."prelevement_rejet as pr";
-$sql .= " WHERE pl.statut = 3";
-$sql .= " AND pr.fk_prelevement_lignes = pl.rowid";
-$sql .= " GROUP BY pr.motif";
-$sql .= " ORDER BY cc DESC";
+$sql.= " FROM ".MAIN_DB_PREFIX."prelevement_lignes as pl";
+$sql.= " , ".MAIN_DB_PREFIX."prelevement_rejet as pr";
+$sql.= ", ".MAIN_DB_PREFIX."societe as s";
+$sql.= " WHERE pl.fk_soc = s.rowid";
+$sql.= " AND s.entity = ".$conf->entity;
+$sql.= " AND pl.statut = 3";
+$sql.= " AND pr.fk_prelevement_lignes = pl.rowid";
+$sql.= " GROUP BY pr.motif";
+$sql.= " ORDER BY cc DESC";
 
 if ($db->query($sql))
 {
diff --git a/htdocs/compta/propal.php b/htdocs/compta/propal.php
index 2c0cacd078b..0449ea60e9c 100644
--- a/htdocs/compta/propal.php
+++ b/htdocs/compta/propal.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2007 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  * Copyright (C) 2008      Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -489,7 +489,7 @@ if ($id > 0 || ! empty($ref))
 	print '<table width="100%"><tr><td width="50%" valign="top">';
 
 	/*
-	 * Documents g�n�r�s
+	 * Documents generes
 	 */
 	$filename=sanitizeFileName($propal->ref);
 	$filedir=$conf->propal->dir_output . "/" . sanitizeFileName($propal->ref);
@@ -503,7 +503,7 @@ if ($id > 0 || ! empty($ref))
 
 
 	/*
-	 * Commandes rattach�es
+	 * Commandes rattachees
 	 */
 	if($conf->commande->enabled)
 	{
@@ -545,13 +545,23 @@ if ($id > 0 || ! empty($ref))
 	$sql = "SELECT f.facnumber, f.total,".$db->pdate("f.datef")." as df, f.rowid as facid, f.fk_user_author, f.fk_statut, f.paye";
 	$sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
 	$sql.= ", ".MAIN_DB_PREFIX."fa_pr as fp";
-	$sql.= " WHERE fp.fk_facture = f.rowid AND fp.fk_propal = ".$propal->id;
+	//$sql.= ", ".MAIN_DB_PREFIX."societe as s";
+	$sql.= " WHERE fp.fk_facture = f.rowid";
+	$sql.= " AND fp.fk_propal = ".$propal->id;
+	//$sql.= " AND f.fk_soc = s.rowid";
+	//$sql.= " AND s.entity = ".$conf->entity;
 	//$sql.= " UNION ";
 	// Cas des factures lier via la commande
 	$sql2= "SELECT f.facnumber, f.total,".$db->pdate("f.datef")." as df, f.rowid as facid, f.fk_user_author, f.fk_statut, f.paye";
 	$sql2.= " FROM ".MAIN_DB_PREFIX."facture as f";
-	$sql2.= ", ".MAIN_DB_PREFIX."co_pr as cp, ".MAIN_DB_PREFIX."co_fa as cf";
-	$sql2.= " WHERE cp.fk_propale = ".$propal->id." AND cf.fk_commande = cp.fk_commande AND cf.fk_facture = f.rowid";
+	//$sql2.= ", ".MAIN_DB_PREFIX."societe as s";
+	$sql2.= ", ".MAIN_DB_PREFIX."co_pr as cp";
+	$sql2.= ", ".MAIN_DB_PREFIX."co_fa as cf";
+	$sql2.= " WHERE cp.fk_propale = ".$propal->id;
+	$sql2.= " AND cf.fk_commande = cp.fk_commande";
+	$sql2.= " AND cf.fk_facture = f.rowid";
+	//$sql2.= " AND f.fk_soc = s.rowid";
+	//$sql2.= " AND s.entity = ".$conf->entity;
 
 	dol_syslog("propal.php::liste factures sql=".$sql);
 	$resql=$db->query($sql);
@@ -659,35 +669,36 @@ else
 	$sql.= " p.total_ht, p.tva, p.total,";
 	$sql.= $db->pdate("p.datep")." as dp, ";
 	$sql.= $db->pdate("p.fin_validite")." as dfin";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
-	$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+	$sql.= ", ".MAIN_DB_PREFIX."propal as p";
+	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql.= " WHERE p.fk_soc = s.rowid";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-	if ($socid)           $sql .= " AND s.rowid = ".$socid;
-	if ($viewstatut <> '') $sql .= " AND p.fk_statut in ($viewstatut)"; // viewstatut peut etre combinaisons s�par� par virgules
+	$sql.= " AND s.entity = ".$conf->entity;
+	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+	if ($socid) $sql.= " AND s.rowid = ".$socid;
+	if ($viewstatut <> '') $sql.= " AND p.fk_statut in ($viewstatut)"; // viewstatut peut etre combinaisons separe par virgules
 	if ($month > 0)
 	{
 		if ($year > 0)
-		$sql .= " AND date_format(p.datep, '%Y-%m') = '$year-$month'";
+		$sql.= " AND date_format(p.datep, '%Y-%m') = '$year-$month'";
 		else
-		$sql .= " AND date_format(p.datep, '%m') = '$month'";
+		$sql.= " AND date_format(p.datep, '%m') = '$month'";
 	}
 	if ($year > 0)         $sql .= " AND date_format(p.datep, '%Y') = $year";
 	if (!empty($_GET['search_ref']))
 	{
-		$sql .= " AND p.ref LIKE '%".addslashes($_GET['search_ref'])."%'";
+		$sql.= " AND p.ref LIKE '%".addslashes($_GET['search_ref'])."%'";
 	}
 	if (!empty($_GET['search_societe']))
 	{
-		$sql .= " AND s.nom LIKE '%".addslashes($_GET['search_societe'])."%'";
+		$sql.= " AND s.nom LIKE '%".addslashes($_GET['search_societe'])."%'";
 	}
 	if (!empty($_GET['search_montant_ht']))
 	{
-		$sql .= " AND p.price='".addslashes($_GET['search_montant_ht'])."'";
+		$sql.= " AND p.price='".addslashes($_GET['search_montant_ht'])."'";
 	}
-	$sql .= " ORDER BY $sortfield $sortorder, p.rowid DESC ";
-	$sql .= $db->plimit($limit + 1,$offset);
+	$sql.= " ORDER BY $sortfield $sortorder, p.rowid DESC ";
+	$sql.= $db->plimit($limit + 1,$offset);
 
 	if ( $result = $db->query($sql) )
 	{
diff --git a/htdocs/compta/sociales/charges.php b/htdocs/compta/sociales/charges.php
index b9ad2a878a8..36a7ea90034 100644
--- a/htdocs/compta/sociales/charges.php
+++ b/htdocs/compta/sociales/charges.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -298,10 +299,15 @@ if ($chid > 0)
 		* Paiements
 		*/
 		$sql = "SELECT ".$db->pdate("datep")." as dp, p.amount,";
-		$sql .= "c.libelle as paiement_type, p.num_paiement, p.rowid";
-		$sql .= " FROM ".MAIN_DB_PREFIX."paiementcharge as p, ".MAIN_DB_PREFIX."c_paiement as c ";
-		$sql .= " WHERE p.fk_charge = ".$chid." AND p.fk_typepaiement = c.id";
-		$sql .= " ORDER BY dp DESC";
+		$sql.= "c.libelle as paiement_type, p.num_paiement, p.rowid";
+		$sql.= " FROM ".MAIN_DB_PREFIX."paiementcharge as p";
+		$sql.= ", ".MAIN_DB_PREFIX."c_paiement as c ";
+		$sql.= ", ".MAIN_DB_PREFIX."chargesociales as s";
+		$sql.= " WHERE p.fk_charge = ".$chid;
+		$sql.= " AND p.fk_charge = s.rowid";
+		$sql.= " AND s.entity = ".$conf->entity;
+		$sql.= " AND p.fk_typepaiement = c.id";
+		$sql.= " ORDER BY dp DESC";
 
 		$result = $db->query($sql);
 		if ($result)
diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php
index 97e714f17ba..0f2d0ae044d 100644
--- a/htdocs/compta/sociales/index.php
+++ b/htdocs/compta/sociales/index.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -78,8 +79,10 @@ $html = new Form($db);
 $sql = "SELECT s.rowid as id, s.fk_type as type, ";
 $sql.= " s.amount,".$db->pdate("s.date_ech")." as de, s.libelle, s.paye,".$db->pdate("s.periode")." as periode,";
 $sql.= " c.libelle as type_lib";
-$sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."chargesociales as s";
+$sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
+$sql.= ", ".MAIN_DB_PREFIX."chargesociales as s";
 $sql.= " WHERE s.fk_type = c.id";
+$sql.= " AND s.entity = ".$conf->entity;
 if ($year > 0)
 {
     $sql .= " AND (";
diff --git a/htdocs/compta/tva/fiche.php b/htdocs/compta/tva/fiche.php
index 4e9c245d2f2..37719d87d1e 100644
--- a/htdocs/compta/tva/fiche.php
+++ b/htdocs/compta/tva/fiche.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php
index 402e1b988de..8bed2c28c00 100644
--- a/htdocs/compta/tva/index.php
+++ b/htdocs/compta/tva/index.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004      Éric Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -47,10 +48,10 @@ $result = restrictedArea($user, 'tax', '', '', 'charges');
 
 
 /**
- * 	\brief		On cherche la tva à collecter
- *	\param		db		Handle accès base
- *	\param		y		Année
- *	\param		m		Mois
+ * 	\brief		On cherche la tva a collecter
+ *	\param		db		Handle acces base
+ *	\param		y		Year
+ *	\param		m		Month
  */
 function tva_coll($db,$y,$m)
 {
@@ -61,8 +62,10 @@ function tva_coll($db,$y,$m)
         // Si on paye la tva sur les factures dues (non brouillon)
         $sql = "SELECT sum(f.tva) as amount";
         $sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
-        $sql.= " WHERE ";
-        $sql.= " f.fk_statut in (1,2)";
+        $sql.= ", ".MAIN_DB_PREFIX."societe as s";
+        $sql.= " WHERE f.fk_soc = s.rowid";
+        $sql.= " AND s.entity = ".$conf->entity;
+        $sql.= " AND f.fk_statut IN (1,2)";
         $sql.= " AND date_format(f.datef,'%Y') = ".$y;
         $sql.= " AND date_format(f.datef,'%m') = ".$m;
     }
@@ -102,7 +105,7 @@ function tva_coll($db,$y,$m)
 
 
 /**
- * 	\brief		On récupère la tva à payer
+ * 	\brief		On recupere la tva à payer
  *	\param		db		Handle accès base
  *	\param		y		Année
  *	\param		m		Mois
@@ -116,8 +119,10 @@ function tva_paye($db, $y,$m)
         // Si on paye la tva sur les factures dues (non brouillon)
         $sql = "SELECT sum(f.total_tva) as amount";
         $sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
-        $sql.= " WHERE ";
-        $sql.= " f.fk_statut in (1,2)";
+        $sql.= ", ".MAIN_DB_PREFIX."societe as s";
+        $sql.= " WHERE f.fk_soc = s.rowid";
+        $sql.= " AND s.entity = ".$conf->entity;
+        $sql.= " AND f.fk_statut in (1,2)";
         $sql.= " AND date_format(f.datef,'%Y') = $y";
         $sql.= " AND date_format(f.datef,'%m') = $m";
     }
@@ -126,19 +131,19 @@ function tva_paye($db, $y,$m)
         // Si on paye la tva sur les payments
 
         // \todo a ce jour on se sait pas la compter car le montant tva d'un payment
-        // n'est pas stocké dans la table des payments.
-        // Seul le module compta expert peut résoudre ce problème.
+        // n'est pas stocke dans la table des payments.
+        // Seul le module compta expert peut resoudre ce probleme.
         // (Il faut quand un payment a lieu, stocker en plus du montant du paiement le
         // detail part tva et part ht).
 
 /*
 
         // \todo a ce jour on se sait pas la compter car le montant tva d'un payment
-        // n'est pas stocké dans la table des payments.
+        // n'est pas stocke dans la table des payments.
         // Il faut quand un payment a lieu, stocker en plus du montant du paiement le
         // detail part tva et part ht.
 
-        // Tva sur factures payés
+        // Tva sur factures payes
         $sql = "SELECT sum(f.total_tva) as amount";
         $sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
   //      $sql.= " WHERE ";
@@ -290,12 +295,15 @@ echo '</td><td>&nbsp;</td><td valign="top" width="50%">';
 
 
 /*
-* Réglée
+* Reglee
 */
 
 $sql = "SELECT SUM(amount) as mm, date_format(f.datev,'%Y-%m') as dm";
-$sql .= " FROM ".MAIN_DB_PREFIX."tva as f WHERE f.datev >= '$y-01-01' AND f.datev <= '$y-12-31' ";
-$sql .= " GROUP BY dm ASC";
+$sql.= " FROM ".MAIN_DB_PREFIX."tva as f";
+$sql.= " WHERE f.entity = ".$conf->entity;
+$sql.= " AND f.datev >= '$y-01-01'";
+$sql.= " AND f.datev <= '$y-12-31' ";
+$sql.= " GROUP BY dm ASC";
 
 pt($db, $sql,$langs->trans("Year")." $y");
 
diff --git a/htdocs/compta/tva/quadri.php b/htdocs/compta/tva/quadri.php
index 44ad296875b..0c1adb3b3a6 100644
--- a/htdocs/compta/tva/quadri.php
+++ b/htdocs/compta/tva/quadri.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2004      Éric Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2006      Yannick Warnier      <ywarnier@beeznest.org>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -63,13 +64,16 @@ function tva_coll($db,$y,$q)
     {
         // if vat payed on due invoices
         $sql = "SELECT d.fk_facture as facid, f.facnumber as facnum, d.tva_taux as rate, d.total_ht as totalht, d.total_tva as amount";
-        $sql.= " FROM ".MAIN_DB_PREFIX."facture as f, ";
-        $sql.= MAIN_DB_PREFIX."facturedet as d " ;
-        $sql.= " WHERE ";
-        $sql.= " f.fk_statut in (1,2)";
+        $sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
+        $sql.= ", ".MAIN_DB_PREFIX."facturedet as d" ;
+        $sql.= ", ".MAIN_DB_PREFIX."societe as s";
+        $sql.= " WHERE f.fk_soc = s.rowid";
+        $sql.= " AND s.entity = ".$conf->entity;
+        $sql.= " AND f.fk_statut in (1,2)";
         $sql.= " AND f.rowid = d.fk_facture ";
         $sql.= " AND date_format(f.datef,'%Y') = ".$y;
-        $sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3)." AND date_format(f.datef,'%m') <= ".($q*3).")";
+        $sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3);
+        $sql.= " AND date_format(f.datef,'%m') <= ".($q*3).")";
         $sql.= " ORDER BY rate, facid";
         
     }
@@ -127,13 +131,16 @@ function tva_paye($db, $y,$q)
     {
         // Si on paye la tva sur les factures dues (non brouillon)
         $sql = "SELECT d.fk_facture_fourn as facid, f.facnumber as facnum, d.tva_taux as rate, d.total_ht as totalht, d.tva as amount";
-        $sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn as f, ";
-        $sql.= MAIN_DB_PREFIX."facture_fourn_det as d " ;
-        $sql.= " WHERE ";
-        $sql.= " f.fk_statut = 1 ";
+        $sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
+        $sql.= ", ".MAIN_DB_PREFIX."facture_fourn_det as d" ;
+        $sql.= ", ".MAIN_DB_PREFIX."societe as s";
+        $sql.= " WHERE f.fk_soc = s.rowid";
+        $sql.= " AND s.entity = ".$conf->entity;
+        $sql.= " AND f.fk_statut = 1 ";
         $sql.= " AND f.rowid = d.fk_facture_fourn ";
         $sql.= " AND date_format(f.datef,'%Y') = ".$y;
-        $sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3)." AND date_format(f.datef,'%m') <= ".($q*3).")";
+        $sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3);
+        $sql.= " AND date_format(f.datef,'%m') <= ".($q*3).")";
         $sql.= " ORDER BY rate, facid ";
     }
     else
diff --git a/htdocs/compta/tva/reglement.php b/htdocs/compta/tva/reglement.php
index 3d0163080be..58a204a160a 100644
--- a/htdocs/compta/tva/reglement.php
+++ b/htdocs/compta/tva/reglement.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -48,8 +49,9 @@ $tva_static = new Tva($db);
 print_fiche_titre($langs->trans("VATPayments"));
 
 $sql = "SELECT rowid, amount, label, ".$db->pdate("f.datev")." as dm";
-$sql .= " FROM ".MAIN_DB_PREFIX."tva as f ";
-$sql .= " ORDER BY dm DESC";
+$sql.= " FROM ".MAIN_DB_PREFIX."tva as f ";
+$sql.= " WHERE f.entity = ".$conf->entity;
+$sql.= " ORDER BY dm DESC";
 
 $result = $db->query($sql);
 if ($result)
diff --git a/htdocs/contact/index.php b/htdocs/contact/index.php
index 24a8f0db64c..1beb51b0f7e 100644
--- a/htdocs/contact/index.php
+++ b/htdocs/contact/index.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2003      Eric Seigne          <erics@rycks.com>
  * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -112,7 +113,7 @@ $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as p";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_pays as cp ON cp.rowid = p.fk_pays";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = p.fk_soc";
 if (!$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
-$sql.= " WHERE 1=1 ";
+$sql.= " WHERE p.entity = ".$conf->entity;
 if (!$user->rights->societe->client->voir && !$socid) //restriction
 {
 	$sql .= " AND IFNULL(sc.fk_user, ".$user->id.") = " .$user->id;
diff --git a/htdocs/contrat/contrat.class.php b/htdocs/contrat/contrat.class.php
index d5429e36b15..8333cdffff2 100644
--- a/htdocs/contrat/contrat.class.php
+++ b/htdocs/contrat/contrat.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2009 Destailleur Laurent  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  * Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
  * Copyright (C) 2008      Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
  * This program is free software; you can redistribute it and/or modify
@@ -1234,27 +1235,33 @@ class Contrat extends CommonObject
 		$now=gmmktime();
 
 		$this->nbtodo=$this->nbtodolate=0;
+		
+		$this->from = " FROM ".MAIN_DB_PREFIX."contrat as c";
+		$this->from.= ", ".MAIN_DB_PREFIX."contratdet as cd";
+		$this->from.= ", ".MAIN_DB_PREFIX."societe as s";
+		if (!$user->rights->societe->client->voir && !$user->societe_id) $this->from.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		
 		if ($mode == 'inactives')
 		{
 			$sql = "SELECT cd.rowid, cd.date_ouverture_prevue as datefin";
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", sc.fk_soc, sc.fk_user";
-			$sql.= " FROM ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."contratdet as cd";
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-			$sql.= " WHERE c.statut = 1 AND c.rowid = cd.fk_contrat";
+			$sql.= $this->from;
+			$sql.= " WHERE c.statut = 1";
+			$sql.= " AND c.rowid = cd.fk_contrat";
 			$sql.= " AND cd.statut = 0";
 		}
 		if ($mode == 'expired')
 		{
 			$sql = "SELECT cd.rowid, cd.date_fin_validite as datefin";
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", sc.fk_soc, sc.fk_user";
-			$sql.= " FROM ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."contratdet as cd";
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-			$sql.= " WHERE c.statut = 1 AND c.rowid = cd.fk_contrat";
+			$sql.= $this->from;
+			$sql.= " WHERE c.statut = 1";
+			$sql.= " AND c.rowid = cd.fk_contrat";
 			$sql.= " AND cd.statut = 4";
 			$sql.= " AND cd.date_fin_validite < '".$this->db->idate(time())."'";
 		}
+		$sql.= " AND c.fk_soc = s.rowid";
+		$sql.= " AND s.entity = ".$conf->entity;
 		if ($user->societe_id) $sql.=" AND c.fk_soc = ".$user->societe_id;
-		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
+		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -1285,15 +1292,19 @@ class Contrat extends CommonObject
 		global $conf, $user;
 
 		$this->nb=array();
+		$clause = "WHERE";
 
 		$sql = "SELECT count(c.rowid) as nb";
 		$sql.= " FROM ".MAIN_DB_PREFIX."contrat as c";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON c.fk_soc = s.rowid";
 		if (!$user->rights->contrat->activer && !$user->societe_id)
 		{
-			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON p.fk_soc = s.rowid";
 			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
 			$sql.= " WHERE sc.fk_user = " .$user->id;
+			$clause = "AND";
 		}
+		$sql.= " ".$clause." s.entity = ".$conf->entity;
+		
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php
index 7ff49222af5..17e48b72284 100644
--- a/htdocs/contrat/fiche.php
+++ b/htdocs/contrat/fiche.php
@@ -1,7 +1,9 @@
 <?php
 /* Copyright (C) 2003-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  * Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -539,7 +541,10 @@ if ($_GET["action"] == 'create')
                 print '</tr>';
 
                 $sql = "SELECT pt.rowid, p.label as product, p.ref, pt.price, pt.qty, p.rowid as prodid, pt.remise_percent";
-                $sql .= " FROM ".MAIN_DB_PREFIX."propaldet as pt, ".MAIN_DB_PREFIX."product as p WHERE pt.fk_product = p.rowid AND pt.fk_propal = $propalid";
+                $sql.= " FROM ".MAIN_DB_PREFIX."propaldet as pt";
+                $sql.= ", ".MAIN_DB_PREFIX."product as p";
+                $sql.= " WHERE pt.fk_product = p.rowid";
+                $sql.= " AND pt.fk_propal = ".$propalid;
                 $sql .= " ORDER BY pt.rowid ASC";
                 $result = $db->query($sql);
                 if ($result)
@@ -562,7 +567,8 @@ if ($_GET["action"] == 'create')
                 }
                 $sql = "SELECT pt.rowid, pt.description as product, pt.price, pt.qty, pt.remise_percent";
                 $sql.= " FROM ".MAIN_DB_PREFIX."propaldet as pt";
-                $sql.= " WHERE  pt.fk_propal = $propalid AND pt.fk_product = 0";
+                $sql.= " WHERE  pt.fk_propal = ".$propalid;
+                $sql.= " AND pt.fk_product = 0";
                 $sql.= " ORDER BY pt.rowid ASC";
                 $result=$db->query($sql);
                 if ($result)
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index ce8e5c80414..c724fd8eaae 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -98,16 +99,13 @@ if ($conf->contrat->enabled && $user->rights->contrat->lire)
 {
 	$sql  = "SELECT c.rowid as ref, c.rowid,";
 	$sql.= " s.nom, s.rowid as socid";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
 	$sql .= " FROM ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql .= " WHERE s.rowid = c.fk_soc AND c.statut = 0";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-
-	if ($socid)
-	{
-		$sql .= " AND f.fk_soc = ".$socid;
-	}
+	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	$sql.= " WHERE s.rowid = c.fk_soc";
+	$sql.= " AND s.entity = ".$conf->entity;
+	$sql.= " AND c.statut = 0";
+	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+	if ($socid) $sql.= " AND f.fk_soc = ".$socid;
 
 	$resql = $db->query($sql);
 
@@ -170,14 +168,15 @@ $sql.= ' sum('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NOT NULL AND
 $sql.= ' sum('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NOT NULL AND cd.date_fin_validite < ".$db->idate($now - $conf->contrat->services->expires->warning_delay).")",1,0).') as nb_late,';
 $sql.= ' sum('.$db->ifsql("cd.statut=5",1,0).') as nb_closed,';
 $sql.= " c.rowid as cid, c.ref, c.datec, c.tms, c.statut, s.nom, s.rowid as socid";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
 $sql.= " FROM ".MAIN_DB_PREFIX."societe as s,";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " ".MAIN_DB_PREFIX."societe_commerciaux as sc,";
+if (!$user->rights->societe->client->voir && !$socid) $sql.= " ".MAIN_DB_PREFIX."societe_commerciaux as sc,";
 $sql.= " ".MAIN_DB_PREFIX."contrat as c";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."contratdet as cd ON c.rowid = cd.fk_contrat";
-$sql.= " WHERE c.fk_soc = s.rowid AND c.statut > 0";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-if ($socid > 0) $sql .= " AND s.rowid = ".$socid;
+$sql.= " WHERE c.fk_soc = s.rowid";
+$sql.= " AND s.entity = ".$conf->entity;
+$sql.= " AND c.statut > 0";
+if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+if ($socid) $sql.= " AND s.rowid = ".$socid;
 $sql.= " GROUP BY c.rowid, c.datec, c.statut, s.nom, s.rowid";
 $sql.= " ORDER BY c.tms DESC";
 $sql.= " LIMIT ".$max;
@@ -239,13 +238,17 @@ print '<br>';
 
 // Not activated services
 $sql = "SELECT c.ref, c.fk_soc, cd.rowid as cid, cd.statut, cd.label, cd.description as note, cd.fk_contrat, s.nom";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
-$sql.= " FROM ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-$sql.= " WHERE c.statut=1 AND cd.statut = 0";
-$sql.= " AND cd.fk_contrat = c.rowid AND c.fk_soc = s.rowid";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-if ($socid > 0) $sql.= " AND s.rowid = ".$socid;
+$sql.= " FROM ".MAIN_DB_PREFIX."contratdet as cd";
+$sql.= ", ".MAIN_DB_PREFIX."contrat as c";
+$sql.= ", ".MAIN_DB_PREFIX."societe as s";
+if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+$sql.= " WHERE c.statut=1";
+$sql.= " AND cd.statut = 0";
+$sql.= " AND cd.fk_contrat = c.rowid";
+$sql.= " AND c.fk_soc = s.rowid";
+$sql.= " AND s.entity = ".$conf->entity;
+if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+if ($socid) $sql.= " AND s.rowid = ".$socid;
 $sql.= " ORDER BY cd.tms DESC";
 
 if ( $db->query($sql) )
@@ -303,12 +306,15 @@ $max=5;
 $sql = "SELECT c.ref, c.fk_soc, ";
 $sql.= " cd.rowid as cid, cd.statut, cd.label, cd.description as note, cd.fk_contrat, cd.date_fin_validite,";
 $sql.= " s.nom";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
-$sql.= " FROM ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-$sql.= " WHERE cd.fk_contrat = c.rowid AND c.fk_soc = s.rowid";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-if ($socid > 0) $sql.= " AND s.rowid = ".$socid;
+$sql.= " FROM ".MAIN_DB_PREFIX."contratdet as cd";
+$sql.= ", ".MAIN_DB_PREFIX."contrat as c";
+$sql.= ", ".MAIN_DB_PREFIX."societe as s";
+if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+$sql.= " WHERE cd.fk_contrat = c.rowid";
+$sql.= " AND c.fk_soc = s.rowid";
+$sql.= " AND s.entity = ".$conf->entity;
+if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+if ($socid) $sql.= " AND s.rowid = ".$socid;
 $sql.= " ORDER BY cd.tms DESC";
 
 $resql=$db->query($sql);
diff --git a/htdocs/contrat/liste.php b/htdocs/contrat/liste.php
index 6878bd6a686..218fa21827e 100644
--- a/htdocs/contrat/liste.php
+++ b/htdocs/contrat/liste.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -72,17 +73,17 @@ $sql.= ' sum('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NOT NULL AND
 $sql.= ' sum('.$db->ifsql("cd.statut=5",1,0).') as nb_closed,';
 $sql.= " c.rowid as cid, c.ref, c.datec, c.date_contrat, c.statut,";
 $sql.= " s.nom, s.rowid as socid";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
-$sql.= " FROM ".MAIN_DB_PREFIX."societe as s,";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " ".MAIN_DB_PREFIX."societe_commerciaux as sc,";
-$sql.= " ".MAIN_DB_PREFIX."contrat as c";
+$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+$sql.= ", ".MAIN_DB_PREFIX."contrat as c";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."contratdet as cd ON c.rowid = cd.fk_contrat";
 $sql.= " WHERE c.fk_soc = s.rowid ";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+$sql.= " AND s.entity = ".$conf->entity;
+if ($socid) $sql.= " AND s.rowid = ".$socid;
+if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 if ($search_nom)      $sql.= " AND s.nom like '%".addslashes($search_nom)."%'";
 if ($search_contract) $sql.= " AND c.rowid = '".addslashes($search_contract)."'";
 if ($sall)            $sql.= " AND (s.nom like '%".addslashes($sall)."%' OR cd.label like '%".addslashes($sall)."%' OR cd.description like '%".addslashes($sall)."%')";
-if ($socid > 0)       $sql.= " AND s.rowid = ".$socid;
 $sql.= " GROUP BY c.rowid, c.datec, c.statut, s.nom, s.rowid";
 $sql.= " ORDER BY $sortfield $sortorder";
 $sql.= $db->plimit($conf->liste_limit + 1 ,$offset);
diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php
index d1443c6526b..d568dbc335c 100644
--- a/htdocs/contrat/services.php
+++ b/htdocs/contrat/services.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -85,6 +86,7 @@ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
 $sql.= " WHERE";
 $sql.= " c.rowid = cd.fk_contrat";
 $sql.= " AND c.fk_soc = s.rowid";
+$sql.= " AND s.entity = ".$conf->entity;
 if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 if ($mode == "0") $sql.= " AND cd.statut = 0";
 if ($mode == "4") $sql.= " AND cd.statut = 4";
diff --git a/htdocs/core/conf.class.php b/htdocs/core/conf.class.php
index 409d4b648d6..d9e5c66d6a1 100644
--- a/htdocs/core/conf.class.php
+++ b/htdocs/core/conf.class.php
@@ -76,7 +76,7 @@ class Conf
 		 * - En $this->global->key=value
 		 */
 		$sql = "SELECT name, value, entity FROM ".MAIN_DB_PREFIX."const ";
-		$sql.= " WHERE entity = 0 OR entity = ".$this->entity;
+		$sql.= " WHERE entity IN (0,".$this->entity.")";
 		$result = $db->query($sql);
 		if ($result)
 		{
diff --git a/htdocs/core/events.class.php b/htdocs/core/events.class.php
index ebd1e8123ef..edf3ad91740 100644
--- a/htdocs/core/events.class.php
+++ b/htdocs/core/events.class.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2007-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -48,6 +49,7 @@ class Events // extends CommonObject
 
 	var $tms;
 	var $type;
+	var $entity;
 	var $dateevent;
 	var $description;
 
@@ -72,49 +74,47 @@ class Events // extends CommonObject
     function create($user)
     {
     	global $conf, $langs;
-
-		// Clean parameters
-		$this->id=trim($this->id);
-		$this->description=trim($this->description);
-
-		// Check parameters
-		if (! $this->description) { $this->error='ErrorBadValueForParameter'; return -1; }
-
-        // Insert request
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."events(";
-
-		$sql.= "type,";
-		$sql.= "ip,";
-		$sql.= "dateevent,";
-		$sql.= "fk_user,";
-		$sql.= "description";
-
-        $sql.= ") VALUES (";
-
-		$sql.= " '".$this->type."',";
-		$sql.= " '".$_SERVER['REMOTE_ADDR']."',";
-		$sql.= " ".$this->db->idate($this->dateevent).",";
-		$sql.= " ".($user->id?"'".$user->id."'":'NULL').",";
-		$sql.= " '".addslashes($this->description)."'";
-
-		$sql.= ")";
+    	
+    	// Clean parameters
+    	$this->id=trim($this->id);
+    	$this->description=trim($this->description);
+    	
+    	// Check parameters
+    	if (! $this->description) { $this->error='ErrorBadValueForParameter'; return -1; }
+    	
+    	// Insert request
+    	$sql = "INSERT INTO ".MAIN_DB_PREFIX."events(";
+    	$sql.= "type,";
+    	$sql.= "entity,";
+    	$sql.= "ip,";
+    	$sql.= "dateevent,";
+    	$sql.= "fk_user,";
+    	$sql.= "description";
+    	$sql.= ") VALUES (";
+    	$sql.= " '".$this->type."',";
+    	$sql.= " ".$conf->entity.",";
+    	$sql.= " '".$_SERVER['REMOTE_ADDR']."',";
+    	$sql.= " ".$this->db->idate($this->dateevent).",";
+    	$sql.= " ".($user->id?"'".$user->id."'":'NULL').",";
+    	$sql.= " '".addslashes($this->description)."'";
+    	$sql.= ")";
 
 	   	dol_syslog("Events::create sql=".$sql, LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."events");
-
-            return $this->id;
-        }
-        else
-        {
-            $this->error="Error ".$this->db->lasterror();
-            dol_syslog("Events::create ".$this->error, LOG_ERR);
-            return -1;
-        }
+      $resql=$this->db->query($sql);
+      if ($resql)
+      {
+      	$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."events");
+      	return $this->id;
+      }
+      else
+      {
+      	$this->error="Error ".$this->db->lasterror();
+        dol_syslog("Events::create ".$this->error, LOG_ERR);
+        return -1;
+      }
     }
 
+
     /*
      *      \brief      Update database
      *      \param      user        	User that modify
@@ -124,37 +124,31 @@ class Events // extends CommonObject
     function update($user=0, $notrigger=0)
     {
     	global $conf, $langs;
-
-		// Clean parameters
-
-		$this->id=trim($this->id);
-		$this->type=trim($this->type);
-		$this->description=trim($this->description);
-
-
-
-		// Check parameters
-		// Put here code to add control on parameters values
-
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX."events SET";
-
-		$sql.= " type='".$this->type."',";
-		$sql.= " dateevent=".$this->db->idate($this->dateevent).",";
-		$sql.= " description='".addslashes($this->description)."'";
-
-        $sql.= " WHERE rowid=".$this->id;
-
-        dol_syslog("Events::update sql=".$sql, LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if (! $resql)
-        {
-            $this->error="Error ".$this->db->lasterror();
-            dol_syslog("Events::update ".$this->error, LOG_ERR);
-            return -1;
-        }
-
-        return 1;
+    	
+    	// Clean parameters
+    	$this->id=trim($this->id);
+    	$this->type=trim($this->type);
+    	$this->description=trim($this->description);
+    	
+    	// Check parameters
+    	// Put here code to add control on parameters values
+    	
+    	// Update request
+    	$sql = "UPDATE ".MAIN_DB_PREFIX."events SET";
+    	$sql.= " type='".$this->type."',";
+    	$sql.= " dateevent=".$this->db->idate($this->dateevent).",";
+    	$sql.= " description='".addslashes($this->description)."'";
+    	$sql.= " WHERE rowid=".$this->id;
+    	
+    	dol_syslog("Events::update sql=".$sql, LOG_DEBUG);
+    	$resql = $this->db->query($sql);
+      if (! $resql)
+      {
+      	$this->error="Error ".$this->db->lasterror();
+        dol_syslog("Events::update ".$this->error, LOG_ERR);
+        return -1;
+      }
+      return 1;
     }
 
 
@@ -167,45 +161,42 @@ class Events // extends CommonObject
     function fetch($id, $user=0)
     {
     	global $langs;
-        $sql = "SELECT";
-		$sql.= " t.rowid,";
-
-		$sql.= " ".$this->db->pdate('t.tms').",";
-		$sql.= " t.type,";
-		$sql.= " ".$this->db->pdate('t.dateevent').",";
-		$sql.= " t.description";
-
-
-        $sql.= " FROM ".MAIN_DB_PREFIX."events as t";
-        $sql.= " WHERE t.rowid = ".$id;
+    	
+    	$sql = "SELECT";
+    	$sql.= " t.rowid,";
+    	$sql.= " ".$this->db->pdate('t.tms').",";
+    	$sql.= " t.type,";
+    	$sql.= " t.entity,";
+    	$sql.= " ".$this->db->pdate('t.dateevent').",";
+    	$sql.= " t.description";
+    	$sql.= " FROM ".MAIN_DB_PREFIX."events as t";
+    	$sql.= " WHERE t.rowid = ".$id;
 
     	dol_syslog("Events::fetch sql=".$sql, LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if ($resql)
+    	$resql=$this->db->query($sql);
+      if ($resql)
+      {
+      	if ($this->db->num_rows($resql))
         {
-            if ($this->db->num_rows($resql))
-            {
-                $obj = $this->db->fetch_object($resql);
-
-                $this->id    = $obj->rowid;
-
-				$this->tms = $obj->tms;
-				$this->type = $obj->type;
-				$this->dateevent = $obj->dateevent;
-				$this->description = $obj->description;
-
-
-            }
-            $this->db->free($resql);
-
-            return 1;
-        }
-        else
-        {
-      	    $this->error="Error ".$this->db->lasterror();
-            dol_syslog("Events::fetch ".$this->error, LOG_ERR);
-            return -1;
+        	$obj = $this->db->fetch_object($resql);
+        	
+        	$this->id    = $obj->rowid;
+        	$this->tms = $obj->tms;
+        	$this->type = $obj->type;
+        	$this->entity = $obj->entity;
+        	$this->dateevent = $obj->dateevent;
+        	$this->description = $obj->description;
         }
+        $this->db->free($resql);
+        
+        return 1;
+      }
+      else
+      {
+      	$this->error="Error ".$this->db->lasterror();
+      	dol_syslog("Events::fetch ".$this->error, LOG_ERR);
+      	return -1;
+      }
     }
 
 
@@ -221,12 +212,12 @@ class Events // extends CommonObject
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."events";
 		$sql.= " WHERE rowid=".$this->id;
 
-	   	dol_syslog("Events::delete sql=".$sql);
+	  dol_syslog("Events::delete sql=".$sql);
 		$resql = $this->db->query($sql);
 		if (! $resql)
 		{
 			$this->error="Error ".$this->db->lasterror();
-            dol_syslog("Events::delete ".$this->error, LOG_ERR);
+      dol_syslog("Events::delete ".$this->error, LOG_ERR);
 			return -1;
 		}
 
diff --git a/htdocs/core/menubase.class.php b/htdocs/core/menubase.class.php
index ef7fdfa8693..5932df2b7ac 100644
--- a/htdocs/core/menubase.class.php
+++ b/htdocs/core/menubase.class.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2007-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2009      Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -50,6 +51,7 @@ class Menubase
 	var $level;
 	var $leftmenu;		//<! 0=Left menu in pre.inc.php files must not be overwrite by database menu, 1=Must be
 	var $perms;
+	var $enabled;
 	var $user;
 	var $tms;
 
@@ -90,6 +92,7 @@ class Menubase
 		$this->level=trim($this->level);
 		$this->leftmenu=trim($this->leftmenu);
 		$this->perms=trim($this->perms);
+		$this->enabled=trim($this->enabled);
 		$this->user=trim($this->user);
 		if (! $this->level) $this->level=0;
 
@@ -99,6 +102,7 @@ class Menubase
 		// Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."menu(";
 		$sql.= "menu_handler,";
+		$sql.= "entity,";
 		$sql.= "module,";
 		$sql.= "type,";
 		$sql.= "mainmenu,";
@@ -111,9 +115,11 @@ class Menubase
 		$sql.= "level,";
 		$sql.= "leftmenu,";
 		$sql.= "perms,";
+		$sql.= "enabled,";
 		$sql.= "user";
 		$sql.= ") VALUES (";
 		$sql.= " '".$this->menu_handler."',";
+		$sql.= " '".$conf->entity."',";
 		$sql.= " '".$this->module."',";
 		$sql.= " '".$this->type."',";
 		$sql.= " '".$this->mainmenu."',";
@@ -126,6 +132,7 @@ class Menubase
 		$sql.= " '".$this->level."',";
 		$sql.= " '".$this->leftmenu."',";
 		$sql.= " '".$this->perms."',";
+		$sql.= " '".$this->enabled."',";
 		$sql.= " '".$this->user."'";
 		$sql.= ")";
 
@@ -170,6 +177,7 @@ class Menubase
 		$this->level=trim($this->level);
 		$this->leftmenu=trim($this->leftmenu);
 		$this->perms=trim($this->perms);
+		$this->enabled=trim($this->enabled);
 		$this->user=trim($this->user);
 
 		// Check parameters
@@ -190,6 +198,7 @@ class Menubase
 		$sql.= " level='".$this->level."',";
 		$sql.= " leftmenu='".addslashes($this->leftmenu)."',";
 		$sql.= " perms='".addslashes($this->perms)."',";
+		$sql.= " enabled='".addslashes($this->enabled)."',";
 		$sql.= " user='".$this->user."'";
 		$sql.= " WHERE rowid=".$this->id;
 
@@ -219,6 +228,7 @@ class Menubase
 		$sql = "SELECT";
 		$sql.= " t.rowid,";
 		$sql.= " t.menu_handler,";
+		$sql.= " t.entity,";
 		$sql.= " t.module,";
 		$sql.= " t.type,";
 		$sql.= " t.mainmenu,";
@@ -231,6 +241,7 @@ class Menubase
 		$sql.= " t.level,";
 		$sql.= " t.leftmenu,";
 		$sql.= " t.perms,";
+		$sql.= " t.enabled,";
 		$sql.= " t.user,";
 		$sql.= " ".$this->db->pdate('t.tms')."";
 		$sql.= " FROM ".MAIN_DB_PREFIX."menu as t";
@@ -247,6 +258,7 @@ class Menubase
 				$this->id    = $obj->rowid;
 
 				$this->menu_handler = $obj->menu_handler;
+				$this->entity = $obj->entity;
 				$this->module = $obj->module;
 				$this->type = $obj->type;
 				$this->mainmenu = $obj->mainmenu;
@@ -259,6 +271,7 @@ class Menubase
 				$this->level = $obj->level;
 				$this->leftmenu = $obj->leftmenu;
 				$this->perms = $obj->perms;
+				$this->enabled = $obj->enabled;
 				$this->user = $obj->user;
 				$this->tms = $obj->tms;
 			}
@@ -321,6 +334,7 @@ class Menubase
 		$this->level='';
 		$this->leftmenu='';
 		$this->perms='';
+		$this->enabled='';
 		$this->user='';
 		$this->tms='';
 	}
@@ -347,12 +361,13 @@ class Menubase
 
 		$tabMenu = array ();
 
-		$sql = "SELECT m.rowid, m.fk_menu, m.url, m.titre, m.langs, m.perms, m.target, m.mainmenu, m.leftmenu,";
-		$sql.= " mo.action";
-		$sql.= " FROM " . MAIN_DB_PREFIX . "menu as m";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."menu_const as mc ON m.rowid = mc.fk_menu";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."menu_constraint as mo ON mc.fk_constraint = mo.rowid";
+		$sql = "SELECT m.rowid, m.fk_menu, m.url, m.titre, m.langs, m.perms, m.enabled, m.target, m.mainmenu, m.leftmenu";
+		//$sql.= ", mo.action";
+		$sql.= " FROM ".MAIN_DB_PREFIX."menu as m";
+		//$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."menu_const as mc ON m.rowid = mc.fk_menu";
+		//$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."menu_constraint as mo ON mc.fk_constraint = mo.rowid";
 		$sql.= " WHERE m.menu_handler in('".$menu_handler."','all')";
+		$sql.= " AND m.entity = ".$conf->entity;
 		if ($type_user == 0) $sql.= " AND m.user in (0,2)";
 		if ($type_user == 1) $sql.= " AND m.user in (1,2)";
 		// If type_user == 2, no test requires
@@ -397,7 +412,7 @@ class Menubase
 					$perms = $this->verifCond($menu['perms']);
 					//print "verifCond rowid=".$menu['rowid']." ".$menu['right'].":".$perms."<br>\n";
 				}
-
+/*
 				// Define $constraint
 				$constraint = true;
 				if ($menu['action'])
@@ -405,6 +420,14 @@ class Menubase
 					$constraint = $this->verifCond($menu['action']);
 					//print "verifCond rowid=".$menu['rowid']." ".$menu['action'].":".$constraint."<br>\n";
 				}
+*/				
+				// Define $enabled
+				$enabled = true;
+				if ($menu['enabled'])
+				{
+					$enabled = $this->verifCond($menu['enabled']);
+					//print "verifCond rowid=".$menu['rowid']." ".$menu['action'].":".$constraint."<br>\n";
+				}
 
 				if ($menu['rowid'] != $oldrowid && $oldrowid) $b++;	// Break on new entry
 				$oldrowid=$menu['rowid'];
@@ -422,8 +445,10 @@ class Menubase
 				$tabMenu[$b][6] = $menu['leftmenu'];
 				if (! isset($tabMenu[$b][4])) $tabMenu[$b][4] = $perms;
 				else $tabMenu[$b][4] = ($tabMenu[$b][4] && $perms);
-				if (! isset($tabMenu[$b][7])) $tabMenu[$b][7] = $constraint;
-				else $tabMenu[$b][7] = ($tabMenu[$b][7] && $constraint);
+				//if (! isset($tabMenu[$b][7])) $tabMenu[$b][7] = $constraint;
+				//else $tabMenu[$b][7] = ($tabMenu[$b][7] && $constraint);
+				if (! isset($tabMenu[$b][7])) $tabMenu[$b][7] = $enabled;
+				else $tabMenu[$b][7] = ($tabMenu[$b][7] && $enabled);
 
 				$a++;
 			}
@@ -440,6 +465,7 @@ class Menubase
 		$sql.= " FROM " . MAIN_DB_PREFIX . "menu as m";
 		$sql.= " WHERE m.mainmenu = '".$mainmenu."'";
 		$sql.= " AND m.menu_handler in('".$menu_handler."','all')";
+		$sql.= " AND m.entity = ".$conf->entity;
 		$sql.= " AND type = 'top'";
 		// It should have only one response
 		$resql = $this->db->query($sql);
@@ -532,11 +558,14 @@ class Menubase
 	 */
 	function listeMainmenu()
 	{
+		global $conf;
+		
 		$overwritemenufor=array();
 
 		$sql = "SELECT DISTINCT m.mainmenu";
 		$sql.= " FROM " . MAIN_DB_PREFIX . "menu as m";
 		$sql.= " WHERE m.menu_handler in ('".$this->menu_handler."','all')";
+		$sql.= " AND m.entity = ".$conf->entity;
 		$sql.= " AND m.leftmenu != '0'";	// leftmenu exists in database so pre.inc.php must be overwritten
 
 		//print $sql;
@@ -570,12 +599,13 @@ class Menubase
 
 		$tabMenu=array();
 
-		$sql = "SELECT m.rowid, m.mainmenu, m.titre, m.url, m.langs, m.perms, m.target,";
-		$sql.= " mo.action";
+		$sql = "SELECT m.rowid, m.mainmenu, m.titre, m.url, m.langs, m.perms, m.enabled, m.target";
+		//$sql.= ", mo.action";
 		$sql.= " FROM ".MAIN_DB_PREFIX."menu as m";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."menu_const as mc ON m.rowid = mc.fk_menu";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."menu_constraint as mo ON mc.fk_constraint = mo.rowid";
+		//$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."menu_const as mc ON m.rowid = mc.fk_menu";
+		//$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."menu_constraint as mo ON mc.fk_constraint = mo.rowid";
 		$sql.= " WHERE m.type = 'top'";
+		$sql.= " AND m.entity = ".$conf->entity;
 		$sql.= " AND m.menu_handler in('".$menu_handler."','all')";
 		if ($type_user == 0) $sql.= " AND m.user in (0,2)";
 		if ($type_user == 1) $sql.= " AND m.user in (1,2)";
@@ -635,6 +665,13 @@ class Menubase
 				{
 					$constraint = $this->verifCond($objm->action);
 				}
+				
+				// Define $constraint
+				$enabled = true;
+				if ($objm->enabled)
+				{
+					$enabled = $this->verifCond($objm->enabled);
+				}
 
 				if ($objm->rowid != $oldrowid && $oldrowid) $b++;	// Break on new entry
 				$oldrowid=$objm->rowid;
@@ -646,8 +683,10 @@ class Menubase
 				$tabMenu[$b]['atarget'] = $objm->target;
 				if (! isset($tabMenu[$b]['right'])) $tabMenu[$b]['right'] = $perms;
 				else $tabMenu[$b]['right'] = ($tabMenu[$b]['right'] && $perms);
-				if (! isset($tabMenu[$b]['enabled'])) $tabMenu[$b]['enabled'] = $constraint;
-				else $tabMenu[$b]['enabled'] = ($tabMenu[$b]['enabled'] && $constraint);
+				//if (! isset($tabMenu[$b]['enabled'])) $tabMenu[$b]['enabled'] = $constraint;
+				//else $tabMenu[$b]['enabled'] = ($tabMenu[$b]['enabled'] && $constraint);
+				if (! isset($tabMenu[$b]['enabled'])) $tabMenu[$b]['enabled'] = $enabled;
+				else $tabMenu[$b]['enabled'] = ($tabMenu[$b]['enabled'] && $enabled);
 
 				//var_dump($tabMenu);
 				$a++;
diff --git a/htdocs/expedition/commande.php b/htdocs/expedition/commande.php
index 55a81a48297..687977e185d 100644
--- a/htdocs/expedition/commande.php
+++ b/htdocs/expedition/commande.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2003-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2005-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2008 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,6 +35,8 @@ require_once(DOL_DOCUMENT_ROOT."/product/stock/entrepot.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/sendings.lib.php");
 
+if (!$user->rights->commande->lire) accessforbidden();
+
 $langs->load('orders');
 $langs->load("companies");
 $langs->load("bills");
@@ -42,15 +44,14 @@ $langs->load('propal');
 $langs->load('deliveries');
 $langs->load('stocks');
 
-if (!$user->rights->commande->lire)
-accessforbidden();
+$id=empty($_GET['id']) ? 0 : intVal($_GET['id']);
+$action=empty($_GET['action']) ? (empty($_POST['action']) ? '' : $_POST['action']) : $_GET['action'];
 
-// S�curit� acc�s client
-if ($user->societe_id > 0)
-{
-	$action = '';
-	$socid = $user->societe_id;
-}
+// Security check
+$socid=0;
+$comid = isset($_GET["id"])?$_GET["id"]:'';
+if ($user->societe_id) $socid=$user->societe_id;
+$result=restrictedArea($user,'commande',$comid,'');
 
 // Chargement des permissions
 $error = $user->load_entrepots();
diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php
index 61926dd3913..c91f5ccc990 100644
--- a/htdocs/expedition/fiche.php
+++ b/htdocs/expedition/fiche.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2003-2008 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2005-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005      Simon TOSSER         <simon@kornog-computing.com>
- * Copyright (C) 2005-2008 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -37,6 +37,8 @@ if ($conf->propal->enabled)   require_once(DOL_DOCUMENT_ROOT."/propal.class.php"
 if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php");
 if ($conf->stock->enabled)    require_once(DOL_DOCUMENT_ROOT."/product/stock/entrepot.class.php");
 
+if (! $user->rights->expedition->lire) accessforbidden();
+
 $langs->load("companies");
 $langs->load("bills");
 $langs->load('deliveries');
@@ -45,17 +47,12 @@ $langs->load('stocks');
 $langs->load('other');
 $langs->load('propal');
 
-if (! $user->rights->expedition->lire)
-accessforbidden();
+// Security check
+$id = isset($_GET["id"])?$_GET["id"]:'';
+if ($user->societe_id) $socid=$user->societe_id;
+$result=restrictedArea($user,'expedition',$id,'');
 
 
-// Security customer access
-if ($user->societe_id > 0)
-{
-	$action = '';
-	$socid = $user->societe_id;
-}
-
 $origin     = $_GET["origin"]?$_GET["origin"]:$_POST["origin"];				// Example: commande, propal
 $origin_id  = $_GET["object_id"]?$_GET["object_id"]:$_POST["object_id"];	// Id of order or propal
 
diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php
index 328ed3b1a71..c206acf690f 100644
--- a/htdocs/expedition/index.php
+++ b/htdocs/expedition/index.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2006 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2008 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -67,10 +67,8 @@ if (!$user->rights->societe->client->voir && !$socid)
 	$clause = " AND ";
 }
 $sql.= $clause." e.fk_statut = 0";
-if ($socid)
-{
-    $sql .= " AND c.fk_soc = ".$socid;
-}
+$sql.= " AND s.entity = ".$conf->entity;
+if ($socid) $sql.= " AND c.fk_soc = ".$socid;
 
 $resql=$db->query($sql);
 if ($resql)
@@ -101,12 +99,14 @@ if ($resql)
  * Commandes à traiter
  */
 $sql = "SELECT c.rowid, c.ref, s.nom, s.rowid as socid";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
-$sql.= " FROM ".MAIN_DB_PREFIX."commande as c, ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-$sql.= " WHERE c.fk_soc = s.rowid AND c.fk_statut = 1";
-if ($socid) $sql .= " AND c.fk_soc = ".$socid;
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+$sql.= " FROM ".MAIN_DB_PREFIX."commande as c";
+$sql.= ", ".MAIN_DB_PREFIX."societe as s";
+if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+$sql.= " WHERE c.fk_soc = s.rowid";
+$sql.= " AND s.entity = ".$conf->entity;
+$sql.= " AND c.fk_statut = 1";
+if ($socid) $sql.= " AND c.fk_soc = ".$socid;
+if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 $sql.= " ORDER BY c.rowid ASC";
 
 if ( $db->query($sql) ) 
@@ -146,12 +146,15 @@ print '</td><td valign="top" width="70%">';
  * Commandes en traitement
  */
 $sql = "SELECT c.rowid, c.ref, s.nom, s.rowid as socid";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
-$sql .= " FROM ".MAIN_DB_PREFIX."commande as c, ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-$sql .= " WHERE c.fk_soc = s.rowid AND c.fk_statut = 2";
-if ($socid) $sql .= " AND c.fk_soc = ".$socid;
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+$sql.= " FROM ".MAIN_DB_PREFIX."commande as c";
+$sql.= ", ".MAIN_DB_PREFIX."societe as s";
+if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+$sql.= " WHERE c.fk_soc = s.rowid";
+$sql.= " AND s.entity = ".$conf->entity;
+$sql.= " AND c.fk_statut = 2";
+if ($socid) $sql.= " AND c.fk_soc = ".$socid;
+if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+
 $resql = $db->query($sql);
 if ( $resql ) 
 {
@@ -197,7 +200,8 @@ if (!$user->rights->societe->client->voir && !$socid)
 	$clause = " AND ";
 }
 $sql.= $clause." e.fk_statut = 1";
-if ($socid) $sql .= " AND c.fk_soc = ".$socid;
+$sql.= " AND s.entity = ".$conf->entity;
+if ($socid) $sql.= " AND c.fk_soc = ".$socid;
 $sql.= " ORDER BY e.date_expedition DESC";
 $sql.= $db->plimit(5, 0);
 
diff --git a/htdocs/expedition/liste.php b/htdocs/expedition/liste.php
index ae151ae28f8..def6bca5b0a 100644
--- a/htdocs/expedition/liste.php
+++ b/htdocs/expedition/liste.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2008 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -54,7 +54,6 @@ $offset = $limit * $_GET["page"] ;
 
 llxHeader('',$langs->trans('ListOfSendings'));
 
-$clause = " WHERE ";
 $sql = "SELECT e.rowid, e.ref,".$db->pdate("e.date_expedition")." as date_expedition, e.fk_statut";
 $sql.= ", s.nom as socname, s.rowid as socid";
 $sql.= ", ori.ref as oriref, ori.rowid as oriid";
@@ -70,21 +69,19 @@ else
 	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."propal as ori ON pe.fk_commande = ori.rowid";
 }
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
+$sql.= " WHERE s.entity = ".$conf->entity;
 if (!$user->rights->societe->client->voir && !$socid)
 {
 	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON e.fk_soc = sc.fk_soc";
-	$sql.= $clause." sc.fk_user = " .$user->id;
-	$clause = " AND ";
+	$sql.= " AND sc.fk_user = " .$user->id;
 }
 if ($socid)
 { 
-  $sql.= $clause." e.fk_soc = ".$socid; 
-  $clause = " AND ";
+  $sql.= " AND e.fk_soc = ".$socid; 
 }
 if ($_POST["sf_ref"])
 {
-  $sql.= $clause." e.ref like '%".addslashes($_POST["sf_ref"])."%'";
-  $clause = " AND ";
+  $sql.= " AND e.ref like '%".addslashes($_POST["sf_ref"])."%'";
 }
 
 $sql.= " ORDER BY $sortfield $sortorder";
diff --git a/htdocs/expedition/stats/expeditionstats.class.php b/htdocs/expedition/stats/expeditionstats.class.php
index d9f10a7b76a..1c18050c340 100644
--- a/htdocs/expedition/stats/expeditionstats.class.php
+++ b/htdocs/expedition/stats/expeditionstats.class.php
@@ -1,5 +1,6 @@
 <?php
-/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+/* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,33 +23,42 @@
 
 class ExpeditionStats 
 {
-  var $db ;
+  var $db;
 
   function ExpeditionStats($DB)
-    {
-      $this->db = $DB;
-    }
+  {
+    $this->db = $DB;
+  }
   /**
    * Renvoie le nombre de expedition par année
    *
    */
   function getNbExpeditionByYear()
   {
+  	global $conf;
+  	
     $result = array();
-    $sql = "SELECT date_format(date_expedition,'%Y') as dm, count(*)  FROM ".MAIN_DB_PREFIX."expedition GROUP BY dm DESC WHERE fk_statut > 0";
+    $sql = "SELECT count(*), date_format(e.date_expedition,'%Y') as dm";
+    $sql.= " FROM ".MAIN_DB_PREFIX."expedition as e";
+    $sql.= ", ".MAIN_DB_PREFIX."societe as s ";
+    $sql.= " WHERE e.fk_statut > 0";
+    $sql.= " AND e.fk_soc = s.rowid";
+    $sql.= " s.entity = ".$conf->entity;
+    $sql.= " GROUP BY dm DESC";
+    
     if ($this->db->query($sql))
-      {
-	$num = $this->db->num_rows();
-	$i = 0;
-	while ($i < $num)
-	  {
-	    $row = $this->db->fetch_row($i);
-	    $result[$i] = $row;
-
-	    $i++;
-	  }
-	$this->db->free();
-      }
+    {
+    	$num = $this->db->num_rows();
+    	$i = 0;
+    	while ($i < $num)
+    	{
+    		$row = $this->db->fetch_row($i);
+    		$result[$i] = $row;
+    		
+    		$i++;
+    	}
+    	$this->db->free();
+    }
     return $result;
   }
   /**
@@ -57,37 +67,43 @@ class ExpeditionStats
    */
   function getNbExpeditionByMonth($year)
   {
+  	global $conf;
+  	
     $result = array();
-    $sql = "SELECT date_format(date_expedition,'%m') as dm, count(*)  FROM ".MAIN_DB_PREFIX."expedition";
-    $sql .= " WHERE date_format(date_expedition,'%Y') = $year AND fk_statut > 0";
-    $sql .= " GROUP BY dm DESC";
+    $sql = "SELECT count(*), date_format(e.date_expedition,'%m') as dm";
+    $sql.= " FROM ".MAIN_DB_PREFIX."expedition as e";
+    $sql.= ", ".MAIN_DB_PREFIX."societe as s ";
+    $sql.= " WHERE date_format(e.date_expedition,'%Y') = ".$year;
+    $sql.= " AND fk_statut > 0";
+    $sql.= " AND e.fk_soc = s.rowid";
+    $sql.= " s.entity = ".$conf->entity;
+    $sql.= " GROUP BY dm DESC";
 
     if ($this->db->query($sql))
-      {
-	$num = $this->db->num_rows();
-	$i = 0;
-	while ($i < $num)
-	  {
-	    $row = $this->db->fetch_row($i);
-	    $j = $row[0] * 1;
-	    $result[$j] = $row[1];
-	    $i++;
-	  }
-	$this->db->free();
-      }
-    
+    {
+    	$num = $this->db->num_rows();
+    	$i = 0;
+    	while ($i < $num)
+    	{
+    		$row = $this->db->fetch_row($i);
+    		$j = $row[0] * 1;
+    		$result[$j] = $row[1];
+    		$i++;
+    	}
+    	$this->db->free();
+    }
     for ($i = 1 ; $i < 13 ; $i++)
-      {
-	$res[$i] = $result[$i] + 0;
-      }
-
+    {
+    	$res[$i] = $result[$i] + 0;
+    }
+    
     $data = array();
     
     for ($i = 1 ; $i < 13 ; $i++)
-      {
-	$data[$i-1] = array(dol_print_date(dol_mktime(12,0,0,$i,1,$year),"%b"), $res[$i]);
-      }
-
+    {
+    	$data[$i-1] = array(dol_print_date(dol_mktime(12,0,0,$i,1,$year),"%b"), $res[$i]);
+    }
+    
     return $data;
   }
 
@@ -100,11 +116,11 @@ class ExpeditionStats
     $data = array();
 
     for ($i = 1 ; $i < 13 ; $i++)
-      {
-	$data[$i-1] = array(dol_print_date(dol_mktime(12,0,0,$i,1,$year),"%b"), 
-			    $data1[$i][1],
-			    $data2[$i][1]);
-      }
+    {
+    	$data[$i-1] = array(dol_print_date(dol_mktime(12,0,0,$i,1,$year),"%b"), 
+			$data1[$i][1],
+			$data2[$i][1]);
+    }
     return $data;
   }
 
diff --git a/htdocs/expedition/stats/index.php b/htdocs/expedition/stats/index.php
index af43f2c511f..6c9f0b36f6d 100644
--- a/htdocs/expedition/stats/index.php
+++ b/htdocs/expedition/stats/index.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -38,7 +39,14 @@ print '<table class="border" width="100%">';
 print '<tr><td align="center">'.$langs->trans("Year").'</td>';
 print '<td width="40%" align="center">'.$langs->trans("NbOfSendings").'</td></tr>';
 
-$sql = "SELECT count(*), date_format(date_expedition,'%Y') as dm FROM ".MAIN_DB_PREFIX."expedition WHERE fk_statut > 0 GROUP BY dm DESC ";
+$sql = "SELECT count(*), date_format(e.date_expedition,'%Y') as dm";
+$sql.= " FROM ".MAIN_DB_PREFIX."expedition as e";
+$sql.= ", ".MAIN_DB_PREFIX."societe as s ";
+$sql.= " WHERE e.fk_statut > 0";
+$sql.= " AND e.fk_soc = s.rowid";
+$sql.= " s.entity = ".$conf->entity;
+$sql.= " GROUP BY dm DESC ";
+
 if ($db->query($sql))
 {
   $num = $db->num_rows();
@@ -55,7 +63,9 @@ if ($db->query($sql))
 }
 $db->free();
 
-print '</table><br><i>Statistiques effectuees sur les expeditions validees uniquement</i>';
+print '</table>';
+print '<br>';
+print '<i>'.$langs->trans("StatsOnShipmentsOnlyValidated").'</i>';
 
 $db->close();
 
diff --git a/htdocs/facture.class.php b/htdocs/facture.class.php
index 3e060070474..022352271cd 100644
--- a/htdocs/facture.class.php
+++ b/htdocs/facture.class.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2004      Sebastien Di Cintio   <sdicintio@ressource-toi.org>
  * Copyright (C) 2004      Benoit Mortier        <benoit.mortier@opensides.be>
  * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
- * Copyright (C) 2005-2007 Regis Houssin         <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin         <regis@dolibarr.fr>
  * Copyright (C) 2006      Andre Cianfarani      <acianfa@free.fr>
  * Copyright (C) 2007      Franky Van Liedekerke <franky.van.liedekerke@telenet.be>
  *
@@ -2530,18 +2530,23 @@ class Facture extends CommonObject
 		$now=gmmktime();
 
 		$this->nbtodo=$this->nbtodolate=0;
-		$clause = "WHERE";
+		$clause = " WHERE";
 
-		$sql = 'SELECT f.rowid, f.date_lim_reglement as datefin';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.'facture as f';
+		$sql = "SELECT f.rowid, f.date_lim_reglement as datefin";
+		$sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
+		$sql.= ", ".MAIN_DB_PREFIX."societe as s";
 		if (!$user->rights->societe->client->voir && !$user->societe_id)
 		{
 			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON f.fk_soc = sc.fk_soc";
 			$sql.= " WHERE sc.fk_user = " .$user->id;
-			$clause = "AND";
+			$clause = " AND";
 		}
-		$sql.= ' '.$clause.' f.paye=0 AND f.fk_statut = 1';
-		if ($user->societe_id) $sql.=' AND f.fk_soc = '.$user->societe_id;
+		$sql.= $clause." f.paye=0";
+		$sql.= " AND f.fk_soc = s.rowid";
+		$sql.= " AND s.entity = ".$conf->entity;
+		$sql.= " AND f.fk_statut = 1";
+		if ($user->societe_id) $sql.= " AND f.fk_soc = ".$user->societe_id;
+		
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -2669,15 +2674,20 @@ class Facture extends CommonObject
 		global $conf, $user;
 
 		$this->nb=array();
+		
+		$clause = "WHERE";
 
 		$sql = "SELECT count(f.rowid) as nb";
 		$sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON f.fk_soc = s.rowid";
 		if (!$user->rights->societe->client->voir && !$user->societe_id)
 		{
-			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON f.fk_soc = s.rowid";
 			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
 			$sql.= " WHERE sc.fk_user = " .$user->id;
+			$clause = "AND";
 		}
+		$sql.= " ".$clause." s.entity = ".$conf->entity;
+		
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
diff --git a/htdocs/fichinter/index.php b/htdocs/fichinter/index.php
index 5c6254ec1c9..248b1908348 100644
--- a/htdocs/fichinter/index.php
+++ b/htdocs/fichinter/index.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2008 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -68,20 +68,17 @@ $sql = "SELECT";
 $sql.= " f.ref, f.rowid as fichid, f.fk_statut, f.description,";
 $sql.= " fd.description as descriptiondetail, ".$db->pdate("fd.date")." as dp, fd.duree,";
 $sql.= " s.nom, s.rowid as socid";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
 $sql.= " FROM (".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= ", ".MAIN_DB_PREFIX."fichinter as f)";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."fichinterdet as fd ON fd.fk_fichinter = f.rowid";
 $sql.= " WHERE f.fk_soc = s.rowid ";
+$sql.= " AND s.entity = ".$conf->entity;
 if ($search_ref)     $sql .= " AND f.ref like '%".addslashes($search_ref)."%'";
 if ($search_company) $sql .= " AND s.nom like '%".addslashes($search_company)."%'";
 if ($search_desc)    $sql .= " AND (f.description like '%".addslashes($search_desc)."%' OR fd.description like '%".addslashes($search_desc)."%')";
 if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-if ($socid > 0)
-{
-	$sql .= " AND s.rowid = " . $socid;
-}
+if ($socid)	$sql.= " AND s.rowid = " . $socid;
 $sql.= " ORDER BY ".$sortfield." ".$sortorder;
 $sql.= $db->plimit( $limit + 1 ,$offset);
 
diff --git a/htdocs/fourn/commande/contact.php b/htdocs/fourn/commande/contact.php
index e67768acad7..b7808edf7df 100644
--- a/htdocs/fourn/commande/contact.php
+++ b/htdocs/fourn/commande/contact.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2005      Patrick Rouillon     <patrick@rouillon.net>
  * Copyright (C) 2005-2009 Destailleur Laurent  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,11 +36,10 @@ $langs->load("orders");
 $langs->load("sendings");
 $langs->load("companies");
 
-$commandeid = isset($_GET["id"])?$_GET["id"]:'';
-
 // Security check
+$id = isset($_GET["id"])?$_GET["id"]:'';
 if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'commande_fournisseur', $commandeid);
+$result = restrictedArea($user, 'commande_fournisseur', $id,'');
 
 
 /*
diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index 495676a8d4d..2b91f6c16cb 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2004-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005	     Eric	Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2007 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This	program	is free	software; you can redistribute it and/or modify
  * it under the	terms of the GNU General Public	License	as published by
@@ -40,22 +40,14 @@ $langs->load('deliveries');
 $langs->load('products');
 $langs->load('stocks');
 
-if (!$user->rights->fournisseur->commande->lire) accessforbidden();
-
-// Sécurité	accés client
-$socid=0;
-if ($user->societe_id >	0)
-{
-	$action	= '';
-	$socid = $user->societe_id;
-}
+// Security check
+$id = isset($_GET["id"])?$_GET["id"]:'';
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'commande_fournisseur', $id,'');
 
 // Récupération	de l'id	de projet
 $projetid =	0;
-if ($_GET["projetid"])
-{
-	$projetid =	$_GET["projetid"];
-}
+if ($_GET["projetid"]) $projetid = $_GET["projetid"];
 
 $mesg='';
 
diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php
index 4afd052d1be..68516878eee 100644
--- a/htdocs/fourn/commande/document.php
+++ b/htdocs/fourn/commande/document.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2003-2007 Rodolphe Quiedeville  <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2009 Laurent Destailleur   <eldy@users.sourceforge.net>
  * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
- * Copyright (C) 2005      Regis Houssin         <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin         <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,9 +33,6 @@ require_once(DOL_DOCUMENT_ROOT."/lib/fourn.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
 require_once DOL_DOCUMENT_ROOT."/fourn/fournisseur.commande.class.php";
 
-if (!$user->rights->commande->lire)
-accessforbidden();
-
 $langs->load('orders');
 $langs->load('sendings');
 $langs->load('companies');
@@ -44,18 +41,11 @@ $langs->load('deliveries');
 $langs->load('products');
 $langs->load('stocks');
 
-
+// Security check
 $id=empty($_GET['id']) ? 0 : intVal($_GET['id']);
 $action=empty($_GET['action']) ? (empty($_POST['action']) ? '' : $_POST['action']) : $_GET['action'];
-
-// Security check
-if (!$user->rights->fournisseur->commande->lire) accessforbidden();
-if ($user->societe_id > 0)
-{
-	unset($_GET["action"]);
-	$action='';
-	$socid = $user->societe_id;
-}
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'commande_fournisseur', $id,'');
 
 // Get parameters
 $page=$_GET["page"];
diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php
index 8ae04574725..347b4a1ebbd 100644
--- a/htdocs/fourn/commande/fiche.php
+++ b/htdocs/fourn/commande/fiche.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2004-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005      Eric	Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2008 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This	program	is free	software; you can redistribute it and/or modify
  * it under	the	terms of the GNU General Public	License	as published by
@@ -45,25 +45,17 @@ $langs->load('deliveries');
 $langs->load('products');
 $langs->load('stocks');
 
-if (!$user->rights->fournisseur->commande->lire) accessforbidden();
-
 $comclientid = isset($_GET["comid"])?$_GET["comid"]:'';
-$id = isset($_GET["id"])?$_GET["id"]:$_POST["id"];
-
-// Securite	acces client
 $socid = isset($_GET["socid"])?$_GET["socid"]:'';
-if ($user->societe_id >	0)
-{
-	$action	= '';
-	$socid = $user->societe_id;
-}
+
+// Security check
+$id = isset($_GET["id"])?$_GET["id"]:$_POST["id"];
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'commande_fournisseur', $id,'');
 
 // Recuperation	de l'id	de projet
 $projetid =	0;
-if ($_GET["projetid"])
-{
-	$projetid =	$_GET["projetid"];
-}
+if ($_GET["projetid"]) $projetid =	$_GET["projetid"];
 
 $mesg='';
 
diff --git a/htdocs/fourn/commande/history.php b/htdocs/fourn/commande/history.php
index 50ee9c442a6..8657d161e98 100644
--- a/htdocs/fourn/commande/history.php
+++ b/htdocs/fourn/commande/history.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,8 +33,10 @@ $langs->load("suppliers");
 $langs->load("companies");
 $langs->load('stocks');
 
-
-if (!$user->rights->fournisseur->commande->lire) accessforbidden();
+// Security check
+$id = isset($_GET["id"])?$_GET["id"]:'';
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'commande_fournisseur', $id,'');
 
 
 /*
@@ -44,8 +47,8 @@ $html =	new	Form($db);
 
 $now=gmmktime();
 
-$id = $_GET['id'];
 $ref= $_GET['ref'];
+
 if ($id > 0 || ! empty($ref))
 {
 	$soc = new Societe($db);
@@ -130,10 +133,11 @@ if ($id > 0 || ! empty($ref))
 		print '</tr>';
 
 		$sql = "SELECT l.fk_statut, l.datelog as dl, l.comment, u.rowid, u.login, u.firstname, u.name";
-		$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur_log as l";
-		$sql .= " , ".MAIN_DB_PREFIX."user as u ";
-		$sql .= " WHERE l.fk_commande = ".$commande->id." AND u.rowid = l.fk_user";
-		$sql .= " ORDER BY l.rowid DESC";
+		$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur_log as l";
+		$sql.= " , ".MAIN_DB_PREFIX."user as u ";
+		$sql.= " WHERE l.fk_commande = ".$commande->id;
+		$sql.= " AND u.rowid = l.fk_user";
+		$sql.= " ORDER BY l.rowid DESC";
 
 		$resql = $db->query($sql);
 		if ($resql)
diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php
index 1fbd934d8b3..2822e72be30 100644
--- a/htdocs/fourn/commande/index.php
+++ b/htdocs/fourn/commande/index.php
@@ -1,6 +1,7 @@
 <?PHP
 /* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -48,14 +49,13 @@ print '<table class="notopnoleftnoright" width="100%">';
 print '<tr valign="top"><td class="notopnoleft" width="30%">';
 
 $sql = "SELECT count(cf.rowid), fk_statut";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
-$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande_fournisseur as cf";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-$sql.= " WHERE cf.fk_soc = s.rowid ";
-if (!$user->rights->societe->client->voir && !$socid) //restriction
-{
-  $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-}
+$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+$sql.= ", ".MAIN_DB_PREFIX."commande_fournisseur as cf";
+if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+$sql.= " WHERE cf.fk_soc = s.rowid";
+$sql.= " AND s.entity = ".$conf->entity;
+if ($user->societe_id) $sql.=' AND cf.fk_soc = '.$user->societe_id;
+if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 $sql.= " GROUP BY cf.fk_statut";
 
 $resql = $db->query($sql);
@@ -97,9 +97,15 @@ print '</td><td width="70%" valign="top" class="notopnoleft">';
 
 $sql = "SELECT u.rowid, u.name, u.firstname";
 $sql.= " FROM ".MAIN_DB_PREFIX."user as u,";
-$sql.= " ".MAIN_DB_PREFIX."user_rights as ur, ".MAIN_DB_PREFIX."rights_def as rd";
-$sql.= " WHERE u.rowid = ur.fk_user AND ur.fk_id = rd.id";
-$sql.= " AND module='fournisseur' AND perms='commande' AND subperms='approuver'";
+$sql.= " ".MAIN_DB_PREFIX."user_rights as ur";
+$sql.= ", ".MAIN_DB_PREFIX."rights_def as rd";
+$sql.= " WHERE u.rowid = ur.fk_user";
+$sql.= " AND (u.entity IN (0,".$conf->entity.")";
+$sql.= " AND (rd.entity =".$conf->entity.")";
+$sql.= " AND ur.fk_id = rd.id";
+$sql.= " AND module='fournisseur'";
+$sql.= " AND perms='commande'";
+$sql.= " AND subperms='approuver'";
 
 $resql = $db->query($sql);
 if ($resql)
diff --git a/htdocs/fourn/commande/liste.php b/htdocs/fourn/commande/liste.php
index dc5e0739fd5..9e679d41043 100644
--- a/htdocs/fourn/commande/liste.php
+++ b/htdocs/fourn/commande/liste.php
@@ -1,6 +1,7 @@
 <?PHP
 /* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -66,19 +67,14 @@ $offset = $conf->liste_limit * $page ;
  */
 
 $sql = "SELECT s.rowid as socid, s.nom, ".$db->pdate("cf.date_commande")." as dc,";
-$sql .= " cf.rowid,cf.ref, cf.fk_statut";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
-$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande_fournisseur as cf";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-$sql .= " WHERE cf.fk_soc = s.rowid ";
-if (!$user->rights->societe->client->voir && !$socid) //restriction
-{
-  $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-}
-if ($socid)
-{
-    $sql .= " AND s.rowid = ".$socid;
-}
+$sql.= " cf.rowid,cf.ref, cf.fk_statut";
+$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+$sql.= ", ".MAIN_DB_PREFIX."commande_fournisseur as cf";
+if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+$sql.= " WHERE cf.fk_soc = s.rowid ";
+$sql.= " AND s.entity = ".$conf->entity;
+if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+if ($socid) $sql.= " AND s.rowid = ".$socid;
 
 if (strlen($_GET["statut"]))
 {
diff --git a/htdocs/fourn/commande/note.php b/htdocs/fourn/commande/note.php
index 81cd0ce11d4..620d0e4ca64 100644
--- a/htdocs/fourn/commande/note.php
+++ b/htdocs/fourn/commande/note.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2004-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin         <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,7 +33,10 @@ $langs->load("suppliers");
 $langs->load("companies");
 $langs->load('stocks');
 
-if (!$user->rights->fournisseur->commande->lire) accessforbidden();
+// Security check
+$id = isset($_GET["id"])?$_GET["id"]:'';
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'commande_fournisseur', $id,'');
 
 
 /*
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index fd3fe080c11..6ab8130bac7 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2003-2004 Rodolphe Quiedeville  <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2009 Laurent Destailleur   <eldy@users.sourceforge.net>
  * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
- * Copyright (C) 2005      Regis Houssin         <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin         <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,24 +32,18 @@ require_once(DOL_DOCUMENT_ROOT.'/lib/fourn.lib.php');
 require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
 
+if (!$user->rights->fournisseur->facture->lire) accessforbidden();
+
 $langs->load('bills');
 $langs->load('other');
 $langs->load("companies");
 
-
-if (!$user->rights->fournisseur->facture->lire)
-	accessforbidden();
-
-$facid=empty($_GET['facid']) ? 0 : intVal($_GET['facid']);
+$facid = isset($_GET["facid"])?$_GET["facid"]:'';
 $action=empty($_GET['action']) ? (empty($_POST['action']) ? '' : $_POST['action']) : $_GET['action'];
 
 // Security check
-if ($user->societe_id > 0)
-{
-	unset($_GET["action"]);
-	$action='';
-	$socid = $user->societe_id;
-}
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'fournisseur', $facid, '', 'facture');
 
 // Get parameters
 $page=$_GET["page"];
diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php
index 137e270ee63..9e1b92880cd 100644
--- a/htdocs/fourn/facture/fiche.php
+++ b/htdocs/fourn/facture/fiche.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Christophe Combelles <ccomb@free.fr>
  * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.fr>
- * Copyright (C) 2005-2007 Regis Houssin         <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin         <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,20 +33,17 @@ require_once(DOL_DOCUMENT_ROOT.'/lib/fourn.lib.php');
 require_once(DOL_DOCUMENT_ROOT.'/product.class.php');
 if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/project.class.php');
 
-
-if (!$user->rights->fournisseur->facture->lire)
-accessforbidden();
+if (!$user->rights->fournisseur->facture->lire) accessforbidden();
 
 $langs->load('bills');
 $langs->load('suppliers');
 $langs->load('companies');
 
+$facid = isset($_GET["facid"])?$_GET["facid"]:'';
+
 // Security check
-if ($user->societe_id > 0)
-{
-	$action = '';
-	$socid = $user->societe_id;
-}
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'fournisseur', $facid, '', 'facture');
 
 $html = new Form($db);
 $mesg='';
diff --git a/htdocs/fourn/facture/info.php b/htdocs/fourn/facture/info.php
index abc1526efe1..00c503e140e 100644
--- a/htdocs/fourn/facture/info.php
+++ b/htdocs/fourn/facture/info.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2006 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,7 +29,15 @@ require('./pre.inc.php');
 require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
 require_once(DOL_DOCUMENT_ROOT.'/lib/fourn.lib.php');
 
-$langs->load("bills");
+if (!$user->rights->fournisseur->facture->lire) accessforbidden();
+
+$langs->load('bills');
+
+$facid = isset($_GET["facid"])?$_GET["facid"]:'';
+
+// Security check
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'fournisseur', $facid, '', 'facture');
 
 llxHeader();
 
diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php
index fe968d1e22e..fca7a176f08 100644
--- a/htdocs/fourn/facture/note.php
+++ b/htdocs/fourn/facture/note.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,21 +28,17 @@
 require("./pre.inc.php");
 require_once(DOL_DOCUMENT_ROOT.'/lib/fourn.lib.php');
 
-$socid=isset($_GET["socid"])?$_GET["socid"]:isset($_POST["socid"])?$_POST["socid"]:"";
-
-if (!$user->rights->facture->lire)
-  accessforbidden();
+if (!$user->rights->fournisseur->facture->lire) accessforbidden();
 
+$langs->load('bills');
 $langs->load("companies");
-$langs->load("bills");
 
-// Sécurité accés
-if ($user->societe_id > 0) 
-{
-	unset($_GET["action"]);
-	$socid = $user->societe_id;
-}
+$facid = isset($_GET["facid"])?$_GET["facid"]:'';
+$action=empty($_GET['action']) ? (empty($_POST['action']) ? '' : $_POST['action']) : $_GET['action'];
 
+// Security check
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'fournisseur', $facid, '', 'facture');
 
 $fac = new FactureFournisseur($db);
 $fac->fetch($_GET["facid"]);
diff --git a/htdocs/fourn/fournisseur.class.php b/htdocs/fourn/fournisseur.class.php
index 9e51cbb6a14..7b389cfb64c 100644
--- a/htdocs/fourn/fournisseur.class.php
+++ b/htdocs/fourn/fournisseur.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2004-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2006      Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -194,6 +195,8 @@ class Fournisseur extends Societe
 			$clause = "AND";
 		}
 		$sql.= " ".$clause." s.fournisseur = 1";
+		$sql.= " AND s.entity = ".$conf->entity;
+		
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -247,14 +250,16 @@ class Fournisseur extends Societe
 	 */
 	function ListArray()
 	{
+		global $conf;
+		
 		$arr = array();
 
 		$sql = "SELECT s.rowid, s.nom";
-		if (!$this->user->rights->societe->client->voir && !$this->user->societe_id) $sql .= ", sc.fk_soc, sc.fk_user";
 		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-		if (!$this->user->rights->societe->client->voir && !$this->user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if (!$this->user->rights->societe->client->voir && !$this->user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql.= " WHERE s.fournisseur = 1";
-		if (!$this->user->rights->societe->client->voir && !$this->user->societe_id) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$this->user->id;
+		$sql.= " AND s.entity = ".$conf->entity;
+		if (!$this->user->rights->societe->client->voir && !$this->user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$this->user->id;
 
 		$resql=$this->db->query($sql);
 
diff --git a/htdocs/fourn/fournisseur.commande.class.php b/htdocs/fourn/fournisseur.commande.class.php
index fdc34469303..c91b4a1bd16 100644
--- a/htdocs/fourn/fournisseur.commande.class.php
+++ b/htdocs/fourn/fournisseur.commande.class.php
@@ -1,8 +1,8 @@
 <?php
-/* Copyright (C) 2003-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2003-2006 Rodolphe Quiedeville  <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2009 Laurent Destailleur   <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin         <regis@dolibarr.fr>
  * Copyright (C) 2007      Franky Van Liedekerke <franky.van.liedekerke@telenet.be>
- * Copyright (C) 2005-2008 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -42,13 +42,14 @@ class CommandeFournisseur extends Commande
 	var $table_element='commande_fournisseur';
 	var $table_element_line = 'commande_fournisseurdet';
 	var $fk_element = 'fk_commande';
+	var $table_optional = 'societe as s';
 
 	var $id ;
 	var $brouillon;
 
 
 	/**   \brief      Constructeur
-	 *    \param      DB      Handler d'acc�s aux bases de donn�es
+	 *    \param      DB      Handler d'acces aux bases de donnees
 	 */
 	function CommandeFournisseur($DB)
 	{
@@ -78,6 +79,8 @@ class CommandeFournisseur extends Commande
 	 */
 	function fetch($id,$ref='')
 	{
+		global $conf;
+		
 		$sql = "SELECT c.rowid, c.ref, c.date_creation, c.fk_soc, c.fk_user_author, c.fk_statut, c.amount_ht, c.total_ht, c.total_ttc, c.tva,";
 		$sql .= " ".$this->db->pdate("c.date_commande")." as date_commande, c.fk_projet as fk_project, c.remise_percent, c.source, c.fk_methode_commande,";
 		$sql .= " c.note, c.note_public, c.model_pdf,";
@@ -115,6 +118,8 @@ class CommandeFournisseur extends Commande
 			$this->note                = $obj->note;
 			$this->note_public         = $obj->note_public;
 			$this->modelpdf            = $obj->model_pdf;
+			
+			$this->next_prev_filter = 'fk_soc = s.rowid AND s.entity = '.$conf->entity;
 
 			$this->db->free();
 
@@ -453,8 +458,8 @@ class CommandeFournisseur extends Commande
 
 
 	/**
-	 *      \brief      Renvoie la r�f�rence de commande suivante non utilis�e en fonction du modul
-	 *                  de num�rotation actif d�fini dans COMMANDE_SUPPLIER_ADDON
+	 *      \brief      Renvoie la reference de commande suivante non utilisee en fonction du module
+	 *                  de numerotation actif defini dans COMMANDE_SUPPLIER_ADDON
 	 *      \param	    soc  		            objet societe
 	 *      \return     string                  reference libre pour la facture
 	 */
diff --git a/htdocs/fourn/fournisseur.facture.class.php b/htdocs/fourn/fournisseur.facture.class.php
index 82c1418c634..546d95045cd 100644
--- a/htdocs/fourn/fournisseur.facture.class.php
+++ b/htdocs/fourn/fournisseur.facture.class.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2009 Laurent Destailleur   <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Christophe Combelles  <ccomb@free.fr>
  * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
- * Copyright (C) 2005-2007 Regis Houssin         <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin         <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -684,12 +684,16 @@ class FactureFournisseur extends Facture
 
 		$this->nbtodo=$this->nbtodolate=0;
 		$sql = 'SELECT ff.rowid, ff.date_lim_reglement as datefin';
-		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", sc.fk_soc, sc.fk_user";
 		$sql.= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as ff';
-		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql.= ' WHERE ff.paye=0 AND ff.fk_statut > 0';
+		$sql.= ', '.MAIN_DB_PREFIX.'societe as s';
+		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		$sql.= ' WHERE ff.paye=0';
+		$sql.= ' AND ff.fk_statut > 0';
+		$sql.= " AND ff.fk_soc = s.rowid";
+		$sql.= " AND s.entity = ".$conf->entity;
 		if ($user->societe_id) $sql.=' AND ff.fk_soc = '.$user->societe_id;
-		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= " AND ff.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
+		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND ff.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
+		
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php
index b32f3ecf49a..60ea2de8ef8 100644
--- a/htdocs/html.form.class.php
+++ b/htdocs/html.form.class.php
@@ -1,14 +1,14 @@
 <?php
-/* Copyright (c) 2002-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
- * Copyright (C) 2004      Sebastien Di Cintio  <sdicintio@ressource-toi.org>
- * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2007 Regis Houssin        <regis@dolibarr.fr>
- * Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
- * Copyright (C) 2006      Marc Barilley/Ocebo  <marc@ocebo.com>
+/* Copyright (c) 2002-2007 Rodolphe Quiedeville  <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2008 Laurent Destailleur   <eldy@users.sourceforge.net>
+ * Copyright (C) 2004      Benoit Mortier        <benoit.mortier@opensides.be>
+ * Copyright (C) 2004      Sebastien Di Cintio   <sdicintio@ressource-toi.org>
+ * Copyright (C) 2004      Eric Seigne           <eric.seigne@ryxeo.com>
+ * Copyright (C) 2005-2009 Regis Houssin         <regis@dolibarr.fr>
+ * Copyright (C) 2006      Andre Cianfarani      <acianfa@free.fr>
+ * Copyright (C) 2006      Marc Barilley/Ocebo   <marc@ocebo.com>
  * Copyright (C) 2007      Franky Van Liedekerke <franky.van.liedekerker@telenet.be>
- * Copyright (C) 2007      Patrick Raguin 		<patrick.raguin@gmail.com>
+ * Copyright (C) 2007      Patrick Raguin 		   <patrick.raguin@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -465,16 +465,10 @@ class Form
 		$sql = "SELECT s.rowid, s.nom";
 		$sql.= " FROM ".MAIN_DB_PREFIX ."societe as s";
 		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql.= " WHERE 1=1";
+		$sql.= " WHERE s.entity = ".$conf->entity;
 		if ($filter) $sql.= " AND ".$filter;
-		if ($selected && $conf->use_javascript_ajax && $conf->global->COMPANY_USE_SEARCH_TO_SELECT)
-		{
-			$sql.= " AND rowid = ".$selected;
-		}
-		if (!$user->rights->societe->client->voir && !$user->societe_id) //restriction
-		{
-			$sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-		}
+		if ($selected && $conf->use_javascript_ajax && $conf->global->COMPANY_USE_SEARCH_TO_SELECT)	$sql.= " AND rowid = ".$selected;
+		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 		$sql.= " ORDER BY nom ASC";
 
 		dol_syslog("Form::select_societes sql=".$sql);
@@ -686,16 +680,16 @@ class Form
 	 */
 	function select_users($selected='',$htmlname='userid',$show_empty=0,$exclude='',$disabled=0)
 	{
+		global $conf;
+		
 		// Permettre l'exclusion d'utilisateurs
-		if (is_array($exclude))
-		{
-			$excludeUsers = implode("','",$exclude);
-		}
+		if (is_array($exclude))	$excludeUsers = implode("','",$exclude);
 
 		// On recherche les utilisateurs
 		$sql = "SELECT u.rowid, u.name, u.firstname FROM";
 		$sql.= " ".MAIN_DB_PREFIX ."user as u";
-		if (is_array($exclude) && $excludeUsers) $sql.= " WHERE u.rowid NOT IN ('".$excludeUsers."')";
+		$sql.= " WHERE u.entity IN (0,".$conf->entity.")";
+		if (is_array($exclude) && $excludeUsers) $sql.= " AND u.rowid NOT IN ('".$excludeUsers."')";
 		$sql.= " ORDER BY u.name ASC";
 
 		dol_syslog("Form::select_users sql=".$sql);
@@ -794,20 +788,22 @@ class Form
 			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON p.rowid = cp.fk_product";
 			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cp.fk_categorie = c.rowid";
 		}
+		$sql.= " AND p.entity = ".$conf->entity;
+		
 		if($finished == 0)
 		{
-			$sql.= " WHERE p.finished = ".$finished;
+			$sql.= " AND p.finished = ".$finished;
 		}
 		elseif($finished == 1)
 		{
-			$sql.= " WHERE p.finished = ".$finished;
+			$sql.= " AND p.finished = ".$finished;
 			if ($status >= 0)  $sql.= " AND p.envente = ".$status;
 		}
 		elseif($status >= 0)
 		{
-			$sql.= " WHERE p.envente = ".$status;
+			$sql.= " AND p.envente = ".$status;
 		}
-		else $sql.= " WHERE 1 = 1";
+
 		if ($conf->categorie->enabled && ! $user->rights->categorie->voir)
 		{
 			$sql.= ' AND IFNULL(c.visible,1)=1';
@@ -1445,11 +1441,14 @@ class Form
 	 */
 	function select_comptes($selected='',$htmlname='accountid',$statut=0,$filtre='',$useempty=0)
 	{
-		global $langs;
+		global $langs, $conf;
+		
+		$langs->load("admin");
 
 		$sql = "SELECT rowid, label, bank";
 		$sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
 		$sql.= " WHERE clos = '".$statut."'";
+		$sql.= " AND entity = ".$conf->entity;
 		if ($filtre) $sql.=" AND ".$filtre;
 		$sql.= " ORDER BY rowid";
 
@@ -1457,30 +1456,37 @@ class Form
 		$result = $this->db->query($sql);
 		if ($result)
 		{
-			print '<select class="flat" name="'.$htmlname.'">';
-			if ($useempty)
-			{
-				print '<option value="'.$obj->rowid.'">&nbsp;</option>';
-			}
-
 			$num = $this->db->num_rows($result);
 			$i = 0;
-			while ($i < $num)
+			if ($num)
 			{
-				$obj = $this->db->fetch_object($result);
-				if ($selected == $obj->rowid)
+				print '<select class="flat" name="'.$htmlname.'">';
+				if ($useempty)
 				{
-					print '<option value="'.$obj->rowid.'" selected="true">';
+					print '<option value="'.$obj->rowid.'">&nbsp;</option>';
 				}
-				else
+				
+				while ($i < $num)
 				{
-					print '<option value="'.$obj->rowid.'">';
+					$obj = $this->db->fetch_object($result);
+					if ($selected == $obj->rowid)
+					{
+						print '<option value="'.$obj->rowid.'" selected="true">';
+					}
+					else
+					{
+						print '<option value="'.$obj->rowid.'">';
+					}
+					print $obj->label;
+					print '</option>';
+					$i++;
 				}
-				print $obj->label;
-				print '</option>';
-				$i++;
+				print "</select>";
+			}
+			else
+			{
+				print $langs->trans("NoActiveBankAccountDefined");
 			}
-			print "</select>";
 		}
 		else {
 			dol_print_error($this->db);
diff --git a/htdocs/html.formorder.class.php b/htdocs/html.formorder.class.php
index e3f4e22c770..74e5ed2d6d8 100644
--- a/htdocs/html.formorder.class.php
+++ b/htdocs/html.formorder.class.php
@@ -25,7 +25,7 @@
 
 /**
  *	\class      FormOrder
- *	\brief      Classe permettant la g�n�ration de composants html
+ *	\brief      Classe permettant la generation de composants html
  *	\remarks	Only common components must be here.
  */
 class FormOrder
@@ -37,7 +37,7 @@ class FormOrder
 
 	/**
 	 *	\brief     Constructeur
-	 *	\param     DB      handler d'acc�s base de donn�e
+	 *	\param     DB      handler d'acces base de donnee
 	 */
 	function FormOrder($DB)
 	{
@@ -49,7 +49,7 @@ class FormOrder
 
 	/**
 	 *   	\brief      Renvoie la liste des sources de commandes
-	 *		\param      selected		Id de la source pr�-s�lectionn�e
+	 *		\param      selected		Id de la source pre-selectionnee
 	 *    	\param     	htmlname 		Nom de la liste deroulante
 	 *      \param     	addempty		0=liste sans valeur nulle, 1=ajoute valeur inconnue
 	 *      \return		array			Tableau des sources de commandes
diff --git a/htdocs/html.formother.class.php b/htdocs/html.formother.class.php
index 9524ea08786..fb0613aaf37 100644
--- a/htdocs/html.formother.class.php
+++ b/htdocs/html.formother.class.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
  * Copyright (C) 2004      Sebastien Di Cintio  <sdicintio@ressource-toi.org>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2007 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  * Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
  * Copyright (C) 2006      Marc Barilley/Ocebo  <marc@ocebo.com>
  * Copyright (C) 2007      Franky Van Liedekerke <franky.van.liedekerker@telenet.be>
diff --git a/htdocs/includes/boxes/box_actions.php b/htdocs/includes/boxes/box_actions.php
index c05cbbcba93..a65f932ce27 100644
--- a/htdocs/includes/boxes/box_actions.php
+++ b/htdocs/includes/boxes/box_actions.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2007 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -55,8 +55,8 @@ class box_actions extends ModeleBoxes {
 	}
 
 	/**
-	 *      \brief      Charge les donn�es en m�moire pour affichage ult�rieur
-	 *      \param      $max        Nombre maximum d'enregistrements � charger
+	 *      \brief      Charge les donnees en memoire pour affichage ulterieur
+	 *      \param      $max        Nombre maximum d'enregistrements a charger
 	 */
 	function loadBox($max=5)
 	{
@@ -74,18 +74,15 @@ class box_actions extends ModeleBoxes {
 			$sql = "SELECT a.id, a.label, a.datep as dp, a.percent as percentage,";
 			$sql.= " ta.code,";
 			$sql.= " s.nom, s.rowid as socid";
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", sc.fk_soc, sc.fk_user";
 			$sql.= " FROM ".MAIN_DB_PREFIX."c_actioncomm AS ta, ";
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= " ".MAIN_DB_PREFIX."societe_commerciaux AS sc, ";
+			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " ".MAIN_DB_PREFIX."societe_commerciaux AS sc, ";
 			$sql.= MAIN_DB_PREFIX."actioncomm AS a";
 			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe AS s ON a.fk_soc = s.rowid";
 			$sql.= " WHERE a.fk_action = ta.id";
 			$sql.= " AND a.percent <> 100";
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-			if($user->societe_id)
-			{
-				$sql .= " AND s.rowid = ".$user->societe_id;
-			}
+			$sql.= " AND s.entity = ".$conf->entity;
+			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+			if($user->societe_id)	$sql.= " AND s.rowid = ".$user->societe_id;
 			$sql.= " ORDER BY a.datec DESC";
 			$sql.= $db->plimit($max, 0);
 
@@ -136,7 +133,9 @@ class box_actions extends ModeleBoxes {
 				if ($num==0) $this->info_box_contents[$i][0] = array('td' => 'align="center"','text'=>$langs->trans("NoActionsToDo"));
 			}
 			else {
-				dol_print_error($db);
+				$this->info_box_contents[0][0] = array(	'td' => 'align="left"',
+    	        										'maxlength'=>500,
+	            										'text' => ($db->error().' sql='.$sql));
 			}
 		}
 		else {
diff --git a/htdocs/includes/boxes/box_clients.php b/htdocs/includes/boxes/box_clients.php
index cd467a0bc9d..58e56807fc7 100644
--- a/htdocs/includes/boxes/box_clients.php
+++ b/htdocs/includes/boxes/box_clients.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2007 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
 /**
  \file       htdocs/includes/boxes/box_clients.php
  \ingroup    societes
- \brief      Module de g�n�ration de l'affichage de la box clients
+ \brief      Module de generation de l'affichage de la box clients
  \version	$Id$
  */
 
@@ -53,12 +53,12 @@ class box_clients extends ModeleBoxes {
 	}
 
 	/**
-	 *      \brief      Charge les donn�es en m�moire pour affichage ult�rieur
-	 *      \param      $max        Nombre maximum d'enregistrements � charger
+	 *      \brief      Charge les donnees en memoire pour affichage ulterieur
+	 *      \param      $max        Nombre maximum d'enregistrements a charger
 	 */
 	function loadBox($max=5)
 	{
-		global $user, $langs, $db;
+		global $user, $langs, $db, $conf;
 		$langs->load("boxes");
 
 		$this->max=$max;
@@ -68,15 +68,12 @@ class box_clients extends ModeleBoxes {
 		if ($user->rights->societe->lire)
 		{
 			$sql = "SELECT s.nom, s.rowid as socid, s.tms";
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", sc.fk_soc, sc.fk_user";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-			$sql .= " WHERE s.client = 1";
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-			if ($user->societe_id > 0)
-			{
-				$sql .= " AND s.rowid = $user->societe_id";
-			}
+			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql.= " WHERE s.client = 1";
+			$sql.= " AND s.entity = ".$conf->entity;
+			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+			if ($user->societe_id) $sql.= " AND s.rowid = $user->societe_id";
 			$sql .= " ORDER BY s.tms DESC ";
 			$sql .= $db->plimit($max, 0);
 
@@ -110,7 +107,9 @@ class box_clients extends ModeleBoxes {
 				if ($num==0) $this->info_box_contents[$i][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedCustomers"));
 			}
 			else {
-				dol_print_error($db);
+				$this->info_box_contents[0][0] = array(	'td' => 'align="left"',
+    	        										'maxlength'=>500,
+	            										'text' => ($db->error().' sql='.$sql));
 			}
 		}
 		else {
diff --git a/htdocs/includes/boxes/box_commandes.php b/htdocs/includes/boxes/box_commandes.php
index 719ae73b9c1..d90578bd527 100644
--- a/htdocs/includes/boxes/box_commandes.php
+++ b/htdocs/includes/boxes/box_commandes.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2007 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -58,7 +58,7 @@ class box_commandes extends ModeleBoxes {
      */
     function loadBox($max=5)
     {
-        global $user, $langs, $db;
+        global $user, $langs, $db, $conf;
             
 		$this->max=$max;
         
@@ -73,17 +73,15 @@ class box_commandes extends ModeleBoxes {
             $sql = "SELECT s.nom, s.rowid as socid,";
             $sql.= " p.ref, p.tms, p.rowid,";
             $sql.= " p.fk_statut, p.facture";
-            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", sc.fk_soc, sc.fk_user";
-            $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as p";
-            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-            $sql .= " WHERE p.fk_soc = s.rowid";
-            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-            if($user->societe_id)
-            {
-                $sql .= " AND s.rowid = ".$user->societe_id;
-            }
-            $sql .= " ORDER BY p.date_commande DESC, p.ref DESC ";
-            $sql .= $db->plimit($max, 0);
+            $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+            $sql.= ", ".MAIN_DB_PREFIX."commande as p";
+            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+            $sql.= " WHERE p.fk_soc = s.rowid";
+            $sql.= " AND s.entity = ".$conf->entity;
+            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+            if ($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
+            $sql.= " ORDER BY p.date_commande DESC, p.ref DESC ";
+            $sql.= $db->plimit($max, 0);
 
             $result = $db->query($sql);
 
@@ -123,7 +121,9 @@ class box_commandes extends ModeleBoxes {
                 if ($num==0) $this->info_box_contents[$i][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedOrders"));
             }
             else {
-                dol_print_error($db);
+                $this->info_box_contents[0][0] = array(	'td' => 'align="left"',
+    	        										'maxlength'=>500,
+	            										'text' => ($db->error().' sql='.$sql));
             }
         }
         else {
diff --git a/htdocs/includes/boxes/box_comptes.php b/htdocs/includes/boxes/box_comptes.php
index f16bb8e3d8c..641fed6a2b2 100644
--- a/htdocs/includes/boxes/box_comptes.php
+++ b/htdocs/includes/boxes/box_comptes.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2005      Christophe
  * Copyright (C) 2005-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -67,13 +68,15 @@ class box_comptes extends ModeleBoxes {
 
 		if ($user->rights->banque->lire)
 		{
-	        $sql = "SELECT rowid, ref, label, bank, number, courant, clos, rappro, url,";
-	        $sql.= " code_banque, code_guichet, cle_rib, bic, iban_prefix,";
-	        $sql.= " domiciliation, proprio, adresse_proprio,";
-	        $sql.= " account_number, currency_code,";
-	        $sql.= " min_allowed, min_desired, comment";
+	    $sql = "SELECT rowid, ref, label, bank, number, courant, clos, rappro, url,";
+	    $sql.= " code_banque, code_guichet, cle_rib, bic, iban_prefix,";
+	    $sql.= " domiciliation, proprio, adresse_proprio,";
+	    $sql.= " account_number, currency_code,";
+	    $sql.= " min_allowed, min_desired, comment";
 			$sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
-			$sql.= " WHERE clos = 0 AND courant = 1";
+			$sql.= " WHERE entity = ".$conf->entity;
+			$sql.= " AND clos = 0";
+			$sql.= " AND courant = 1";
 			$sql.= " ORDER BY label";
 			$sql.= $db->plimit($max, 0);
 
diff --git a/htdocs/includes/boxes/box_factures.php b/htdocs/includes/boxes/box_factures.php
index eadc0304712..91339581afc 100644
--- a/htdocs/includes/boxes/box_factures.php
+++ b/htdocs/includes/boxes/box_factures.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2007 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
 /**
  \file       htdocs/includes/boxes/box_factures.php
  \ingroup    factures
- \brief      Module de g�n�ration de l'affichage de la box factures
+ \brief      Module de generation de l'affichage de la box factures
  \version	$Id$
  */
 
@@ -53,12 +53,12 @@ class box_factures extends ModeleBoxes {
 	}
 
 	/**
-	 *      \brief      Charge les donn�es en m�moire pour affichage ult�rieur
-	 *      \param      $max        Nombre maximum d'enregistrements � charger
+	 *      \brief      Charge les donnees en memoire pour affichage ulterieur
+	 *      \param      $max        Nombre maximum d'enregistrements a charger
 	 */
 	function loadBox($max=5)
 	{
-		global $user, $langs, $db;
+		global $conf, $user, $langs, $db;
 
 		$this->max=$max;
 
@@ -73,19 +73,16 @@ class box_factures extends ModeleBoxes {
 
 		if ($user->rights->facture->lire)
 		{
-			$sql = "SELECT f.rowid as facid, f.facnumber, f.type, f.amount, f.datef as df,";
-			$sql.= " f.paye, f.fk_statut, f.datec,";
-			$sql.= " s.nom, s.rowid as socid,";
-			$sql.= " f.date_lim_reglement as datelimite ";
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", sc.fk_soc, sc.fk_user";
+			$sql = "SELECT f.rowid as facid, f.facnumber, f.type, f.amount, f.datef as df";
+			$sql.= ", f.paye, f.fk_statut, f.datec";
+			$sql.= ", s.nom, s.rowid as socid";
+			$sql.= ", f.date_lim_reglement as datelimite";
 			$sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			$sql.= " WHERE f.fk_soc = s.rowid";
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-			if($user->societe_id)
-			{
-				$sql.= " AND s.rowid = ".$user->societe_id;
-			}
+			$sql.= " AND s.entity = ".$conf->entity;
+			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+			if($user->societe_id)	$sql.= " AND s.rowid = ".$user->societe_id;
 			$sql.= " ORDER BY f.datef DESC, f.facnumber DESC ";
 			$sql.= $db->plimit($max, 0);
 
diff --git a/htdocs/includes/boxes/box_factures_fourn.php b/htdocs/includes/boxes/box_factures_fourn.php
index be4bf036c4c..7f50cce35bc 100644
--- a/htdocs/includes/boxes/box_factures_fourn.php
+++ b/htdocs/includes/boxes/box_factures_fourn.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -52,8 +53,8 @@ class box_factures_fourn extends ModeleBoxes {
     }
 
     /**
-     *      \brief      Charge les donn�es en m�moire pour affichage ult�rieur
-     *      \param      $max        Nombre maximum d'enregistrements � charger
+     *      \brief      Charge les donnees en memoire pour affichage ulterieur
+     *      \param      $max        Nombre maximum d'enregistrements a charger
      */
     function loadBox($max=5)
     {
@@ -76,17 +77,15 @@ class box_factures_fourn extends ModeleBoxes {
             $sql.= ' f.datef as df,';
             $sql.= ' f.datec as datec,';
             $sql.= ' f.date_lim_reglement as datelimite ';
-            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", sc.fk_soc, sc.fk_user";
-            $sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture_fourn as f";
-            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-            $sql .= " WHERE f.fk_soc = s.rowid";
-            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-            if($user->societe_id)
-            {
-                $sql .= " AND s.rowid = ".$user->societe_id;
-            }
-            $sql .= " ORDER BY f.datef DESC, f.facnumber DESC ";
-            $sql .= $db->plimit($max, 0);
+            $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+            $sql.= ", ".MAIN_DB_PREFIX."facture_fourn as f";
+            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+            $sql.= " WHERE f.fk_soc = s.rowid";
+            $sql.= " AND s.entity = ".$conf->entity;
+            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+            if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
+            $sql.= " ORDER BY f.datef DESC, f.facnumber DESC ";
+            $sql.= $db->plimit($max, 0);
 
             $result = $db->query($sql);
             if ($result)
diff --git a/htdocs/includes/boxes/box_factures_fourn_imp.php b/htdocs/includes/boxes/box_factures_fourn_imp.php
index 4305821b181..8ae7fe306e0 100644
--- a/htdocs/includes/boxes/box_factures_fourn_imp.php
+++ b/htdocs/includes/boxes/box_factures_fourn_imp.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2004-2005 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -57,49 +58,49 @@ class box_factures_fourn_imp extends ModeleBoxes {
      */
     function loadBox($max=5)
     {
-        global $conf, $user, $langs, $db;
+    	global $conf, $user, $langs, $db;
+    	
+    	$this->max=$max;
+    	
+    	include_once(DOL_DOCUMENT_ROOT."/fourn/fournisseur.facture.class.php");
+      $facturestatic=new FactureFournisseur($db);
 
-		$this->max=$max;
+      $this->info_box_head = array('text' => $langs->trans("BoxTitleOldestUnpayedSupplierBills",$max));
+
+      if ($user->rights->fournisseur->facture->lire)
+      {
+      	$sql = "SELECT s.nom, s.rowid as socid,";
+        $sql.= " f.facnumber, f.date_lim_reglement as datelimite,";
+        $sql.= " f.amount, f.datef as df,";
+        $sql.= " f.paye, f.fk_statut, f.rowid as facid";
+        $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+        $sql.= ",".MAIN_DB_PREFIX."facture_fourn as f";
+        if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+        $sql.= " WHERE f.fk_soc = s.rowid";
+        $sql.= " AND s.entity = ".$conf->entity;
+        $sql.= " AND f.paye=0";
+        $sql.= " AND fk_statut = 1";
+        if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+        if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
+        $sql.= " ORDER BY datelimite DESC, f.facnumber DESC ";
+        $sql.= $db->plimit($max, 0);
         
-		include_once(DOL_DOCUMENT_ROOT."/fourn/fournisseur.facture.class.php");
-        $facturestatic=new FactureFournisseur($db);
-
-        $this->info_box_head = array('text' => $langs->trans("BoxTitleOldestUnpayedSupplierBills",$max));
-
-        if ($user->rights->fournisseur->facture->lire)
+        $result = $db->query($sql);
+        if ($result)
         {
-            $sql = "SELECT s.nom, s.rowid as socid,";
-            $sql.= " f.facnumber, f.date_lim_reglement as datelimite,";
-			$sql.= " f.amount, f.datef as df,";
-            $sql.= " f.paye, f.fk_statut, f.rowid as facid";
-            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", sc.fk_soc, sc.fk_user";
-            $sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture_fourn as f";
-            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-            $sql .= " WHERE f.fk_soc = s.rowid AND f.paye=0 AND fk_statut = 1";
-            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-            if($user->societe_id)
-            {
-                $sql .= " AND s.rowid = ".$user->societe_id;
-            }
-            $sql .= " ORDER BY datelimite DESC, f.facnumber DESC ";
-            $sql .= $db->plimit($max, 0);
-
-            $result = $db->query($sql);
-            if ($result)
-            {
-                $num = $db->num_rows($result);
-				$now=gmmktime();
-                
-                $i = 0;
-                $l_due_date = $langs->trans('Late').' ('.strtolower($langs->trans('DateEcheance')).': %s)';
-                
-                while ($i < $num)
-                {
-                    $objp = $db->fetch_object($result);
-					$datelimite=$db->jdate($objp->datelimite);
-					
-                    $late='';
-                    if ($datelimite < ($now - $conf->facture->fournisseur->warning_delay)) $late=img_warning(sprintf($l_due_date,dol_print_date($datelimite,'day')));
+        	$num = $db->num_rows($result);
+        	$now=gmmktime();
+        	
+        	$i = 0;
+        	$l_due_date = $langs->trans('Late').' ('.strtolower($langs->trans('DateEcheance')).': %s)';
+        	
+        	while ($i < $num)
+        	{
+        		$objp = $db->fetch_object($result);
+        		$datelimite=$db->jdate($objp->datelimite);
+        		
+        		$late='';
+        		if ($datelimite < ($now - $conf->facture->fournisseur->warning_delay)) $late=img_warning(sprintf($l_due_date,dol_print_date($datelimite,'day')));
                     
                     $this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"',
                     'logo' => $this->boximg,
@@ -126,7 +127,9 @@ class box_factures_fourn_imp extends ModeleBoxes {
                 if ($num==0) $this->info_box_contents[$i][0] = array('td' => 'align="center"','text'=>$langs->trans("NoUnpayedSupplierBills"));
             }
             else {
-                dol_print_error($db);
+                $this->info_box_contents[0][0] = array(	'td' => 'align="left"',
+    	        										'maxlength'=>500,
+	            										'text' => ($db->error().' sql='.$sql));
             }
         }
         else {
diff --git a/htdocs/includes/boxes/box_factures_imp.php b/htdocs/includes/boxes/box_factures_imp.php
index b3f3f607624..9088f33734a 100644
--- a/htdocs/includes/boxes/box_factures_imp.php
+++ b/htdocs/includes/boxes/box_factures_imp.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2007 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,9 +35,9 @@ class box_factures_imp extends ModeleBoxes {
     var $boximg="object_bill";
     var $boxlabel;
     var $depends = array("facture");
-
-	var $db;
-	var $param;
+    
+    var $db;
+    var $param;
 
     var $info_box_head = array();
     var $info_box_contents = array();
@@ -48,59 +48,58 @@ class box_factures_imp extends ModeleBoxes {
      */
     function box_factures_imp()
     {
-        global $langs;
-        $langs->load("boxes");
+    	global $langs;
+      $langs->load("boxes");
 
-        $this->boxlabel=$langs->trans("BoxOldestUnpayedCustomerBills");
+      $this->boxlabel=$langs->trans("BoxOldestUnpayedCustomerBills");
     }
 
     /**
-     *      \brief      Charge les donn�es en m�moire pour affichage ult�rieur
-     *      \param      $max        Nombre maximum d'enregistrements � charger
+     *      \brief      Charge les donnees en memoire pour affichage ulterieur
+     *      \param      $max        Nombre maximum d'enregistrements a charger
      */
     function loadBox($max=5)
     {
-        global $conf, $user, $langs, $db;
+    	global $conf, $user, $langs, $db;
+    	
+    	$this->max=$max;
+    	
+    	include_once(DOL_DOCUMENT_ROOT."/facture.class.php");
+    	$facturestatic=new Facture($db);
+    	
+    	$this->info_box_head = array('text' => $langs->trans("BoxTitleOldestUnpayedCustomerBills",$max));
 
-		$this->max=$max;
-        
-		include_once(DOL_DOCUMENT_ROOT."/facture.class.php");
-		$facturestatic=new Facture($db);
+      if ($user->rights->facture->lire)
+      {
+      	$sql = "SELECT s.nom, s.rowid as socid,";
+        $sql.= " f.facnumber, f.date_lim_reglement as datelimite,";
+        $sql.= " f.amount, f.datef as df,";
+        $sql.= " f.paye, f.fk_statut, f.rowid as facid";
+        $sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
+        if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+        $sql.= " WHERE f.fk_soc = s.rowid";
+        $sql.= " AND s.entity = ".$conf->entity;
+        $sql.= " AND f.paye = 0";
+        $sql.= " AND fk_statut = 1";
+        if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+        if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
+        //$sql.= " ORDER BY f.datef DESC, f.facnumber DESC ";
+        $sql.= " ORDER BY datelimite ASC, f.facnumber ASC ";
+        $sql.= $db->plimit($max, 0);
 
-        $this->info_box_head = array('text' => $langs->trans("BoxTitleOldestUnpayedCustomerBills",$max));
-
-        if ($user->rights->facture->lire)
+        $result = $db->query($sql);
+        if ($result)
         {
-            $sql = "SELECT s.nom, s.rowid as socid,";
-            $sql.= " f.facnumber, f.date_lim_reglement as datelimite,";
-            $sql.= " f.amount, f.datef as df,";
-            $sql.= " f.paye, f.fk_statut, f.rowid as facid";
-            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", sc.fk_soc, sc.fk_user";
-            $sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
-            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-            $sql .= " WHERE f.fk_soc = s.rowid AND f.paye=0 AND fk_statut = 1";
-            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-            if($user->societe_id)
-            {
-                $sql .= " AND s.rowid = ".$user->societe_id;
-            }
-            //$sql .= " ORDER BY f.datef DESC, f.facnumber DESC ";
-            $sql .= " ORDER BY datelimite ASC, f.facnumber ASC ";
-            $sql .= $db->plimit($max, 0);
+        	$num = $db->num_rows($result);
+        	$now=gmmktime();
+        	
+        	$i = 0;
+        	$l_due_date = $langs->trans('Late').' ('.strtolower($langs->trans('DateEcheance')).': %s)';
 
-            $result = $db->query($sql);
-            if ($result)
-            {
-                $num = $db->num_rows($result);
-				$now=gmmktime();
-                
-                $i = 0;
-                $l_due_date = $langs->trans('Late').' ('.strtolower($langs->trans('DateEcheance')).': %s)';
-
-                while ($i < $num)
-                {
-                    $objp = $db->fetch_object($result);
-					$datelimite=$db->jdate($objp->datelimite);
+          while ($i < $num)
+          {
+          	$objp = $db->fetch_object($result);
+          	$datelimite=$db->jdate($objp->datelimite);
 					
                     $late='';
                     if ($datelimite < ($now - $conf->facture->warning_delay)) $late = img_warning(sprintf($l_due_date,dol_print_date($datelimite,'day')));
diff --git a/htdocs/includes/boxes/box_fournisseurs.php b/htdocs/includes/boxes/box_fournisseurs.php
index 3e6769cde06..6fbde9626d4 100644
--- a/htdocs/includes/boxes/box_fournisseurs.php
+++ b/htdocs/includes/boxes/box_fournisseurs.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2004-2006 Destailleur Laurent  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2006 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -57,7 +57,7 @@ class box_fournisseurs extends ModeleBoxes {
      */
     function loadBox($max=5)
     {
-        global $user, $langs, $db;
+        global $conf, $user, $langs, $db;
         $langs->load("boxes");
 
 		$this->max=$max;
@@ -67,17 +67,14 @@ class box_fournisseurs extends ModeleBoxes {
         if ($user->rights->societe->lire)
         {
             $sql = "SELECT s.nom, s.rowid as socid, s.tms";
-            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", sc.fk_soc, sc.fk_user";
             $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-            $sql .= " WHERE s.fournisseur = 1";
-            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-            if ($user->societe_id > 0)
-            {
-                $sql .= " AND s.rowid = ".$user->societe_id;
-            }
-            $sql .= " ORDER BY s.tms DESC ";
-            $sql .= $db->plimit($max, 0);
+            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+            $sql.= " WHERE s.fournisseur = 1";
+            $sql.= " AND s.entity = ".$conf->entity;
+            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+            if ($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
+            $sql.= " ORDER BY s.tms DESC ";
+            $sql.= $db->plimit($max, 0);
 
             $result = $db->query($sql);
             if ($result)
diff --git a/htdocs/includes/boxes/box_produits.php b/htdocs/includes/boxes/box_produits.php
index f354669d0de..68ae85cb8ad 100644
--- a/htdocs/includes/boxes/box_produits.php
+++ b/htdocs/includes/boxes/box_produits.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -54,8 +55,8 @@ class box_produits extends ModeleBoxes {
 	}
 
 	/**
-	 *      \brief      Charge les donn�es en m�moire pour affichage ult�rieur
-	 *      \param      $max        Nombre maximum d'enregistrements � charger
+	 *      \brief      Charge les donnees en memoire pour affichage ulterieur
+	 *      \param      $max        Nombre maximum d'enregistrements a charger
 	 */
 	function loadBox($max=5)
 	{
@@ -70,16 +71,20 @@ class box_produits extends ModeleBoxes {
 
 		if ($user->rights->produit->lire)
 		{
+			$clause = " WHERE";
+			
 			$sql = "SELECT p.rowid, p.label, p.price, p.price_base_type, p.price_ttc, p.fk_product_type, p.tms, p.envente";
-			$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
+			$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
 			if ($conf->categorie->enabled && !$user->rights->categorie->voir)
 			{
 				$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON cp.fk_product = p.rowid";
 				$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cp.fk_categorie = c.rowid";
-				$sql.= " WHERE IFNULL(c.visible,1)=1";
+				$sql.= $clause." IFNULL(c.visible,1)=1";
+				$clause = " AND";
 			}
-			$sql .= " ORDER BY p.datec DESC";
-			$sql .= $db->plimit($max, 0);
+			$sql.= $clause." p.entity = ".$conf->entity;
+			$sql.= " ORDER BY p.datec DESC";
+			$sql.= $db->plimit($max, 0);
 
 			$result = $db->query($sql);
 			if ($result)
@@ -94,8 +99,10 @@ class box_produits extends ModeleBoxes {
 					// Multilangs
 					if ($conf->global->MAIN_MULTILANGS) // si l'option est active
 					{
-						$sqld = "SELECT label FROM ".MAIN_DB_PREFIX."product_det";
-						$sqld.= " WHERE fk_product=".$objp->rowid." AND lang='". $langs->getDefaultLang() ."'";
+						$sqld = "SELECT label";
+						$sqld.= " FROM ".MAIN_DB_PREFIX."product_det";
+						$sqld.= " WHERE fk_product=".$objp->rowid;
+						$sqld.= " AND lang='". $langs->getDefaultLang() ."'";
 						$sqld.= " LIMIT 1";
 
 						$resultd = $db->query($sqld);
@@ -138,9 +145,13 @@ class box_produits extends ModeleBoxes {
 
 					$i++;
 				}
+				if ($num==0) $this->info_box_contents[$i][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedProducts"));
 			}
-			else {
-				dol_print_error($db);
+			else
+			{
+				$this->info_box_contents[0][0] = array(	'td' => 'align="left"',
+    	        										'maxlength'=>500,
+	            										'text' => ($db->error().' sql='.$sql));
 			}
 		}
 		else {
diff --git a/htdocs/includes/boxes/box_propales.php b/htdocs/includes/boxes/box_propales.php
index bbb6c97a360..7e01b1bc5a4 100644
--- a/htdocs/includes/boxes/box_propales.php
+++ b/htdocs/includes/boxes/box_propales.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2007 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
 /**
 		\file       htdocs/includes/boxes/box_propales.php
 		\ingroup    propales
-		\brief      Module de g�n�ration de l'affichage de la box propales
+		\brief      Module de generation de l'affichage de la box propales
 		\version	$Id$
 */
 
@@ -34,9 +34,9 @@ class box_propales extends ModeleBoxes {
     var $boximg="object_propal";
     var $boxlabel;
     var $depends = array("propal");	// conf->propal->enabled
-
-	var $db;
-	var $param;
+    
+    var $db;
+    var $param;
 
     var $info_box_head = array();
     var $info_box_contents = array();
@@ -47,99 +47,96 @@ class box_propales extends ModeleBoxes {
      */
     function box_propales()
     {
-        global $langs;
-        $langs->load("boxes");
-
-        $this->boxlabel=$langs->trans("BoxLastProposals");
+    	global $langs;
+      $langs->load("boxes");
+      
+      $this->boxlabel=$langs->trans("BoxLastProposals");
     }
 
     /**
-     *      \brief      Charge les donn�es en m�moire pour affichage ult�rieur
-     *      \param      $max        Nombre maximum d'enregistrements � charger
+     *      \brief      Charge les donnees en memoire pour affichage ulterieur
+     *      \param      $max        Nombre maximum d'enregistrements a charger
      */
     function loadBox($max=5)
     {
+    	global $user, $langs, $db, $conf;
+    	
+    	$this->max=$max;
+    	
+    	include_once(DOL_DOCUMENT_ROOT."/propal.class.php");
+      $propalstatic=new Propal($db);
         
-        global $user, $langs, $db, $conf;
+      $this->info_box_head = array('text' => $langs->trans("BoxTitleLastPropals",$max));
 
-		$this->max=$max;
+      if ($user->rights->propale->lire)
+      {
+      	$sql = "SELECT s.nom, s.rowid as socid,";
+        $sql.= " p.rowid, p.ref, p.fk_statut, p.datep as dp, p.datec, p.fin_validite, p.date_cloture";
+        $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+        $sql.= ", ".MAIN_DB_PREFIX."propal as p";
+        if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+        $sql.= " WHERE p.fk_soc = s.rowid";
+        $sql.= " AND s.entity = ".$conf->entity;
+        if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+        if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
+        $sql.= " ORDER BY p.datep DESC, p.ref DESC ";
+        $sql.= $db->plimit($max, 0);
         
-		include_once(DOL_DOCUMENT_ROOT."/propal.class.php");
-        $propalstatic=new Propal($db);
+        $result = $db->query($sql);
         
-        $this->info_box_head = array('text' => $langs->trans("BoxTitleLastPropals",$max));
-
-        if ($user->rights->propale->lire)
+        if ($result)
         {
-
-            $sql = "SELECT s.nom, s.rowid as socid,";
-            $sql.= " p.rowid, p.ref, p.fk_statut, p.datep as dp, p.datec, p.fin_validite, p.date_cloture";
-            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", sc.fk_soc, sc.fk_user";
-            $sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."propal as p";
-            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-            $sql .= " WHERE p.fk_soc = s.rowid";
-            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-            if($user->societe_id)
-            {
-                $sql .= " AND s.rowid = ".$user->societe_id;
-            }
-            $sql .= " ORDER BY p.datep DESC, p.ref DESC ";
-            $sql .= $db->plimit($max, 0);
-
-            $result = $db->query($sql);
-
-            if ($result)
-            {
-                $num = $db->num_rows($result);
-				$now=gmmktime();
-                
-                $i = 0;
-
-                while ($i < $num)
-                {
-                    $objp = $db->fetch_object($result);
-					$datec=$db->jdate($objp->datec);
-					$dateterm=$db->jdate($objp->fin_validite);
-					$dateclose=$db->jdate($objp->date_cloture);
-					
-					$late = '';
-					if ($objp->fk_statut == 1 && $dateterm < ($now - $conf->propal->cloture->warning_delay)) { $late = img_warning($langs->trans("Late")); }
-					
-                    $this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"',
-                    'logo' => $this->boximg,
-                    'url' => DOL_URL_ROOT."/comm/propal.php?propalid=".$objp->rowid);
-
-                    $this->info_box_contents[$i][1] = array('td' => 'align="left"',
-                    'text' => $objp->ref,
-					'text2'=> $late,
-                    'url' => DOL_URL_ROOT."/comm/propal.php?propalid=".$objp->rowid);
-                    
-                    $this->info_box_contents[$i][2] = array('td' => 'align="left"',
-                    'text' => dol_trunc($objp->nom,40),
-                    'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->socid);
-                    
-                    $this->info_box_contents[$i][3] = array('td' => 'align="right"',
-                    'text' => dol_print_date($datec,'day'));
-
-                    $this->info_box_contents[$i][4] = array('td' => 'align="right" width="18"',
-                    'text' => $propalstatic->LibStatut($objp->fk_statut,3));
-
-                    $i++;
-                }
-                
-                if ($num==0) $this->info_box_contents[$i][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedProposals"));
-            }
-            else 
-            {
-                dol_print_error($db);
-            }
+        	$num = $db->num_rows($result);
+        	$now=gmmktime();
+        	
+        	$i = 0;
+        	
+        	while ($i < $num)
+        	{
+        		$objp = $db->fetch_object($result);
+        		$datec=$db->jdate($objp->datec);
+        		$dateterm=$db->jdate($objp->fin_validite);
+        		$dateclose=$db->jdate($objp->date_cloture);
+        		
+        		$late = '';
+        		if ($objp->fk_statut == 1 && $dateterm < ($now - $conf->propal->cloture->warning_delay)) { $late = img_warning($langs->trans("Late")); }
+        		
+        		$this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"',
+        		'logo' => $this->boximg,
+        		'url' => DOL_URL_ROOT."/comm/propal.php?propalid=".$objp->rowid);
+        		
+        		$this->info_box_contents[$i][1] = array('td' => 'align="left"',
+        		'text' => $objp->ref,
+        		'text2'=> $late,
+        		'url' => DOL_URL_ROOT."/comm/propal.php?propalid=".$objp->rowid);
+        		
+        		$this->info_box_contents[$i][2] = array('td' => 'align="left"',
+        		'text' => dol_trunc($objp->nom,40),
+        		'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->socid);
+        		
+        		$this->info_box_contents[$i][3] = array('td' => 'align="right"',
+        		'text' => dol_print_date($datec,'day'));
+        		
+        		$this->info_box_contents[$i][4] = array('td' => 'align="right" width="18"',
+        		'text' => $propalstatic->LibStatut($objp->fk_statut,3));
+        		
+        		$i++;
+        	}
+        	
+        	if ($num==0) $this->info_box_contents[$i][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedProposals"));
         }
-        else {
-            $this->info_box_contents[0][0] = array('td' => 'align="left"',
-            'text' => $langs->trans("ReadPermissionNotAllowed"));
+        else 
+        {
+        	dol_print_error($db);
         }
+      }
+      else
+      {
+      	$this->info_box_contents[0][0] = array('td' => 'align="left"',
+      	'text' => $langs->trans("ReadPermissionNotAllowed"));
+      }
     }
-
+    
     function showBox()
     {
         parent::showBox($this->info_box_head, $this->info_box_contents);
diff --git a/htdocs/includes/boxes/box_prospect.php b/htdocs/includes/boxes/box_prospect.php
index 067514464d3..1ce8fc02f6a 100644
--- a/htdocs/includes/boxes/box_prospect.php
+++ b/htdocs/includes/boxes/box_prospect.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2007 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,9 +36,9 @@ class box_prospect extends ModeleBoxes {
     var $boximg="object_company";
     var $boxlabel;
     var $depends = array("societe");
-
-	var $db;
-	var $param;
+    
+    var $db;
+    var $param;
 
     var $info_box_head = array();
     var $info_box_contents = array();
@@ -48,13 +48,13 @@ class box_prospect extends ModeleBoxes {
      */
     function box_prospect($DB,$param)
     {
-        global $langs;
-        $langs->load("boxes");
-
-		$this->db=$DB;
-		$this->param=$param;
-
-		$this->boxlabel=$langs->trans("BoxLastProspects");
+    	global $langs;
+      $langs->load("boxes");
+      
+      $this->db=$DB;
+      $this->param=$param;
+      
+      $this->boxlabel=$langs->trans("BoxLastProspects");
     }
 
     /**
@@ -63,69 +63,68 @@ class box_prospect extends ModeleBoxes {
      */
     function loadBox($max=5)
     {
-        global $user, $langs, $db;
+    	global $user, $langs, $db, $conf;
+    	
+    	$this->max=$max;
+    	
+    	$this->info_box_head = array('text' => $langs->trans("BoxTitleLastProspects",$max));
 
-		$this->max=$max;
-
-		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastProspects",$max));
-
-        if ($user->rights->societe->lire)
+      if ($user->rights->societe->lire)
+      {
+      	$sql = "SELECT s.nom, s.rowid as socid, s.fk_stcomm, s.tms";
+        $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+        if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+        $sql.= " WHERE s.client = 2";
+        $sql.= " AND s.entity = ".$conf->entity;
+        if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+        if ($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
+        $sql.= " ORDER BY s.tms DESC";
+        $sql.= $db->plimit($max, 0);
+        
+        dol_syslog("box_prospect::loadBox sql=".$sql,LOG_DEBUG);
+        $resql = $db->query($sql);
+        if ($resql)
         {
-            $sql = "SELECT s.nom, s.rowid as socid, s.fk_stcomm, s.tms";
-            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", sc.fk_soc, sc.fk_user";
-            $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-            $sql .= " WHERE s.client = 2";
-            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-            if ($user->societe_id > 0)
-            {
-                $sql .= " AND s.rowid = ".$user->societe_id;
-            }
-            $sql .= " ORDER BY s.tms DESC";
-            $sql .= $db->plimit($max, 0);
-
-			dol_syslog("box_prospect::loadBox sql=".$sql,LOG_DEBUG);
-            $resql = $db->query($sql);
-            if ($resql)
-            {
-                $num = $db->num_rows($resql);
-
-                $i = 0;
+        	$num = $db->num_rows($resql);
+        	
+        	$i = 0;
     			$prospectstatic=new Prospect($db);
-                while ($i < $num)
-                {
-                    $objp = $db->fetch_object($resql);
+          while ($i < $num)
+          {
+          	$objp = $db->fetch_object($resql);
     				$datem=$objp->tms;
+    				
+    				$this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"',
+            'logo' => $this->boximg,
+            'url' => DOL_URL_ROOT."/comm/prospect/fiche.php?socid=".$objp->socid);
 
-                    $this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"',
-                    'logo' => $this->boximg,
-                    'url' => DOL_URL_ROOT."/comm/prospect/fiche.php?socid=".$objp->socid);
+            $this->info_box_contents[$i][1] = array('td' => 'align="left"',
+            'text' => $objp->nom,
+            'url' => DOL_URL_ROOT."/comm/prospect/fiche.php?socid=".$objp->socid);
 
-                    $this->info_box_contents[$i][1] = array('td' => 'align="left"',
-                    'text' => $objp->nom,
-                    'url' => DOL_URL_ROOT."/comm/prospect/fiche.php?socid=".$objp->socid);
+            $this->info_box_contents[$i][2] = array('td' => 'align="right"',
+            'text' => dol_print_date($datem, "day"));
+            
+            $this->info_box_contents[$i][3] = array('td' => 'align="right" width="18"',
+            'text' => eregi_replace('img ','img height="14px" ',$prospectstatic->LibStatut($objp->fk_stcomm,3)));
 
-                    $this->info_box_contents[$i][2] = array('td' => 'align="right"',
-					'text' => dol_print_date($datem, "day"));
-
-                    $this->info_box_contents[$i][3] = array('td' => 'align="right" width="18"',
-                    'text' => eregi_replace('img ','img height="14px" ',$prospectstatic->LibStatut($objp->fk_stcomm,3)));
-
-                    $i++;
-                }
-
-				if ($num==0) $this->info_box_contents[$i][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedProspects"));
-            }
-			else
-			{
-				dol_print_error($db);
-			}
-        }
-        else {
-			dol_syslog("box_prospect::loadBox not allowed de read this box content",LOG_ERR);
-            $this->info_box_contents[0][0] = array('td' => 'align="left"',
-            'text' => $langs->trans("ReadPermissionNotAllowed"));
+            $i++;
+          }
+          
+          if ($num==0) $this->info_box_contents[$i][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedProspects"));
         }
+        else
+        {
+        	$this->info_box_contents[0][0] = array(	'td' => 'align="left"',
+    	        										'maxlength'=>500,
+	            										'text' => ($db->error().' sql='.$sql));
+	      }
+	    }
+	    else {
+	    	dol_syslog("box_prospect::loadBox not allowed de read this box content",LOG_ERR);
+        $this->info_box_contents[0][0] = array('td' => 'align="left"',
+        'text' => $langs->trans("ReadPermissionNotAllowed"));
+      }
     }
 
     function showBox()
diff --git a/htdocs/includes/boxes/box_services_vendus.php b/htdocs/includes/boxes/box_services_vendus.php
index 561c0e8f49c..87338956d9a 100644
--- a/htdocs/includes/boxes/box_services_vendus.php
+++ b/htdocs/includes/boxes/box_services_vendus.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2005-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2006 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
 /**
  *      \file       htdocs/includes/boxes/box_services_vendus.php
  *		\ingroup    produits,services
- *      \brief      Module de g�n�ration de l'affichage de la box services_vendus
+ *      \brief      Module de generation de l'affichage de la box services_vendus
  *		\version	$Id$
  */
 
@@ -73,24 +73,26 @@ class box_services_vendus extends ModeleBoxes {
 			$sql.= " c.rowid,";
 			$sql.= " cd.rowid as cdid, cd.tms as datem, cd.statut,";
 			$sql.= " p.rowid as pid, p.label, p.fk_product_type";
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", sc.fk_soc, sc.fk_user";
-			$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."product as p";
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+			$sql.= ", ".MAIN_DB_PREFIX."contrat as c";
+			$sql.= ", ".MAIN_DB_PREFIX."contratdet as cd";
+			$sql.= ", ".MAIN_DB_PREFIX."product as p";
+			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			if ($conf->categorie->enabled && !$user->rights->categorie->voir)
 			{
 				$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON cp.fk_product = p.rowid";
 				$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as ca ON cp.fk_categorie = ca.rowid";
 			}
-			$sql.= " WHERE s.rowid = c.fk_soc AND c.rowid = cd.fk_contrat AND cd.fk_product = p.rowid";
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+			$sql.= " WHERE s.rowid = c.fk_soc";
+			$sql.= " AND s.entity = ".$conf->entity;
+			$sql.= " AND c.rowid = cd.fk_contrat";
+			$sql.= " AND cd.fk_product = p.rowid";
+			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+			if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
 			if ($conf->categorie->enabled && !$user->rights->categorie->voir)
 			{
 				$sql.= ' AND IFNULL(ca.visible,1)=1';
 			}
-			if($user->societe_id)
-			{
-				$sql.= " AND s.rowid = ".$user->societe_id;
-			}
 			$sql.= " ORDER BY c.tms DESC ";
 			$sql.= $db->plimit($max, 0);
 
@@ -145,10 +147,13 @@ class box_services_vendus extends ModeleBoxes {
 						
 					$i++;
 				}
+				if ($num==0) $this->info_box_contents[$i][0] = array('td' => 'align="center"','text'=>$langs->trans("NoContractedProducts"));
 			}
 			else 
 			{
-				dol_print_error($db);
+				$this->info_box_contents[0][0] = array(	'td' => 'align="left"',
+    	        										'maxlength'=>500,
+	            										'text' => ($db->error().' sql='.$sql));
 			}
 		}
 		else {
diff --git a/htdocs/includes/modules/DolibarrModules.class.php b/htdocs/includes/modules/DolibarrModules.class.php
index f1ae50258c5..ea7f6a31a4e 100644
--- a/htdocs/includes/modules/DolibarrModules.class.php
+++ b/htdocs/includes/modules/DolibarrModules.class.php
@@ -498,6 +498,8 @@ class DolibarrModules
 	 */
 	function insert_boxes()
 	{
+		global $conf;
+		
 		$err=0;
 
 		if (is_array($this->boxes))
@@ -509,7 +511,8 @@ class DolibarrModules
 				$note  = isset($this->boxes[$key][2])?$this->boxes[$key][2]:'';
 
 				$sql = "SELECT count(*) FROM ".MAIN_DB_PREFIX."boxes_def";
-				$sql.= " WHERE file ='".$file."'";
+				$sql.= " WHERE file = '".$file."'";
+				$sql.= " AND entity = ".$conf->entity;
 				if ($note) $sql.=" AND note ='".addslashes($note)."'";
 
 				$result=$this->db->query($sql);
@@ -518,8 +521,9 @@ class DolibarrModules
 					$row = $this->db->fetch_row($result);
 					if ($row[0] == 0)
 					{
-						$sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes_def (file,note)";
+						$sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes_def (file,entity,note)";
 						$sql.= " VALUES ('".addslashes($file)."',";
+						$sql.= $conf->entity.",";
 						$sql.= $note?"'".addslashes($note)."'":"null";
 						$sql.= ")";
 						dol_syslog("DolibarrModules::insert_boxes sql=".$sql);
@@ -546,6 +550,8 @@ class DolibarrModules
 	 */
 	function delete_boxes()
 	{
+		global $conf;
+		
 		$err=0;
 
 		if (is_array($this->boxes))
@@ -560,11 +566,13 @@ class DolibarrModules
 				$sql.= " FROM ".MAIN_DB_PREFIX."boxes, ".MAIN_DB_PREFIX."boxes_def";
 				$sql.= " WHERE ".MAIN_DB_PREFIX."boxes.box_id = ".MAIN_DB_PREFIX."boxes_def.rowid";
 				$sql.= " AND ".MAIN_DB_PREFIX."boxes_def.file = '".addslashes($file)."'";
+				$sql.= " AND ".MAIN_DB_PREFIX."boxes_def.entity = ".$conf->entity;
 				dol_syslog("DolibarrModules::delete_boxes sql=".$sql);
 				$this->db->query($sql);
 
 				$sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes_def";
 				$sql.= " WHERE file = '".addslashes($file)."'";
+				$sql.= " AND entity = ".$conf->entity;
 				dol_syslog("DolibarrModules::delete_boxes sql=".$sql);
 				if (! $this->db->query($sql))
 				{
@@ -582,12 +590,15 @@ class DolibarrModules
 	 */
 	function delete_style_sheet()
 	{
+		global $conf;
+		
 		$err=0;
 
 		if ($this->style_sheet)
 		{
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."const";
 			$sql.= " WHERE name = '".$this->const_name."_CSS'";
+			$sql.= " AND entity = ".$conf->entity;
 			dol_syslog("DolibarrModules::delete_style_sheet sql=".$sql);
 			if (! $this->db->query($sql))
 			{
@@ -604,10 +615,13 @@ class DolibarrModules
 	 */
 	function delete_tabs()
 	{
+		global $conf;
+		
 		$err=0;
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."const";
 		$sql.= " WHERE name like '".$this->const_name."_TABS_%'";
+		$sql.= " AND entity = ".$conf->entity;
 		dol_syslog("DolibarrModules::delete_tabs sql=".$sql);
 		if (! $this->db->query($sql))
 		{
@@ -623,12 +637,14 @@ class DolibarrModules
 	 */
 	function insert_style_sheet()
 	{
+		global $conf;
+		
 		$err=0;
 
 		if ($this->style_sheet)
 		{
-			$sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,type,value,note,visible)";
-			$sql.= " VALUES ('".$this->const_name."_CSS','chaine','".$this->style_sheet."','Style sheet for module ".$this->name."','0')";
+			$sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,type,value,note,visible,entity)";
+			$sql.= " VALUES ('".$this->const_name."_CSS','chaine','".$this->style_sheet."','Style sheet for module ".$this->name."','0',".$conf->entity.")";
 			dol_syslog("DolibarrModules::insert_style_sheet sql=".$sql);
 			$resql=$this->db->query($sql);
 			/* Allow duplicate key
@@ -648,6 +664,8 @@ class DolibarrModules
 	 */
 	function insert_tabs()
 	{
+		global $conf;
+		
 		$err=0;
 
 		if (! empty($this->tabs))
@@ -657,8 +675,8 @@ class DolibarrModules
 			{
 				if ($value)
 				{
-					$sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,type,value,note,visible)";
-					$sql.= " VALUES ('".$this->const_name."_TABS_".$i."','chaine','".$value."',null,'0')";
+					$sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,type,value,note,visible,entity)";
+					$sql.= " VALUES ('".$this->const_name."_TABS_".$i."','chaine','".$value."',null,'0',".$conf->entity.")";
 					dol_syslog("DolibarrModules::insert_tabs sql=".$sql);
 					$resql=$this->db->query($sql);
 					/* Allow duplicate key
@@ -680,6 +698,8 @@ class DolibarrModules
 	 */
 	function insert_const()
 	{
+		global $conf;
+		
 		$err=0;
 
 		foreach ($this->const as $key => $value)
@@ -690,7 +710,10 @@ class DolibarrModules
 			$note   = $this->const[$key][3];
 			$visible= $this->const[$key][4];
 
-			$sql = "SELECT count(*) FROM ".MAIN_DB_PREFIX."const WHERE name ='".$name."'";
+			$sql = "SELECT count(*)";
+			$sql.= " FROM ".MAIN_DB_PREFIX."const";
+			$sql.= " WHERE name ='".$name."'";
+			$sql.= " AND entity = ".$conf->entity;
 
 			$result=$this->db->query($sql);
 			if ($result)
@@ -702,15 +725,18 @@ class DolibarrModules
 					if (! $visible) $visible='0';
 					if (strlen($note))
 					{
-						$sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,type,value,note,visible) VALUES ('$name','$type','$val','$note','$visible')";
+						$sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,type,value,note,visible,entity)";
+						$sql.= " VALUES ('".$name."','".$type."','".$val."','".$note."','".$visible."',".$conf->entity.")";
 					}
 					elseif (strlen($val))
 					{
-						$sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,type,value,visible) VALUES ('$name','$type','$val','$visible')";
+						$sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,type,value,visible,entity)";
+						$sql.= " VALUES ('".$name."','".$type."','".$val."','".$visible."',".$conf->entity.")";
 					}
 					else
 					{
-						$sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,type,visible) VALUES ('$name','$type','$visible')";
+						$sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,type,visible,entity)";
+						$sql.= " VALUES ('".$name."','".$type."','".$visible."',".$conf->entity.")";
 					}
 
 					dol_syslog("DolibarrModules::insert_const sql=".$sql);
@@ -736,12 +762,16 @@ class DolibarrModules
 	 */
 	function insert_permissions()
 	{
+		global $conf;
+		
 		$err=0;
 
 		//print $this->rights_class." ".sizeof($this->rights)."<br>";
 
 		// Test si module actif
-		$sql_del = "SELECT value FROM ".MAIN_DB_PREFIX."const WHERE name = '".$this->const_name."'";
+		$sql_del = "SELECT value FROM ".MAIN_DB_PREFIX."const";
+		$sql_del.= " WHERE name = '".$this->const_name."'";
+		$sql_del.= " AND entity IN (0,".$conf->entity.")";
 		$resql=$this->db->query($sql_del);
 		if ($resql) {
 
@@ -766,24 +796,24 @@ class DolibarrModules
 						if (strlen($r_subperms) )
 						{
 							$sql = "INSERT INTO ".MAIN_DB_PREFIX."rights_def ";
-							$sql .= " (id, libelle, module, type, bydefault, perms, subperms)";
+							$sql .= " (id, entity, libelle, module, type, bydefault, perms, subperms)";
 							$sql .= " VALUES ";
-							$sql .= "(".$r_id.",'".addslashes($r_desc)."','".$r_modul."','".$r_type."',".$r_def.",'".$r_perms."','".$r_subperms."')";
+							$sql .= "(".$r_id.",".$conf->entity.",'".addslashes($r_desc)."','".$r_modul."','".$r_type."',".$r_def.",'".$r_perms."','".$r_subperms."')";
 						}
 						else
 						{
 							$sql = "INSERT INTO ".MAIN_DB_PREFIX."rights_def ";
-							$sql .= " (id, libelle, module, type, bydefault, perms)";
+							$sql .= " (id, entity, libelle, module, type, bydefault, perms)";
 							$sql .= " VALUES ";
-							$sql .= "(".$r_id.",'".addslashes($r_desc)."','".$r_modul."','".$r_type."',".$r_def.",'".$r_perms."')";
+							$sql .= "(".$r_id.",".$conf->entity.",'".addslashes($r_desc)."','".$r_modul."','".$r_type."',".$r_def.",'".$r_perms."')";
 						}
 					}
 					else
 					{
 						$sql = "INSERT INTO ".MAIN_DB_PREFIX."rights_def ";
-						$sql .= " (id, libelle, module, type, bydefault)";
+						$sql .= " (id, entity, libelle, module, type, bydefault)";
 						$sql .= " VALUES ";
-						$sql .= "(".$r_id.",'".addslashes($r_desc)."','".$r_modul."','".$r_type."',".$r_def.")";
+						$sql .= "(".$r_id.",".$conf->entity.",'".addslashes($r_desc)."','".$r_modul."','".$r_type."',".$r_def.")";
 					}
 
 					dol_syslog("DolibarrModules::insert_permissions sql=".$sql, LOG_DEBUG);
@@ -809,9 +839,13 @@ class DolibarrModules
 	 */
 	function delete_permissions()
 	{
+		global $conf;
+		
 		$err=0;
 
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."rights_def WHERE module = '".$this->rights_class."'";
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."rights_def";
+		$sql.= " WHERE module = '".$this->rights_class."'";
+		$sql.= " AND entity = ".$conf->entity;
 		dol_syslog("DolibarrModules::delete_permissions sql=".$sql);
 		if (!$this->db->query($sql))
 		{
@@ -873,7 +907,8 @@ class DolibarrModules
 			$menu->perms=$this->menu[$key]['perms'];
 			$menu->target=$this->menu[$key]['target'];
 			$menu->user=$this->menu[$key]['user'];
-			$menu->constraint=$this->menu[$key]['constraint'];
+			//$menu->constraint=$this->menu[$key]['constraint'];
+			$menu->enabled=$this->menu[$key]['enabled'];
 			if (! $err)
 			{
 				$result=$menu->create($user);
@@ -911,10 +946,13 @@ class DolibarrModules
 	 */
 	function delete_menus()
 	{
+		global $conf;
+		
 		$err=0;
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."menu";
 		$sql.= " WHERE module = '".addslashes($this->rights_class)."'";
+		$sql.= " AND entity = ".$conf->entity;
 
 		dol_syslog("DolibarrModules::delete_menus sql=".$sql);
 		$resql=$this->db->query($sql);
diff --git a/htdocs/includes/modules/modAgenda.class.php b/htdocs/includes/modules/modAgenda.class.php
index b4db72f54c0..560c61ea8c8 100644
--- a/htdocs/includes/modules/modAgenda.class.php
+++ b/htdocs/includes/modules/modAgenda.class.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Sebastien Di Cintio  <sdicintio@ressource-toi.org>
  * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
+ * Copyright (C) 2009      Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -149,6 +150,7 @@ class modAgenda extends DolibarrModules
 													'langs'=>'commercial',
 													'position'=>100,
 													'perms'=>'$user->rights->agenda->myactions->read',
+													'enabled'=>'$conf->agenda->enabled',
 													'target'=>'',
 													'user'=>0);
 		$r++;
diff --git a/htdocs/includes/modules/modECM.class.php b/htdocs/includes/modules/modECM.class.php
index 8301dfd5fe4..b1335b0ffcd 100644
--- a/htdocs/includes/modules/modECM.class.php
+++ b/htdocs/includes/modules/modECM.class.php
@@ -131,6 +131,7 @@ class modECM extends DolibarrModules
 							  'langs'=>'ecm',
 							  'position'=>100,
 							  'perms'=>'$user->rights->ecm->download || $user->rights->ecm->upload || $user->rights->ecm->setup',
+							  'enabled'=>'$user->rights->ecm->download || $user->rights->ecm->upload || $user->rights->ecm->setup',
 							  'target'=>'',
 							  'user'=>0);
 		$r++;
@@ -144,6 +145,7 @@ class modECM extends DolibarrModules
 							  'langs'=>'ecm',
 							  'position'=>101,
 							  'perms'=>'$user->rights->ecm->download || $user->rights->ecm->upload',
+							  'enabled'=>'$user->rights->ecm->download || $user->rights->ecm->upload',
 							  'target'=>'',
 							  'user'=>0);
 		$r++;
@@ -156,6 +158,7 @@ class modECM extends DolibarrModules
 							  'langs'=>'ecm',
 							  'position'=>100,
 							  'perms'=>'$user->rights->ecm->setup',
+							  'enabled'=>'$user->rights->ecm->setup',
 							  'target'=>'',
 							  'user'=>0);
 		$r++;
@@ -168,6 +171,7 @@ class modECM extends DolibarrModules
 							  'langs'=>'ecm',
 							  'position'=>102,
 							  'perms'=>'$user->rights->ecm->download || $user->rights->ecm->upload',
+							  'enabled'=>'$user->rights->ecm->download || $user->rights->ecm->upload',
 							  'target'=>'',
 							  'user'=>0);
 		$r++;
@@ -180,6 +184,7 @@ class modECM extends DolibarrModules
 							  'langs'=>'ecm',
 							  'position'=>103,
 							  'perms'=>'$user->rights->ecm->download',
+							  'enabled'=>'$user->rights->ecm->download',
 							  'target'=>'',
 							  'user'=>0);
 		$r++;
diff --git a/htdocs/includes/triggers/interface_all_Logevents.class.php b/htdocs/includes/triggers/interface_all_Logevents.class.php
index d41dde319f7..38549c82105 100644
--- a/htdocs/includes/triggers/interface_all_Logevents.class.php
+++ b/htdocs/includes/triggers/interface_all_Logevents.class.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2005-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2009      Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -93,15 +94,18 @@ class InterfaceLogevents
      *      \param      user        Objet user
      *      \param      langs       Objet langs
      *      \param      conf        Objet conf
+     *      \param      entity      Entity
      *      \return     int         <0 si ko, 0 si aucune action faite, >0 si ok
      */
-    function run_trigger($action,$object,$user,$langs,$conf)
+    function run_trigger($action,$object,$user,$langs,$conf,$entity=1)
     {
-        if (! empty($conf->global->MAIN_LOGEVENTS_DISABLE_ALL)) return 0;	// Log events is disabled (hidden features)
-
-		$key='MAIN_LOGEVENTS_'.$action;
-		//dol_syslog("xxxxxxxxxxx".$key);
-		if (empty($conf->global->$key)) return 0;				// Log events not enabled for this action
+    	if (! empty($conf->global->MAIN_LOGEVENTS_DISABLE_ALL)) return 0;	// Log events is disabled (hidden features)
+    	
+    	$key='MAIN_LOGEVENTS_'.$action;
+    	//dol_syslog("xxxxxxxxxxx".$key);
+    	if (empty($conf->global->$key)) return 0;				// Log events not enabled for this action
+    	
+    	if (empty($conf->entity)) $conf->entity = $entity;  // forcing of the entity if it's not defined (ex: in login form)
 
         // Actions
         if ($action == 'USER_LOGIN')
diff --git a/htdocs/index.php b/htdocs/index.php
index 7dd99159ea4..105f7bcbb6a 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2007 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php
index d882dc85437..f55a43c65c3 100644
--- a/htdocs/install/etape5.php
+++ b/htdocs/install/etape5.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
  * Copyright (C) 2004      Sebastien DiCintio   <sdicintio@ressource-toi.org>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -87,40 +88,40 @@ pHeader($langs->trans("SetupEnd"),"etape5");
 
 if ($_POST["action"] == "set" || $_POST["action"] == "upgrade")
 {
-    print '<table cellspacing="0" cellpadding="2" width="100%">';
-    $error=0;
+	print '<table cellspacing="0" cellpadding="2" width="100%">';
+  $error=0;
     
 	// decode database pass if needed
-    if (! empty($dolibarr_main_db_encrypted_pass))
-    {
-		require_once(DOL_DOCUMENT_ROOT ."/lib/security.lib.php");
-    	$dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
-    }
-
-    $conf->db->type = $dolibarr_main_db_type;
-    $conf->db->host = $dolibarr_main_db_host;
-    $conf->db->port = $dolibarr_main_db_port;
-    $conf->db->name = $dolibarr_main_db_name;
-    $conf->db->user = $dolibarr_main_db_user;
-    $conf->db->pass = $dolibarr_main_db_pass;
+  if (! empty($dolibarr_main_db_encrypted_pass))
+  {
+  	require_once(DOL_DOCUMENT_ROOT ."/lib/security.lib.php");
+  	$dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
+  }
+  
+  $conf->db->type = $dolibarr_main_db_type;
+  $conf->db->host = $dolibarr_main_db_host;
+  $conf->db->port = $dolibarr_main_db_port;
+  $conf->db->name = $dolibarr_main_db_name;
+  $conf->db->user = $dolibarr_main_db_user;
+  $conf->db->pass = $dolibarr_main_db_pass;
 	
-    $db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port);
-    $ok = 0;
+  $db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port);
+  $ok = 0;
 
-    // Active module user
-    $modName='modUser';
-    $file = $modName . ".class.php";
-    dolibarr_install_syslog('install/etape5.php Load module user '.DOL_DOCUMENT_ROOT ."/includes/modules/".$file, LOG_INFO);
+  // Active module user
+  $modName='modUser';
+  $file = $modName . ".class.php";
+  dolibarr_install_syslog('install/etape5.php Load module user '.DOL_DOCUMENT_ROOT ."/includes/modules/".$file, LOG_INFO);
 	include_once(DOL_DOCUMENT_ROOT ."/includes/modules/".$file);
-    $objMod = new $modName($db);
-    $objMod->init();
+  $objMod = new $modName($db);
+  $objMod->init();
     
-    // If first install
-    if ($_POST["action"] == "set")
+  // If first install
+  if ($_POST["action"] == "set")
+  {
+  	if ($db->connected == 1)
     {
-        if ($db->connected == 1)
-        {
-			$conf->setValues($db);
+    	$conf->setValues($db);
 
 			// Create user
 			include_once(DOL_DOCUMENT_ROOT ."/user.class.php");
@@ -129,73 +130,74 @@ if ($_POST["action"] == "set" || $_POST["action"] == "upgrade")
 			$createuser->id=0;
 			
 			$newuser = new User($db);
-			$newuser->nom='Admin';
+			$newuser->nom='SuperAdmin';
 			$newuser->prenom='';
 			$newuser->login=$_POST["login"];
 			$newuser->pass=$_POST["pass"];
 			$newuser->admin=1;
+			$newuser->entity=0;
 
 			$result=$newuser->create($createuser,1);
-	        if ($result > 0)
-	        {
-	            print $langs->trans("AdminLoginCreatedSuccessfuly",$_POST["login"])."<br>";
-	            $success = 1;
-	        }
-	        else
-	        {
-	            if ($newuser->error == 'ErrorLoginAlreadyExists')
-	            {
-					dolibarr_install_syslog('install/etape5.php AdminLoginAlreadyExists', LOG_WARNING);
-	                print '<br><div class="warning">'.$langs->trans("AdminLoginAlreadyExists",$_POST["login"])."</div><br>";
-	                $success = 1;
-	            }
-	            else
-	            {
-					dolibarr_install_syslog('install/etape5.php FailedToCreateAdminLogin '.$newuser->error, LOG_ERR);
-	                print '<br>'.$langs->trans("FailedToCreateAdminLogin").' '.$newuser->error.'<br><br>';
-	            }
-	        }
+	    if ($result > 0)
+	    {
+	    	print $langs->trans("AdminLoginCreatedSuccessfuly",$_POST["login"])."<br>";
+	      $success = 1;
+	    }
+	    else
+	    {
+	    	if ($newuser->error == 'ErrorLoginAlreadyExists')
+	      {
+	      	dolibarr_install_syslog('install/etape5.php AdminLoginAlreadyExists', LOG_WARNING);
+	        print '<br><div class="warning">'.$langs->trans("AdminLoginAlreadyExists",$_POST["login"])."</div><br>";
+	        $success = 1;
+	      }
+	      else
+	      {
+	      	dolibarr_install_syslog('install/etape5.php FailedToCreateAdminLogin '.$newuser->error, LOG_ERR);
+	        print '<br>'.$langs->trans("FailedToCreateAdminLogin").' '.$newuser->error.'<br><br>';
+	      }
+	    }
 	    
-	        if ($success)
-	        {
-	            // Si install non Français, on configure pour fonctionner en mode internationnal
-	            if ($langs->defaultlang != "fr_FR")
-	            {
-	                $db->query("UPDATE llx_const set value='eldy_backoffice.php' WHERE name='MAIN_MENU_BARRETOP';");
-	                $db->query("UPDATE llx_const set value='eldy_backoffice.php' WHERE name='MAIN_MENU_BARRELEFT';");
-	
-	                $db->query("UPDATE llx_const set value='eldy_frontoffice.php' WHERE name='MAIN_MENUFRONT_BARRETOP';");
-	                $db->query("UPDATE llx_const set value='eldy_frontoffice.php' WHERE name='MAIN_MENUFRONT_BARRELEFT';");
-	            }
-	
-				dolibarr_install_syslog('install/etape5.php set MAIN_VERSION_LAST_INSTALL const to '.DOL_VERSION, LOG_DEBUG);
-	            $db->query("DELETE FROM llx_const WHERE name='MAIN_VERSION_LAST_INSTALL'");
-				$db->query("INSERT INTO llx_const(name,value,type,visible,note) values('MAIN_VERSION_LAST_INSTALL','".DOL_VERSION."','chaine',0,'Dolibarr version for last install')");
+	    if ($success)
+	    {
+	    	// Si install non Français, on configure pour fonctionner en mode internationnal
+	      if ($langs->defaultlang != "fr_FR")
+	      {
+	      	$db->query("UPDATE llx_const set value='eldy_backoffice.php' WHERE name='MAIN_MENU_BARRETOP';");
+	        $db->query("UPDATE llx_const set value='eldy_backoffice.php' WHERE name='MAIN_MENU_BARRELEFT';");
+	        
+	        $db->query("UPDATE llx_const set value='eldy_frontoffice.php' WHERE name='MAIN_MENUFRONT_BARRETOP';");
+	        $db->query("UPDATE llx_const set value='eldy_frontoffice.php' WHERE name='MAIN_MENUFRONT_BARRELEFT';");
+	      }
+	      
+	      dolibarr_install_syslog('install/etape5.php set MAIN_VERSION_LAST_INSTALL const to '.DOL_VERSION, LOG_DEBUG);
+	      $db->query("DELETE FROM llx_const WHERE name='MAIN_VERSION_LAST_INSTALL'");
+				$db->query("INSERT INTO llx_const(name,value,type,visible,note,entity) values('MAIN_VERSION_LAST_INSTALL','".DOL_VERSION."','chaine',0,'Dolibarr version for last install,0')");
 
 				dolibarr_install_syslog('install/etape5.php Remove MAIN_NOT_INSTALLED const', LOG_DEBUG);
-	            $db->query("DELETE FROM llx_const WHERE name='MAIN_NOT_INSTALLED'");
-			}
-    	}
-    	else
-    	{
-            print $langs->trans("Error")."<br>";
-    	}
-    }
-
-	// If upgrade
-    if ($_POST["action"] == "upgrade")
+	      $db->query("DELETE FROM llx_const WHERE name='MAIN_NOT_INSTALLED'");
+	    }
+	  }
+	  else
     {
-		dolibarr_install_syslog('install/etape5.php set MAIN_VERSION_LAST_UPGRADE const to value '.DOL_VERSION, LOG_DEBUG);
-	    $db->query("DELETE FROM llx_const WHERE name='MAIN_VERSION_LAST_UPGRADE'");
-		$db->query("INSERT INTO llx_const(name,value,type,visible,note) values('MAIN_VERSION_LAST_UPGRADE','".DOL_VERSION."','chaine',0,'Dolibarr version for last upgrade')");
+    	print $langs->trans("Error")."<br>";
+    }
+  }
+  
+  // If upgrade
+  if ($_POST["action"] == "upgrade")
+  {
+  	dolibarr_install_syslog('install/etape5.php set MAIN_VERSION_LAST_UPGRADE const to value '.DOL_VERSION, LOG_DEBUG);
+	  $db->query("DELETE FROM llx_const WHERE name='MAIN_VERSION_LAST_UPGRADE'");
+		$db->query("INSERT INTO llx_const(name,value,type,visible,note,entity) values('MAIN_VERSION_LAST_UPGRADE','".DOL_VERSION."','chaine',0,'Dolibarr version for last upgrade',0)");
 	}
 	
-    // May fail if parameter already defined
-    $resql=$db->query("INSERT INTO llx_const(name,value,type,visible,note) values('MAIN_LANG_DEFAULT','".$setuplang."','chaine',0,'Default language')");
+	// May fail if parameter already defined
+  $resql=$db->query("INSERT INTO llx_const(name,value,type,visible,note,entity) values('MAIN_LANG_DEFAULT','".$setuplang."','chaine',0,'Default language',1)");
 	
-    print '</table>';
+  print '</table>';
 
-    $db->close();
+  $db->close();
 }
 
 print "<br>";
@@ -204,9 +206,9 @@ print "<br>";
 // If first install
 if ($_POST["action"] == "set")
 {
-    // Fin install
-    print $langs->trans("SystemIsInstalled")."<br>";
-    if (empty($force_install_lockinstall))
+	// Fin install
+  print $langs->trans("SystemIsInstalled")."<br>";
+  if (empty($force_install_lockinstall))
 	{
 		print '<div class="warning">'.$langs->trans("WarningRemoveInstallDir")."</div>";
 	}
@@ -217,18 +219,18 @@ if ($_POST["action"] == "set")
 		fwrite($fp, "This is a lock file to prevent use of install pages");
 		fclose($fp);
 	}
+	
+	print "<br>";
     
-    print "<br>";
-    
-    print $langs->trans("YouNeedToPersonalizeSetup")."<br><br>";
+  print $langs->trans("YouNeedToPersonalizeSetup")."<br><br>";
 }
 
 // If upgrade
 if ($_POST["action"] == "upgrade")
 {
-    // Fin install
-    print $langs->trans("SystemIsUpgraded")."<br>";
-    if (empty($force_install_lockinstall))
+	// Fin install
+  print $langs->trans("SystemIsUpgraded")."<br>";
+  if (empty($force_install_lockinstall))
 	{
 		print '<div class="warning">'.$langs->trans("WarningRemoveInstallDir")."</div>";
 	}
@@ -239,8 +241,8 @@ if ($_POST["action"] == "upgrade")
 		fwrite($fp, "This is a lock file to prevent use of install pages");
 		fclose($fp);
 	}
-    
-    print "<br>";
+	
+	print "<br>";
 }
 
 
@@ -256,4 +258,4 @@ clearstatcache();
 dolibarr_install_syslog("Dolibarr install/setup finished", LOG_INFO);
 
 pFooter(1,$setuplang);
-?>
+?>
\ No newline at end of file
diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang
index 24082293b77..b3fdab8fca3 100644
--- a/htdocs/langs/en_US/boxes.lang
+++ b/htdocs/langs/en_US/boxes.lang
@@ -39,6 +39,7 @@ BoxTitleTotalUnpayedCustomerBills=Unpayed customer's invoices
 BoxTitleTotalUnpayedSuppliersBills=Unpayed supplier's invoices
 BoxMyLastBookmarks=My last %s bookmarks
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Last successfull refresh date: %s
+LastRefreshDate=Last refresh date
 NoRecordedBookmarks=No bookmarks defined. Click <a href="%s">here</a> to add bookmarks.
 NoRecordedCustomers=No recorded customers
 BoxTitleLastActionsToDo=Last %s actions to do
@@ -48,4 +49,7 @@ NoRecordedProposals=No recorded proposals
 NoRecordedInvoices=No recorded customer's invoices
 NoUnpayedCustomerBills=No unpayed customer's invoices
 NoRecordedSupplierInvoices=No recorded supplier's invoices
-NoUnpayedSupplierBills=No unpayed supplier's invoices
\ No newline at end of file
+NoUnpayedSupplierBills=No unpayed supplier's invoices
+NoRecordedProducts=No recorded products/services
+NoRecordedProspects=No recorded prospects
+NoContractedProducts= No products/services contracted
\ No newline at end of file
diff --git a/htdocs/langs/en_US/commercial.lang b/htdocs/langs/en_US/commercial.lang
index 48ab40a0d86..8ba3ff0d647 100644
--- a/htdocs/langs/en_US/commercial.lang
+++ b/htdocs/langs/en_US/commercial.lang
@@ -46,7 +46,6 @@ ToDoActions=Uncomplete actions
 ToDoActionsFor=Uncomplete actions for %s
 SendPropalRef=Send commercial proposal %s
 SendOrderRef=Send order %s
-NoRecordedProspects=No prospect recorded
 StatusActionToDo=To do
 StatusActionDone=Done
 MyActionsAsked=Actions I have recorded
diff --git a/htdocs/langs/fr_FR/boxes.lang b/htdocs/langs/fr_FR/boxes.lang
index 344c07c1db2..860c965bc8a 100644
--- a/htdocs/langs/fr_FR/boxes.lang
+++ b/htdocs/langs/fr_FR/boxes.lang
@@ -49,4 +49,7 @@ NoRecordedProposals=Pas de propositions commerciales enregistrées
 NoRecordedInvoices=Pas de factures clients enregistrées
 NoUnpayedCustomerBills=Pas de factures clients impayées
 NoRecordedSupplierInvoices=Pas de factures fournisseurs enregistrées
-NoUnpayedSupplierBills=Pas de factures fournisseurs impayées
\ No newline at end of file
+NoUnpayedSupplierBills=Pas de factures fournisseurs impayées
+NoRecordedProducts=Pas de produits/services enregistrés
+NoRecordedProspects=Pas de prospects enregistrés
+NoContractedProducts=Pas de produits/services contractés
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/commercial.lang b/htdocs/langs/fr_FR/commercial.lang
index 491e49dac2e..1fcff1b7ee1 100644
--- a/htdocs/langs/fr_FR/commercial.lang
+++ b/htdocs/langs/fr_FR/commercial.lang
@@ -46,7 +46,6 @@ DoneAndToDoActionsFor=Liste des actions réalisées ou à faire pour %s
 DoneAndToDoActions=Liste des actions réalisées ou à faire
 SendPropalRef=Envoi proposition commerciale %s
 SendOrderRef=Envoi commande %s
-NoRecordedProspects=Aucun prospect enregistré
 StatusActionToDo=À faire
 StatusActionDone=Réalisé
 StatusActionInProcess=En cours
diff --git a/htdocs/lib/admin.lib.php b/htdocs/lib/admin.lib.php
index 9548ec04431..3a988811d8e 100644
--- a/htdocs/lib/admin.lib.php
+++ b/htdocs/lib/admin.lib.php
@@ -289,13 +289,13 @@ function run_sql($sqlfile,$silent=1)
 	\param	    entity			Multi company id
 	\return     int         <0 si ko, >0 si ok
 */
-function dolibarr_del_const($db, $name)
+function dolibarr_del_const($db, $name, $entity=1)
 {
 	global $conf;
 
 	$sql = "DELETE FROM llx_const";
 	$sql.=" WHERE (name='".addslashes($name)."' OR rowid='".addslashes($name)."')";
-	$sql.= " AND entity = ".$conf->entity;
+	$sql.= " AND entity = ".$entity;
 
   dol_syslog("admin.lib::dolibarr_del_const sql=".$sql);
 	$resql=$db->query($sql);
@@ -318,7 +318,7 @@ function dolibarr_del_const($db, $name)
 		\param	    entity			Multi company id
 		\return     string      Valeur de la constante
 */
-function dolibarr_get_const($db, $name)
+function dolibarr_get_const($db, $name, $entity=1)
 {
 	global $conf;
   $value='';
@@ -326,7 +326,7 @@ function dolibarr_get_const($db, $name)
   $sql = "SELECT value";
   $sql.= " FROM llx_const";
   $sql.= " WHERE name = '".addslashes($name)."'";
-  $sql.= " AND entity = ".$conf->entity;
+  $sql.= " AND entity = ".$entity;
 
   dol_syslog("admin.lib::dolibarr_get_const sql=".$sql);
   $resql=$db->query($sql);
@@ -351,28 +351,28 @@ function dolibarr_get_const($db, $name)
    \param	    entity			Multi company id
    \return     	int         -1 if KO, 1 if OK
 */
-function dolibarr_set_const($db, $name, $value, $type='chaine', $visible=0, $note='')
+function dolibarr_set_const($db, $name, $value, $type='chaine', $visible=0, $note='', $entity=1)
 {
 	global $conf;
-	
+
 	if (empty($name))
   {
   	dol_print_error("Error: Call to function dolibarr_set_const with wrong parameters", LOG_ERR);
     exit;
   }
-  
+
   $db->begin();
 
   //dol_syslog("dolibarr_set_const name=$name, value=$value");
   $sql = "DELETE FROM llx_const WHERE name = '".addslashes($name)."'";
-  $sql.= " AND entity = ".$conf->entity;
+  $sql.= " AND entity = ".$entity;
   dol_syslog("admin.lib::dolibarr_set_const sql=".$sql, LOG_DEBUG);
 	$resql=$db->query($sql);
 
   if (strcmp($value,''))	// true if different. Must work for $value='0' or $value=0
   {
   	$sql = "INSERT INTO llx_const(name,value,type,visible,note,entity)";
-	  $sql.= " VALUES ('".$name."','".addslashes($value)."','".$type."',".$visible.",'".addslashes($note)."',".$conf->entity.")";
+	  $sql.= " VALUES ('".$name."','".addslashes($value)."','".$type."',".$visible.",'".addslashes($note)."',".$entity.")";
 
 		dol_syslog("admin.lib::dolibarr_set_const sql=".$sql, LOG_DEBUG);
 	  $resql=$db->query($sql);
diff --git a/htdocs/lib/agenda.lib.php b/htdocs/lib/agenda.lib.php
index 22a29c27db8..f4b61c3d0e0 100644
--- a/htdocs/lib/agenda.lib.php
+++ b/htdocs/lib/agenda.lib.php
@@ -1,5 +1,6 @@
 <?php
-/* Copyright (C) 2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2008      Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -38,17 +39,18 @@ function show_array_actions_to_do($max=5)
 	$sql = "SELECT a.id, a.label, ".$db->pdate("a.datep")." as dp, a.fk_user_author, a.percent,";
 	$sql.= " c.code, c.libelle,";
 	$sql.= " s.nom as sname, s.rowid, s.client";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
-	$sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as a, ".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql.= " WHERE c.id=a.fk_action AND a.percent < 100 AND s.rowid = a.fk_soc";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-	if ($socid)
-	{
-	    $sql .= " AND s.rowid = ".$socid;
-	}
-	$sql .= " ORDER BY a.datep DESC, a.id DESC";
-	$sql .= $db->plimit($max, 0);
+	$sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as a";
+	$sql.= ", ".MAIN_DB_PREFIX."c_actioncomm as c";
+	$sql.= ", ".MAIN_DB_PREFIX."societe as s";
+	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	$sql.= " WHERE c.id = a.fk_action";
+	$sql.= " AND a.percent < 100";
+	$sql.= " AND s.rowid = a.fk_soc";
+	$sql.= " AND s.entity = ".$conf->entity;
+	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+	if ($socid) $sql.= " AND s.rowid = ".$socid;
+	$sql.= " ORDER BY a.datep DESC, a.id DESC";
+	$sql.= $db->plimit($max, 0);
 
 	$resql=$db->query($sql);
 	if ($resql)
@@ -124,18 +126,16 @@ function show_array_last_actions_done($max=5)
 	$sql = "SELECT a.id, a.percent, ".$db->pdate("a.datep")." as da, ".$db->pdate("a.datep2")." as da2, a.fk_user_author, a.label,";
 	$sql.= " c.code, c.libelle,";
 	$sql.= " s.rowid, s.nom as sname, s.client";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
-	$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a, ".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql .= " WHERE c.id = a.fk_action AND a.percent >= 100 AND s.rowid = a.fk_soc";
-	if ($socid)
-	{
-		$sql .= " AND s.rowid = ".$socid;
-	}
-	if (!$user->rights->societe->client->voir && !$socid) //restriction
-	{
-		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-	}
+	$sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as a";
+	$sql.= ", ".MAIN_DB_PREFIX."c_actioncomm as c";
+	$sql.= ", ".MAIN_DB_PREFIX."societe as s";
+	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	$sql.= " WHERE c.id = a.fk_action";
+	$sql.= " AND a.percent >= 100";
+	$sql.= " AND s.rowid = a.fk_soc";
+	$sql.= " AND s.entity = ".$conf->entity;
+	if ($socid)	$sql.= " AND s.rowid = ".$socid;
+	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 	$sql .= " ORDER BY a.datep2 DESC";
 	$sql .= $db->plimit($max, 0);
 
diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php
index f5c509e92da..b137e4533de 100644
--- a/htdocs/lib/functions.lib.php
+++ b/htdocs/lib/functions.lib.php
@@ -1319,15 +1319,18 @@ function info_admin($texte,$infoonimgalt=0)
 /**
  *	\brief      Check permissions of a user to show a page and an object.
  *	\param      user      	  	User to check
- *	\param      feature			Feature to check (in most cases, it's module name)
+ *	\param      feature			    Feature to check (in most cases, it's module name)
  *	\param      objectid      	Object ID if we want to check permission on on object (optionnal)
- *	\param      dbtablename    	Table name where object is stored. Not used if objectid is null (optionnel)
- *	\param      feature2		Feature to check (second level of permission)
- *  \param      dbt_socfield    Field name for socid foreign key if not fk_soc. (optionnel)
+ *	\param      dbtablename    	Table name where object is stored. Not used if objectid is null (optionnal)
+ *	\param      feature2		    Feature to check (second level of permission)
+ *  \param      dbt_socfield    Field name for socid foreign key if not fk_soc. (optionnal)
+ *  \param      dbt_select      Field name for select if not rowid. (optionnal)
  */
-function restrictedArea($user, $feature='societe', $objectid=0, $dbtablename='',$feature2='',$dbt_socfield='fk_soc')
+function restrictedArea($user, $feature='societe', $objectid=0, $dbtablename='',$feature2='',$dbt_socfield='fk_soc',$dbt_select='rowid')
 {
-	global $db;
+	global $db, $conf;
+	
+	if ($dbt_select != 'rowid') $objectid = "'".$objectid."'";
 
 	//print "$user->id, $feature, $objectid, $dbtablename, ".$user->rights->societe->contact->lire;
 
@@ -1359,7 +1362,7 @@ function restrictedArea($user, $feature='societe', $objectid=0, $dbtablename='',
 		if (empty($user->rights->$feature->$feature2->lire)
 		&& empty($user->rights->$feature->$feature2->read)) $readok=0;
 	}
-	else if (! empty($feature))		// This is for old permissions
+	else if (! empty($feature) && ($feature!='user' && $feature!='usergroup'))		// This is for old permissions
 	{
 		if (empty($user->rights->$feature->lire)
 		&& empty($user->rights->$feature->read)) $readok=0;
@@ -1414,46 +1417,76 @@ function restrictedArea($user, $feature='societe', $objectid=0, $dbtablename='',
 	if ($objectid)
 	{
 		$sql='';
-		// Check permission for external users
-		if ($user->societe_id > 0)
+
+		// If dbtable not defined, we use same name for table than module name
+		if (!$dbtablename) $dbtablename = $feature;
+	
+		// Check permission for object with entity
+		if ($feature == 'user' || $feature == 'usergroup' || $feature == 'produit')
 		{
-			if ($feature == 'societe')
+			$sql = "SELECT dbt.".$dbt_select;
+			$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+			$sql.= " WHERE dbt.".$dbt_select." = ".$objectid;
+			$sql.= " AND dbt.entity IN (0,".$conf->entity.")";
+		}
+    else if ($feature == 'societe')
+		{
+			// Check permission for external users
+			if ($user->societe_id > 0)
 			{
 				if ($user->societe_id <> $objectid) accessforbidden();
 			}
+			// Check permission for internal users that are restricted on their objects
+			else if (! $user->rights->societe->client->voir)
+			{
+				$sql = "SELECT sc.fk_soc";
+				$sql.= " FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc, ".MAIN_DB_PREFIX."societe as s";
+				$sql.= " WHERE sc.fk_soc = ".$objectid." AND sc.fk_user = ".$user->id;
+				$sql.= " AND sc.fk_soc = s.rowid";
+				$sql.= " AND s.entity = ".$conf->entity;
+			}
+			// Check permission for entity
 			else
 			{
-				// If dbtable not defined, we use same name for table than module name
-				if (!$dbtablename) $dbtablename = $feature;
-
+				$sql = "SELECT s.rowid";
+				$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+				$sql.= " WHERE s.rowid = ".$objectid;
+				$sql.= " AND s.entity = ".$conf->entity;
+			}
+		}
+		else
+		{
+			// Check permission for external users
+			if ($user->societe_id > 0)
+			{
 				$sql = "SELECT dbt.fk_soc";
 				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
 				$sql.= " WHERE dbt.rowid = ".$objectid;
 				$sql.= " AND dbt.fk_soc = ".$user->societe_id;
 			}
-		}
-		// Check permission for internal users that are restricted on their objects
-		else if (! $user->rights->societe->client->voir)
-		{
-			if ($feature == 'societe')
+			// Check permission for internal users that are restricted on their objects
+			else if (! $user->rights->societe->client->voir)
 			{
 				$sql = "SELECT sc.fk_soc";
-				$sql.= " FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-				$sql.= " WHERE sc.fk_soc = ".$objectid." AND sc.fk_user = ".$user->id;
-			}
-			else
-			{
-				if (!$dbtablename) $dbtablename = $feature;	// Si dbtable non defini, meme nom que le module
-
-				$sql = "SELECT sc.fk_soc";
-				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt, ".MAIN_DB_PREFIX."societe as s";
 				$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = dbt.".$dbt_socfield;
 				$sql.= " WHERE dbt.rowid = ".$objectid;
+				$sql.= " AND dbt.fk_soc = s.rowid";
+				$sql.= " AND s.entity = ".$conf->entity;
 				$sql.= " AND IFNULL(sc.fk_user, ".$user->id.") = ".$user->id;
 			}
+			// Check permission for entity
+			else
+			{
+				$sql = "SELECT dbt.".$dbt_select;
+				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt, ".MAIN_DB_PREFIX."societe as s";
+				$sql.= " WHERE dbt.".$dbt_select." = ".$objectid;
+				$sql.= " AND dbt.fk_soc = s.rowid";
+				$sql.= " AND s.entity = ".$conf->entity;
+			}
 		}
 
-		//print $sql;
+		//print $sql."<br>";
 		if ($sql)
 		{
 			$resql=$db->query($sql);
diff --git a/htdocs/lib/functions2.lib.php b/htdocs/lib/functions2.lib.php
index 395593e4c11..b007310b914 100644
--- a/htdocs/lib/functions2.lib.php
+++ b/htdocs/lib/functions2.lib.php
@@ -767,7 +767,7 @@ function weight_convert($weight,&$from_unit,$to_unit)
  *	\param	    tab         Tableau (cle=>valeur) des parametres a sauvegarder
  *	\return     int         <0 if KO, >0 if OK
  */
-function dol_set_user_param($db, &$user, $tab)
+function dol_set_user_param($db, $conf, &$user, $tab)
 {
 	// Verification parametres
 	if (sizeof($tab) < 1) return -1;
@@ -777,6 +777,7 @@ function dol_set_user_param($db, &$user, $tab)
 	// We remove old parameters for all keys in $tab
 	$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_param";
 	$sql.= " WHERE fk_user = ".$user->id;
+	$sql.= " AND entity = ".$conf->entity;
 	$sql.= " AND param in (";
 	$i=0;
 	foreach ($tab as $key => $value)
@@ -801,8 +802,8 @@ function dol_set_user_param($db, &$user, $tab)
 		// Set new parameters
 		if ($value && (! $url || in_array($key,array('sortfield','sortorder','begin','page'))))
 		{
-			$sql = "INSERT INTO ".MAIN_DB_PREFIX."user_param(fk_user,param,value)";
-			$sql.= " VALUES (".$user->id.",";
+			$sql = "INSERT INTO ".MAIN_DB_PREFIX."user_param(fk_user,entity,param,value)";
+			$sql.= " VALUES (".$user->id.",".$conf->entity.",";
 			$sql.= " '".$key."','".addslashes($value)."');";
 			dol_syslog("functions2.lib::dol_set_user_param sql=".$sql, LOG_DEBUG);
 
diff --git a/htdocs/lib/product.lib.php b/htdocs/lib/product.lib.php
index 5eb4bd8e437..12a547c42ce 100644
--- a/htdocs/lib/product.lib.php
+++ b/htdocs/lib/product.lib.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2006-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2007      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2009      Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/htdocs/lib/security.lib.php b/htdocs/lib/security.lib.php
index bad8a0bc1fa..2e10af9cbce 100644
--- a/htdocs/lib/security.lib.php
+++ b/htdocs/lib/security.lib.php
@@ -148,8 +148,10 @@ function dol_loginfunction($langs,$conf,$mysoc)
 	if ($conf->multicompany->enabled)
 	{
 		$html = new Form($db);
+		
 		//TODO: creer class
 		$entity = array('1'=>'company1','2'=>'company2');
+		
 		print '<tr><td align="left" valign="top" nowrap="nowrap"> &nbsp; <b>'.$langs->trans("Entity").'</b> &nbsp; </td>';
 		print '<td valign="top" nowrap="nowrap">';
 		$html->select_array('entity',$entity);
diff --git a/htdocs/livraison/fiche.php b/htdocs/livraison/fiche.php
index 367db064051..7430f1a7a22 100644
--- a/htdocs/livraison/fiche.php
+++ b/htdocs/livraison/fiche.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2005-2009 Laurent Destailleur   <eldy@users.sourceforge.net>
  * Copyright (C) 2005      Simon TOSSER          <simon@kornog-computing.com>
  * Copyright (C) 2007      Franky Van Liedekerke <franky.van.liedekerke@telenet.be>
- * Copyright (C) 2005-2008 Regis Houssin         <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin         <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,20 +35,16 @@ if ($conf->produit->enabled) require_once(DOL_DOCUMENT_ROOT."/product.class.php"
 if ($conf->expedition_bon->enabled) require_once(DOL_DOCUMENT_ROOT."/expedition/expedition.class.php");
 if ($conf->stock->enabled) require_once(DOL_DOCUMENT_ROOT."/product/stock/entrepot.class.php");
 
+if (!$user->rights->expedition->livraison->lire) accessforbidden();
+
 $langs->load("sendings");
 $langs->load("bills");
 $langs->load('deliveries');
 
-if (!$user->rights->expedition->livraison->lire)
-accessforbidden();
-
-
 // Security check
-if ($user->societe_id > 0)
-{
-	$action = '';
-	$socid = $user->societe_id;
-}
+$id = isset($_GET["id"])?$_GET["id"]:'';
+if ($user->societe_id) $socid=$user->societe_id;
+$result=restrictedArea($user,'expedition',$id,'','livraison');
 
 
 /*
diff --git a/htdocs/product.class.php b/htdocs/product.class.php
index cfd30746c46..16a3b8a7d43 100644
--- a/htdocs/product.class.php
+++ b/htdocs/product.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2007 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  * Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
  * Copyright (C) 2007      Jean Heimburger      <jean@tiaris.info>
  *
@@ -875,9 +875,9 @@ class Product extends CommonObject
 
 
 	/**
-	 *      \brief      Charge le produit/service en m�moire
-	 *      \param      id      Id du produit/service � charger
-	 *      \param      ref     Ref du produit/service � charger
+	 *      \brief      Charge le produit/service en memoire
+	 *      \param      id      Id du produit/service a charger
+	 *      \param      ref     Ref du produit/service a charger
 	 *      \return     int     <0 si ko, >0 si ok
 	 */
 	function fetch($id='',$ref='')
@@ -936,6 +936,11 @@ class Product extends CommonObject
 			$this->barcode            = $result["barcode"];
 			$this->barcode_type       = $result["fk_barcode_type"];
 
+			$this->stock_in_command   = 0;	// TODO
+			$this->stock_in_propal    = 0;	// TODO
+
+			$this->next_prev_filter = 'entity = '.$conf->entity;
+			
 			$this->label_url = '<a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$this->id.'">'.$this->libelle.'</a>';
 
 			$this->db->free();
@@ -1024,17 +1029,19 @@ class Product extends CommonObject
 		global $conf;
 		global $user;
 
-		$sql = "SELECT COUNT(DISTINCT pr.fk_soc) as nb_customers, COUNT(DISTINCT pr.rowid) as nb,";
+		$sql = "SELECT COUNT(DISTINCT p.fk_soc) as nb_customers, COUNT(DISTINCT p.rowid) as nb,";
 		$sql.= " COUNT(pd.rowid) as nb_rows, SUM(pd.qty) as qty";
-		$sql.= " FROM ".MAIN_DB_PREFIX."propaldet as pd, ".MAIN_DB_PREFIX."propal as pr";
+		$sql.= " FROM ".MAIN_DB_PREFIX."propaldet as pd";
+		$sql.= ", ".MAIN_DB_PREFIX."propal as p";
+		$sql.= ", ".MAIN_DB_PREFIX."societe as s";
 		if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql.= " WHERE pr.rowid = pd.fk_propal AND pd.fk_product = ".$this->id;
-		if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND pr.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
+		$sql.= " WHERE p.rowid = pd.fk_propal";
+		$sql.= " AND p.fk_soc = s.rowid";
+	  $sql.= " AND s.entity = ".$conf->entity;
+		$sql.= " AND pd.fk_product = ".$this->id;
+		if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		//$sql.= " AND pr.fk_statut != 0";
-		if ($socid > 0)
-		{
-			$sql .= " AND pr.fk_soc = $socid";
-		}
+		if ($socid > 0)	$sql.= " AND p.fk_soc = ".$socid;
 
 		$result = $this->db->query($sql) ;
 		if ( $result )
@@ -1066,20 +1073,17 @@ class Product extends CommonObject
 
 		$sql = "SELECT COUNT(DISTINCT c.fk_soc) as nb_customers, COUNT(DISTINCT c.rowid) as nb,";
 		$sql.= " COUNT(cd.rowid) as nb_rows, SUM(cd.qty) as qty";
-		$sql.= " FROM ".MAIN_DB_PREFIX."commandedet as cd,";
-		$sql.= " ".MAIN_DB_PREFIX."commande as c";
-		if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql.= " WHERE c.rowid = cd.fk_commande AND cd.fk_product = ".$this->id;
-		if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
-		if ($socid > 0)
-		{
-			$sql.= " AND c.fk_soc = ".$socid;
-		}
-
-		if ($filtrestatut <> '')
-		{
-			$sql.= " AND c.fk_statut in (".$filtrestatut.")";
-		}
+		$sql.= " FROM ".MAIN_DB_PREFIX."commandedet as cd";
+		$sql.= ", ".MAIN_DB_PREFIX."commande as c";
+		$sql.= ", ".MAIN_DB_PREFIX."societe as s";
+		if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		$sql.= " WHERE c.rowid = cd.fk_commande";
+		$sql.= " AND c.fk_soc = s.rowid";
+	  $sql.= " AND s.entity = ".$conf->entity;
+		$sql.= " AND cd.fk_product = ".$this->id;
+		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
+		if ($socid > 0)	$sql.= " AND c.fk_soc = ".$socid;
+		if ($filtrestatut <> '') $sql.= " AND c.fk_statut in (".$filtrestatut.")";
 
 		$result = $this->db->query($sql) ;
 		if ( $result )
@@ -1110,19 +1114,17 @@ class Product extends CommonObject
 
 		$sql = "SELECT COUNT(DISTINCT c.fk_soc) as nb_suppliers, COUNT(DISTINCT c.rowid) as nb,";
 		$sql.= " COUNT(cd.rowid) as nb_rows, SUM(cd.qty) as qty";
-		$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd,";
-		$sql.= " ".MAIN_DB_PREFIX."commande_fournisseur as c";
-		if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql.= " WHERE c.rowid = cd.fk_commande AND cd.fk_product = ".$this->id;
-		if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
-		if ($socid > 0)
-		{
-			$sql.= " AND c.fk_soc = ".$socid;
-		}
-		if ($filtrestatut != '')	// Peut valoir 0
-		{
-			$sql.= " AND c.fk_statut in (".$filtrestatut.")";
-		}
+		$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd";
+		$sql.= ", ".MAIN_DB_PREFIX."commande_fournisseur as c";
+		$sql.= ", ".MAIN_DB_PREFIX."societe as s";
+		if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		$sql.= " WHERE c.rowid = cd.fk_commande";
+		$sql.= " AND c.fk_soc = s.rowid";
+	  $sql.= " AND s.entity = ".$conf->entity;
+		$sql.= " AND cd.fk_product = ".$this->id;
+		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
+		if ($socid > 0) $sql.= " AND c.fk_soc = ".$socid;
+		if ($filtrestatut != '') $sql.= " AND c.fk_statut in (".$filtrestatut.")"; // Peut valoir 0
 
 		$result = $this->db->query($sql) ;
 		if ( $result )
@@ -1151,22 +1153,21 @@ class Product extends CommonObject
 	{
 		global $conf,$user;
 
-		$sql = "SELECT COUNT(DISTINCT c.fk_soc) as nb_customers, COUNT(DISTINCT c.rowid) as nb,";
+		$sql = "SELECT COUNT(DISTINCT e.fk_soc) as nb_customers, COUNT(DISTINCT e.rowid) as nb,";
 		$sql.= " COUNT(ed.rowid) as nb_rows, SUM(ed.qty) as qty";
-		$sql.= " FROM ".MAIN_DB_PREFIX."expeditiondet as ed, ".MAIN_DB_PREFIX."commandedet as cd,";
-		$sql.= " ".MAIN_DB_PREFIX."expedition as c";
-		if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql.= " WHERE c.rowid = ed.fk_expedition AND ed.fk_origin_line = cd.rowid AND cd.fk_product = ".$this->id;
-		if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
-		if ($socid > 0)
-		{
-			$sql.= " AND c.fk_soc = ".$socid;
-		}
-
-		if ($filtrestatut <> '')
-		{
-			$sql.= " AND c.fk_statut in (".$filtrestatut.")";
-		}
+		$sql.= " FROM ".MAIN_DB_PREFIX."expeditiondet as ed";
+		$sql.= ", ".MAIN_DB_PREFIX."commandedet as cd";
+		$sql.= ", ".MAIN_DB_PREFIX."expedition as e";
+		$sql.= ", ".MAIN_DB_PREFIX."societe as s";
+		if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		$sql.= " WHERE e.rowid = ed.fk_expedition";
+		$sql.= " AND e.fk_soc = s.rowid";
+	  $sql.= " AND s.entity = ".$conf->entity;
+		$sql.= " AND ed.fk_origin_line = cd.rowid";
+		$sql.= " AND cd.fk_product = ".$this->id;
+		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND e.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
+		if ($socid > 0)	$sql.= " AND e.fk_soc = ".$socid;
+		if ($filtrestatut <> '') $sql.= " AND e.fk_statut in (".$filtrestatut.")";
 
 		$result = $this->db->query($sql) ;
 		if ( $result )
@@ -1197,17 +1198,18 @@ class Product extends CommonObject
 
 		$sql = "SELECT COUNT(DISTINCT c.fk_soc) as nb_customers, COUNT(DISTINCT c.rowid) as nb,";
 		$sql.= " COUNT(cd.rowid) as nb_rows, SUM(cd.qty) as qty";
-		$sql.= " FROM ".MAIN_DB_PREFIX."contratdet as cd,";
-		$sql.= " ".MAIN_DB_PREFIX."contrat as c";
-		if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql.= " WHERE c.rowid = cd.fk_contrat AND cd.fk_product = ".$this->id;
-		if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
+		$sql.= " FROM ".MAIN_DB_PREFIX."contratdet as cd";
+		$sql.= ", ".MAIN_DB_PREFIX."contrat as c";
+		$sql.= ", ".MAIN_DB_PREFIX."societe as s";
+		if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		$sql.= " WHERE c.rowid = cd.fk_contrat";
+		$sql.= " AND c.fk_soc = s.rowid";
+	  $sql.= " AND s.entity = ".$conf->entity;
+		$sql.= " AND cd.fk_product = ".$this->id;
+		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		//$sql.= " AND c.statut != 0";
-		if ($socid > 0)
-		{
-			$sql .= " AND c.fk_soc = $socid";
-		}
-
+		if ($socid > 0)	$sql.= " AND c.fk_soc = ".$socid;
+		
 		$result = $this->db->query($sql) ;
 		if ( $result )
 		{
@@ -1236,17 +1238,18 @@ class Product extends CommonObject
 		global $user;
 
 		$sql = "SELECT COUNT(DISTINCT f.fk_soc) as nb_customers, COUNT(DISTINCT f.rowid) as nb,";
-		$sql.= " COUNT(pd.rowid) as nb_rows, SUM(pd.qty) as qty";
-		$sql.= " FROM ".MAIN_DB_PREFIX."facturedet as pd,";
-		$sql.= " ".MAIN_DB_PREFIX."facture as f";
-		if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql.= " WHERE f.rowid = pd.fk_facture AND pd.fk_product = ".$this->id;
-		if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
+		$sql.= " COUNT(fd.rowid) as nb_rows, SUM(fd.qty) as qty";
+		$sql.= " FROM ".MAIN_DB_PREFIX."facturedet as fd";
+		$sql.= ", ".MAIN_DB_PREFIX."facture as f";
+		$sql.= ", ".MAIN_DB_PREFIX."societe as s";
+		if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		$sql.= " WHERE f.rowid = fd.fk_facture";
+		$sql.= " AND f.fk_soc = s.rowid";
+	  $sql.= " AND s.entity = ".$conf->entity;
+		$sql.= " AND fd.fk_product = ".$this->id;
+		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		//$sql.= " AND f.fk_statut != 0";
-		if ($socid > 0)
-		{
-			$sql .= " AND f.fk_soc = $socid";
-		}
+		if ($socid > 0)	$sql .= " AND f.fk_soc = ".$socid;
 
 		$result = $this->db->query($sql) ;
 		if ( $result )
@@ -1276,17 +1279,18 @@ class Product extends CommonObject
 		global $user;
 
 		$sql = "SELECT COUNT(DISTINCT f.fk_soc) as nb_suppliers, COUNT(DISTINCT f.rowid) as nb,";
-		$sql.= " COUNT(pd.rowid) as nb_rows, SUM(pd.qty) as qty";
-		$sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn_det as pd,";
-		$sql.= " ".MAIN_DB_PREFIX."facture_fourn as f";
-		if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql.= " WHERE f.rowid = pd.fk_facture_fourn AND pd.fk_product = ".$this->id;
-		if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
+		$sql.= " COUNT(fd.rowid) as nb_rows, SUM(fd.qty) as qty";
+		$sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn_det as fd";
+		$sql.= ", ".MAIN_DB_PREFIX."facture_fourn as f";
+		$sql.= ", ".MAIN_DB_PREFIX."societe as s";
+		if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		$sql.= " WHERE f.rowid = fd.fk_facture_fourn";
+		$sql.= " AND f.fk_soc = s.rowid";
+	  $sql.= " AND s.entity = ".$conf->entity;
+		$sql.= " AND fd.fk_product = ".$this->id;
+		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		//$sql.= " AND f.fk_statut != 0";
-		if ($socid > 0)
-		{
-			$sql .= " AND f.fk_soc = $socid";
-		}
+		if ($socid > 0)	$sql .= " AND f.fk_soc = ".$socid;
 
 		$result = $this->db->query($sql) ;
 		if ( $result )
@@ -1373,14 +1377,14 @@ class Product extends CommonObject
 
 		$sql = "SELECT sum(d.qty), date_format(f.datef, '%Y%m')";
 		if ($mode == 'bynumber') $sql.= ", count(DISTINCT f.rowid)";
-		$sql.= " FROM ".MAIN_DB_PREFIX."facturedet as d, ".MAIN_DB_PREFIX."facture as f";
-		if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql.= " WHERE f.rowid = d.fk_facture and d.fk_product =".$this->id;
-		if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
-		if ($socid > 0)
-		{
-			$sql .= " AND f.fk_soc = $socid";
-		}
+		$sql.= " FROM ".MAIN_DB_PREFIX."facturedet as d, ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s";
+		if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		$sql.= " WHERE f.rowid = d.fk_facture";
+		$sql.= " AND d.fk_product =".$this->id;
+		$sql.= " AND f.fk_soc = s.rowid";
+		$sql.= " AND s.entity = ".$conf->entity;
+		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
+		if ($socid > 0)	$sql.= " AND f.fk_soc = $socid";
 		$sql.= " GROUP BY date_format(f.datef,'%Y%m') DESC";
 
 		return $this->_get_stats($sql,$mode);
@@ -1400,14 +1404,14 @@ class Product extends CommonObject
 
 		$sql = "SELECT sum(d.qty), date_format(f.datef, '%Y%m')";
 		if ($mode == 'bynumber') $sql.= ", count(DISTINCT f.rowid)";
-		$sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn_det as d, ".MAIN_DB_PREFIX."facture_fourn as f";
-		if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql.= " WHERE f.rowid = d.fk_facture_fourn and d.fk_product =".$this->id;
-		if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
-		if ($socid > 0)
-		{
-			$sql .= " AND f.fk_soc = $socid";
-		}
+		$sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn_det as d, ".MAIN_DB_PREFIX."facture_fourn as f, ".MAIN_DB_PREFIX."societe as s";
+		if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		$sql.= " WHERE f.rowid = d.fk_facture_fourn";
+		$sql.= " AND d.fk_product =".$this->id;
+		$sql.= " AND f.fk_soc = s.rowid";
+		$sql.= " AND s.entity = ".$conf->entity;
+		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
+		if ($socid > 0)	$sql.= " AND f.fk_soc = $socid";
 		$sql.= " GROUP BY date_format(f.datef,'%Y%m') DESC";
 
 		$resarray=$this->_get_stats($sql,$mode);
@@ -1427,14 +1431,14 @@ class Product extends CommonObject
 
 		$sql = "SELECT sum(d.qty), date_format(p.datep, '%Y%m')";
 		if ($mode == 'bynumber') $sql.= ", count(DISTINCT p.rowid)";
-		$sql.= " FROM ".MAIN_DB_PREFIX."propaldet as d, ".MAIN_DB_PREFIX."propal as p";
+		$sql.= " FROM ".MAIN_DB_PREFIX."propaldet as d, ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."societe as s";
 		if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql.= " WHERE p.rowid = d.fk_propal and d.fk_product =".$this->id;
-		if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
-		if ($socid > 0)
-		{
-			$sql .= " AND p.fk_soc = $socid";
-		}
+		$sql.= " WHERE p.rowid = d.fk_propal";
+		$sql.= " AND d.fk_product =".$this->id;
+		$sql.= " AND p.fk_soc = s.rowid";
+		$sql.= " AND s.entity = ".$conf->entity;
+		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
+		if ($socid > 0)	$sql.= " AND p.fk_soc = ".$socid;
 		$sql.= " GROUP BY date_format(p.datep,'%Y%m') DESC";
 
 		return $this->_get_stats($sql,$mode);
@@ -1450,17 +1454,17 @@ class Product extends CommonObject
 	{
 		global $conf, $user;
 
-		$sql = "SELECT sum(d.qty), date_format(p.date_commande, '%Y%m')";
-		if ($mode == 'bynumber') $sql.= ", count(DISTINCT p.rowid)";
-		$sql.= " FROM ".MAIN_DB_PREFIX."commandedet as d, ".MAIN_DB_PREFIX."commande as p";
+		$sql = "SELECT sum(d.qty), date_format(c.date_commande, '%Y%m')";
+		if ($mode == 'bynumber') $sql.= ", count(DISTINCT c.rowid)";
+		$sql.= " FROM ".MAIN_DB_PREFIX."commandedet as d, ".MAIN_DB_PREFIX."commande as c, ".MAIN_DB_PREFIX."societe as s";
 		if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql.= " WHERE p.rowid = d.fk_commande and d.fk_product =".$this->id;
-		if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
-		if ($socid > 0)
-		{
-			$sql .= " AND p.fk_soc = $socid";
-		}
-		$sql.= " GROUP BY date_format(p.date_commande,'%Y%m') DESC";
+		$sql.= " WHERE c.rowid = d.fk_commande";
+		$sql.= " AND d.fk_product =".$this->id;
+		$sql.= " AND c.fk_soc = s.rowid";
+		$sql.= " AND s.entity = ".$conf->entity;
+		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
+		if ($socid > 0)	$sql.= " AND c.fk_soc = ".$socid;
+		$sql.= " GROUP BY date_format(c.date_commande,'%Y%m') DESC";
 
 		return $this->_get_stats($sql,$mode);
 	}
@@ -2547,6 +2551,7 @@ class Product extends CommonObject
 			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cp.fk_categorie = c.rowid";
 		}
 		$sql.= " WHERE p.fk_product_type <> 1";
+		$sql.= " AND p.entity = ".$conf->entity;
 		if ($conf->categorie->enabled && !$user->rights->categorie->voir)
 		{
 			$sql.= " AND IFNULL(c.visible,1)=1";
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 424dfa035e6..d43a22beb2b 100755
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -2,8 +2,8 @@
 /* Copyright (C) 2003-2007 Rodolphe Quiedeville  <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2009 Laurent Destailleur   <eldy@users.sourceforge.net>
  * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
- * Copyright (C) 2005      Regis Houssin         <regis@dolibarr.fr>
- * Copyright (C) 2005      Simon TOSSER         <simon@kornog-computing.com>
+ * Copyright (C) 2005-2009 Regis Houssin         <regis@dolibarr.fr>
+ * Copyright (C) 2005      Simon TOSSER          <simon@kornog-computing.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,18 +36,12 @@ require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
 $langs->load("other");
 $langs->load("products");
 
-if (!$user->rights->produit->lire)
-	accessforbidden();
-
-$action=empty($_GET['action']) ? (empty($_POST['action']) ? '' : $_POST['action']) : $_GET['action'];
-
 // Security check
-if ($user->societe_id > 0)
-{
-	unset($_GET["action"]);
-	$action='';
-	$socid = $user->societe_id;
-}
+$id = isset($_GET["id"])?$_GET["id"]:'';
+$action=empty($_GET['action']) ? (empty($_POST['action']) ? '' : $_POST['action']) : $_GET['action'];
+if ($user->societe_id) $socid=$user->societe_id;
+$result=restrictedArea($user,'produit',$id,'product');
+
 
 // Get parameters
 $page=$_GET["page"];
diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php
index c4be4ea17ad..cdc5567d700 100644
--- a/htdocs/product/fiche.php
+++ b/htdocs/product/fiche.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2007 Régis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Régis Houssin        <regis@dolibarr.fr>
  * Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
  * Copyright (C) 2006      Auguria SARL         <info@auguria.org>
  *
@@ -36,13 +36,28 @@ require_once(DOL_DOCUMENT_ROOT."/facture.class.php");
 require_once(DOL_DOCUMENT_ROOT."/product.class.php");
 require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php");
 
+if (!$user->rights->produit->lire) accessforbidden();
+
 $langs->load("bills");
 $langs->load("other");
 $langs->load("stocks");
 
-$mesg = '';
+// Security check
+$id = '';
+if (isset($_GET["id"]))
+{
+	$id = $_GET["id"];
+	$fieldid = 'rowid';
+}
+if (isset($_GET["ref"]))
+{
+	$id = $_GET["ref"];
+	$fieldid = 'ref';
+}
+if ($user->societe_id) $socid=$user->societe_id;
+$result=restrictedArea($user,'produit',$id,'product','','',$fieldid);
 
-if (!$user->rights->produit->lire) accessforbidden();
+$mesg = '';
 
 /*
  *
@@ -1212,9 +1227,12 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->status)
 		print '<tr><td width="50%" valign="top">';
 
 		$sql = "SELECT s.nom, s.rowid as socid, p.rowid as propalid, p.ref,".$db->pdate("p.datep")." as dp";
-		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p";
-		$sql .=" WHERE p.fk_soc = s.rowid AND p.fk_statut = 0 AND p.fk_user_author = ".$user->id;
-		$sql .= " ORDER BY p.datec DESC, tms DESC";
+		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p";
+		$sql.= " WHERE p.fk_soc = s.rowid";
+		$sql.= " AND s.entity = ".$conf->entity;
+		$sql.= " AND p.fk_statut = 0";
+		$sql.= " AND p.fk_user_author = ".$user->id;
+		$sql.= " ORDER BY p.datec DESC, tms DESC";
 
 		$result=$db->query($sql);
 		if ($result)
@@ -1324,10 +1342,14 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->status)
 
 		// Liste de "Mes commandes"
 		print '<tr><td width="50%" valign="top">';
+		
 		$sql = "SELECT s.nom, s.rowid as socid, c.rowid as commandeid, c.ref,".$db->pdate("c.date_commande")." as dc";
-		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as c";
-		$sql .=" WHERE c.fk_soc = s.rowid AND c.fk_statut = 0 AND c.fk_user_author = ".$user->id;
-		$sql .= " ORDER BY c.date_creation DESC";
+		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as c";
+		$sql.= " WHERE c.fk_soc = s.rowid";
+		$sql.= " AND s.entity = ".$conf->entity;
+		$sql.= " AND c.fk_statut = 0";
+		$sql.= " AND c.fk_user_author = ".$user->id;
+		$sql.= " ORDER BY c.date_creation DESC";
 
 		$result=$db->query($sql);
 		if ($result)
@@ -1433,10 +1455,14 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->status)
 
 		// Liste de Mes factures
 		print '<tr><td width="50%" valign="top">';
+		
 		$sql = "SELECT s.nom, s.rowid as socid, f.rowid as factureid, f.facnumber,".$db->pdate("f.datef")." as df";
-		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture as f";
-		$sql .=" WHERE f.fk_soc = s.rowid AND f.fk_statut = 0 AND f.fk_user_author = ".$user->id;
-		$sql .= " ORDER BY f.datec DESC, f.rowid DESC";
+		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture as f";
+		$sql.= " WHERE f.fk_soc = s.rowid";
+		$sql.= " AND s.entity = ".$conf->entity;
+		$sql.= " AND f.fk_statut = 0";
+		$sql.= " AND f.fk_user_author = ".$user->id;
+		$sql.= " ORDER BY f.datec DESC, f.rowid DESC";
 
 		$result=$db->query($sql);
 		if ($result)
@@ -1492,9 +1518,12 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->status)
 	  $var=true;
 
 	  $sql = "SELECT s.nom, s.rowid as socid, f.rowid as factureid, f.facnumber,".$db->pdate("f.datef")." as df";
-	  $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture as f";
-	  $sql .=" WHERE f.fk_soc = s.rowid AND f.fk_statut = 0 AND f.fk_user_author <> ".$user->id;
-	  $sql .= " ORDER BY f.datec DESC, f.rowid DESC";
+	  $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture as f";
+	  $sql.= " WHERE f.fk_soc = s.rowid";
+	  $sql.= " AND s.entity = ".$conf->entity;
+	  $sql.= " AND f.fk_statut = 0";
+	  $sql.= " AND f.fk_user_author <> ".$user->id;
+	  $sql.= " ORDER BY f.datec DESC, f.rowid DESC";
 
 	  $result=$db->query($sql);
 	  if ($result)
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 2f2b9129cf3..2861f717dd5 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2005      Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,16 +29,19 @@
 require("./pre.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/propal.class.php");
-require_once(DOL_DOCUMENT_ROOT."/facture.class.php");
 require_once DOL_DOCUMENT_ROOT."/fourn/fournisseur.product.class.php";
 
 $langs->load("products");
 $langs->load("suppliers");
 $langs->load("bills");
 
+// Security check
+$id = isset($_GET["id"])?$_GET["id"]:'';
+if ($user->societe_id) $socid=$user->societe_id;
+$result=restrictedArea($user,'produit',$id,'product');
+
 $mesg = '';
 
-if (! $user->rights->produit->lire) accessforbidden();
 
 //Récupère le résultat de la recherche Ajax
 //Todo: voir pour le supprimer par la suite
@@ -341,10 +344,13 @@ if ($_GET["id"] || $_GET["ref"])
 				$sql = "SELECT s.nom, s.rowid as socid,";
 				$sql.= " pf.ref_fourn,";
 				$sql.= " pfp.rowid, pfp.price, pfp.quantity, pfp.unitprice";
-				$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."product_fournisseur as pf";
+				$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+				$sql.= ", ".MAIN_DB_PREFIX."product_fournisseur as pf";
 				$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
 				$sql.= " ON pf.rowid = pfp.fk_product_fournisseur";
-				$sql.= " WHERE pf.fk_soc = s.rowid AND pf.fk_product = ".$product->id;
+				$sql.= " WHERE pf.fk_soc = s.rowid";
+				$sql.= " AND s.entity = ".$conf->entity;
+				$sql.= " AND pf.fk_product = ".$product->id;
 				$sql.= " ORDER BY lower(s.nom), pfp.quantity";
 
 				$resql="";
diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index f067179d53b..ac99bc19e3f 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2007 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -85,6 +85,7 @@ $prodser[0][0]=$prodser[0][1]=$prodser[1][0]=$prodser[1][1]=0;
 
 $sql = "SELECT COUNT(p.rowid) as total, p.fk_product_type, p.envente";
 $sql.= " FROM ".MAIN_DB_PREFIX."product as p";
+$sql.= " WHERE p.entity = ".$conf->entity;
 $sql.= " GROUP BY p.fk_product_type, p.envente";
 $result = $db->query($sql);
 while ($objp = $db->fetch_object($result))
@@ -145,6 +146,7 @@ if ($conf->categorie->enabled && !$user->rights->categorie->voir)
 }
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_subproduct as sp ON p.rowid = sp.fk_product_subproduct";
 $sql.= " WHERE sp.fk_product_subproduct IS NULL";
+$sql.= " AND p.entity = ".$conf->entity;
 if ($conf->categorie->enabled && !$user->rights->categorie->voir) $sql.= " AND IFNULL(c.visible,1)=1 ";
 if (isset($_GET["type"])) $sql.= " AND p.fk_product_type = ".$_GET["type"];
 $sql.= " ORDER BY p.tms DESC ";
diff --git a/htdocs/product/liste.php b/htdocs/product/liste.php
index c367dcb9234..2f514e91bbc 100644
--- a/htdocs/product/liste.php
+++ b/htdocs/product/liste.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2007 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -104,43 +104,43 @@ $sql.= ' p.duration, p.envente as statut, p.seuil_stock_alerte';
 $sql.= ' FROM '.MAIN_DB_PREFIX.'product as p';
 if ($conf->categorie->enabled && ($catid || !$user->rights->categorie->voir))
 {
-	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON cp.fk_product = p.rowid";
-	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cp.fk_categorie = c.rowid";
+	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON cp.fk_product = p.rowid";
+	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cp.fk_categorie = c.rowid";
 }
 
 if ($_GET["fourn_id"] > 0)
 {
 	$fourn_id = $_GET["fourn_id"];
-	$sql .= ", ".MAIN_DB_PREFIX."product_fournisseur as pf";
+	$sql.= ", ".MAIN_DB_PREFIX."product_fournisseur as pf";
 }
-$sql .= " WHERE 1=1";
+$sql.= " WHERE p.entity = ".$conf->entity;
 if ($sall)
 {
-	$sql .= " AND (p.ref like '%".addslashes($sall)."%' OR p.label like '%".addslashes($sall)."%' OR p.description like '%".addslashes($sall)."%' OR p.note like '%".addslashes($sall)."%')";
+	$sql.= " AND (p.ref like '%".addslashes($sall)."%' OR p.label like '%".addslashes($sall)."%' OR p.description like '%".addslashes($sall)."%' OR p.note like '%".addslashes($sall)."%')";
 }
 # if the type is not 1, we show all products (type = 0,2,3)
 if (strlen($_GET["type"]) || strlen($_POST["type"]))
 {
 	if ($type==1) {
-		$sql .= " AND p.fk_product_type = '1'";
+		$sql.= " AND p.fk_product_type = '1'";
 	} else {
-		$sql .= " AND p.fk_product_type <> '1'";
+		$sql.= " AND p.fk_product_type <> '1'";
 	}
 }
-if ($sref)     $sql .= " AND p.ref like '%".$sref."%'";
-if ($sbarcode) $sql .= " AND p.barcode like '%".$sbarcode."%'";
-if ($snom)     $sql .= " AND p.label like '%".addslashes($snom)."%'";
+if ($sref)     $sql.= " AND p.ref like '%".$sref."%'";
+if ($sbarcode) $sql.= " AND p.barcode like '%".$sbarcode."%'";
+if ($snom)     $sql.= " AND p.label like '%".addslashes($snom)."%'";
 if (isset($_GET["envente"]) && strlen($_GET["envente"]) > 0)
 {
-	$sql .= " AND p.envente = ".$_GET["envente"];
+	$sql.= " AND p.envente = ".$_GET["envente"];
 }
 if (isset($_GET["canvas"]) && strlen($_GET["canvas"]) > 0)
 {
-	$sql .= " AND p.canvas = '".mysql_escape_string($_GET["canvas"])."'";
+	$sql.= " AND p.canvas = '".mysql_escape_string($_GET["canvas"])."'";
 }
 if($catid)
 {
-	$sql .= " AND cp.fk_categorie = ".$catid;
+	$sql.= " AND cp.fk_categorie = ".$catid;
 }
 if ($conf->categorie->enabled && !$user->rights->categorie->voir)
 {
@@ -148,10 +148,10 @@ if ($conf->categorie->enabled && !$user->rights->categorie->voir)
 }
 if ($fourn_id > 0)
 {
-	$sql .= " AND p.rowid = pf.fk_product AND pf.fk_soc = ".$fourn_id;
+	$sql.= " AND p.rowid = pf.fk_product AND pf.fk_soc = ".$fourn_id;
 }
-$sql .= " ORDER BY $sortfield $sortorder ";
-$sql .= $db->plimit($limit + 1 ,$offset);
+$sql.= " ORDER BY $sortfield $sortorder ";
+$sql.= $db->plimit($limit + 1 ,$offset);
 $resql = $db->query($sql) ;
 
 if ($resql)
diff --git a/htdocs/product/photos.php b/htdocs/product/photos.php
index e4dceaed813..24b7a56e7ab 100644
--- a/htdocs/product/photos.php
+++ b/htdocs/product/photos.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2007 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,17 +28,19 @@
 
 require("./pre.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/propal.class.php");
-require_once(DOL_DOCUMENT_ROOT."/facture.class.php");
 require_once(DOL_DOCUMENT_ROOT."/product.class.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
 
 $langs->load("products");
 $langs->load("bills");
 
+// Security check
+$id = isset($_GET["id"])?$_GET["id"]:'';
+if ($user->societe_id) $socid=$user->societe_id;
+$result=restrictedArea($user,'produit',$id,'product');
+
 $mesg = '';
 
-if (!$user->rights->produit->lire) accessforbidden();
 
 /*
  * Actions
diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php
index d2a751acabc..b502be27099 100644
--- a/htdocs/product/popuprop.php
+++ b/htdocs/product/popuprop.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2005 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2006 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,7 +35,7 @@ if ($page < 0) $page = 0;
 if (! $sortfield) $sortfield="c";
 if (! $sortorder) $sortorder="DESC";
 
-if ($page == -1) { $page = 0 ; }
+if ($page == -1) $page = 0;
 $limit = $conf->liste_limit;
 $offset = $limit * $page ;
 
@@ -67,20 +67,22 @@ print_liste_field_titre("Nb. de proposition","popuprop.php", "c","","",'align="r
 print "</tr>\n";
 
 $sql  = "SELECT p.rowid, p.label, p.ref, fk_product_type, count(*) as c";
-$sql .= " FROM ".MAIN_DB_PREFIX."propaldet as pd, ".MAIN_DB_PREFIX."product as p";
+$sql.= " FROM ".MAIN_DB_PREFIX."propaldet as pd";
+$sql.= ", ".MAIN_DB_PREFIX."product as p";
 if ($conf->categorie->enabled && !$user->rights->categorie->voir)
 {
   $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON cp.fk_product = p.rowid";
 	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cp.fk_categorie = c.rowid";
 }
-$sql .= " WHERE p.rowid = pd.fk_product";
+$sql.= " WHERE p.rowid = pd.fk_product";
+$sql.= " AND p.entity = ".$conf->entity;
 if ($conf->categorie->enabled && !$user->rights->categorie->voir)
 {
   $sql.= ' AND IFNULL(c.visible,1)=1';
 }
-$sql .= " group by (p.rowid)";
-$sql .= " ORDER BY $sortfield $sortorder ";
-$sql .= $db->plimit( $limit ,$offset);
+$sql.= " group by (p.rowid)";
+$sql.= " ORDER BY $sortfield $sortorder ";
+$sql.= $db->plimit( $limit ,$offset);
 
 $result=$db->query($sql) ;
 if ($result)
@@ -96,8 +98,10 @@ if ($result)
       	  // Multilangs
 	    if ($conf->global->MAIN_MULTILANGS) // si l'option est active
 	    {
-		    $sql = "SELECT label FROM ".MAIN_DB_PREFIX."product_det";
-		    $sql.= " WHERE fk_product=".$objp->rowid." AND lang='". $langs->getDefaultLang() ."'";
+		    $sql = "SELECT label";
+		    $sql.= " FROM ".MAIN_DB_PREFIX."product_det";
+		    $sql.= " WHERE fk_product=".$objp->rowid;
+		    $sql.= " AND lang='". $langs->getDefaultLang() ."'";
 		    $sql.= " LIMIT 1";
 		    $resultp = $db->query($sql);
 		    if ($resultp)
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 7a5dabf1dd1..8fa373670e1 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2007 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  * Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -34,9 +34,10 @@ require_once(DOL_DOCUMENT_ROOT."/product.class.php");
 $langs->load("products");
 $langs->load("bills");
 
-if (!$user->rights->produit->lire)
-accessforbidden();
-
+// Security check
+$id = isset($_GET["id"])?$_GET["id"]:'';
+if ($user->societe_id) $socid=$user->societe_id;
+$result=restrictedArea($user,'produit',$id,'product');
 
 
 /*
@@ -345,7 +346,8 @@ if ($_GET["action"] == 'edit_price' && $user->rights->produit->creer)
 $sql = "SELECT p.rowid, p.price, p.price_ttc, p.price_base_type, p.tva_tx,";
 $sql.= " p.price_level, p.price_min, p.price_min_ttc,";
 $sql.= " ".$db->pdate("p.date_price")." as dp, u.rowid as user_id, u.login";
-$sql.= " FROM ".MAIN_DB_PREFIX."product_price as p, ".MAIN_DB_PREFIX."user as u";
+$sql.= " FROM ".MAIN_DB_PREFIX."product_price as p";
+$sql.= ", ".MAIN_DB_PREFIX."user as u";
 $sql.= " WHERE fk_product = ".$product->id;
 $sql.= " AND p.fk_user_author = u.rowid";
 if ($conf->global->PRODUIT_MULTIPRICES)	$sql.= " ORDER BY p.price_level ASC, p.date_price DESC";
diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index 68ed4b1f404..b335a2d54bd 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2006 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -79,43 +79,44 @@ $sql.= ' FROM '.MAIN_DB_PREFIX.'product_stock as s,';
 $sql.= ' '.MAIN_DB_PREFIX.'product as p';
 if ($catid || ($conf->categorie->enabled && ! $user->rights->categorie->voir))
 {
-	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON cp.fk_product = p.rowid";
-	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cp.fk_categorie = c.rowid";
+	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON cp.fk_product = p.rowid";
+	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cp.fk_categorie = c.rowid";
 }
 
 if ($_GET["fourn_id"] > 0)
 {
 	$fourn_id = $_GET["fourn_id"];
-	$sql .= ", ".MAIN_DB_PREFIX."product_fournisseur as pf";
+	$sql.= ", ".MAIN_DB_PREFIX."product_fournisseur as pf";
 }
-$sql .= " WHERE p.rowid = s.fk_product";
+$sql.= " WHERE p.rowid = s.fk_product";
+$sql.= " AND p.entity = ".$conf->entity;
 if ($sall)
 {
-	$sql .= " AND (p.ref like '%".addslashes($sall)."%' OR p.label like '%".addslashes($sall)."%' OR p.description like '%".addslashes($sall)."%' OR p.note like '%".addslashes($sall)."%')";
+	$sql.= " AND (p.ref like '%".addslashes($sall)."%' OR p.label like '%".addslashes($sall)."%' OR p.description like '%".addslashes($sall)."%' OR p.note like '%".addslashes($sall)."%')";
 }
 if ($type==1)
 {
-	$sql .= " AND p.fk_product_type = '1'";
+	$sql.= " AND p.fk_product_type = '1'";
 }
 else
 {
-	$sql .= " AND p.fk_product_type <> '1'";
+	$sql.= " AND p.fk_product_type <> '1'";
 }
 if ($sref)
 {
-	$sql .= " AND p.ref like '%".$sref."%'";
+	$sql.= " AND p.ref like '%".$sref."%'";
 }
 if ($snom)
 {
-	$sql .= " AND p.label like '%".addslashes($snom)."%'";
+	$sql.= " AND p.label like '%".addslashes($snom)."%'";
 }
 if (isset($_GET["envente"]) && strlen($_GET["envente"]) > 0)
 {
-	$sql .= " AND p.envente = ".$_GET["envente"];
+	$sql.= " AND p.envente = ".$_GET["envente"];
 }
 if($catid)
 {
-	$sql .= " AND cp.fk_categorie = ".$catid;
+	$sql.= " AND cp.fk_categorie = ".$catid;
 }
 if ($conf->categorie->enabled && !$user->rights->categorie->voir)
 {
@@ -123,11 +124,11 @@ if ($conf->categorie->enabled && !$user->rights->categorie->voir)
 }
 if ($fourn_id > 0)
 {
-	$sql .= " AND p.rowid = pf.fk_product AND pf.fk_soc = ".$fourn_id;
+	$sql.= " AND p.rowid = pf.fk_product AND pf.fk_soc = ".$fourn_id;
 }
-$sql .= " GROUP BY p.rowid";
-$sql .= " ORDER BY $sortfield $sortorder ";
-$sql .= $db->plimit($limit + 1 ,$offset);
+$sql.= " GROUP BY p.rowid";
+$sql.= " ORDER BY $sortfield $sortorder ";
+$sql.= $db->plimit($limit + 1 ,$offset);
 $resql = $db->query($sql) ;
 
 if ($resql)
@@ -228,8 +229,10 @@ if ($resql)
 		// Multilangs
 		if ($conf->global->MAIN_MULTILANGS) // si l'option est active
 		{
-			$sql = "SELECT label FROM ".MAIN_DB_PREFIX."product_det";
-			$sql.= " WHERE fk_product=".$objp->rowid." AND lang='". $langs->getDefaultLang() ."'";
+			$sql = "SELECT label";
+			$sql.= " FROM ".MAIN_DB_PREFIX."product_det";
+			$sql.= " WHERE fk_product=".$objp->rowid;
+			$sql.= " AND lang='". $langs->getDefaultLang() ."'";
 			$sql.= " LIMIT 1";
 			$result = $db->query($sql);
 			if ($result)
diff --git a/htdocs/product/sousproduits/fiche.php b/htdocs/product/sousproduits/fiche.php
index 175d46713d3..56367d84516 100644
--- a/htdocs/product/sousproduits/fiche.php
+++ b/htdocs/product/sousproduits/fiche.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2007 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  * Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -35,7 +35,13 @@ require_once(DOL_DOCUMENT_ROOT."/categories/categorie.class.php");
 $langs->load("bills");
 $langs->load("products");
 
+// Security check
+$id = isset($_GET["id"])?$_GET["id"]:'';
+if ($user->societe_id) $socid=$user->societe_id;
+$result=restrictedArea($user,'produit',$id,'product');
+
 $mesg = '';
+
 $ref=isset($_GET["ref"])?$_GET["ref"]:$_POST["ref"];
 $key=isset($_GET["key"])?$_GET["key"]:$_POST["key"];
 $catMere=isset($_GET["catMere"])?$_GET["catMere"]:$_POST["catMere"];
@@ -52,9 +58,6 @@ if ($action <> 're-edit')
 	if ($_GET["id"])  $result = $product->fetch($_GET["id"]);
 }
 
-
-if (!$user->rights->produit->lire) accessforbidden();
-
 $html = new Form($db);
 
 // Action association d'un sousproduit
@@ -99,19 +102,20 @@ if($action == 'search' )
 {
 	$sql = 'SELECT DISTINCT p.rowid, p.ref, p.label, p.price';
 	$sql.= ' FROM '.MAIN_DB_PREFIX.'product as p';
-	$sql.= ' left join '.MAIN_DB_PREFIX.'categorie_product as cp on p.rowid=cp.fk_product';
-	$sql.= " WHERE 1=1";
+	$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON p.rowid = cp.fk_product';
+	$sql.= " WHERE p.entity = ".$conf->entity;
 	if($key != "")
 	{
-		$sql .= " AND (p.ref like '%".$key."%'";
-		$sql .= " OR p.label like '%".$key."%')";
+		$sql.= " AND (p.ref like '%".$key."%'";
+		$sql.= " OR p.label like '%".$key."%')";
 	}
 	if ($conf->categorie->enabled && $catMere != -1 and $catMere)
 	{
-		$sql .= " AND cp.fk_categorie ='".addslashes($catMere)."'";
+		$sql.= " AND cp.fk_categorie ='".addslashes($catMere)."'";
 	}
-	$sql .= " ORDER BY p.ref ASC ";
-	// $sql .= $db->plimit($limit + 1 ,$offset);
+	$sql.= " ORDER BY p.ref ASC ";
+	// $sql.= $db->plimit($limit + 1 ,$offset);
+	
 	$resql = $db->query($sql) ;
 }
 
diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php
index b792381d4b7..27979aa7694 100644
--- a/htdocs/product/stats/commande.php
+++ b/htdocs/product/stats/commande.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2007 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,6 +35,11 @@ $langs->load("orders");
 $langs->load("products");
 $langs->load("companies");
 
+// Security check
+$id = isset($_GET["id"])?$_GET["id"]:'';
+if ($user->societe_id) $socid=$user->societe_id;
+$result=restrictedArea($user,'produit',$id,'product');
+
 $mesg = '';
 
 $page = $_GET["page"];
@@ -48,19 +53,6 @@ if (! $sortorder) $sortorder="DESC";
 if (! $sortfield) $sortfield="c.date_creation";
 
 
-// Securite
-$socid = 0;
-if ($user->societe_id > 0)
-{
-    $action = '';
-    $socid = $user->societe_id;
-}
-else
-{
-  $socid = 0;
-}
-
-
 /*
  * Affiche fiche
  *
@@ -129,16 +121,17 @@ if ($_GET["id"] || $_GET["ref"])
 
         $sql = "SELECT distinct(s.nom), s.rowid as socid, s.code_client, c.rowid, c.total_ht as total_ht, c.ref,";
         $sql.= " ".$db->pdate("c.date_creation")." as date, c.fk_statut as statut, c.facture, c.rowid as commandeid";
-        if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
-        $sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."commande as c, ".MAIN_DB_PREFIX."commandedet as d";
-        if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+        if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user ";
+        $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+        $sql.= ", ".MAIN_DB_PREFIX."commande as c";
+        $sql.= ", ".MAIN_DB_PREFIX."commandedet as d";
+        if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		    $sql.= " WHERE c.fk_soc = s.rowid";
-        $sql.= " AND d.fk_commande = c.rowid AND d.fk_product =".$product->id;
-        if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-        if ($socid)
-        {
-            $sql .= " AND c.fk_soc = $socid";
-        }
+		    $sql.= " AND s.entity = ".$conf->entity;
+        $sql.= " AND d.fk_commande = c.rowid";
+        $sql.= " AND d.fk_product =".$product->id;
+        if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+        if ($socid) $sql.= " AND c.fk_soc = ".$socid;
         $sql.= " ORDER BY $sortfield $sortorder ";
         $sql.= $db->plimit($conf->liste_limit +1, $offset);
 
diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php
index bb70543b470..aba3a8bf1a5 100644
--- a/htdocs/product/stats/commande_fournisseur.php
+++ b/htdocs/product/stats/commande_fournisseur.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2007 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,6 +35,11 @@ $langs->load("orders");
 $langs->load("products");
 $langs->load("companies");
 
+// Security check
+$id = isset($_GET["id"])?$_GET["id"]:'';
+if ($user->societe_id) $socid=$user->societe_id;
+$result=restrictedArea($user,'produit',$id,'product');
+
 $mesg = '';
 
 $page = $_GET["page"];
@@ -48,18 +53,6 @@ if (! $sortorder) $sortorder="DESC";
 if (! $sortfield) $sortfield="c.date_creation";
 
 
-// Securite
-$socid = 0;
-if ($user->societe_id > 0)
-{
-  $action = '';
-  $socid = $user->societe_id;
-}
-else
-{
-  $socid = 0;
-}
-
 /*
  * Affiche fiche
  *
@@ -123,15 +116,16 @@ if ($_GET["id"] || $_GET["ref"])
       $sql = "SELECT distinct(s.nom), s.rowid as socid, s.code_client, c.rowid, c.total_ht as total_ht, c.ref,";
       $sql.= " ".$db->pdate("c.date_creation")." as date, c.fk_statut as statut, c.rowid as commandeid";
       if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
-      $sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."commande_fournisseur as c, ".MAIN_DB_PREFIX."commande_fournisseurdet as d";
-      if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+      $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+      $sql.= ", ".MAIN_DB_PREFIX."commande_fournisseur as c";
+      $sql.= ", ".MAIN_DB_PREFIX."commande_fournisseurdet as d";
+      if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
       $sql.= " WHERE c.fk_soc = s.rowid";
-      $sql.= " AND d.fk_commande = c.rowid AND d.fk_product =".$product->id;
-      if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-      if ($socid)
-        {
-	  	$sql .= " AND c.fk_soc = ".$socid;
-        }
+      $sql.= " AND s.entity = ".$conf->entity;
+      $sql.= " AND d.fk_commande = c.rowid";
+      $sql.= " AND d.fk_product =".$product->id;
+      if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+      if ($socid)	$sql.= " AND c.fk_soc = ".$socid;
       $sql.= " ORDER BY $sortfield $sortorder ";
       $sql.= $db->plimit($conf->liste_limit +1, $offset);
       
diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php
index 56d1bdb5150..d4d562ad566 100644
--- a/htdocs/product/stats/contrat.php
+++ b/htdocs/product/stats/contrat.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2007 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -70,40 +70,40 @@ $html = new Form($db);
 
 if ($_GET["id"] || $_GET["ref"])
 {
-    $product = new Product($db);
-    if ($_GET["ref"]) 
-    {
-    	$result = $product->fetch('',$_GET["ref"]);
-    	$_GET["id"]=$product->id;
-    }
-    if ($_GET["id"]) $result = $product->fetch($_GET["id"]);
-    
-    llxHeader("","",$langs->trans("CardProduct".$product->type));
+	$product = new Product($db);
+  if ($_GET["ref"]) 
+  {
+  	$result = $product->fetch('',$_GET["ref"]);
+  	$_GET["id"]=$product->id;
+  }
+  if ($_GET["id"]) $result = $product->fetch($_GET["id"]);
+  
+  llxHeader("","",$langs->trans("CardProduct".$product->type));
+  
+  if ($result > 0)
+  {
+  	/*
+     *  En mode visu
+     */
+    $head=product_prepare_head($product,$user);
+    $titre=$langs->trans("CardProduct".$product->type);
+    dol_fiche_head($head, 'referers', $titre);
 
-    if ($result > 0)
-    {
-        /*
-         *  En mode visu
-         */
-      $head=product_prepare_head($product,$user);
-      $titre=$langs->trans("CardProduct".$product->type);
-      dol_fiche_head($head, 'referers', $titre);
+    print '<table class="border" width="100%">';
 
-      print '<table class="border" width="100%">';
-
-        // Reference
-        print '<tr>';
-        print '<td width="15%">'.$langs->trans("Ref").'</td><td colspan="3">';
+    // Reference
+    print '<tr>';
+    print '<td width="15%">'.$langs->trans("Ref").'</td><td colspan="3">';
 		print $html->showrefnav($product,'ref','',1,'ref');
-        print '</td>';
-        print '</tr>';
+    print '</td>';
+    print '</tr>';
         
-        // Libelle
-        print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$product->libelle.'</td>';
-        print '</tr>';
+    // Libelle
+    print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$product->libelle.'</td>';
+    print '</tr>';
         
-        // Prix
-        print '<tr><td>'.$langs->trans("SellingPrice").'</td><td colspan="3">';
+    // Prix
+    print '<tr><td>'.$langs->trans("SellingPrice").'</td><td colspan="3">';
 		if ($product->price_base_type == 'TTC')
 		{
 			print price($product->price_ttc).' '.$langs->trans($product->price_base_type);
@@ -114,99 +114,101 @@ if ($_GET["id"] || $_GET["ref"])
 		}
 		print '</td></tr>';
         
-        // Statut
-        print '<tr><td>'.$langs->trans("Status").'</td><td colspan="3">';
+    // Statut
+    print '<tr><td>'.$langs->trans("Status").'</td><td colspan="3">';
 		print $product->getLibStatut(2);
-        print '</td></tr>';
+    print '</td></tr>';
 
 		show_stats_for_company($product,$socid);
         
-        print "</table>";
+    print "</table>";
 
-        print '</div>';
+    print '</div>';
         
 
-        $sql = "SELECT";
+    $sql = "SELECT";
 		$sql.= ' sum('.$db->ifsql("cd.statut=0",1,0).') as nb_initial,';
 		$sql.= ' sum('.$db->ifsql("cd.statut=4 AND cd.date_fin_validite > ".$db->idate(mktime()),1,0).') as nb_running,';
 		$sql.= ' sum('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NULL OR cd.date_fin_validite <= ".$db->idate(mktime()).")",1,0).') as nb_late,';
 		$sql.= ' sum('.$db->ifsql("cd.statut=5",1,0).') as nb_closed,';
 		$sql.= " ".$db->pdate("c.datec")." as date, c.statut as statut, c.rowid as rowid,";
 		$sql.= " s.nom, s.rowid as socid, s.code_client";
-        if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
-        $sql.= " FROM ".MAIN_DB_PREFIX."societe as s,";
-		if (!$user->rights->societe->client->voir && !$socid) $sql .= " ".MAIN_DB_PREFIX."societe_commerciaux as sc,";
-        $sql.= " ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."contratdet as cd";
-		$sql.= " WHERE c.rowid = cd.fk_contrat AND c.fk_soc = s.rowid";
-		if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+    $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+		if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+    $sql.= ", ".MAIN_DB_PREFIX."contrat as c";
+    $sql.= ", ".MAIN_DB_PREFIX."contratdet as cd";
+		$sql.= " WHERE c.rowid = cd.fk_contrat";
+		$sql.= " AND c.fk_soc = s.rowid";
+		$sql.= " AND s.entity = ".$conf->entity;
 		$sql.= " AND cd.fk_product =".$product->id;
-		if ($socid > 0)       $sql.= " AND s.rowid = ".$socid;
+		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+		if ($socid) $sql.= " AND s.rowid = ".$socid;
 		$sql.= " GROUP BY c.rowid, c.datec, c.statut, s.nom, s.rowid";
 		$sql.= " ORDER BY $sortfield $sortorder";
-        $sql.= $db->plimit($conf->liste_limit +1, $offset);
+    $sql.= $db->plimit($conf->liste_limit +1, $offset);
 
-        $result = $db->query($sql);
-        if ($result)
+    $result = $db->query($sql);
+    if ($result)
+    {
+    	$num = $db->num_rows($result);
+
+      print_barre_liste($langs->trans("Contrats"),$page,$_SERVER["PHP_SELF"],"&amp;id=$product->id",$sortfield,$sortorder,'',$num,0,'');
+
+      $i = 0;
+      print "<table class=\"noborder\" width=\"100%\">";
+
+      print '<tr class="liste_titre">';
+      print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"c.rowid","","&amp;id=".$_GET["id"],'',$sortfield,$sortorder);
+      print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","","&amp;id=".$_GET["id"],'',$sortfield,$sortorder);
+      print_liste_field_titre($langs->trans("CustomerCode"),$_SERVER["PHP_SELF"],"s.code_client","","&amp;id=".$_GET["id"],'',$sortfield,$sortorder);
+      print_liste_field_titre($langs->trans("DateCreation"),$_SERVER["PHP_SELF"],"c.datec","","&amp;id=".$_GET["id"],'align="center"',$sortfield,$sortorder);
+      //print_liste_field_titre($langs->trans("AmountHT"),$_SERVER["PHP_SELF"],"c.amount","","&amp;id=".$_GET["id"],'align="right"',$sortfield,$sortorder);
+      print '<td class="liste_titre" width="16">'.$staticcontratligne->LibStatut(0,3).'</td>';
+		  print '<td class="liste_titre" width="16">'.$staticcontratligne->LibStatut(4,3).'</td>';
+		  print '<td class="liste_titre" width="16">'.$staticcontratligne->LibStatut(5,3).'</td>';
+      print "</tr>\n";
+      
+      $contratstatic=new Contrat($db);
+
+      if ($num > 0)
+      {
+      	$var=True;
+        while ($i < $num && $i < $conf->liste_limit)
         {
-            $num = $db->num_rows($result);
+        	$objp = $db->fetch_object($result);
+          $var=!$var;
 
-            print_barre_liste($langs->trans("Contrats"),$page,$_SERVER["PHP_SELF"],"&amp;id=$product->id",$sortfield,$sortorder,'',$num,0,'');
-
-            $i = 0;
-            print "<table class=\"noborder\" width=\"100%\">";
-
-            print '<tr class="liste_titre">';
-            print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"c.rowid","","&amp;id=".$_GET["id"],'',$sortfield,$sortorder);
-            print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","","&amp;id=".$_GET["id"],'',$sortfield,$sortorder);
-            print_liste_field_titre($langs->trans("CustomerCode"),$_SERVER["PHP_SELF"],"s.code_client","","&amp;id=".$_GET["id"],'',$sortfield,$sortorder);
-            print_liste_field_titre($langs->trans("DateCreation"),$_SERVER["PHP_SELF"],"c.datec","","&amp;id=".$_GET["id"],'align="center"',$sortfield,$sortorder);
-            //print_liste_field_titre($langs->trans("AmountHT"),$_SERVER["PHP_SELF"],"c.amount","","&amp;id=".$_GET["id"],'align="right"',$sortfield,$sortorder);
-		    print '<td class="liste_titre" width="16">'.$staticcontratligne->LibStatut(0,3).'</td>';
-		    print '<td class="liste_titre" width="16">'.$staticcontratligne->LibStatut(4,3).'</td>';
-		    print '<td class="liste_titre" width="16">'.$staticcontratligne->LibStatut(5,3).'</td>';
-            print "</tr>\n";
-
-            $contratstatic=new Contrat($db);
-
-            if ($num > 0)
-            {
-                $var=True;
-                while ($i < $num && $i < $conf->liste_limit)
-                {
-                    $objp = $db->fetch_object($result);
-                    $var=!$var;
-
-                    print "<tr $bc[$var]>";
-                    print '<td><a href="'.DOL_URL_ROOT.'/contrat/fiche.php?id='.$objp->rowid.'">'.img_object($langs->trans("ShowContract"),"contract").' ';
-                    print $objp->rowid;
-                    print "</a></td>\n";
-                    print '<td><a href="'.DOL_URL_ROOT.'/compta/fiche.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).'</a></td>';
-                    print "<td>".$objp->code_client."</td>\n";
-                    print "<td align=\"center\">";
-                    print dol_print_date($objp->date)."</td>";
-                    //print "<td align=\"right\">".price($objp->total_ht)."</td>\n";
-                    //print '<td align="right">';
-                    print '<td align="center">'.($objp->nb_initial>0?$objp->nb_initial:'').'</td>';
-			        print '<td align="center">'.($objp->nb_running+$objp->nb_late>0?$objp->nb_running+$objp->nb_late:'').'</td>';
-			        print '<td align="center">'.($objp->nb_closed>0?$objp->nb_closed:'').'</td>';
-                    //$contratstatic->LibStatut($objp->statut,5).'</td>';
-                    print "</tr>\n";
-                    $i++;
-                }
-            }
+          print "<tr $bc[$var]>";
+          print '<td><a href="'.DOL_URL_ROOT.'/contrat/fiche.php?id='.$objp->rowid.'">'.img_object($langs->trans("ShowContract"),"contract").' ';
+          print $objp->rowid;
+          print "</a></td>\n";
+          print '<td><a href="'.DOL_URL_ROOT.'/compta/fiche.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).'</a></td>';
+          print "<td>".$objp->code_client."</td>\n";
+          print "<td align=\"center\">";
+          print dol_print_date($objp->date)."</td>";
+          //print "<td align=\"right\">".price($objp->total_ht)."</td>\n";
+          //print '<td align="right">';
+          print '<td align="center">'.($objp->nb_initial>0?$objp->nb_initial:'').'</td>';
+			    print '<td align="center">'.($objp->nb_running+$objp->nb_late>0?$objp->nb_running+$objp->nb_late:'').'</td>';
+			    print '<td align="center">'.($objp->nb_closed>0?$objp->nb_closed:'').'</td>';
+          //$contratstatic->LibStatut($objp->statut,5).'</td>';
+          print "</tr>\n";
+          $i++;
         }
-        else
-        {
-            dol_print_error($db);
-        }
-        print "</table>";
-        print '<br>';
-        $db->free($result);
+      }
     }
+    else
+    {
+    	dol_print_error($db);
+    }
+    print "</table>";
+    print '<br>';
+    $db->free($result);
+  }
 }
 else
 {
-    dol_print_error();
+	dol_print_error();
 }
 
 $db->close();
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index cea8a22dee3..ec289804066 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2006 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,6 +35,11 @@ $langs->load("companies");
 $langs->load("bills");
 $langs->load("products");
 
+// Security check
+$id = isset($_GET["id"])?$_GET["id"]:'';
+if ($user->societe_id) $socid=$user->societe_id;
+$result=restrictedArea($user,'produit',$id,'product');
+
 $mesg = '';
 
 $page = $_GET["page"];
@@ -47,13 +52,6 @@ $pagenext = $_GET["page"] + 1;
 if (! $sortorder) $sortorder="DESC";
 if (! $sortfield) $sortfield="f.datef";
 
-// Securite
-$socid = 0;
-if ($user->societe_id > 0)
-{
-    $socid = $user->societe_id;
-}
-
 
 /*
  * View
@@ -66,41 +64,40 @@ $html = new Form($db);
 
 if ($_GET["id"] || $_GET["ref"])
 {
-    $product = new Product($db);
-    if ($_GET["ref"]) 
-    {
-    	$result = $product->fetch('',$_GET["ref"]);
-    	$_GET["id"]=$product->id;
-    }
-    if ($_GET["id"]) $result = $product->fetch($_GET["id"]);
-    
-    llxHeader("","",$langs->trans("CardProduct".$product->type));
-
-    if ($result > 0)
-    {
-        /*
-         *  En mode visu
-         */
-		$head=product_prepare_head($product, $user);
+	$product = new Product($db);
+  if ($_GET["ref"]) 
+  {
+  	$result = $product->fetch('',$_GET["ref"]);
+    $_GET["id"]=$product->id;
+  }
+  if ($_GET["id"]) $result = $product->fetch($_GET["id"]);
+  
+  llxHeader("","",$langs->trans("CardProduct".$product->type));
+  
+  /*
+   *  En mode visu
+   */
+  if ($result > 0)
+  {
+  	$head=product_prepare_head($product, $user);
 		$titre=$langs->trans("CardProduct".$product->type);
 		dol_fiche_head($head, 'referers', $titre);
+		
+		print '<table class="border" width="100%">';
 
-
-        print '<table class="border" width="100%">';
-
-        // Reference
-        print '<tr>';
-        print '<td width="15%">'.$langs->trans("Ref").'</td><td colspan="3">';
+    // Reference
+    print '<tr>';
+    print '<td width="15%">'.$langs->trans("Ref").'</td><td colspan="3">';
 		print $html->showrefnav($product,'ref','',1,'ref');
-        print '</td>';
-        print '</tr>';
+    print '</td>';
+    print '</tr>';
 
-        // Libelle
-        print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$product->libelle.'</td>';
-        print '</tr>';
+    // Libelle
+    print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$product->libelle.'</td>';
+    print '</tr>';
  
-        // Price
-        print '<tr><td>'.$langs->trans("SellingPrice").'</td><td colspan="3">';
+    // Price
+    print '<tr><td>'.$langs->trans("SellingPrice").'</td><td colspan="3">';
 		if ($product->price_base_type == 'TTC')
 		{
 			print price($product->price_ttc).' '.$langs->trans($product->price_base_type);
@@ -111,85 +108,86 @@ if ($_GET["id"] || $_GET["ref"])
 		}
 		print '</td></tr>';
         
-        // Statut
-        print '<tr><td>'.$langs->trans("Status").'</td><td colspan="3">';
+    // Statut
+    print '<tr><td>'.$langs->trans("Status").'</td><td colspan="3">';
 		print $product->getLibStatut(2);
-        print '</td></tr>';
+    print '</td></tr>';
 
 		show_stats_for_company($product,$socid);
     
-        print "</table>";
+    print "</table>";
 
-        print '</div>';
+    print '</div>';
         
 
-        $sql = "SELECT distinct(s.nom), s.rowid as socid, s.code_client, f.facnumber, f.total as total_ht,";
-        $sql.= " ".$db->pdate("f.datef")." as date, f.paye, f.fk_statut as statut, f.rowid as facid";
-        if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
-        $sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."facturedet as d";
-        if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql.= " WHERE f.fk_soc = s.rowid";
-        $sql.= " AND d.fk_facture = f.rowid AND d.fk_product =".$product->id;
-        if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-        if ($socid)
+    $sql = "SELECT distinct(s.nom), s.rowid as socid, s.code_client, f.facnumber, f.total as total_ht,";
+    $sql.= " ".$db->pdate("f.datef")." as date, f.paye, f.fk_statut as statut, f.rowid as facid";
+    if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user ";
+    $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+    $sql.= ", ".MAIN_DB_PREFIX."facture as f";
+    $sql.= ", ".MAIN_DB_PREFIX."facturedet as d";
+    if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+    $sql.= " WHERE f.fk_soc = s.rowid";
+    $sql.= " AND s.entity = ".$conf->entity;
+    $sql.= " AND d.fk_facture = f.rowid";
+    $sql.= " AND d.fk_product =".$product->id;
+    if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+    if ($socid) $sql.= " AND f.fk_soc = $socid";
+    $sql.= " ORDER BY $sortfield $sortorder ";
+    $sql.= $db->plimit($conf->liste_limit +1, $offset);
+
+    $result = $db->query($sql);
+    if ($result)
+    {
+    	$num = $db->num_rows($result);
+
+      print_barre_liste($langs->trans("CustomersInvoices"),$page,$_SERVER["PHP_SELF"],"&amp;id=$product->id",$sortfield,$sortorder,'',$num,0,'');
+
+      $i = 0;
+      print "<table class=\"noborder\" width=\"100%\">";
+
+      print '<tr class="liste_titre">';
+      print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"s.rowid","","&amp;id=".$_GET["id"],'',$sortfield,$sortorder);
+      print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","","&amp;id=".$_GET["id"],'',$sortfield,$sortorder);
+      print_liste_field_titre($langs->trans("CustomerCode"),$_SERVER["PHP_SELF"],"s.code_client","","&amp;id=".$_GET["id"],'',$sortfield,$sortorder);
+      print_liste_field_titre($langs->trans("DateCreation"),$_SERVER["PHP_SELF"],"f.datef","","&amp;id=".$_GET["id"],'align="center"',$sortfield,$sortorder);
+      print_liste_field_titre($langs->trans("AmountHT"),$_SERVER["PHP_SELF"],"f.total_ht","","&amp;id=".$_GET["id"],'align="right"',$sortfield,$sortorder);
+      print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"f.paye,f.fk_statut","","&amp;id=".$_GET["id"],'align="right"',$sortfield,$sortorder);
+      print "</tr>\n";
+
+      if ($num > 0)
+      {
+      	$var=True;
+        while ($i < $num && $i < $conf->liste_limit)
         {
-            $sql .= " AND f.fk_soc = $socid";
-        }
-        $sql.= " ORDER BY $sortfield $sortorder ";
-        $sql.= $db->plimit($conf->liste_limit +1, $offset);
+        	$objp = $db->fetch_object($result);
+          $var=!$var;
 
-        $result = $db->query($sql);
-        if ($result)
-        {
-            $num = $db->num_rows($result);
-
-            print_barre_liste($langs->trans("CustomersInvoices"),$page,$_SERVER["PHP_SELF"],"&amp;id=$product->id",$sortfield,$sortorder,'',$num,0,'');
-
-            $i = 0;
-            print "<table class=\"noborder\" width=\"100%\">";
-
-            print '<tr class="liste_titre">';
-            print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"s.rowid","","&amp;id=".$_GET["id"],'',$sortfield,$sortorder);
-            print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","","&amp;id=".$_GET["id"],'',$sortfield,$sortorder);
-            print_liste_field_titre($langs->trans("CustomerCode"),$_SERVER["PHP_SELF"],"s.code_client","","&amp;id=".$_GET["id"],'',$sortfield,$sortorder);
-            print_liste_field_titre($langs->trans("DateCreation"),$_SERVER["PHP_SELF"],"f.datef","","&amp;id=".$_GET["id"],'align="center"',$sortfield,$sortorder);
-            print_liste_field_titre($langs->trans("AmountHT"),$_SERVER["PHP_SELF"],"f.total_ht","","&amp;id=".$_GET["id"],'align="right"',$sortfield,$sortorder);
-            print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"f.paye,f.fk_statut","","&amp;id=".$_GET["id"],'align="right"',$sortfield,$sortorder);
-            print "</tr>\n";
-
-            if ($num > 0)
-            {
-                $var=True;
-                while ($i < $num && $i < $conf->liste_limit)
-                {
-                    $objp = $db->fetch_object($result);
-                    $var=!$var;
-
-                    print "<tr $bc[$var]>";
-                    print '<td>';
-                    $invoicestatic->id=$objp->facid;
-                    $invoicestatic->ref=$objp->facnumber;
+          print "<tr $bc[$var]>";
+          print '<td>';
+          $invoicestatic->id=$objp->facid;
+          $invoicestatic->ref=$objp->facnumber;
 					print $invoicestatic->getNomUrl(1);
-                    print "</td>\n";
-                    print '<td><a href="'.DOL_URL_ROOT.'/compta/fiche.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).'</a></td>';
-                    print "<td>".$objp->code_client."</td>\n";
-                    print "<td align=\"center\">";
-                    print dol_print_date($objp->date)."</td>";
-                    print "<td align=\"right\">".price($objp->total_ht)."</td>\n";
-                    print '<td align="right">'.$invoicestatic->LibStatut($objp->paye,$objp->statut,5).'</td>';
-                    print "</tr>\n";
-                    $i++;
-                }
-            }
+          print "</td>\n";
+          print '<td><a href="'.DOL_URL_ROOT.'/compta/fiche.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).'</a></td>';
+          print "<td>".$objp->code_client."</td>\n";
+          print "<td align=\"center\">";
+          print dol_print_date($objp->date)."</td>";
+          print "<td align=\"right\">".price($objp->total_ht)."</td>\n";
+          print '<td align="right">'.$invoicestatic->LibStatut($objp->paye,$objp->statut,5).'</td>';
+          print "</tr>\n";
+          $i++;
         }
-        else
-        {
-            dol_print_error($db);
-        }
-        print "</table>";
-        print '<br>';
-        $db->free($result);
+      }
     }
+    else
+    {
+    	dol_print_error($db);
+    }
+    print "</table>";
+    print '<br>';
+    $db->free($result);
+  }
 }
 else
 {
@@ -199,4 +197,4 @@ else
 $db->close();
 
 llxFooter('$Date$ - $Revision$');
-?>
+?>
\ No newline at end of file
diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php
index 2b0ccd44055..4d64eb49824 100644
--- a/htdocs/product/stats/facture_fournisseur.php
+++ b/htdocs/product/stats/facture_fournisseur.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2007 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,6 +36,11 @@ $langs->load("bills");
 $langs->load("products");
 $langs->load("companies");
 
+// Security check
+$id = isset($_GET["id"])?$_GET["id"]:'';
+if ($user->societe_id) $socid=$user->societe_id;
+$result=restrictedArea($user,'produit',$id,'product');
+
 $mesg = '';
 
 $page = $_GET["page"];
@@ -48,13 +53,6 @@ $pagenext = $_GET["page"] + 1;
 if (! $sortorder) $sortorder="DESC";
 if (! $sortfield) $sortfield="f.datef";
 
-// Securite
-$socid = 0;
-if ($user->societe_id > 0)
-{
-    $socid = $user->societe_id;
-}
-
 
 /*
  * View
@@ -125,16 +123,17 @@ if ($_GET["id"] || $_GET["ref"])
 
         $sql = "SELECT distinct(s.nom), s.rowid as socid, s.code_client, f.facnumber, f.total_ht as total_ht,";
         $sql.= " ".$db->pdate("f.datef")." as date, f.paye, f.fk_statut as statut, f.rowid as facid";
-        if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
-        $sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture_fourn as f, ".MAIN_DB_PREFIX."facture_fourn_det as d";
-        if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+        if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user ";
+        $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+        $sql.= ", ".MAIN_DB_PREFIX."facture_fourn as f";
+        $sql.= ", ".MAIN_DB_PREFIX."facture_fourn_det as d";
+        if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
         $sql.= " WHERE f.fk_soc = s.rowid";
-        $sql.= " AND d.fk_facture_fourn = f.rowid AND d.fk_product =".$product->id;
-        if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-        if ($socid)
-        {
-            $sql .= " AND f.fk_soc = $socid";
-        }
+        $sql.= " AND s.entity = ".$conf->entity;
+        $sql.= " AND d.fk_facture_fourn = f.rowid";
+        $sql.= " AND d.fk_product =".$product->id;
+        if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+        if ($socid) $sql.= " AND f.fk_soc = ".$socid;
         $sql.= " ORDER BY $sortfield $sortorder ";
         $sql.= $db->plimit($conf->liste_limit +1, $offset);
 
diff --git a/htdocs/product/stats/fiche.php b/htdocs/product/stats/fiche.php
index 6172ec79532..39315cae89e 100644
--- a/htdocs/product/stats/fiche.php
+++ b/htdocs/product/stats/fiche.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (c) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005      Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  * Copyright (C) 2005      Eric Seigne          <eric.seigne@ryxeo.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -28,7 +28,6 @@
 
 require("./pre.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/propal.class.php");
 require_once(DOL_DOCUMENT_ROOT."/product.class.php");
 require_once(DOL_DOCUMENT_ROOT."/core/dolgraph.class.php");
 
@@ -39,16 +38,10 @@ $langs->load("other");
 
 $mode=isset($_GET["mode"])?$_GET["mode"]:'byunit';
 
-if ($user->societe_id > 0)
-{
-  $action = '';
-  $socid = $user->societe_id;
-}
-else
-{
-  $socid = 0;
-}
-
+// Security check
+$id = isset($_GET["id"])?$_GET["id"]:'';
+if ($user->societe_id) $socid=$user->societe_id;
+$result=restrictedArea($user,'produit',$id,'product');
 
 $mesg = '';
 
diff --git a/htdocs/product/stats/index.php b/htdocs/product/stats/index.php
index 4adba2a6213..142c0fcf23b 100644
--- a/htdocs/product/stats/index.php
+++ b/htdocs/product/stats/index.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004      Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2006 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -41,35 +41,36 @@ $mesg = '';
  *
  */
 $sql = "SELECT count(*)";
-$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
+$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
 if ($conf->categorie->enabled && !$user->rights->categorie->voir)
 {
   $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON cp.fk_product = p.rowid";
 	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cp.fk_categorie = c.rowid";
 }
-$sql .= " WHERE p.fk_product_type <> 1";
-if ($conf->categorie->enabled && !$user->rights->categorie->voir)
-{
-  $sql.= ' AND IFNULL(c.visible,1)=1';
-}
+$sql.= " WHERE p.fk_product_type <> 1";
+$sql.= " AND p.entity = ".$conf->entity;
+if ($conf->categorie->enabled && !$user->rights->categorie->voir) $sql.= ' AND IFNULL(c.visible,1)=1';
+
 if ($db->query($sql))
 {
   $row = $db->fetch_row(0);
   $nbproduct = $row[0];
 }
 $db->free();
+
+
 $sql = "SELECT count(*)";
-$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
+$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
 if ($conf->categorie->enabled && !$user->rights->categorie->voir)
 {
   $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON cp.fk_product = p.rowid";
 	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cp.fk_categorie = c.rowid";
 }
-$sql .= " WHERE p.envente = 0 AND p.fk_product_type <> '1'";
-if ($conf->categorie->enabled && !$user->rights->categorie->voir)
-{
-  $sql.= ' AND IFNULL(c.visible,1)=1';
-}
+$sql.= " WHERE p.envente = 0";
+$sql.= " AND p.fk_product_type <> '1'";
+$sql.= " AND p.entity = ".$conf->entity;
+if ($conf->categorie->enabled && !$user->rights->categorie->voir) $sql.= ' AND IFNULL(c.visible,1)=1';
+
 if ($db->query($sql))
 {
   $row = $db->fetch_row(0);
@@ -105,35 +106,34 @@ print '<td>'.$nbhv.'</td></tr>';
 if ($conf->service->enabled)
 {
   $sql = "SELECT count(*)";
-  $sql .= " FROM ".MAIN_DB_PREFIX."product as p";
+  $sql.= " FROM ".MAIN_DB_PREFIX."product as p";
   if ($conf->categorie->enabled && !$user->rights->categorie->voir)
   {
     $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON cp.fk_product = p.rowid";
 	  $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cp.fk_categorie = c.rowid";
   }
-  $sql .= " WHERE p.fk_product_type = '1'";
-  if ($conf->categorie->enabled && !$user->rights->categorie->voir)
-  {
-    $sql.= ' AND IFNULL(c.visible,1)=1';
-  }
+  $sql.= " WHERE p.fk_product_type = '1'";
+  $sql.= " AND p.entity = ".$conf->entity;
+  if ($conf->categorie->enabled && !$user->rights->categorie->voir) $sql.= ' AND IFNULL(c.visible,1)=1';
+
   if ($db->query($sql))
   {
     $row = $db->fetch_row(0);
     $nbproduct = $row[0];
   }
   $db->free();
+  
   $sql = "SELECT count(*)";
-  $sql .= " FROM ".MAIN_DB_PREFIX."product as p";
+  $sql.= " FROM ".MAIN_DB_PREFIX."product as p";
   if ($conf->categorie->enabled && !$user->rights->categorie->voir)
   {
     $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON cp.fk_product = p.rowid";
 	  $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cp.fk_categorie = c.rowid";
   }
-  $sql .= " WHERE p.envente = 0 AND p.fk_product_type = '1'";
-  if ($conf->categorie->enabled && !$user->rights->categorie->voir)
-  {
-    $sql.= ' AND IFNULL(c.visible,1)=1';
-  }
+  $sql.= " WHERE p.envente = 0";
+  $sql.= " AND p.fk_product_type = '1'";
+  $sql.= " AND p.entity = ".$conf->entity;
+  if ($conf->categorie->enabled && !$user->rights->categorie->voir) $sql.= ' AND IFNULL(c.visible,1)=1';
 
   if ($db->query($sql))
   {
diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php
index 8e76590b69a..8572583c606 100644
--- a/htdocs/product/stats/propal.php
+++ b/htdocs/product/stats/propal.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2004-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2007 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,6 +34,11 @@ require_once(DOL_DOCUMENT_ROOT."/product.class.php");
 $langs->load("products");
 $langs->load("companies");
 
+// Security check
+$id = isset($_GET["id"])?$_GET["id"]:'';
+if ($user->societe_id) $socid=$user->societe_id;
+$result=restrictedArea($user,'produit',$id,'product');
+
 $mesg = '';
 
 $page = $_GET["page"];
@@ -47,19 +52,6 @@ if (! $sortorder) $sortorder="DESC";
 if (! $sortfield) $sortfield="p.datec";
 
 
-// Securite
-$socid = 0;
-if ($user->societe_id > 0)
-{
-  $action = '';
-  $socid = $user->societe_id;
-}
-else
-{
-  $socid = 0;
-}
-
-
 /*
  * Affiche fiche
  *
@@ -127,17 +119,18 @@ if ($_GET["id"] || $_GET["ref"])
 
         $sql = "SELECT distinct(s.nom), s.rowid as socid, p.rowid as propalid, p.ref, p.total as amount,";
 				$sql.= $db->pdate("p.datec")." as date, p.fk_statut as statut";
-				if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
-        $sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."propaldet as d";
-        if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+				if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user ";
+        $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+        $sql.= ",".MAIN_DB_PREFIX."propal as p";
+        $sql.= ", ".MAIN_DB_PREFIX."propaldet as d";
+        if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 				$sql.= " WHERE p.fk_soc = s.rowid";
-        $sql.= " AND d.fk_propal = p.rowid AND d.fk_product =".$product->id;
-        if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-        if ($socid)
-        {
-            $sql .= " AND p.fk_soc = $socid";
-        }
-        $sql .= " ORDER BY $sortfield $sortorder ";
+				$sql.= " AND s.entity = ".$conf->entity;
+        $sql.= " AND d.fk_propal = p.rowid";
+        $sql.= " AND d.fk_product =".$product->id;
+        if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+        if ($socid) $sql.= " AND p.fk_soc = ".$socid;
+        $sql.= " ORDER BY $sortfield $sortorder ";
         $sql.= $db->plimit($conf->liste_limit +1, $offset);
 
         $result = $db->query($sql);
diff --git a/htdocs/product/stock/fiche.php b/htdocs/product/stock/fiche.php
index 334fe774441..e4d09688359 100644
--- a/htdocs/product/stock/fiche.php
+++ b/htdocs/product/stock/fiche.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2003-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005      Simon Tosser         <simon@kornog-computing.com>
- * Copyright (C) 2005-2006 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -329,7 +329,8 @@ else
 
 			$sql = "SELECT p.rowid as rowid, p.ref, p.label as produit,";
 			$sql.= " ps.reel as value";
-			$sql.= " FROM ".MAIN_DB_PREFIX."product_stock ps, ".MAIN_DB_PREFIX."product p ";
+			$sql.= " FROM ".MAIN_DB_PREFIX."product_stock ps";
+			$sql.= ", ".MAIN_DB_PREFIX."product p ";
 			if ($conf->categorie->enabled && !$user->rights->categorie->voir)
 			{
 				$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON cp.fk_product = p.rowid";
@@ -342,8 +343,7 @@ else
 			{
 				$sql.= ' AND IFNULL(c.visible,1)=1';
 			}
-
-			$sql .=  " ORDER BY " . $sortfield . " " . $sortorder;
+			$sql.=  " ORDER BY " . $sortfield . " " . $sortorder;
 
 			//$sql .= $db->plimit($limit + 1 ,$offset);
 
@@ -360,8 +360,10 @@ else
 					// Multilangs
 					if ($conf->global->MAIN_MULTILANGS) // si l'option est active
 					{
-						$sql = "SELECT label FROM ".MAIN_DB_PREFIX."product_det";
-						$sql.= " WHERE fk_product=".$objp->rowid." AND lang='". $langs->getDefaultLang() ."'";
+						$sql = "SELECT label";
+						$sql.= " FROM ".MAIN_DB_PREFIX."product_det";
+						$sql.= " WHERE fk_product=".$objp->rowid;
+						$sql.= " AND lang='". $langs->getDefaultLang() ."'";
 						$sql.= " LIMIT 1";
 
 						$result = $db->query($sql);
diff --git a/htdocs/product/stock/index.php b/htdocs/product/stock/index.php
index 8d16dd81057..6495002caa2 100644
--- a/htdocs/product/stock/index.php
+++ b/htdocs/product/stock/index.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2003-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -53,9 +54,13 @@ print $langs->trans("Ref").':</td><td><input class="flat" type="text" size="18"
 print "<tr $bc[0]><td>".$langs->trans("Other").':</td><td><input type="text" name="sall" class="flat" size="18"></td>';
 print "</table></form><br>";
 
-$sql = "SELECT e.label, e.rowid, e.statut FROM ".MAIN_DB_PREFIX."entrepot as e";
-$sql .= " WHERE statut in (0,1) ORDER BY e.statut DESC ";
-$sql .= $db->plimit(15 ,0);
+$sql = "SELECT e.label, e.rowid, e.statut";
+$sql.= " FROM ".MAIN_DB_PREFIX."entrepot as e";
+$sql.= " WHERE e.statut in (0,1)";
+$sql.= " AND e.entity = ".$conf->entity;
+$sql.= " ORDER BY e.statut DESC ";
+$sql.= $db->plimit(15 ,0);
+
 $result = $db->query($sql) ;
 
 if ($result)
@@ -99,19 +104,23 @@ $max=10;
 $sql = "SELECT p.rowid, p.label as produit,";
 $sql.= " s.label as stock, s.rowid as entrepot_id,";
 $sql.= " m.value, ".$db->pdate("m.datem")." as datem";
-$sql.= " FROM ".MAIN_DB_PREFIX."entrepot as s, ".MAIN_DB_PREFIX."stock_mouvement as m, ".MAIN_DB_PREFIX."product as p";
+$sql.= " FROM ".MAIN_DB_PREFIX."entrepot as s";
+$sql.= ", ".MAIN_DB_PREFIX."stock_mouvement as m";
+$sql.= ", ".MAIN_DB_PREFIX."product as p";
 if ($conf->categorie->enabled && !$user->rights->categorie->voir)
 {
 	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON cp.fk_product = p.rowid";
 	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cp.fk_categorie = c.rowid";
 }
-$sql .= " WHERE m.fk_product = p.rowid AND m.fk_entrepot = s.rowid";
+$sql.= " WHERE m.fk_product = p.rowid";
+$sql.= " AND m.fk_entrepot = s.rowid";
+$sql.= " AND s.entity = ".$conf->entity;
 if ($conf->categorie->enabled && !$user->rights->categorie->voir)
 {
 	$sql.= " AND IFNULL(c.visible,1)=1";
 }
-$sql .= " ORDER BY datem DESC";
-$sql .= $db->plimit($max,0);
+$sql.= " ORDER BY datem DESC";
+$sql.= $db->plimit($max,0);
 
 dol_syslog("Index:list stock movements sql=".$sql, LOG_DEBUG);
 $resql = $db->query($sql) ;
diff --git a/htdocs/product/stock/liste.php b/htdocs/product/stock/liste.php
index 1ded8c4247b..eeea21a19aa 100644
--- a/htdocs/product/stock/liste.php
+++ b/htdocs/product/stock/liste.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -47,18 +48,18 @@ $offset = $limit * $page;
 
   
 $sql  = "SELECT e.rowid, e.label as ref, e.statut, e.lieu, e.address, e.cp, e.ville, e.fk_pays";
-$sql .= " FROM ".MAIN_DB_PREFIX."entrepot as e";
-$sql .= " WHERE 1=1";
+$sql.= " FROM ".MAIN_DB_PREFIX."entrepot as e";
+$sql.= " WHERE e.entity = ".$conf->entity;
 if ($sref)
 {
-    $sql .= " AND e.label like '%".$sref."%'";
+    $sql.= " AND e.label like '%".$sref."%'";
 }
 if ($sall)
 {
-    $sql .= " AND (e.description like '%".$sall."%' OR e.lieu like '%".$sall."%' OR e.address like '%".$sall."%' OR e.ville like '%".$sall."%')";
+    $sql.= " AND (e.description like '%".$sall."%' OR e.lieu like '%".$sall."%' OR e.address like '%".$sall."%' OR e.ville like '%".$sall."%')";
 }
-$sql .= " ORDER BY $sortfield $sortorder";
-$sql .= $db->plimit($limit + 1 ,$offset);
+$sql.= " ORDER BY $sortfield $sortorder";
+$sql.= $db->plimit($limit + 1 ,$offset);
 
 $result = $db->query($sql) ;
 if ($result)
diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php
index 57db6d3d8e6..074a555a40b 100644
--- a/htdocs/product/stock/mouvement.php
+++ b/htdocs/product/stock/mouvement.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2006 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -50,21 +50,26 @@ $form=new Form($db);
 $sql = "SELECT p.rowid, p.label as produit,";
 $sql.= " s.label as stock, s.rowid as entrepot_id,";
 $sql.= " m.value, ".$db->pdate("m.datem")." as datem";
-$sql.= " FROM ".MAIN_DB_PREFIX."entrepot as s, ".MAIN_DB_PREFIX."stock_mouvement as m, ".MAIN_DB_PREFIX."product as p";
+$sql.= " FROM ".MAIN_DB_PREFIX."entrepot as s";
+$sql.= ", ".MAIN_DB_PREFIX."stock_mouvement as m";
+$sql.= ", ".MAIN_DB_PREFIX."product as p";
 if ($conf->categorie->enabled && !$user->rights->categorie->voir)
 {
 	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON cp.fk_product = p.rowid";
 	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cp.fk_categorie = c.rowid";
 }
-$sql .= " WHERE m.fk_product = p.rowid AND m.fk_entrepot = s.rowid";
+$sql.= " WHERE m.fk_product = p.rowid";
+$sql.= " AND m.fk_entrepot = s.rowid";
+$sql.= " AND s.entity = ".$conf->entity;
 if ($_GET["id"])
-$sql .= " AND s.rowid ='".$_GET["id"]."'";
+$sql.= " AND s.rowid ='".$_GET["id"]."'";
 if ($conf->categorie->enabled && !$user->rights->categorie->voir)
 {
 	$sql.= " AND IFNULL(c.visible,1)=1";
 }
-$sql .= " ORDER BY $sortfield $sortorder ";
-$sql .= $db->plimit($conf->liste_limit + 1 ,$offset);
+$sql.= " ORDER BY $sortfield $sortorder ";
+$sql.= $db->plimit($conf->liste_limit + 1 ,$offset);
+
 $resql = $db->query($sql) ;
 
 if ($resql)
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 6eb93067eaa..0d702412e2c 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2005      Simon TOSSER         <simon@kornog-computing.com>
- * Copyright (C) 2005-2007 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,18 +32,19 @@ require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/product.class.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formproduct.class.php");
 
+if (! $user->rights->produit->lire || ! $product->type == 0 || ! $conf->stock->enabled)	accessforbidden();
+
 $langs->load("products");
 $langs->load("orders");
 $langs->load("bills");
 
+// Security check
+$id = isset($_GET["id"])?$_GET["id"]:'';
+if ($user->societe_id) $socid=$user->societe_id;
+$result=restrictedArea($user,'produit',$id,'product');
+
 $mesg = '';
 
-if (! $user->rights->produit->lire || ! $product->type == 0 || ! $conf->stock->enabled)
-{
-	accessforbidden();
-}
-
-
 /*
  *	Actions
  */
@@ -346,9 +347,14 @@ print '<br><table class="noborder" width="100%">';
 print '<tr class="liste_titre"><td width="40%">'.$langs->trans("Warehouse").'</td>';
 print '<td align="right">'.$langs->trans("NumberOfUnit").'</td></tr>';
 
-$sql = "SELECT e.rowid, e.label, ps.reel FROM ".MAIN_DB_PREFIX."entrepot as e, ".MAIN_DB_PREFIX."product_stock as ps";
-$sql .= " WHERE ps.reel != 0 AND ps.fk_entrepot = e.rowid AND ps.fk_product = ".$product->id;
-$sql .= " ORDER BY lower(e.label)";
+$sql = "SELECT e.rowid, e.label, ps.reel";
+$sql.= " FROM ".MAIN_DB_PREFIX."entrepot as e";
+$sql.= ", ".MAIN_DB_PREFIX."product_stock as ps";
+$sql.= " WHERE ps.reel != 0";
+$sql.= " AND ps.fk_entrepot = e.rowid";
+$sql.= " AND e.entity = ".$conf->entity;
+$sql.= " AND ps.fk_product = ".$product->id;
+$sql.= " ORDER BY lower(e.label)";
 
 $entrepotstatic=new Entrepot($db);
 
diff --git a/htdocs/product/stock/valo.php b/htdocs/product/stock/valo.php
index aac41622852..537ae23ac89 100644
--- a/htdocs/product/stock/valo.php
+++ b/htdocs/product/stock/valo.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -53,19 +54,23 @@ $year = strftime("%Y",time());
  */
 
 // Affichage valorisation par entrepot
-$sql  = "SELECT e.rowid as ref, e.label, e.statut, e.lieu";
-$sql .= " FROM ".MAIN_DB_PREFIX."entrepot as e";
-$sql .= " WHERE 1=1";
+$sql = "SELECT e.rowid as ref, e.label, e.statut, e.lieu";
+$sql.= " FROM ".MAIN_DB_PREFIX."entrepot as e";
+$sql.= " WHERE e.entity = ".$conf->entity;
 if ($sref)
 {
-	$sql .= " AND e.ref like '%".$sref."%'";
+	$sql.= " AND e.ref LIKE '%".$sref."%'";
 }
 if ($sall)
 {
-	$sql .= " AND (e.label like '%".addslashes($sall)."%' OR e.description like '%".addslashes($sall)."%' OR e.lieu like '%".addslashes($sall)."%' OR e.address like '%".addslashes($sall)."%' OR e.ville like '%".addslashes($sall)."%')";
+	$sql.= " AND (e.label LIKE '%".addslashes($sall)."%'";
+	$sql.= " OR e.description LIKE '%".addslashes($sall)."%'";
+	$sql.= " OR e.lieu LIKE '%".addslashes($sall)."%'";
+	$sql.= " OR e.address LIKE '%".addslashes($sall)."%'";
+	$sql.= " OR e.ville LIKE '%".addslashes($sall)."%')";
 }
-$sql .= " ORDER BY $sortfield $sortorder ";
-$sql .= $db->plimit($limit + 1, $offset);
+$sql.= " ORDER BY $sortfield $sortorder ";
+$sql.= $db->plimit($limit + 1, $offset);
 
 $result = $db->query($sql) ;
 if ($result)
diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php
index 2f925d472bd..a630cea8e6d 100644
--- a/htdocs/product/traduction.php
+++ b/htdocs/product/traduction.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2005-2007 Regis Houssin  <regis@dolibarr.fr>
+/* Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  * Copyright (C) 2007      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -35,8 +35,11 @@ require_once(DOL_DOCUMENT_ROOT."/product.class.php");
 $langs->load("products");
 $langs->load("bills");
 
-if (!$user->rights->produit->lire)
-accessforbidden();
+// Security check
+$id = isset($_GET["id"])?$_GET["id"]:'';
+if ($user->societe_id) $socid=$user->societe_id;
+$result=restrictedArea($user,'produit',$id,'product');
+
 
 /*
  * Actions
diff --git a/htdocs/project.class.php b/htdocs/project.class.php
index b30c1013ef2..18568f017f2 100644
--- a/htdocs/project.class.php
+++ b/htdocs/project.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2005-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2007 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -456,6 +456,8 @@ class Project extends CommonObject
 	 */
 	function getTasksArray($usert=0, $userp=0, $mode=0)
 	{
+		global $conf;
+		
 		$tasks = array();
 
 		//print $usert.'-'.$userp;
@@ -471,9 +473,11 @@ class Project extends CommonObject
 			{
 				$sql.= ", ".MAIN_DB_PREFIX."projet_task_actors as ta";
 			}
-			$sql.= ")";
+			$sql.= ", ".MAIN_DB_PREFIX."societe as s)";
 			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as up on p.fk_user_resp = up.rowid";
 			$sql.= " WHERE t.fk_projet = p.rowid";
+			$sql.= " AND p.fk_soc = s.rowid";
+			$sql.= " AND s.entity = ".$conf->entity;
 			if ($this->id) $sql .= " AND t.fk_projet =".$this->id;
 			if (is_object($usert)) $sql .= " AND ta.fk_projet_task = t.rowid AND ta.fk_user = ".$usert->id;
 			if (is_object($userp)) $sql .= " AND (p.fk_user_resp = ".$userp->id." OR p.fk_user_resp IS NULL OR p.fk_user_resp = -1)";
@@ -485,15 +489,16 @@ class Project extends CommonObject
 			{
 				$sql.= ", ".MAIN_DB_PREFIX."projet_task as t";
 				$sql.= ", ".MAIN_DB_PREFIX."projet_task_actors as ta";
-				$sql.= ")";
+				$sql.= ", ".MAIN_DB_PREFIX."societe as s)";
 			}
 			else
 			{
-				$sql.= ")";
+				$sql.= ", ".MAIN_DB_PREFIX."societe as s)";
 				$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t on t.fk_projet = p.rowid";
 			}
 			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as up on p.fk_user_resp = up.rowid";
-			$sql.= " WHERE 1 = 1";
+			$sql.= " WHERE p.fk_soc = s.rowid";
+			$sql.= " AND s.entity = ".$conf->entity;
 			if ($this->id) $sql .= " AND t.fk_projet =".$this->id;
 			if (is_object($usert)) $sql .= " AND t.fk_projet = p.rowid AND ta.fk_projet_task = t.rowid AND ta.fk_user = ".$usert->id;
 			if (is_object($userp)) $sql .= " AND (p.fk_user_resp = ".$userp->id." OR p.fk_user_resp IS NULL OR p.fk_user_resp = -1)";
diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php
index 2ab4bd2cafa..34d08c0aeb0 100644
--- a/htdocs/projet/activity/index.php
+++ b/htdocs/projet/activity/index.php
@@ -64,20 +64,19 @@ print '<td align="right">'.$langs->trans("NbOpenTasks").'</td>';
 print "</tr>\n";
 
 $sql = "SELECT p.rowid, p.ref, p.title, count(t.rowid) as nb";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
-$sql .= " FROM ".MAIN_DB_PREFIX."projet as p,";
-$sql .= " ".MAIN_DB_PREFIX."projet_task as t";
+$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
+$sql.= ", ".MAIN_DB_PREFIX."societe as s";
+$sql.= ", ".MAIN_DB_PREFIX."projet_task as t";
 if ($mode == 'mine') $sql.= ", ".MAIN_DB_PREFIX."projet_task_actors as pta";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-$sql .= " WHERE t.fk_projet = p.rowid";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
-if ($socid)
-{
-	$sql .= " AND p.fk_soc = ".$socid;
-}
+if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+$sql.= " WHERE t.fk_projet = p.rowid";
+$sql.= " AND p.fk_soc = s.rowid";
+$sql.= " AND s.entity = ".$conf->entity;
+if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
+if ($socid) $sql.= " AND p.fk_soc = ".$socid;
 if ($mode == 'mine') $sql.=" AND t.rowid = pta.fk_projet_task";
 if ($mode == 'mine') $sql.=" AND pta.fk_user = ".$user->id;
-$sql .= " GROUP BY p.rowid";
+$sql.= " GROUP BY p.rowid";
 
 $var=true;
 $resql = $db->query($sql);
diff --git a/htdocs/projet/fiche.php b/htdocs/projet/fiche.php
index 61493d2d3b5..eb7e526d125 100644
--- a/htdocs/projet/fiche.php
+++ b/htdocs/projet/fiche.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2007 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,10 +26,10 @@
  */
 
 require("./pre.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/propal.class.php");
-require_once(DOL_DOCUMENT_ROOT."/facture.class.php");
-require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php");
+if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/propal.class.php");
+if ($conf->facture->enabled) require_once(DOL_DOCUMENT_ROOT."/facture.class.php");
+if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php");
 
 $projetid='';
 $ref='';
diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index e77478376ea..3343a64ace4 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2006 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2006 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -57,19 +57,16 @@ print '<td align="right">'.$langs->trans("NbOpenTasks").'</td>';
 print "</tr>\n";
 
 $sql = "SELECT p.title, p.rowid, count(t.rowid)";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
-$sql.= " FROM";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " ".MAIN_DB_PREFIX."societe_commerciaux as sc,";
-$sql.= " ".MAIN_DB_PREFIX."projet as p";
-//$sql.= " , ".MAIN_DB_PREFIX."projet_task as t"; // pourquoi est-ce que c'était en commentaire ? => Si on laisse ce lien, les projet sans taches se retrouvent invisibles
+$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc,";
+$sql.= ", ".MAIN_DB_PREFIX."projet as p";
+//$sql.= ", ".MAIN_DB_PREFIX."projet_task as t"; // pourquoi est-ce que c'était en commentaire ? => Si on laisse ce lien, les projet sans taches se retrouvent invisibles
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t ON p.rowid = t.fk_projet";
-$sql.= " WHERE 1 = 1";
+$sql.= " WHERE p.fk_soc = s.rowid";
+$sql.= " AND s.entity = ".$conf->entity;
 if ($_REQUEST["mode"]=='mine') $sql.=' AND p.fk_user_resp='.$user->id;
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
-if ($socid)
-{
-	$sql .= " AND p.fk_soc = ".$socid;
-}
+if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
+if ($socid)	$sql.= " AND p.fk_soc = ".$socid;
 $sql.= " GROUP BY p.rowid";
 
 $var=true;
@@ -109,17 +106,15 @@ print '<td align="right">'.$langs->trans("NbOfProjects").'</td>';
 print "</tr>\n";
 
 $sql = "SELECT s.nom, s.rowid as socid, count(p.rowid)";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
-$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."projet as p";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-$sql .= " WHERE p.fk_soc = s.rowid";
+$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+$sql.= ", ".MAIN_DB_PREFIX."projet as p";
+if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+$sql.= " WHERE p.fk_soc = s.rowid";
+$sql.= " AND s.entity = ".$conf->entity;
 if ($_REQUEST["mode"]=='mine') $sql.=' AND p.fk_user_resp='.$user->id;
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-if ($socid)
-{
-	$sql .= " AND s.rowid = ".$socid;
-}
-$sql .= " GROUP BY s.nom";
+if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+if ($socid) $sql.= " AND s.rowid = ".$socid;
+$sql.= " GROUP BY s.nom";
 //$sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit, $offset);
 
 $var=true;
diff --git a/htdocs/projet/liste.php b/htdocs/projet/liste.php
index 06bbd4fcbb2..6fd09d39a54 100644
--- a/htdocs/projet/liste.php
+++ b/htdocs/projet/liste.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005      Marc Bariley / Ocebo <marc@ocebo.com>
- * Copyright (C) 2005-2006 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -70,34 +70,31 @@ $userstatic = new User($db);
 $staticsoc=new Societe($db);
 
 $sql = "SELECT p.rowid as projectid, p.ref, p.title, ".$db->pdate("p.dateo")." as do, p.fk_user_resp,";
-$sql .= " u.login,";
-$sql .= " s.nom, s.rowid as socid, s.client";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
-$sql .= " FROM (".MAIN_DB_PREFIX."projet as p";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-$sql .= ")";
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on p.fk_user_resp = u.rowid";
-$sql .= " WHERE 1 = 1 ";
+$sql.= " u.login,";
+$sql.= " s.nom, s.rowid as socid, s.client";
+$sql.= " FROM (".MAIN_DB_PREFIX."projet as p";
+if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+$sql.= ")";
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on p.fk_user_resp = u.rowid";
+$sql.= " WHERE s.entity = ".$conf->entity;
 if ($_REQUEST["mode"]=='mine') $sql.=' AND p.fk_user_resp='.$user->id;
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-if ($socid)
-{
-	$sql .= " AND s.rowid = ".$socid;
-}
+if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+if ($socid)	$sql.= " AND s.rowid = ".$socid;
+
 if ($_GET["search_ref"])
 {
-	$sql .= " AND p.ref LIKE '%".addslashes($_GET["search_ref"])."%'";
+	$sql.= " AND p.ref LIKE '%".addslashes($_GET["search_ref"])."%'";
 }
 if ($_GET["search_label"])
 {
-	$sql .= " AND p.title LIKE '%".addslashes($_GET["search_label"])."%'";
+	$sql.= " AND p.title LIKE '%".addslashes($_GET["search_label"])."%'";
 }
 if ($_GET["search_societe"])
 {
-	$sql .= " AND s.nom LIKE '%".addslashes($_GET["search_societe"])."%'";
+	$sql.= " AND s.nom LIKE '%".addslashes($_GET["search_societe"])."%'";
 }
-$sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit+1, $offset);
+$sql.= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit+1, $offset);
 
 $var=true;
 $resql = $db->query($sql);
diff --git a/htdocs/projet/tasks/fiche.php b/htdocs/projet/tasks/fiche.php
index da145d27fdb..3b61a184123 100644
--- a/htdocs/projet/tasks/fiche.php
+++ b/htdocs/projet/tasks/fiche.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2005      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2007 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/htdocs/propal.class.php b/htdocs/propal.class.php
index 66d1954f715..439b60c5721 100644
--- a/htdocs/propal.class.php
+++ b/htdocs/propal.class.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004      Eric Seigne           <eric.seigne@ryxeo.com>
  * Copyright (C) 2004-2009 Laurent Destailleur   <eldy@users.sourceforge.net>
  * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
- * Copyright (C) 2005-2007 Regis Houssin         <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin         <regis@dolibarr.fr>
  * Copyright (C) 2006      Andre Cianfarani      <acianfa@free.fr>
  * Copyright (C) 2008      Raphael Bertrand (Resultic)   <raphael.bertrand@resultic.fr>
  *
@@ -1731,7 +1731,7 @@ class Propal extends CommonObject
 	/**
 	 *      \brief      Charge indicateurs this->nbtodo et this->nbtodolate de tableau de bord
 	 *      \param      user        Objet user
-	 *      \param      mode        "opened" pour propal � fermer, "signed" pour propale � facturer
+	 *      \param      mode        "opened" pour propal a fermer, "signed" pour propale a facturer
 	 *      \return     int         <0 si ko, >0 si ok
 	 */
 	function load_board($user,$mode)
@@ -1741,19 +1741,23 @@ class Propal extends CommonObject
 		$now=gmmktime();
 
 		$this->nbtodo=$this->nbtodolate=0;
-		$clause = "WHERE";
+		$clause = " WHERE";
 
 		$sql ="SELECT p.rowid, p.ref, p.datec as datec, p.fin_validite as datefin";
 		$sql.=" FROM ".MAIN_DB_PREFIX."propal as p";
+		$sql.= ", ".MAIN_DB_PREFIX."societe as s";
 		if (!$user->rights->societe->client->voir && !$user->societe_id)
 		{
 			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON p.fk_soc = sc.fk_soc";
 			$sql.= " WHERE sc.fk_user = " .$user->id;
-			$clause = "AND";
+			$clause = " AND";
 		}
-		if ($mode == 'opened') $sql.=" ".$clause." p.fk_statut = 1";
-		if ($mode == 'signed') $sql.=" ".$clause." p.fk_statut = 2";
-		if ($user->societe_id) $sql.=" AND p.fk_soc = ".$user->societe_id;
+		$sql.= $clause." p.fk_soc = s.rowid";
+		$sql.= " AND s.entity = ".$conf->entity;
+		if ($mode == 'opened') $sql.= " AND p.fk_statut = 1";
+		if ($mode == 'signed') $sql.= " AND p.fk_statut = 2";
+		if ($user->societe_id) $sql.= " AND p.fk_soc = ".$user->societe_id;
+
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -1771,7 +1775,7 @@ class Propal extends CommonObject
 						$this->nbtodolate++;
 					}
 				}
-				// \todo Definir r�gle des propales � facturer en retard
+				// \todo Definir regle des propales a facturer en retard
 				// if ($mode == 'signed' && ! sizeof($this->FactureListeArray($obj->rowid))) $this->nbtodolate++;
 			}
 			return 1;
@@ -1869,15 +1873,19 @@ class Propal extends CommonObject
 		global $conf, $user;
 
 		$this->nb=array();
+		$clause = "WHERE";
 
 		$sql = "SELECT count(p.rowid) as nb";
 		$sql.= " FROM ".MAIN_DB_PREFIX."propal as p";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON p.fk_soc = s.rowid";
 		if (!$user->rights->societe->client->voir && !$user->societe_id)
 		{
-			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON p.fk_soc = s.rowid";
 			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
 			$sql.= " WHERE sc.fk_user = " .$user->id;
+			$clause = "AND";
 		}
+		$sql.= " ".$clause." s.entity = ".$conf->entity;
+		
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
diff --git a/htdocs/prospect.class.php b/htdocs/prospect.class.php
index f8001997ffa..ea24e83def2 100644
--- a/htdocs/prospect.class.php
+++ b/htdocs/prospect.class.php
@@ -1,6 +1,7 @@
 <?php
-/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2006 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2006      Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,7 +41,7 @@ class Prospect extends Societe
     
     /**
      *    \brief  Constructeur de la classe
-     *    \param  DB     handler acc�s base de donn�es
+     *    \param  DB     handler acces base de donnees
      *    \param  id     id societe (0 par defaut)
      */
     function Prospect($DB, $id=0)
@@ -74,6 +75,7 @@ class Prospect extends Societe
         	$clause = "AND";
         }
         $sql.= " ".$clause." s.client in (1,2)";
+        $sql.= " AND s.entity = ".$conf->entity;
         $sql.= " GROUP BY s.client";
         $resql=$this->db->query($sql);
         if ($resql)
diff --git a/htdocs/service.class.php b/htdocs/service.class.php
index 2f8e2715e7f..07cd5fc84fc 100644
--- a/htdocs/service.class.php
+++ b/htdocs/service.class.php
@@ -212,6 +212,7 @@ class Service
            $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cp.fk_categorie = c.rowid";
         }
         $sql.= " WHERE p.fk_product_type = 1";
+        $sql.= " AND p.entity = ".$conf->entity;
         if ($conf->categorie->enabled && !$user->rights->categorie->voir)
         {
            $sql.= " AND IFNULL(c.visible,1)=1";
diff --git a/htdocs/societe.class.php b/htdocs/societe.class.php
index 5beca995205..05daeede7c7 100644
--- a/htdocs/societe.class.php
+++ b/htdocs/societe.class.php
@@ -4,8 +4,8 @@
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2003      Brian Fraval         <brian@fraval.org>
  * Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
- * Copyright (C) 2005-2007 Regis Houssin        <regis@dolibarr.fr>
- * Copyright (C) 2008	   Patrick Raguin       <patrick.raguin@auguria.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2008	     Patrick Raguin       <patrick.raguin@auguria.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -153,8 +153,8 @@ class Societe extends CommonObject
 
 		if ($result >= 0)
 		{
-			$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe (nom, datec, datea, fk_user_creat)";
-			$sql.= " VALUES ('".addslashes($this->nom)."', ".$this->db->idate(gmmktime()).", ".$this->db->idate(gmmktime()).",";
+			$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe (nom, entity, datec, datea, fk_user_creat)";
+			$sql.= " VALUES ('".addslashes($this->nom)."', ".$conf->entity.", ".$this->db->idate(gmmktime()).", ".$this->db->idate(gmmktime()).",";
 			$sql.= " ".($user->id > 0 ? "'".$user->id."'":"null");
 			$sql.= ")";
 
@@ -502,7 +502,7 @@ class Societe extends CommonObject
 			}
 		}
 
-		$sql = 'SELECT s.rowid, s.nom, s.address,'.$this->db->pdate('s.datec').' as dc, s.prefix_comm';
+		$sql = 'SELECT s.rowid, s.nom, s.entity, s.address,'.$this->db->pdate('s.datec').' as dc, s.prefix_comm';
 		$sql .= ', s.price_level';
 		$sql .= ','. $this->db->pdate('s.tms').' as date_update';
 		$sql .= ', s.tel, s.fax, s.email, s.url, s.cp, s.ville, s.note, s.client, s.fournisseur';
@@ -538,6 +538,7 @@ class Societe extends CommonObject
 
 				$this->id = $obj->rowid;
 				$this->ref = $obj->rowid;
+				$this->entity = $obj->entity;
 
 				$this->date_update = $obj->date_update;
 
@@ -686,8 +687,8 @@ class Societe extends CommonObject
 	}
 
 	/**
-	 *    \brief      Suppression d'une societe de la base avec ses d�pendances (contacts, rib...)
-	 *    \param      id      id de la societe � supprimer
+	 *    \brief      Suppression d'une societe de la base avec ses dependances (contacts, rib...)
+	 *    \param      id      id de la societe a supprimer
 	 */
 	function delete($id)
 	{
@@ -835,8 +836,8 @@ class Societe extends CommonObject
 
 
 	/**
-	 *    \brief     Retournes les factures impay�es de la soci�t�
-	 *    \return    array   tableau des id de factures impay�es
+	 *    \brief     Retournes les factures impayees de la societe
+	 *    \return    array   tableau des id de factures impayees
 	 *
 	 */
 	function factures_impayes()
@@ -868,11 +869,13 @@ class Societe extends CommonObject
 	}
 
 	/**
-	 *    \brief      Attribut le prefix de la soci�t� en base
+	 *    \brief      Attribut le prefix de la societe en base
 	 *
 	 */
 	function attribute_prefix()
 	{
+		global $conf;
+		
 		$sql = "SELECT nom FROM ".MAIN_DB_PREFIX."societe WHERE rowid = '".$this->id."'";
 		$resql=$this->db->query( $sql);
 		if ($resql)
@@ -885,7 +888,10 @@ class Societe extends CommonObject
 
 				$prefix = $this->genprefix($nom,4);
 
-				$sql = "SELECT count(*) as nb FROM ".MAIN_DB_PREFIX."societe WHERE prefix_comm = '$prefix'";
+				$sql = "SELECT count(*) as nb FROM ".MAIN_DB_PREFIX."societe";
+				$sql.= " WHERE prefix_comm = '".$prefix."'";
+				$sql.= " AND entity = ".$conf->entity;
+				
 				$resql=$this->db->query($sql);
 				if ($resql)
 				{
@@ -919,10 +925,10 @@ class Societe extends CommonObject
 	}
 
 	/**
-	 *    \brief      G�n�re le pr�fix de la soci�t�
-	 *    \param      nom         nom de la soci�t�
-	 *    \param      taille      taille du prefix � retourner
-	 *    \param      mot         l'indice du mot � utiliser
+	 *    \brief      Genere le prefix de la societe
+	 *    \param      nom         nom de la societe
+	 *    \param      taille      taille du prefix a retourner
+	 *    \param      mot         l'indice du mot a utiliser
 	 */
 	function genprefix($nom, $taille=4, $mot=0)
 	{
@@ -932,8 +938,12 @@ class Societe extends CommonObject
 		if ($mot < count($tab))
 		{
 			$prefix = strtoupper(substr($tab[$mot],0,$taille));
-			// On v�rifie que ce prefix n'a pas d�j� �t� pris ...
-			$sql = "SELECT count(*) as nb FROM ".MAIN_DB_PREFIX."societe WHERE prefix_comm = '$prefix'";
+			
+			// On verifie que ce prefix n'a pas deja ete pris ...
+			$sql = "SELECT count(*) as nb FROM ".MAIN_DB_PREFIX."societe";
+			$sql.= " WHERE prefix_comm = '".$prefix."'";
+			$sql.= " AND entity = ".$conf->entity;
+			
 			$resql=$this->db->query( $sql);
 			if ($resql)
 			{
@@ -1163,7 +1173,7 @@ class Societe extends CommonObject
 		if ($this->id > 0 && $commid > 0)
 		{
 			$sql  = "DELETE FROM  ".MAIN_DB_PREFIX."societe_commerciaux ";
-			$sql .= " WHERE fk_soc = " . $this->id ." AND fk_user =".$commid;
+			$sql .= " WHERE fk_soc = ".$this->id." AND fk_user =".$commid;
 
 			$this->db->query($sql);
 
@@ -1189,7 +1199,7 @@ class Societe extends CommonObject
 		if ($this->id > 0 && $commid > 0)
 		{
 			$sql  = "DELETE FROM  ".MAIN_DB_PREFIX."societe_commerciaux ";
-			$sql .= " WHERE fk_soc = " . $this->id ." AND fk_user =".$commid;
+			$sql .= " WHERE fk_soc = ".$this->id." AND fk_user =".$commid;
 
 			if (! $this->db->query($sql) )
 	  {
@@ -1279,7 +1289,7 @@ class Societe extends CommonObject
 
 
 	/**
-	 *    \brief      Renvoie la liste des contacts emails existant pour la soci�t�
+	 *    \brief      Renvoie la liste des contacts emails existant pour la societe
 	 *    \return     array       tableau des contacts emails
 	 */
 	function thirdparty_and_contact_email_array()
@@ -1296,7 +1306,7 @@ class Societe extends CommonObject
 	}
 
 	/**
-	 *    \brief      Renvoie la liste des contacts emails existant pour la soci�t�
+	 *    \brief      Renvoie la liste des contacts emails existant pour la societe
 	 *    \return     array       tableau des contacts emails
 	 */
 	function contact_email_array()
@@ -1330,7 +1340,7 @@ class Societe extends CommonObject
 
 
 	/**
-	 *    \brief      Renvoie la liste des contacts de cette soci�t�
+	 *    \brief      Renvoie la liste des contacts de cette societe
 	 *    \return     array      tableau des contacts
 	 */
 	function contact_array()
@@ -1439,7 +1449,7 @@ class Societe extends CommonObject
 	}
 
 	/**
-	 *    \brief      Attribut un code client � partir du module de controle des codes.
+	 *    \brief      Attribut un code client a partir du module de controle des codes.
 	 *    \return     code_client		Code client automatique
 	 */
 	function get_codeclient($objsoc=0,$type=0)
@@ -1459,7 +1469,7 @@ class Societe extends CommonObject
 	}
 
 	/**
-	 *    \brief      Attribut un code fournisseur � partir du module de controle des codes.
+	 *    \brief      Attribut un code fournisseur a partir du module de controle des codes.
 	 *    \return     code_fournisseur		Code fournisseur automatique
 	 */
 	function get_codefournisseur($objsoc=0,$type=1)
@@ -1587,8 +1597,8 @@ class Societe extends CommonObject
 
 	/**
 	 *    	\brief  	Renvoie un code compta, suivant le module de code compta.
-	 *            		Peut �tre identique � celui saisit ou g�n�r� automatiquement.
-	 *            		A ce jour seule la g�n�ration automatique est impl�ment�e
+	 *            		Peut etre identique a celui saisit ou genere automatiquement.
+	 *            		A ce jour seule la generation automatique est implementee
 	 *    	\param      type			Type de tiers ('customer' ou 'supplier')
 	 *		\return		string			Code compta si ok, 0 si aucun, <0 si ko
 	 */
@@ -1622,8 +1632,8 @@ class Societe extends CommonObject
 	}
 
 	/**
-	 *    \brief      D�fini la soci�t� m�re pour les filiales
-	 *    \param      id      id compagnie m�re � positionner
+	 *    \brief      Defini la societe mere pour les filiales
+	 *    \param      id      id compagnie mere a positionner
 	 *    \return     int     <0 si ko, >0 si ok
 	 */
 	function set_parent($id)
@@ -1646,8 +1656,8 @@ class Societe extends CommonObject
 	}
 
 	/**
-	 *    \brief      Supprime la soci�t� m�re
-	 *    \param      id      id compagnie m�re � effacer
+	 *    \brief      Supprime la societe mere
+	 *    \param      id      id compagnie mere a effacer
 	 *    \return     int     <0 si ko, >0 si ok
 	 */
 	function remove_parent($id)
@@ -1722,7 +1732,7 @@ class Societe extends CommonObject
 	}
 
 	/**
-	 *      \brief      Renvoi url de v�rification d'un identifiant professionnal
+	 *      \brief      Renvoi url de verification d'un identifiant professionnal
 	 *      \param      idprof          1,2,3,4 (Exemple: 1=siren,2=siret,3=naf,4=rcs/rm)
 	 *      \param      soc             Objet societe
 	 *      \return     string          url ou chaine vide si aucune url connue
@@ -1740,8 +1750,8 @@ class Societe extends CommonObject
 	}
 
 	/**
-	 *      \brief      Indique si la soci�t� a des projets
-	 *      \return     bool	   true si la soci�t� a des projets, false sinon
+	 *      \brief      Indique si la societe a des projets
+	 *      \return     bool	   true si la societe a des projets, false sinon
 	 */
 	function has_projects()
 	{
@@ -1822,7 +1832,7 @@ class Societe extends CommonObject
 	}
 
 	/**
-	 *       \brief     Renvoi si pays appartient � CEE
+	 *       \brief     Renvoi si pays appartient a CEE
 	 *       \param     boolean		true = pays dans CEE, false= pays hors CEE
 	 */
 	function isInEEC()
@@ -1916,15 +1926,15 @@ class Societe extends CommonObject
 	function set_status($id_status)
 	{
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_log (datel, fk_soc, fk_statut, fk_user, author, label)";
-		$sql.= " VALUES ('$dateaction', $socid, $id_status,";
+		$sql.= " VALUES ('".$dateaction."', ".$socid.", ".$id_status.",";
 		$sql.= "'".$user->id."',";
 		$sql.= "'".addslashes($user->login)."',";
-		$sql.= "'Change statut from $oldstcomm to $stcommid'";
+		$sql.= "'Change statut from ".$oldstcomm." to ".$stcommid."'";
 		$sql.= ")";
 		$result = $db->query($sql);
 		if ($result)
 		{
-			$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=$stcommid WHERE rowid=".$socid;
+			$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm = ".$stcommid." WHERE rowid=".$socid;
 			$result = $db->query($sql);
 		}
 		else
diff --git a/htdocs/societe.php b/htdocs/societe.php
index 0ba7d82250f..62f34ce7153 100644
--- a/htdocs/societe.php
+++ b/htdocs/societe.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2006 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -71,16 +71,17 @@ if ($mode == 'search')
 	$_POST["search_nom"]=$socname;
 
 	$sql = "SELECT s.rowid";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
 	$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql.= " WHERE (";
 	$sql.= "s.nom like '%".addslashes($socname)."%'";
 	$sql.= " OR s.code_client LIKE '%".addslashes($socname)."%'";
 	$sql.= " OR s.email like '%".addslashes($socname)."%'";
 	$sql.= " OR s.url like '%".addslashes($socname)."%'";
 	$sql.= ")";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+	$sql.= " AND s.entity = ".$conf->entity;
+	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+	if ($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
 	if (! $user->rights->societe->lire || ! $user->rights->fournisseur->lire)
 	{
 		if (! $user->rights->fournisseur->lire) $sql.=" AND s.fourn != 1";
@@ -152,23 +153,16 @@ $title=$langs->trans("ListOfThirdParties");
 $sql = "SELECT s.rowid, s.nom, s.ville, ".$db->pdate("s.datec")." as datec, ".$db->pdate("s.datea")." as datea";
 $sql.= ", st.libelle as stcomm, s.prefix_comm, s.client, s.fournisseur,";
 $sql.= " s.siren as idprof1, s.siret as idprof2, ape as idprof3, idprof4 as idprof4";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
 $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 $sql.= ", ".MAIN_DB_PREFIX."c_stcomm as st";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= " WHERE s.fk_stcomm = st.id";
-if ($socid)
-{
-	$sql .= " AND s.rowid = ".$socid;
-}
+$sql.= " AND s.entity = ".$conf->entity;
+if (! $user->rights->societe->client->voir && ! $socid)	$sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+if ($socid)	$sql.= " AND s.rowid = ".$socid;
 if (strlen($stcomm))
 {
-	$sql .= " AND s.fk_stcomm=".$stcomm;
-}
-
-if (! $user->rights->societe->client->voir && ! $socid) //restriction
-{
-	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+	$sql.= " AND s.fk_stcomm=".$stcomm;
 }
 if (! $user->rights->societe->lire || ! $user->rights->fournisseur->lire)
 {
diff --git a/htdocs/telephonie/config/compta.php b/htdocs/telephonie/config/compta.php
index e5994f3d05c..25da92fb8bb 100644
--- a/htdocs/telephonie/config/compta.php
+++ b/htdocs/telephonie/config/compta.php
@@ -36,7 +36,7 @@ if (!$user->admin) accessforbidden();
 if ($_GET["action"] == "set")
 {
 
-  dolibarr_set_const($db, 'TELEPHONIE_COMPTE_VENTILATION', $_POST["cg"], $type='chaine');
+  dolibarr_set_const($db, 'TELEPHONIE_COMPTE_VENTILATION', $_POST["cg"],'chaine',0,'',$conf->entity);
 
 
   Header("Location: compta.php");
@@ -47,8 +47,8 @@ if ($_GET["action"] == "set")
  *
  *
  */
-llxHeader('','T�l�phonie - Configuration');
-print_titre("Configuration du module de T�l�phonie");
+llxHeader('','Telephonie - Configuration');
+print_titre("Configuration du module de Telephonie");
 
 print "<br>";
 
diff --git a/htdocs/telephonie/config/index.php b/htdocs/telephonie/config/index.php
index 7033d58b986..8af053f8491 100644
--- a/htdocs/telephonie/config/index.php
+++ b/htdocs/telephonie/config/index.php
@@ -37,7 +37,7 @@ if ($_GET["action"] == "set")
 {
   for ($i = 1 ; $i < 5 ; $i++)
     {
-      dolibarr_set_const($db, $_POST["nom$i"], $_POST["value$i"], $type='chaine');
+      dolibarr_set_const($db, $_POST["nom$i"], $_POST["value$i"],'chaine',0,'',$conf->entity);
     }
 
   Header("Location: index.php");
@@ -45,7 +45,7 @@ if ($_GET["action"] == "set")
 
 if ($_GET["action"] == "switch")
 {
-  dolibarr_set_const($db, $_GET["name"], $_GET["value"], $type='chaine');
+  dolibarr_set_const($db, $_GET["name"], $_GET["value"],'chaine',0,'',$conf->entity);
 
   Header("Location: index.php");
 }
@@ -55,8 +55,8 @@ if ($_GET["action"] == "switch")
  *
  *
  */
-llxHeader('','T�l�phonie - Configuration');
-print_titre("Configuration du module de T�l�phonie");
+llxHeader('','Telephonie - Configuration');
+print_titre("Configuration du module de Telephonie");
 
 print "<br>";
 
diff --git a/htdocs/telephonie/config/mail.php b/htdocs/telephonie/config/mail.php
index 881cc14e0e8..a42eebc018c 100644
--- a/htdocs/telephonie/config/mail.php
+++ b/htdocs/telephonie/config/mail.php
@@ -36,9 +36,9 @@ if (!$user->admin) accessforbidden();
 if ($_GET["action"] == "set")
 {
 
-  dolibarr_set_const($db, 'TELEPHONIE_MAIL_FACTURATION_SUJET', $_POST["sujet"], $type='chaine');
+  dolibarr_set_const($db, 'TELEPHONIE_MAIL_FACTURATION_SUJET', $_POST["sujet"],'chaine',0,'',$conf->entity);
 
-  dolibarr_set_const($db, 'TELEPHONIE_MAIL_FACTURATION_SIGNATURE', $_POST["signature"], $type='texte');
+  dolibarr_set_const($db, 'TELEPHONIE_MAIL_FACTURATION_SIGNATURE', $_POST["signature"],'chaine',0,'',$conf->entity);
 
   Header("Location: mail.php");
 }
@@ -48,8 +48,8 @@ if ($_GET["action"] == "set")
  *
  *
  */
-llxHeader('','T�l�phonie - Configuration');
-print_titre("Configuration du module de T�l�phonie");
+llxHeader('','Telephonie - Configuration');
+print_titre("Configuration du module de Telephonie");
 
 print "<br>";
 
diff --git a/htdocs/theme/auguria/img/redstar.png b/htdocs/theme/auguria/img/redstar.png
new file mode 100644
index 00000000000..001cde58667
Binary files /dev/null and b/htdocs/theme/auguria/img/redstar.png differ
diff --git a/htdocs/theme/bluelagoon/img/redstar.png b/htdocs/theme/bluelagoon/img/redstar.png
new file mode 100644
index 00000000000..001cde58667
Binary files /dev/null and b/htdocs/theme/bluelagoon/img/redstar.png differ
diff --git a/htdocs/theme/eldy/img/redstar.png b/htdocs/theme/eldy/img/redstar.png
new file mode 100644
index 00000000000..001cde58667
Binary files /dev/null and b/htdocs/theme/eldy/img/redstar.png differ
diff --git a/htdocs/theme/freelug/img/redstar.png b/htdocs/theme/freelug/img/redstar.png
new file mode 100644
index 00000000000..001cde58667
Binary files /dev/null and b/htdocs/theme/freelug/img/redstar.png differ
diff --git a/htdocs/theme/yellow/img/redstar.png b/htdocs/theme/yellow/img/redstar.png
new file mode 100644
index 00000000000..001cde58667
Binary files /dev/null and b/htdocs/theme/yellow/img/redstar.png differ
diff --git a/htdocs/user.class.php b/htdocs/user.class.php
index ee7b90ed93d..a88b28c2286 100644
--- a/htdocs/user.class.php
+++ b/htdocs/user.class.php
@@ -208,6 +208,8 @@ class User extends CommonObject
 				$this->societe_id           = $obj->fk_societe;
 				$this->contact_id           = $obj->fk_socpeople;
 				$this->fk_member            = $obj->fk_member;
+				
+				$this->next_prev_filter     = 'entity IN (0,'.$conf->entity.')';
 
 				if (! $this->lang) $this->lang='fr_FR';
 
@@ -234,6 +236,7 @@ class User extends CommonObject
 		{
 			$sql = "SELECT param, value FROM ".MAIN_DB_PREFIX."user_param";
 			$sql.= " WHERE fk_user = ".$this->id;
+			$sql.= " AND entity = ".$conf->entity;
 			$result=$this->db->query($sql);
 			if ($result)
 			{
@@ -268,6 +271,8 @@ class User extends CommonObject
 	 */
 	function addrights($rid,$allmodule='',$allperms='')
 	{
+		global $conf;
+		
 		dol_syslog("User::addrights $rid, $allmodule, $allperms");
 		$err=0;
 		$whereforadd='';
@@ -280,8 +285,8 @@ class User extends CommonObject
 			// les caracteristiques (module, perms et subperms) de ce droit.
 			$sql = "SELECT module, perms, subperms";
 			$sql.= " FROM ".MAIN_DB_PREFIX."rights_def";
-			$sql.= " WHERE ";
-			$sql.= " id = '".$rid."'";
+			$sql.= " WHERE id = '".$rid."'";
+			$sql.= " AND entity = ".$conf->entity;
 
 			$result=$this->db->query($sql);
 			if ($result) {
@@ -316,6 +321,7 @@ class User extends CommonObject
 			$sql = "SELECT id";
 			$sql.= " FROM ".MAIN_DB_PREFIX."rights_def";
 			$sql.= " WHERE ".$whereforadd;
+			$sql.= " AND entity = ".$conf->entity;
 
 			$result=$this->db->query($sql);
 			if ($result)
@@ -363,6 +369,8 @@ class User extends CommonObject
 	 */
 	function delrights($rid,$allmodule='',$allperms='')
 	{
+		global $conf;
+		
 		$err=0;
 		$wherefordel='';
 
@@ -374,8 +382,8 @@ class User extends CommonObject
 			// les caracteristiques module, perms et subperms de ce droit.
 			$sql = "SELECT module, perms, subperms";
 			$sql.= " FROM ".MAIN_DB_PREFIX."rights_def";
-			$sql.= " WHERE ";
-			$sql.=" id = '".$rid."'";
+			$sql.= " WHERE id = '".$rid."'";
+			$sql.= " AND entity = ".$conf->entity;
 
 			$result=$this->db->query($sql);
 			if ($result) {
@@ -409,6 +417,7 @@ class User extends CommonObject
 			$sql = "SELECT id";
 			$sql.= " FROM ".MAIN_DB_PREFIX."rights_def";
 			$sql.= " WHERE $wherefordel";
+			$sql.= " AND entity = ".$conf->entity;
 
 			$result=$this->db->query($sql);
 			if ($result)
@@ -420,7 +429,8 @@ class User extends CommonObject
 					$obj = $this->db->fetch_object($result);
 					$nid = $obj->id;
 
-					$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_rights WHERE fk_user = $this->id AND fk_id=$nid";
+					$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_rights";
+					$sql.= " WHERE fk_user = $this->id AND fk_id=$nid";
 					if (! $this->db->query($sql)) $err++;
 
 					$i++;
@@ -462,6 +472,8 @@ class User extends CommonObject
 		*/
 	function getrights($moduletag='')
 	{
+		global $conf;
+		
 		if ($moduletag && isset($this->tab_loaded[$moduletag]) && $this->tab_loaded[$moduletag])
 		{
 			// Le fichier de ce module est deja charge
@@ -480,6 +492,7 @@ class User extends CommonObject
 		$sql = "SELECT r.module, r.perms, r.subperms";
 		$sql.= " FROM ".MAIN_DB_PREFIX."user_rights as ur, ".MAIN_DB_PREFIX."rights_def as r";
 		$sql.= " WHERE r.id = ur.fk_id AND ur.fk_user= ".$this->id." AND r.perms IS NOT NULL";
+		$sql.= " AND r.entity = ".$conf->entity;
 		if ($moduletag) $sql.= " AND r.module = '".addslashes($moduletag)."'";
 
 		dol_syslog('User::getRights sql='.$sql, LOG_DEBUG);
@@ -522,6 +535,7 @@ class User extends CommonObject
 		$sql = "SELECT r.module, r.perms, r.subperms";
 		$sql.= " FROM ".MAIN_DB_PREFIX."usergroup_rights as gr, ".MAIN_DB_PREFIX."usergroup_user as gu, ".MAIN_DB_PREFIX."rights_def as r";
 		$sql.= " WHERE r.id = gr.fk_id AND gr.fk_usergroup = gu.fk_usergroup AND gu.fk_user = ".$this->id." AND r.perms IS NOT NULL";
+		$sql.= " AND r.entity = ".$conf->entity;
 		if ($moduletag) $sql.= " AND r.module = '".addslashes($moduletag)."'";
 
 		dol_syslog('User::getRights sql='.$sql, LOG_DEBUG);
@@ -685,6 +699,7 @@ class User extends CommonObject
 
 		$sql = "SELECT login FROM ".MAIN_DB_PREFIX."user";
 		$sql.= " WHERE login ='".addslashes($this->login)."'";
+		$sql.= " AND entity IN (0,".$conf->entity.")";
 
 		dol_syslog("User::Create sql=".$sql, LOG_DEBUG);
 		$resql=$this->db->query($sql);
@@ -701,8 +716,8 @@ class User extends CommonObject
 			}
 			else
 			{
-				$sql = "INSERT INTO ".MAIN_DB_PREFIX."user (datec,login,ldap_sid)";
-				$sql.= " VALUES(".$this->db->idate(mktime()).",'".addslashes($this->login)."','".$this->ldap_sid."')";
+				$sql = "INSERT INTO ".MAIN_DB_PREFIX."user (datec,login,ldap_sid,entity)";
+				$sql.= " VALUES(".$this->db->idate(mktime()).",'".addslashes($this->login)."','".$this->ldap_sid."',".$this->entity.")";
 				$result=$this->db->query($sql);
 
 				dol_syslog("User::Create sql=".$sql, LOG_DEBUG);
@@ -900,7 +915,11 @@ class User extends CommonObject
 	 */
 	function set_default_rights()
 	{
-		$sql = "SELECT id FROM ".MAIN_DB_PREFIX."rights_def WHERE bydefault = 1";
+		global $conf;
+		
+		$sql = "SELECT id FROM ".MAIN_DB_PREFIX."rights_def";
+		$sql.= " WHERE bydefault = 1";
+		$sql.= " AND entity = ".$conf->entity;
 
 		if ($this->db->query($sql))
 		{
@@ -982,7 +1001,7 @@ class User extends CommonObject
 		$sql.= ", phenix_login = '".addslashes($this->phenix_login)."'";
 		$sql.= ", phenix_pass = '".addslashes($this->phenix_pass)."'";
 		$sql.= ", note = '".addslashes($this->note)."'";
-		$sql.= ", entity = '".$this->entity."'";
+		//$sql.= ", entity = '".$this->entity."'";
 		$sql.= " WHERE rowid = ".$this->id;
 
 		dol_syslog("User::update sql=".$sql, LOG_DEBUG);
diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
index 36823f0a492..96c74b3c081 100644
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2002-2003 Jean-Louis Bergamo   <jlb@j1b.org>
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2008 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  * Copyright (C) 2005      Lionel COUSTEIX      <etm_ltd@tiscali.co.uk>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -50,10 +50,10 @@ if ($_GET["id"])
 	$caneditpassword=( (($user->id == $_GET["id"]) && $user->rights->user->self->password)
 	|| (($user->id != $_GET["id"]) && $user->rights->user->user->password) );
 }
-if ($user->id <> $_GET["id"] && ! $canreadperms)
-{
-	accessforbidden();
-}
+
+// Security check
+$result = restrictedArea($user, 'user',$_GET["id"]);
+if ($user->id <> $_GET["id"] && ! $canreadperms) accessforbidden();
 
 $langs->load("users");
 $langs->load("companies");
@@ -155,6 +155,7 @@ if ($_POST["action"] == 'add' && $canadduser)
 		$edituser->phenix_pass   = $_POST["phenix_pass"];
 		$edituser->note          = $_POST["note"];
 		$edituser->ldap_sid      = $_POST["ldap_sid"];
+		$edituser->entity        = $_POST["entity"];
 
 		$db->begin();
 
@@ -244,6 +245,7 @@ if ($_POST["action"] == 'update' && ! $_POST["cancel"] && $caneditfield)
 		$edituser->webcal_login  = $_POST["webcal_login"];
 		$edituser->phenix_login  = $_POST["phenix_login"];
 		$edituser->phenix_pass   = $_POST["phenix_pass"];
+		$edituser->entity        = $_POST["entity"];
 
 		$ret=$edituser->update($user);
 		if ($ret < 0)
@@ -490,6 +492,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
 	print '<form action="fiche.php" method="post" name="createuser">';
 	print '<input type="hidden" name="action" value="add">';
 	if ($ldap_sid) print '<input type="hidden" name="ldap_sid" value="'.$ldap_sid.'">';
+	print '<input type="hidden" name="entity" value="'.$conf->entity.'">';
 
 	print '<table class="border" width="100%">';
 
@@ -884,7 +887,14 @@ else
 			// Administrateur
 			print '<tr><td width="25%" valign="top">'.$langs->trans("Administrator").'</td>';
 			print '<td>'.yn($fuser->admin);
-			if ($fuser->admin) print ' '.img_picto($langs->trans("Administrator"),"star");
+			if ($fuser->admin && !$fuser->entity)
+			{
+				print ' '.img_picto($langs->trans("SuperAdministrator"),"redstar");
+			}
+			else if ($fuser->admin)
+			{
+				print ' '.img_picto($langs->trans("Administrator"),"star");
+			}
 			print '</td>';
 			print "</tr>\n";
 
@@ -899,10 +909,14 @@ else
 			{
 				print $langs->trans("DomainUser",$ldap->domainFQDN);
 			}
-			else
+			else if ($fuser->entity!=0)
 			{
 				print $html->textwithhelp($langs->trans("Internal"),$langs->trans("InternalExternalDesc"));
 			}
+			else
+			{
+				print $html->textwithhelp($langs->trans("SuperAdministrator"),$langs->trans("SuperAdministratorDesc"));
+			}
 			print '</td></tr>';
 
 			// Company / Contact
@@ -1072,10 +1086,9 @@ else
 			$uss = array();
 
 			$sql = "SELECT ug.rowid, ug.nom ";
-			$sql .= " FROM ".MAIN_DB_PREFIX."usergroup as ug ";
-			#      $sql .= " LEFT JOIN llx_usergroup_user ug ON u.rowid = ug.fk_user";
-			#      $sql .= " WHERE ug.fk_usergroup IS NULL";
-			$sql .= " ORDER BY ug.nom";
+			$sql.= " FROM ".MAIN_DB_PREFIX."usergroup as ug ";
+			$sql.= " WHERE ug.entity IN (0,".$conf->entity.")";
+			$sql.= " ORDER BY ug.nom";
 
 			$resql = $db->query($sql);
 			if ($resql)
@@ -1179,6 +1192,7 @@ else
 
 			print '<form action="fiche.php?id='.$fuser->id.'" method="post" name="updateuser" enctype="multipart/form-data">';
 			print '<input type="hidden" name="action" value="update">';
+			print '<input type="hidden" name="entity" value="'.$conf->entity.'">';
 			print '<table width="100%" class="border">';
 
 			$rowspan=10;
@@ -1282,7 +1296,7 @@ else
 			else
 			{
 				print '<td>';
-				if ($user->admin)
+				if ($user->admin && ($fuser->entity!=0)) // On ne modifie pas le superadmin
 				{
 					print $form->selectyesno('admin',$fuser->admin,1);
 				}
@@ -1304,10 +1318,14 @@ else
 			{
 				print $langs->trans("DomainUser");
 			}
-			else
+			else if ($fuser->entity!=0)
 			{
 				print $langs->trans("Internal");
 			}
+			else
+			{
+				print $langs->trans("SuperAdmin");
+			}
 			print '</td></tr>';
 
 			// Company / Contact
diff --git a/htdocs/user/group/fiche.php b/htdocs/user/group/fiche.php
index 741a2a13825..a38ad674077 100644
--- a/htdocs/user/group/fiche.php
+++ b/htdocs/user/group/fiche.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2005      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2005-2006 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,6 +25,7 @@
  */
 
 require("./pre.inc.php");
+require_once(DOL_DOCUMENT_ROOT."/usergroup.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php");
 
 // Defini si peux lire/modifier utilisateurs et permisssions
@@ -34,6 +36,9 @@ $candisableperms=($user->admin || $user->rights->user->user->supprimer);
 $langs->load("users");
 $langs->load("other");
 
+// Security check
+$result = restrictedArea($user, 'usergroup',$_GET["id"]);
+
 $action=isset($_GET["action"])?$_GET["action"]:$_POST["action"];
 
 
@@ -153,6 +158,8 @@ if ($_POST["action"] == 'update')
 
 llxHeader('',$langs->trans("GroupCard"));
 
+$html = new Form($db);
+
 
 /* ************************************************************************** */
 /*                                                                            */
@@ -202,17 +209,19 @@ if ($action == 'create')
 /* ************************************************************************** */
 else
 {
-    if ($_GET["id"] )
-    {
-        $group = new UserGroup($db);
-        $group->fetch($_GET["id"]);
+	if ($_GET["id"] )
+  {
+  	$group = new UserGroup($db);
+    $group->fetch($_GET["id"]);
 
 		/*
 		 * Affichage onglets
 		 */
 		$head = group_prepare_head($group);
+		$title = $langs->trans("Group");
+		if (!$group->entity) $title = $langs->trans("GlobalGroup");
 
-		dol_fiche_head($head, 'group', $langs->trans("Group").": ".$group->nom);
+		dol_fiche_head($head, 'group', $title.": ".$group->nom);
 
 
         /*
@@ -233,6 +242,13 @@ else
         {
             print '<table class="border" width="100%">';
 
+            // Ref
+            print '<tr><td width="25%" valign="top">'.$langs->trans("Ref").'</td>';
+            print '<td colspan="2">';
+            print $html->showrefnav($group,'id','',$user->rights->user->user->lire || $user->admin);
+            print '</td>';
+            print '</tr>';
+            
             // Nom
             print '<tr><td width="25%" valign="top">'.$langs->trans("Name").'</td>';
             print '<td width="75%" class="valeur">'.$group->nom.'</td>';
@@ -279,9 +295,8 @@ else
 
             $sql = "SELECT u.rowid, u.login, u.name, u.firstname, u.admin";
             $sql.= " FROM ".MAIN_DB_PREFIX."user as u";
-            #      $sql .= " LEFT JOIN llx_usergroup_user ug ON u.rowid = ug.fk_user";
-            #      $sql .= " WHERE ug.fk_usergroup IS NULL";
-            $sql .= " ORDER BY u.name";
+            $sql.= " WHERE u.entity IN (0,".$conf->entity.")";
+            $sql.= " ORDER BY u.name";
 
             $result = $db->query($sql);
             if ($result)
@@ -322,7 +337,7 @@ else
             /*
              * Membres du groupe
              */
-            $sql = "SELECT u.rowid, u.login, u.name, u.firstname, u.admin";
+            $sql = "SELECT u.rowid, u.login, u.name, u.firstname, u.admin, u.entity";
             $sql.= " FROM ".MAIN_DB_PREFIX."user as u,";
             $sql.= " ".MAIN_DB_PREFIX."usergroup_user as ug";
             $sql.= " WHERE ug.fk_user = u.rowid";
@@ -352,7 +367,14 @@ else
                         print "<tr $bc[$var]>";
                         print '<td>';
                         print '<a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowUser"),"user").' '.$obj->login.'</a>';
-                        if ($obj->admin) print img_picto($langs->trans("Administrator"),'star');
+                        if ($obj->admin  && !$obj->entity)
+                        {
+                        	print img_picto($langs->trans("SuperAdministrator"),'redstar');
+                        }
+                        else if ($obj->admin)
+                        {
+                        	print img_picto($langs->trans("Administrator"),'star');
+                        }
                         print '</td>';
                         print '<td>'.ucfirst(stripslashes($obj->name)).'</td>';
                         print '<td>'.ucfirst(stripslashes($obj->firstname)).'</td>';
diff --git a/htdocs/user/group/index.php b/htdocs/user/group/index.php
index b6a0b10c0df..3c07753efa4 100644
--- a/htdocs/user/group/index.php
+++ b/htdocs/user/group/index.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2005 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -54,9 +55,9 @@ llxHeader();
 
 print_fiche_titre($langs->trans("ListOfGroups"));
 
-$sql = "SELECT g.rowid, g.nom, ".$db->pdate("g.datec")." as datec";
+$sql = "SELECT g.rowid, g.nom, g.entity, ".$db->pdate("g.datec")." as datec";
 $sql .= " FROM ".MAIN_DB_PREFIX."usergroup as g";
-$sql .= " WHERE 1=1";
+$sql .= " WHERE g.entity IN (0,".$conf->entity.")";
 if ($_POST["search_group"])
 {
     $sql .= " AND (g.nom like '%".$_POST["search_group"]."%' OR g.note like '%".$_POST["search_group"]."%')";
@@ -87,7 +88,12 @@ if ($resql)
         $var=!$var;
 
         print "<tr $bc[$var]>";
-        print '<td><a href="fiche.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowGroup"),"group").' '.$obj->nom.'</a></td>';
+        print '<td><a href="fiche.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowGroup"),"group").' '.$obj->nom.'</a>';
+        if (!$obj->entity)
+        {
+        	print img_picto($langs->trans("GlobalGroup"),'redstar');
+        }
+        print "</td>";
         print '<td width="100" align="center">'.dol_print_date($obj->datec,"day").'</td>';
         print "</tr>\n";
         $i++;
diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php
index 96a18ff83b4..985fcc99207 100644
--- a/htdocs/user/group/perms.php
+++ b/htdocs/user/group/perms.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2002-2003 Jean-Louis Bergamo   <jlb@j1b.org>
  * Copyright (C) 2004-2005 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -73,8 +74,10 @@ if ($_GET["id"])
 	 * Affichage onglets
 	 */
 	$head = group_prepare_head($fgroup);
+	$title = $langs->trans("Group");
+	if (!$fgroup->entity) $title = $langs->trans("GlobalGroup");
 
-	dol_fiche_head($head, 'rights', $langs->trans("Group").": ".$fgroup->nom);
+	dol_fiche_head($head, 'rights', $title.": ".$fgroup->nom);
 
 
     $db->begin();
@@ -110,9 +113,11 @@ if ($_GET["id"])
     $permsgroup = array();
 
     $sql = "SELECT r.id, r.libelle, r.module ";
-    $sql .= " FROM ".MAIN_DB_PREFIX."rights_def as r";
-    $sql .= ", ".MAIN_DB_PREFIX."usergroup_rights as ugr";
-    $sql .= " WHERE ugr.fk_id = r.id AND ugr.fk_usergroup = ".$fgroup->id;
+    $sql.= " FROM ".MAIN_DB_PREFIX."rights_def as r";
+    $sql.= ", ".MAIN_DB_PREFIX."usergroup_rights as ugr";
+    $sql.= " WHERE ugr.fk_id = r.id";
+    $sql.= " AND r.entity = ".$conf->entity;
+    $sql.= " AND ugr.fk_usergroup = ".$fgroup->id;
 
     $result=$db->query($sql);
 
@@ -138,6 +143,29 @@ if ($_GET["id"])
      * Ecran ajout/suppression permission
      */
 
+    print '<table class="border" width="100%">';
+    
+    // Ref
+    print '<tr><td width="25%" valign="top">'.$langs->trans("Ref").'</td>';
+    print '<td colspan="2">';
+    print $form->showrefnav($fgroup,'id','',$user->rights->user->user->lire || $user->admin);
+    print '</td>';
+    print '</tr>';
+    
+    // Nom
+    print '<tr><td width="25%" valign="top">'.$langs->trans("Name").'</td>';
+    print '<td colspan="2">'.$fgroup->nom.'</td>';
+    print "</tr>\n";
+    
+    // Note
+    print '<tr><td width="25%" valign="top">'.$langs->trans("Note").'</td>';
+    print '<td class="valeur">'.nl2br($fgroup->note).'&nbsp;</td>';
+    print "</tr>\n";
+    
+    print '</table><br>';
+    
+    if ($user->admin) print info_admin($langs->trans("WarningOnlyPermissionOfActivatedModules"));
+    
     print '<table width="100%" class="noborder">';
     print '<tr class="liste_titre">';
     print '<td>'.$langs->trans("Module").'</td>';
@@ -146,10 +174,11 @@ if ($_GET["id"])
     print '<td>'.$langs->trans("Permissions").'</td>';
     print '</tr>';
 
-    $sql ="SELECT r.id, r.libelle, r.module";
-    $sql.=" FROM ".MAIN_DB_PREFIX."rights_def as r";
-    $sql.=" WHERE r.libelle NOT LIKE 'tou%'";    // On ignore droits "tous"
-    $sql.=" ORDER BY r.module, r.id";
+    $sql = "SELECT r.id, r.libelle, r.module";
+    $sql.= " FROM ".MAIN_DB_PREFIX."rights_def as r";
+    $sql.= " WHERE r.libelle NOT LIKE 'tou%'";    // On ignore droits "tous"
+    $sql.= " AND r.entity = ".$conf->entity;
+    $sql.= " ORDER BY r.module, r.id";
 
     $result=$db->query($sql);
     if ($result)
diff --git a/htdocs/user/home.php b/htdocs/user/home.php
index 8c83d6f11cf..87d64385179 100644
--- a/htdocs/user/home.php
+++ b/htdocs/user/home.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2005-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -75,9 +76,10 @@ print '</td><td valign="top" width="70%" class="notopnoleftnoright">';
 $max=10;
 
 $sql = "SELECT u.rowid, u.name, u.firstname, u.admin, u.login, u.fk_societe, ".$db->pdate("u.datec")." as datec,";
-$sql.= " u.ldap_sid, s.nom";
+$sql.= " u.entity, u.ldap_sid, s.nom";
 $sql.= " FROM ".MAIN_DB_PREFIX."user as u";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON u.fk_societe = s.rowid";
+$sql.= " WHERE u.entity IN (0,".$conf->entity.")";
 $sql.= " ORDER BY u.datec";
 $sql.= " DESC limit $max";
 
@@ -97,7 +99,14 @@ if ($resql)
 
         print "<tr $bc[$var]>";
         print "<td><a href=\"".DOL_URL_ROOT."/user/fiche.php?id=$obj->rowid\">".img_object($langs->trans("ShowUser"),"user")." ".$obj->firstname." ".$obj->name."</a>";
-        if ($obj->admin) print img_picto($langs->trans("Administrator"),'star');
+        if ($obj->admin && !$obj->entity)
+        {
+        	print img_picto($langs->trans("SuperAdministrator"),'redstar');
+        }
+        else if ($obj->admin)
+        {
+        	print img_picto($langs->trans("Administrator"),'star');
+        }
         print "</td>";
         print "<td align=\"left\">".$obj->login.'</td>';
         print "<td>";
@@ -130,16 +139,17 @@ else
  */
 $max=5;
 
-$sql = "SELECT g.rowid, g.nom, g.note, ".$db->pdate("g.datec")." as datec";
-$sql .= " FROM ".MAIN_DB_PREFIX."usergroup as g";
-$sql .= " ORDER BY g.datec DESC";
-if ($max) $sql .= " LIMIT $max";
+$sql = "SELECT g.rowid, g.nom, g.note, g.entity, ".$db->pdate("g.datec")." as datec";
+$sql.= " FROM ".MAIN_DB_PREFIX."usergroup as g";
+$sql.= " WHERE g.entity IN (0,".$conf->entity.")";
+$sql.= " ORDER BY g.datec DESC";
+if ($max) $sql.= " LIMIT $max";
 
 if ( $db->query($sql) )
 {
     $num = $db->num_rows();
     print '<table class="noborder" width="100%">';
-    print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("LastGroupsCreated",$max).'</td></tr>';
+    print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("LastGroupsCreated",($num ? $num : $max)).'</td></tr>';
     $var = true;
     $i = 0;
 
@@ -149,9 +159,14 @@ if ( $db->query($sql) )
         $var=!$var;
 
         print "<tr $bc[$var]>";
-        print "<td><a href=\"".DOL_URL_ROOT."/user/group/fiche.php?id=$obj->rowid\">".img_object($langs->trans("ShowGroup"),"group")." ".$obj->nom."</a></td>";
+        print '<td><a href="'.DOL_URL_ROOT.'/user/group/fiche.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowGroup"),"group").' '.$obj->nom.'</a>';
+        if (!$obj->entity)
+        {
+        	print img_picto($langs->trans("GlobalGroup"),'redstar');
+        }
+        print "</td>";
         print "<td width=\"80\" align=\"center\">".dol_print_date($obj->datec)."</td>";
-        print '</tr>';
+        print "</tr>";
         $i++;
     }
     print "</table><br>";
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index 00fa8688b3b..6af5512efab 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -58,11 +59,11 @@ $sql = "SELECT u.rowid, u.name, u.firstname, u.admin, u.fk_societe, u.login,";
 $sql.= " ".$db->pdate("u.datec")." as datec,";
 $sql.= " ".$db->pdate("u.tms")." as datem,";
 $sql.= " ".$db->pdate("u.datelastlogin")." as datelastlogin,";
-$sql.= " u.ldap_sid, u.statut,";
+$sql.= " u.ldap_sid, u.statut, u.entity,";
 $sql.= " s.nom";
 $sql.= " FROM ".MAIN_DB_PREFIX."user as u";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON u.fk_societe = s.rowid";
-$sql.= " WHERE 1=1";
+$sql.= " WHERE u.entity IN (0,".$conf->entity.")";
 if ($_POST["search_user"])
 {
     $sql.= " AND (u.login like '%".$_POST["search_user"]."%' OR u.name like '%".$_POST["search_user"]."%' OR u.firstname like '%".$_POST["search_user"]."%')";
@@ -85,8 +86,8 @@ if ($result)
     print_liste_field_titre($langs->trans("LastName"),"index.php","u.name",$param,"","",$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("FirstName"),"index.php","u.firstname",$param,"","",$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("Company"),"index.php","u.fk_societe",$param,"","",$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("DateCreation"),"index.php","u.datec",$param,"","",$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("LastConnexion"),"index.php","u.datelastlogin",$param,"","",$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("DateCreation"),"index.php","u.datec",$param,"",'align="center"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("LastConnexion"),"index.php","u.datelastlogin",$param,"",'align="center"',$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("Status"),"index.php","u.status",$param,"",'align="right"',$sortfield,$sortorder);
     print "</tr>\n";
     $var=True;
@@ -97,9 +98,13 @@ if ($result)
 
         print "<tr $bc[$var]>";
         print '<td><a href="fiche.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowUser"),"user").' '.$obj->login.'</a>';
-        if ($obj->admin)
+        if ($obj->admin && !$obj->entity)
         {
-          	print img_picto($langs->trans("Administrator"),'star');
+          	print img_picto($langs->trans("SuperAdministrator"),'redstar');
+        }
+        else if ($obj->admin)
+        {
+        	print img_picto($langs->trans("Administrator"),'star');
         }
         print '</td>';
         print '<td>'.ucfirst($obj->name).'</td>';
diff --git a/htdocs/user/logout.php b/htdocs/user/logout.php
index 00cab39cfd3..cde4e646df9 100644
--- a/htdocs/user/logout.php
+++ b/htdocs/user/logout.php
@@ -60,6 +60,12 @@ dol_syslog("Start session name=".$sessionname." Session id()=".session_id().", _
 
 session_unregister("dol_login");
 
+// Destroy entity cookie
+if ($conf->multicompany->enabled)
+{
+	$entityCookieName = "DOLENTITYID_dolibarr";
+	setcookie($entityCookieName, '', 1, "/");
+}
 
 // Define url to go
 $url=DOL_URL_ROOT."/index.php";		// By default go to login page
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index 80a3d865baf..b598dbb267e 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2002-2003 Jean-Louis Bergamo   <jlb@j1b.org>
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -134,10 +135,12 @@ $db->commit();
 // Lecture des droits utilisateurs
 $permsuser = array();
 
-$sql  = "SELECT r.id, r.libelle, r.module";
-$sql .= " FROM ".MAIN_DB_PREFIX."rights_def as r,";
-$sql .= " ".MAIN_DB_PREFIX."user_rights as ur";
-$sql .= " WHERE ur.fk_id = r.id AND ur.fk_user = ".$fuser->id;
+$sql = "SELECT r.id, r.libelle, r.module";
+$sql.= " FROM ".MAIN_DB_PREFIX."rights_def as r,";
+$sql.= " ".MAIN_DB_PREFIX."user_rights as ur";
+$sql.= " WHERE ur.fk_id = r.id";
+$sql.= " AND r.entity = ".$conf->entity;
+$sql.= " AND ur.fk_user = ".$fuser->id;
 
 $result=$db->query($sql);
 if ($result)
@@ -160,11 +163,14 @@ else
 // Lecture des droits groupes
 $permsgroup = array();
 
-$sql  = "SELECT r.id, r.libelle, r.module";
-$sql .= " FROM ".MAIN_DB_PREFIX."rights_def as r,";
-$sql .= " ".MAIN_DB_PREFIX."usergroup_rights as gr,";
-$sql .= " ".MAIN_DB_PREFIX."usergroup_user as gu";
-$sql .= " WHERE gr.fk_id = r.id AND gr.fk_usergroup = gu.fk_usergroup AND gu.fk_user = ".$fuser->id;
+$sql = "SELECT r.id, r.libelle, r.module";
+$sql.= " FROM ".MAIN_DB_PREFIX."rights_def as r,";
+$sql.= " ".MAIN_DB_PREFIX."usergroup_rights as gr,";
+$sql.= " ".MAIN_DB_PREFIX."usergroup_user as gu";
+$sql.= " WHERE gr.fk_id = r.id";
+$sql.= " AND r.entity = ".$conf->entity;
+$sql.= " AND gr.fk_usergroup = gu.fk_usergroup";
+$sql.= " AND gu.fk_user = ".$fuser->id;
 
 $result=$db->query($sql);
 if ($result)
@@ -220,10 +226,11 @@ print '<td align="center" width="24">&nbsp;</td>';
 print '<td>'.$langs->trans("Permissions").'</td>';
 print '</tr>';
 
-$sql ="SELECT r.id, r.libelle, r.module";
-$sql.=" FROM ".MAIN_DB_PREFIX."rights_def as r";
-$sql.=" WHERE r.libelle NOT LIKE 'tou%'";    // On ignore droits "tous"
-$sql.=" ORDER BY r.module, r.id";
+$sql = "SELECT r.id, r.libelle, r.module";
+$sql.= " FROM ".MAIN_DB_PREFIX."rights_def as r";
+$sql.= " WHERE r.libelle NOT LIKE 'tou%'";    // On ignore droits "tous"
+$sql.= " AND r.entity = ".$conf->entity;
+$sql.= " ORDER BY r.module, r.id";
 
 $result=$db->query($sql);
 if ($result)
diff --git a/htdocs/usergroup.class.php b/htdocs/usergroup.class.php
index cc3bcd5a45b..5fa3c253411 100644
--- a/htdocs/usergroup.class.php
+++ b/htdocs/usergroup.class.php
@@ -32,11 +32,15 @@ if ($conf->ldap->enabled) require_once (DOL_DOCUMENT_ROOT."/lib/ldap.class.php")
        \brief      Classe permettant la gestion des groupes d'utilisateur
 */
 
-class UserGroup
+class UserGroup extends CommonObject
 {
     var $db;			// Database handler
+    var $error;
+    var $errors=array();
+    var $table_element='usergroup';
 
     var $id;			// Group id
+    var $entity;  // Entity of group
     var $nom;			// Name of group
     var $note;			// Note on group
     var $datec;			// Creation date of group
@@ -64,38 +68,45 @@ class UserGroup
 	*/
     function fetch($id)
     {
-        $this->id = $id;
+    	global $conf;
+    	
+    	$this->id = $id;
 
-        $sql = "SELECT g.rowid, g.nom, g.note, g.datec, tms as datem";
-        $sql.= " FROM ".MAIN_DB_PREFIX."usergroup as g";
-        $sql.= " WHERE g.rowid = ".$this->id;
+      $sql = "SELECT g.rowid, g.entity, g.nom, g.note, g.datec, g.tms as datem";
+      $sql.= " FROM ".MAIN_DB_PREFIX."usergroup as g";
+      $sql.= " WHERE g.rowid = ".$this->id;
 
-        dol_syslog("Usergroup::fetch sql=".$sql);
-		$result = $this->db->query($sql);
-        if ($result)
+      dol_syslog("Usergroup::fetch sql=".$sql);
+      $result = $this->db->query($sql);
+      if ($result)
+      {
+      	if ($this->db->num_rows($result))
         {
-            if ($this->db->num_rows($result))
-            {
-                $obj = $this->db->fetch_object($result);
+        	$obj = $this->db->fetch_object($result);
 
-                $this->id = $obj->rowid;
-                $this->nom  = $obj->nom;
-                $this->note = $obj->note;
-                $this->datec = $obj->datec;
-                $this->datem = $obj->datem;
-            }
-            $this->db->free($result);
-			return 1;
+          $this->id = $obj->rowid;
+          $this->ref = $obj->rowid;
+          $this->entity = $obj->entity;
+          $this->nom  = $obj->nom;
+          $this->note = $obj->note;
+          $this->datec = $obj->datec;
+          $this->datem = $obj->datem;
+          
+          $this->next_prev_filter = 'entity IN (0,'.$conf->entity.')';
+          
         }
-        else
-        {
-        	$this->error=$this->db->lasterror();
-        	dol_syslog("UserGroup::Fetch ".$this->error, LOG_ERR);
-			return -1;
-        }
-
+        $this->db->free($result);
+        return 1;
+      }
+      else
+      {
+      	$this->error=$this->db->lasterror();
+      	dol_syslog("UserGroup::Fetch ".$this->error, LOG_ERR);
+      	return -1;
+      }
     }
 
+
     /**
      * 	\brief		Return array of groups of a user
      *	\param		usertosearch
@@ -147,10 +158,12 @@ class UserGroup
    */
     function addrights($rid,$allmodule='',$allperms='')
     {
-        $err=0;
-        $whereforadd='';
-
-        $this->db->begin();
+    	global $conf;
+    	
+    	$err=0;
+      $whereforadd='';
+      
+      $this->db->begin();
 
         if ($rid)
         {
@@ -158,8 +171,8 @@ class UserGroup
             // les caractéristiques (module, perms et subperms) de ce droit.
             $sql = "SELECT module, perms, subperms";
             $sql.= " FROM ".MAIN_DB_PREFIX."rights_def";
-            $sql.= " WHERE ";
-            $sql.=" id = '".$rid."'";
+            $sql.= " WHERE id = '".$rid."'";
+            $sql.= " AND entity = ".$conf->entity;
 
             $result=$this->db->query($sql);
             if ($result) {
@@ -196,6 +209,7 @@ class UserGroup
             $sql = "SELECT id";
             $sql.= " FROM ".MAIN_DB_PREFIX."rights_def";
             $sql.= " WHERE $whereforadd";
+            $sql.= " AND entity = ".$conf->entity;
 
             $result=$this->db->query($sql);
             if ($result)
@@ -243,10 +257,12 @@ class UserGroup
    */
     function delrights($rid,$allmodule='',$allperms='')
     {
-        $err=0;
-        $wherefordel='';
-
-        $this->db->begin();
+    	global $conf;
+    	
+    	$err=0;
+    	$wherefordel='';
+    	
+    	$this->db->begin();
 
         if ($rid)
         {
@@ -254,8 +270,8 @@ class UserGroup
             // les caractéristiques module, perms et subperms de ce droit.
             $sql = "SELECT module, perms, subperms";
             $sql.= " FROM ".MAIN_DB_PREFIX."rights_def";
-            $sql.= " WHERE ";
-            $sql.=" id = '".$rid."'";
+            $sql.= " WHERE id = '".$rid."'";
+            $sql.= " AND entity = ".$conf->entity;
 
             $result=$this->db->query($sql);
             if ($result) {
@@ -292,6 +308,7 @@ class UserGroup
             $sql = "SELECT id";
             $sql.= " FROM ".MAIN_DB_PREFIX."rights_def";
             $sql.= " WHERE $wherefordel";
+            $sql.= " AND entity = ".$conf->entity;
 
             $result=$this->db->query($sql);
             if ($result)
@@ -334,6 +351,8 @@ class UserGroup
    */
   	function getrights($module='')
     {
+    	global $conf;
+    	
       if ($this->all_permissions_are_loaded)
       {
         // Si les permissions ont déja été chargées, on quitte
@@ -344,8 +363,11 @@ class UserGroup
        * Récupération des droits
        */
       $sql = "SELECT r.module, r.perms, r.subperms ";
-      $sql .= " FROM ".MAIN_DB_PREFIX."usergroup_rights as u, ".MAIN_DB_PREFIX."rights_def as r";
-      $sql .= " WHERE r.id = u.fk_id AND u.fk_usergroup= $this->id AND r.perms IS NOT NULL";
+      $sql.= " FROM ".MAIN_DB_PREFIX."usergroup_rights as u, ".MAIN_DB_PREFIX."rights_def as r";
+      $sql.= " WHERE r.id = u.fk_id";
+      $sql.= " AND r.entity = ".$conf->entity;
+      $sql.= " AND u.fk_usergroup = ".$this->id;
+      $sql.= " AND r.perms IS NOT NULL";
       if ($this->db->query($sql))
 	{
 	  $num = $this->db->num_rows();
@@ -427,10 +449,10 @@ class UserGroup
 	*/
 	function create()
 	{
-		global $user,$conf,$langs;
+		global $user, $conf, $langs;
 		
-		$sql = "INSERT into ".MAIN_DB_PREFIX."usergroup (datec,nom)";
-		$sql .= " VALUES(".$this->db->idate(mktime()).",'".addslashes($this->nom)."')";
+		$sql = "INSERT into ".MAIN_DB_PREFIX."usergroup (datec, nom, entity)";
+		$sql .= " VALUES(".$this->db->idate(mktime()).",'".addslashes($this->nom)."',".$conf->entity.")";
 	
 		$result=$this->db->query($sql);
 		if ($result)
diff --git a/mysql/migration/2.5.0-2.6.0.sql b/mysql/migration/2.5.0-2.6.0.sql
index 74620f1b031..aaf70f3523c 100644
--- a/mysql/migration/2.5.0-2.6.0.sql
+++ b/mysql/migration/2.5.0-2.6.0.sql
@@ -127,11 +127,42 @@ ALTER TABLE llx_categorie_association ADD UNIQUE INDEX uk_categorie_association_
 ALTER TABLE llx_const ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER name;
 ALTER TABLE llx_user ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER login;
 ALTER TABLE llx_usergroup ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER nom;
+ALTER TABLE llx_rights_def ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER module;
+ALTER TABLE llx_events ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER type;
+ALTER TABLE llx_boxes_def ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER file;
+ALTER TABLE llx_user_param ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER fk_user;
+ALTER TABLE llx_societe ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER nom;
+ALTER TABLE llx_socpeople ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER fk_soc;
+ALTER TABLE llx_product ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER ref;
+ALTER TABLE llx_entrepot ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER label;
+ALTER TABLE llx_chargesociales ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER libelle;
+ALTER TABLE llx_tva ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER label;
+ALTER TABLE llx_bank_account ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER label;
+ALTER TABLE llx_document_model ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER nom;
+ALTER TABLE llx_menu ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER menu_handler;
 
 ALTER TABLE llx_const DROP INDEX name;
 ALTER TABLE llx_user DROP INDEX uk_user_login;
 ALTER TABLE llx_usergroup DROP INDEX nom;
+ALTER TABLE llx_rights_def DROP PRIMARY KEY;
+ALTER TABLE llx_user_param DROP INDEX fk_user;
+ALTER TABLE llx_societe DROP INDEX uk_societe_prefix_comm;
+ALTER TABLE llx_societe DROP INDEX uk_societe_code_client;
+ALTER TABLE llx_product DROP INDEX uk_product_ref;
+ALTER TABLE llx_entrepot DROP INDEX label;
+ALTER TABLE llx_bank_account DROP INDEX uk_bank_account_label;
+ALTER TABLE llx_document_model DROP INDEX uk_document_model;
+ALTER TABLE llx_menu DROP INDEX idx_menu_uk_menu;
 
 ALTER TABLE llx_const ADD UNIQUE INDEX uk_const (name, entity);
 ALTER TABLE llx_user ADD UNIQUE INDEX uk_user_login (login, entity);
 ALTER TABLE llx_usergroup ADD UNIQUE INDEX uk_usergroup_name (nom, entity);
+ALTER TABLE llx_rights_def ADD PRIMARY KEY (id, entity);
+ALTER TABLE llx_user_param ADD UNIQUE INDEX uk_user_param (fk_user,param,entity);
+ALTER TABLE llx_societe ADD UNIQUE INDEX uk_societe_prefix_comm (prefix_comm, entity);
+ALTER TABLE llx_societe ADD UNIQUE INDEX uk_societe_code_client (code_client, entity);
+ALTER TABLE llx_product ADD UNIQUE INDEX uk_product_ref (ref, entity);
+ALTER TABLE llx_entrepot ADD UNIQUE INDEX uk_entrepot_label (label, entity);
+ALTER TABLE llx_bank_account ADD UNIQUE INDEX uk_bank_account_label (label, entity);
+ALTER TABLE llx_document_model ADD UNIQUE INDEX uk_document_model (nom, type, entity);
+ALTER TABLE llx_menu ADD UNIQUE INDEX idx_menu_uk_menu (menu_handler, fk_menu, url, entity);
\ No newline at end of file
diff --git a/mysql/migration/2.6.0-2.7.0.sql b/mysql/migration/2.6.0-2.7.0.sql
new file mode 100644
index 00000000000..be46ac7d40a
--- /dev/null
+++ b/mysql/migration/2.6.0-2.7.0.sql
@@ -0,0 +1,42 @@
+--
+-- $Id$
+--
+-- Be carefull to requests order.
+-- This file must be loaded by calling /install/index.php page
+-- when current version is 2.5.0 or higher. 
+--
+
+-- Multi company
+ALTER TABLE llx_rights_def ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER module;
+ALTER TABLE llx_events ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER type;
+ALTER TABLE llx_boxes_def ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER file;
+ALTER TABLE llx_user_param ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER fk_user;
+ALTER TABLE llx_societe ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER nom;
+ALTER TABLE llx_socpeople ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER fk_soc;
+ALTER TABLE llx_product ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER ref;
+ALTER TABLE llx_entrepot ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER label;
+ALTER TABLE llx_chargesociales ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER libelle;
+ALTER TABLE llx_tva ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER label;
+ALTER TABLE llx_bank_account ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER label;
+ALTER TABLE llx_document_model ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER nom;
+ALTER TABLE llx_menu ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER menu_handler;
+
+ALTER TABLE llx_rights_def DROP PRIMARY KEY;
+ALTER TABLE llx_user_param DROP INDEX fk_user;
+ALTER TABLE llx_societe DROP INDEX uk_societe_prefix_comm;
+ALTER TABLE llx_societe DROP INDEX uk_societe_code_client;
+ALTER TABLE llx_product DROP INDEX uk_product_ref;
+ALTER TABLE llx_entrepot DROP INDEX label;
+ALTER TABLE llx_bank_account DROP INDEX uk_bank_account_label;
+ALTER TABLE llx_document_model DROP INDEX uk_document_model;
+ALTER TABLE llx_menu DROP INDEX idx_menu_uk_menu;
+
+ALTER TABLE llx_rights_def ADD PRIMARY KEY (id, entity);
+ALTER TABLE llx_user_param ADD UNIQUE INDEX uk_user_param (fk_user,param,entity);
+ALTER TABLE llx_societe ADD UNIQUE INDEX uk_societe_prefix_comm (prefix_comm, entity);
+ALTER TABLE llx_societe ADD UNIQUE INDEX uk_societe_code_client (code_client, entity);
+ALTER TABLE llx_product ADD UNIQUE INDEX uk_product_ref (ref, entity);
+ALTER TABLE llx_entrepot ADD UNIQUE INDEX uk_entrepot_label (label, entity);
+ALTER TABLE llx_bank_account ADD UNIQUE INDEX uk_bank_account_label (label, entity);
+ALTER TABLE llx_document_model ADD UNIQUE INDEX uk_document_model (nom, type, entity);
+ALTER TABLE llx_menu ADD UNIQUE INDEX idx_menu_uk_menu (menu_handler, fk_menu, url, entity);
\ No newline at end of file
diff --git a/mysql/tables/llx_bank.sql b/mysql/tables/llx_bank.sql
index 647433e3f0e..7f34d0a3120 100644
--- a/mysql/tables/llx_bank.sql
+++ b/mysql/tables/llx_bank.sql
@@ -23,20 +23,20 @@ create table llx_bank
 (
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
   datec           datetime,
-  datev           date,           -- date de valeur
-  dateo           date,           -- date operation
+  datev           date,                      -- date de valeur
+  dateo           date,                      -- date operation
   amount          double(24,8) NOT NULL default 0,
   label           varchar(255),
   fk_account      integer,
   fk_user_author  integer,
   fk_user_rappro  integer,
-  fk_type         varchar(4),     -- CB, Virement, cheque
+  fk_type         varchar(4),                -- CB, Virement, cheque
   num_releve      varchar(50),
   num_chq         varchar(50),
   rappro          tinyint default 0,
   note            text,
   fk_bordereau    integer DEFAULT 0,
-  banque          varchar(255),   -- banque pour les cheques
-  emetteur        varchar(255),   -- emetteur du cheque
-  author          varchar(40) -- a supprimer apres migration
+  banque          varchar(255),             -- banque pour les cheques
+  emetteur        varchar(255),             -- emetteur du cheque
+  author          varchar(40)               -- a supprimer apres migration
 )type=innodb;
diff --git a/mysql/tables/llx_bank_account.key.sql b/mysql/tables/llx_bank_account.key.sql
index 16cae73bb59..e39fbf71f12 100644
--- a/mysql/tables/llx_bank_account.key.sql
+++ b/mysql/tables/llx_bank_account.key.sql
@@ -1,5 +1,6 @@
 -- ============================================================================
--- Copyright (C) 2005 Laurent Destailleur <eldy@users.sourceforge.net>
+-- Copyright (C) 2005      Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -19,4 +20,4 @@
 -- ============================================================================
 
 
-ALTER TABLE llx_bank_account ADD UNIQUE uk_bank_account_label (label);
+ALTER TABLE llx_bank_account ADD UNIQUE uk_bank_account_label (label,entity);
diff --git a/mysql/tables/llx_bank_account.sql b/mysql/tables/llx_bank_account.sql
index 4e43828b974..37d7daede51 100644
--- a/mysql/tables/llx_bank_account.sql
+++ b/mysql/tables/llx_bank_account.sql
@@ -1,6 +1,7 @@
 -- =============================================================================
 -- Copyright (C) 2000-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 -- Copyright (C) 2004-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -29,13 +30,14 @@ create table llx_bank_account
   tms            timestamp,
   ref            varchar(12) NOT NULL,
   label          varchar(30) NOT NULL,
+  entity         integer DEFAULT 1 NOT NULL,	-- multi company id
   bank           varchar(60),
   code_banque    varchar(7),
   code_guichet   varchar(6),
   number         varchar(255),
   cle_rib        varchar(5),
   bic            varchar(11),
-  iban_prefix    varchar(50), -- Code IBAN
+  iban_prefix    varchar(50),                 -- Code IBAN
   country_iban   varchar(2),
   cle_iban       varchar(2),
   domiciliation  varchar(255),
@@ -51,3 +53,11 @@ create table llx_bank_account
   min_desired    integer DEFAULT 0,
   comment        text
 )type=innodb;
+
+-- 
+-- List of codes for the field entity
+--
+-- 1 : first company bank account
+-- 2 : second company bank account
+-- 3 : etc...
+--
\ No newline at end of file
diff --git a/mysql/tables/llx_boxes_def.key.sql b/mysql/tables/llx_boxes_def.key.sql
new file mode 100644
index 00000000000..cdd4485c527
--- /dev/null
+++ b/mysql/tables/llx_boxes_def.key.sql
@@ -0,0 +1,22 @@
+-- ============================================================================
+-- Copyright (C) 2009 Regis Houssin        <regis@dolibarr.fr>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+--
+-- $Id$
+-- ===========================================================================
+
+
+ALTER TABLE llx_boxes_def ADD PRIMARY KEY(rowid, entity);
\ No newline at end of file
diff --git a/mysql/tables/llx_boxes_def.sql b/mysql/tables/llx_boxes_def.sql
index 89e3aa50895..93fde44596e 100644
--- a/mysql/tables/llx_boxes_def.sql
+++ b/mysql/tables/llx_boxes_def.sql
@@ -1,5 +1,6 @@
 -- ============================================================================
--- Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+-- Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+-- Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -22,6 +23,15 @@ create table llx_boxes_def
 (
   rowid       integer AUTO_INCREMENT PRIMARY KEY,
   file        varchar(255) NOT NULL,
+  entity      integer DEFAULT 1 NOT NULL,	-- multi company id
   tms         timestamp,
   note        text
 )type=innodb;
+
+-- 
+-- List of codes for the field entity
+--
+-- 1 : first company boxes
+-- 2 : second company boxes
+-- 3 : etc...
+--
\ No newline at end of file
diff --git a/mysql/tables/llx_chargesociales.sql b/mysql/tables/llx_chargesociales.sql
index 1676041ba38..9d080e47605 100644
--- a/mysql/tables/llx_chargesociales.sql
+++ b/mysql/tables/llx_chargesociales.sql
@@ -1,5 +1,6 @@
 -- ========================================================================
 -- Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+-- Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -21,13 +22,19 @@
 create table llx_chargesociales
 (
   rowid      integer AUTO_INCREMENT PRIMARY KEY,
-  date_ech   datetime NOT NULL, -- date d'echeance
+  date_ech   datetime NOT NULL,             -- date echeance
   libelle    varchar(80) NOT NULL,
+  entity     integer DEFAULT 1 NOT NULL,	  -- multi company id
   fk_type    integer NOT NULL,
   amount     real     default 0 NOT NULL,
   paye       smallint default 0 NOT NULL,
   periode    date
 )type=innodb;
 
-
-
+-- 
+-- List of codes for the field entity
+--
+-- 1 : first company tax
+-- 2 : second company tax
+-- 3 : etc...
+--
\ No newline at end of file
diff --git a/mysql/tables/llx_document_model.key.sql b/mysql/tables/llx_document_model.key.sql
index d27cb29666c..1c5d5c30173 100644
--- a/mysql/tables/llx_document_model.key.sql
+++ b/mysql/tables/llx_document_model.key.sql
@@ -1,5 +1,6 @@
 -- ===================================================================
 -- Copyright (C) 2007      Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2009      Regis Houssin        <regis@dolibarr.fr>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -19,4 +20,4 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_document_model ADD UNIQUE uk_document_model (nom,type);
+ALTER TABLE llx_document_model ADD UNIQUE uk_document_model (nom,type,entity);
diff --git a/mysql/tables/llx_document_model.sql b/mysql/tables/llx_document_model.sql
index 65f7a824d4f..2afbf195848 100644
--- a/mysql/tables/llx_document_model.sql
+++ b/mysql/tables/llx_document_model.sql
@@ -1,6 +1,7 @@
 -- ===================================================================
 -- Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 -- Copyright (C) 2006      Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2009      Regis Houssin        <regis@dolibarr.fr>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -25,7 +26,16 @@ create table llx_document_model
 (
   	rowid         integer AUTO_INCREMENT PRIMARY KEY,
   	nom         	varchar(50),
+  	entity        integer DEFAULT 1 NOT NULL,	-- multi company id
   	type			    varchar(20) NOT NULL,
   	libelle		    varchar(255),
   	description 	text
-)type=innodb;
\ No newline at end of file
+)type=innodb;
+
+-- 
+-- List of codes for the field entity
+--
+-- 1 : first company document model
+-- 2 : second company document model
+-- 3 : etc...
+--
\ No newline at end of file
diff --git a/mysql/tables/llx_entrepot.key.sql b/mysql/tables/llx_entrepot.key.sql
new file mode 100644
index 00000000000..94e726796c5
--- /dev/null
+++ b/mysql/tables/llx_entrepot.key.sql
@@ -0,0 +1,22 @@
+-- ============================================================================
+-- Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+--
+-- $Id$
+-- ============================================================================
+
+
+ALTER TABLE llx_entrepot ADD UNIQUE INDEX uk_entrepot_label (label, entity);
diff --git a/mysql/tables/llx_entrepot.sql b/mysql/tables/llx_entrepot.sql
index 9420fa88b71..650c62a3049 100644
--- a/mysql/tables/llx_entrepot.sql
+++ b/mysql/tables/llx_entrepot.sql
@@ -24,15 +24,23 @@ create table llx_entrepot
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
   datec           datetime,
   tms             timestamp,
-  label           varchar(255) UNIQUE NOT NULL,
+  label           varchar(255) NOT NULL,
+  entity          integer DEFAULT 1 NOT NULL,	-- multi company id
   description     text,
-  lieu            varchar(64),       -- résumé lieu situation
+  lieu            varchar(64),                -- résumé lieu situation
   address         varchar(255),
   cp              varchar(10),
   ville           varchar(50),
   fk_pays         integer DEFAULT 0,
-  statut          tinyint DEFAULT 1, -- 1 ouvert, 0 fermé
-  valo_pmp        float(12,4),    -- valoristaion du stock en PMP
+  statut          tinyint DEFAULT 1,          -- 1 ouvert, 0 fermé
+  valo_pmp        float(12,4),                -- valoristaion du stock en PMP
   fk_user_author  integer
 )type=innodb;
 
+-- 
+-- List of codes for the field entity
+--
+-- 1 : first company entrepot
+-- 2 : second company entrepot
+-- 3 : etc...
+--
\ No newline at end of file
diff --git a/mysql/tables/llx_events.sql b/mysql/tables/llx_events.sql
index 2798cb356f5..31da56fdaf6 100644
--- a/mysql/tables/llx_events.sql
+++ b/mysql/tables/llx_events.sql
@@ -1,5 +1,6 @@
 -- ========================================================================
 -- Copyright (C) 2008      Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2009      Regis Houssin        <regis@dolibarr.fr>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -25,15 +26,20 @@
 create table llx_events
 (
   rowid          integer AUTO_INCREMENT PRIMARY KEY,
-  tms            timestamp,             -- date creation/modification
-  type			 varchar(32)  NOT NULL, -- action type
-  dateevent      datetime,              -- date event
-  fk_user        integer,               -- id user
-  description    varchar(250) NOT NULL, -- full description of action
-  ip			 varchar(32) NOT NULL,  -- ip
-  fk_object      integer                -- id of related object
+  tms            timestamp,                   -- date creation/modification
+  type           varchar(32)  NOT NULL,       -- action type
+  entity         integer DEFAULT 1 NOT NULL,	-- multi company id
+  dateevent      datetime,                    -- date event
+  fk_user        integer,                     -- id user
+  description    varchar(250) NOT NULL,       -- full description of action
+  ip             varchar(32) NOT NULL,        -- ip
+  fk_object      integer                      -- id of related object
 ) type=innodb;
 
-
-
-
+-- 
+-- List of codes for the field entity
+--
+-- 1 : first company events
+-- 2 : second company events
+-- 3 : etc...
+--
\ No newline at end of file
diff --git a/mysql/tables/llx_menu.key.sql b/mysql/tables/llx_menu.key.sql
index e899f4e1290..cd360e2e68a 100644
--- a/mysql/tables/llx_menu.key.sql
+++ b/mysql/tables/llx_menu.key.sql
@@ -1,6 +1,7 @@
 -- ========================================================================
--- Copyright (C) 2007      Patrick Raguin <patrick.raguin@gmail.com>
+-- Copyright (C) 2007      Patrick Raguin       <patrick.raguin@gmail.com>
 -- Copyright (C) 2005-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2009      Regis Houssin        <regis@dolibarr.fr>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -22,5 +23,5 @@
 
 ALTER TABLE llx_menu ADD INDEX idx_menu_menuhandler_type (menu_handler, type);
 
-ALTER TABLE llx_menu ADD UNIQUE INDEX idx_menu_uk_menu (menu_handler, fk_menu, url);
+ALTER TABLE llx_menu ADD UNIQUE INDEX idx_menu_uk_menu (menu_handler, fk_menu, url, entity);
 
diff --git a/mysql/tables/llx_menu.sql b/mysql/tables/llx_menu.sql
index 5f90a467354..e979eda4ccf 100644
--- a/mysql/tables/llx_menu.sql
+++ b/mysql/tables/llx_menu.sql
@@ -1,6 +1,7 @@
 -- ========================================================================
 -- Copyright (C) 2007      Patrick Raguin      <patrick.raguin@gmail.com>
 -- Copyright (C) 2007-2008 Laurent Destailleur <eldy@users.sourceforge.net>
+-- Copyright (C) 2009      Regis Houssin       <regis@dolibarr.fr>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -20,29 +21,32 @@
 -- ========================================================================
 
 
-CREATE TABLE `llx_menu` (
-	rowid			integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
-
-	menu_handler	varchar(16) NOT NULL,				-- Menu handler name
-	module			varchar(64),						-- Module name if record is added by a module
-	type			varchar(4) NOT NULL,				-- Menu top or left
-
-	mainmenu		varchar(100) NOT NULL,				-- Name family/module (home, companies, ...)
-	fk_menu			int(11) NOT NULL,					-- 0 or Id of mother menu line
-	position		integer NOT NULL,					-- Sort order of entry
-
-	url				varchar(255) NOT NULL,				-- Relative (or absolute) url to go
-	target			varchar(100) NULL,					-- Target of Url link
-
-	titre			varchar(255) NOT NULL,				-- Key for menu translation 
-	langs			varchar(100),						-- Lang file to load for translation
-
-	level			tinyint(1),							-- Used by auguria menu only. Do not use.
-
-	leftmenu		varchar(1) NULL default '1',		-- Say if left menu defined in pre.inc.php and used by top menu must be overwritten by dynamic databse menu (1=yes by default)
-	perms			varchar(255),						-- Condition to show enabled or disabled
-	enabled			varchar(255) NULL default '1',		-- Condition to show or hide
-	user			integer NOT NULL default '0',	    -- 0 if menu for all users, 1 for external only, 2 for internal only
-
-	tms				timestamp
+CREATE TABLE llx_menu
+(
+	rowid         integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+	menu_handler  varchar(16) NOT NULL,             -- Menu handler name
+	entity        integer DEFAULT 1 NOT NULL,       -- Multi company id
+	module        varchar(64),                      -- Module name if record is added by a module
+	type          varchar(4) NOT NULL,              -- Menu top or left
+	mainmenu      varchar(100) NOT NULL,            -- Name family/module (home, companies, ...)
+	fk_menu       int(11) NOT NULL,                 -- 0 or Id of mother menu line
+	position      integer NOT NULL,                 -- Sort order of entry
+	url           varchar(255) NOT NULL,            -- Relative (or absolute) url to go
+	target        varchar(100) NULL,                -- Target of Url link
+	titre         varchar(255) NOT NULL,            -- Key for menu translation 
+	langs         varchar(100),                     -- Lang file to load for translation
+	level         tinyint(1),                       -- Used by auguria menu only. Do not use.
+	leftmenu      varchar(1) NULL default '1',      -- Say if left menu defined in pre.inc.php and used by top menu must be overwritten by dynamic databse menu (1=yes by default)
+	perms         varchar(255),                     -- Condition to show enabled or disabled
+	enabled       varchar(255) NULL default '1',    -- Condition to show or hide
+	user          integer NOT NULL default '0',     -- 0 if menu for all users, 1 for external only, 2 for internal only
+	tms           timestamp
 ) type=innodb;
+
+-- 
+-- List of codes for the field entity
+--
+-- 1 : first company product
+-- 2 : second company product
+-- 3 : etc...
+--
\ No newline at end of file
diff --git a/mysql/tables/llx_product.key.sql b/mysql/tables/llx_product.key.sql
index 39d3ec354f8..3d34ef226a7 100644
--- a/mysql/tables/llx_product.key.sql
+++ b/mysql/tables/llx_product.key.sql
@@ -1,6 +1,7 @@
 -- ============================================================================
 -- Copyright (C) 2002-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 -- Copyright (C) 2004-2005 Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -20,8 +21,6 @@
 -- ============================================================================
 
 
-ALTER TABLE llx_product ADD UNIQUE uk_product_ref (ref);
+ALTER TABLE llx_product ADD UNIQUE uk_product_ref (ref, entity);
 ALTER TABLE llx_product ADD INDEX idx_product_barcode (barcode);
 ALTER TABLE llx_product ADD INDEX idx_product_import_key (import_key);
-
-
diff --git a/mysql/tables/llx_product.sql b/mysql/tables/llx_product.sql
index 58d0f462229..0ad03e2095c 100644
--- a/mysql/tables/llx_product.sql
+++ b/mysql/tables/llx_product.sql
@@ -1,6 +1,7 @@
 -- ============================================================================
 -- Copyright (C) 2002-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 -- Copyright (C) 2008-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -25,6 +26,7 @@ create table llx_product
   datec              datetime,
   tms                timestamp,
   ref                varchar(32)  NOT NULL,
+  entity             integer DEFAULT 1 NOT NULL, -- multi company id
   label              varchar(255) NOT NULL,
   description        text,
   note               text,
@@ -47,10 +49,17 @@ create table llx_product
   weight_units       tinyint      DEFAULT NULL,
   volume             float        DEFAULT NULL,
   volume_units       tinyint      DEFAULT NULL,
-  stock              integer,		-- physical stock
+  stock              integer,                  -- physical stock
   pmp                double(24,8) default 0 NOT NULL,
   canvas             varchar(15)  DEFAULT '',
-  finished			 tinyint	  DEFAULT NULL,
+  finished           tinyint      DEFAULT NULL,
   import_key         varchar(14)
 )type=innodb;
 
+-- 
+-- List of codes for the field entity
+--
+-- 1 : first company product
+-- 2 : second company product
+-- 3 : etc...
+--
\ No newline at end of file
diff --git a/mysql/tables/llx_rights_def.key.sql b/mysql/tables/llx_rights_def.key.sql
new file mode 100644
index 00000000000..7e87b4e7da8
--- /dev/null
+++ b/mysql/tables/llx_rights_def.key.sql
@@ -0,0 +1,22 @@
+-- ============================================================================
+-- Copyright (C) 2009      Regis Houssin        <regis@dolibarr.fr>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+--
+-- $Id$
+-- ===========================================================================
+
+
+ALTER TABLE llx_rights_def ADD PRIMARY KEY(id, entity);
\ No newline at end of file
diff --git a/mysql/tables/llx_rights_def.sql b/mysql/tables/llx_rights_def.sql
index 19acea69b20..9f222129038 100644
--- a/mysql/tables/llx_rights_def.sql
+++ b/mysql/tables/llx_rights_def.sql
@@ -1,5 +1,6 @@
 -- ============================================================================
 -- Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+-- Copyright (C) 2009 Regis Houssin        <regis@dolibarr.fr>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -20,12 +21,20 @@
 
 create table llx_rights_def
 (
-  id            integer PRIMARY KEY,
+  id            integer,
   libelle       varchar(255),
   module        varchar(12),
+  entity        integer DEFAULT 1 NOT NULL,
   perms         varchar(50),
   subperms      varchar(50),
   type          varchar(1),
   bydefault     tinyint DEFAULT 0
 )type=innodb;
 
+-- 
+-- List of codes for the field entity
+--
+-- 1 : first company user
+-- 2 : second company user
+-- 3 : etc...
+--
\ No newline at end of file
diff --git a/mysql/tables/llx_societe.key.sql b/mysql/tables/llx_societe.key.sql
index cfb904b7507..16bf4dea7f0 100644
--- a/mysql/tables/llx_societe.key.sql
+++ b/mysql/tables/llx_societe.key.sql
@@ -19,10 +19,10 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_societe ADD UNIQUE uk_societe_prefix_comm(prefix_comm);
-ALTER TABLE llx_societe ADD UNIQUE uk_societe_code_client(code_client);
+ALTER TABLE llx_societe ADD UNIQUE uk_societe_prefix_comm(prefix_comm, entity);
+ALTER TABLE llx_societe ADD UNIQUE uk_societe_code_client(code_client, entity);
 
 ALTER TABLE llx_societe ADD INDEX idx_societe_user_creat(fk_user_creat);
 ALTER TABLE llx_societe ADD INDEX idx_societe_user_modif(fk_user_modif);
 
---ALTER TABLE llx_societe ADD FOREIGN KEY fk_prospectlevel llx_c_prospectlevel(code);
+-- ALTER TABLE llx_societe ADD FOREIGN KEY fk_prospectlevel llx_c_prospectlevel(code);
diff --git a/mysql/tables/llx_societe.sql b/mysql/tables/llx_societe.sql
index f5fbe3912a6..3236ee3870b 100644
--- a/mysql/tables/llx_societe.sql
+++ b/mysql/tables/llx_societe.sql
@@ -1,5 +1,7 @@
 -- ========================================================================
 -- Copyright (C) 2000-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+-- Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -20,54 +22,63 @@
 
 create table llx_societe
 (
-  rowid              integer AUTO_INCREMENT PRIMARY KEY,
-  statut             tinyint        DEFAULT 0,            -- statut
-  parent             integer,
-  tms                timestamp,
-  datec	             datetime,                            -- creation date
-  datea	             datetime,                            -- activation date
-  nom                varchar(60),                         -- company name
-  code_client        varchar(15),                         -- code client
-  code_fournisseur   varchar(15),                         -- code founisseur
-  code_compta        varchar(15),                         -- code compta client
-  code_compta_fournisseur  varchar(15),                   -- code compta founisseur
-  address            varchar(255),                        -- company adresse
-  cp                 varchar(10),                         -- zipcode
-  ville              varchar(50),                         -- town
-  fk_departement     integer        DEFAULT 0,            --
-  fk_pays            integer        DEFAULT 0,            --
-  tel                varchar(20),                         -- phone number
-  fax                varchar(20),                         -- fax number
-  url                varchar(255),                        --
-  email              varchar(128),                        --
-  fk_secteur         integer        DEFAULT 0,            --
-  fk_effectif        integer        DEFAULT 0,            --
-  fk_typent          integer        DEFAULT 0,            --
-  fk_forme_juridique integer        DEFAULT 0,            -- forme juridique INSEE
-  siren	             varchar(16),                         -- IDProf1: siren ou RCS pour france
-  siret              varchar(16),                         -- IDProf2: siret pour france
-  ape                varchar(16),                         -- IDProf3: code ape pour france
-  idprof4            varchar(16),                         -- IDProf4: nu pour france
-  tva_intra          varchar(20),                         -- tva
-  capital            real,                                -- capital de la société
-  description        text,                                --
-  fk_stcomm          smallint       DEFAULT 0,            -- commercial statut
-  note               text,                                --
-  services           tinyint        DEFAULT 0,            --
-  prefix_comm        varchar(5),                          -- prefix commercial
-  client             tinyint        DEFAULT 0,            -- client 0/1/2
-  fournisseur        tinyint        DEFAULT 0,            -- fournisseur 0/1
-  supplier_account   varchar(32),                         -- compte client chez un fournisseur
-  fk_prospectlevel   varchar(12),                         -- prospect level (in llx_c_prospectlevel)
-  customer_bad       tinyint        DEFAULT 0,            -- mauvais payeur 0/1
-  customer_rate      real           DEFAULT 0,            -- taux fiabilié client (0 à 1)
-  supplier_rate      real           DEFAULT 0,            -- taux fiabilié fournisseur (0 à 1)
-  fk_user_creat      integer NULL,                        -- utilisateur qui a créé l'info
-  fk_user_modif      integer,                             -- utilisateur qui a modifié l'info
-  remise_client      real           DEFAULT 0,            -- remise systématique pour le client
-  mode_reglement     tinyint, 					          -- mode de réglement
-  cond_reglement     tinyint, 							  -- condition de réglement
-  tva_assuj          tinyint        DEFAULT 1,	          -- assujeti ou non à la TVA
-  gencod			 varchar(255),						  -- barcode
-  price_level        tinyint(4) NULL					  -- level of price for multiprices
+  rowid                    integer AUTO_INCREMENT PRIMARY KEY,
+  statut                   tinyint        DEFAULT 0,            -- statut
+  parent                   integer,
+  tms                      timestamp,
+  datec	                   datetime,                            -- creation date
+  datea	                   datetime,                            -- activation date
+  nom                      varchar(60),                         -- company name
+  entity                   integer DEFAULT 1 NOT NULL,	        -- multi company id
+  code_client              varchar(15),                         -- code client
+  code_fournisseur         varchar(15),                         -- code founisseur
+  code_compta              varchar(15),                         -- code compta client
+  code_compta_fournisseur  varchar(15),                         -- code compta founisseur
+  address                  varchar(255),                        -- company adresse
+  cp                       varchar(10),                         -- zipcode
+  ville                    varchar(50),                         -- town
+  fk_departement           integer        DEFAULT 0,            --
+  fk_pays                  integer        DEFAULT 0,            --
+  tel                      varchar(20),                         -- phone number
+  fax                      varchar(20),                         -- fax number
+  url                      varchar(255),                        --
+  email                    varchar(128),                        --
+  fk_secteur               integer        DEFAULT 0,            --
+  fk_effectif              integer        DEFAULT 0,            --
+  fk_typent                integer        DEFAULT 0,            --
+  fk_forme_juridique       integer        DEFAULT 0,            -- forme juridique INSEE
+  siren	                   varchar(16),                         -- IDProf1: siren ou RCS pour france
+  siret                    varchar(16),                         -- IDProf2: siret pour france
+  ape                      varchar(16),                         -- IDProf3: code ape pour france
+  idprof4                  varchar(16),                         -- IDProf4: nu pour france
+  tva_intra                varchar(20),                         -- tva
+  capital                  real,                                -- capital de la société
+  description              text,                                --
+  fk_stcomm                smallint       DEFAULT 0,            -- commercial statut
+  note                     text,                                --
+  services                 tinyint        DEFAULT 0,            --
+  prefix_comm              varchar(5),                          -- prefix commercial
+  client                   tinyint        DEFAULT 0,            -- client 0/1/2
+  fournisseur              tinyint        DEFAULT 0,            -- fournisseur 0/1
+  supplier_account         varchar(32),                         -- compte client chez un fournisseur
+  fk_prospectlevel         varchar(12),                         -- prospect level (in llx_c_prospectlevel)
+  customer_bad             tinyint        DEFAULT 0,            -- mauvais payeur 0/1
+  customer_rate            real           DEFAULT 0,            -- taux fiabilié client (0 à 1)
+  supplier_rate            real           DEFAULT 0,            -- taux fiabilié fournisseur (0 à 1)
+  fk_user_creat            integer NULL,                        -- utilisateur qui a créé l'info
+  fk_user_modif            integer,                             -- utilisateur qui a modifié l'info
+  remise_client            real           DEFAULT 0,            -- remise systématique pour le client
+  mode_reglement           tinyint,                             -- mode de réglement
+  cond_reglement           tinyint,                             -- condition de réglement
+  tva_assuj                tinyint        DEFAULT 1,	          -- assujeti ou non à la TVA
+  gencod                   varchar(255),                        -- barcode
+  price_level              tinyint(4) NULL                      -- level of price for multiprices
 )type=innodb;
+
+-- 
+-- List of codes for the field entity
+--
+-- 1 : first company customers/suppliers
+-- 2 : second company customers/suppliers
+-- 3 : etc...
+--
\ No newline at end of file
diff --git a/mysql/tables/llx_socpeople.sql b/mysql/tables/llx_socpeople.sql
index 4a00905ba21..cd3a372ff85 100644
--- a/mysql/tables/llx_socpeople.sql
+++ b/mysql/tables/llx_socpeople.sql
@@ -1,6 +1,7 @@
 -- ============================================================================
 -- Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 -- Copyright (C) 2008      Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -24,7 +25,8 @@ create table llx_socpeople
   rowid          integer AUTO_INCREMENT PRIMARY KEY,
   datec          datetime,
   tms            timestamp,
-  fk_soc         integer,           -- lien vers la societe
+  fk_soc         integer,                       -- lien vers la societe
+  entity         integer DEFAULT 1 NOT NULL,	  -- multi company id
   civilite       varchar(6),
   name           varchar(50),
   firstname      varchar(50),
@@ -41,8 +43,16 @@ create table llx_socpeople
   email          varchar(255),
   jabberid       varchar(255),
   priv           smallint NOT NULL DEFAULT 0,
-  fk_user_creat  integer DEFAULT 0, -- user qui a créé l'enregistrement
+  fk_user_creat  integer DEFAULT 0,             -- user qui a créé l'enregistrement
   fk_user_modif  integer,
   note           text,
   import_key     varchar(14)
 )type=innodb;
+
+-- 
+-- List of codes for the field entity
+--
+-- 1 : first company contact
+-- 2 : second company contact
+-- 3 : etc...
+--
\ No newline at end of file
diff --git a/mysql/tables/llx_tva.sql b/mysql/tables/llx_tva.sql
index 8ca871cf565..73fc3e35189 100644
--- a/mysql/tables/llx_tva.sql
+++ b/mysql/tables/llx_tva.sql
@@ -1,5 +1,6 @@
 -- ===================================================================
 -- Copyright (C) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+-- Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -22,12 +23,21 @@ create table llx_tva
 (
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
   tms             timestamp,
-  datep           date,           -- date de paiement
-  datev           date,           -- date de valeur
+  datep           date,                       -- date de paiement
+  datev           date,                       -- date de valeur
   amount          real NOT NULL DEFAULT 0,
   label           varchar(255),
+  entity          integer DEFAULT 1 NOT NULL,	-- multi company id
   note            text,
   fk_bank         integer,  
-  fk_user_creat   integer,            -- utilisateur qui a créé l'info
-  fk_user_modif   integer             -- utilisateur qui a modifié l'info
+  fk_user_creat   integer,                    -- utilisateur qui a créé l'info
+  fk_user_modif   integer                     -- utilisateur qui a modifié l'info
 )type=innodb;
+
+-- 
+-- List of codes for the field entity
+--
+-- 1 : first company vat
+-- 2 : second company vat
+-- 3 : etc...
+--
\ No newline at end of file
diff --git a/mysql/tables/llx_user.sql b/mysql/tables/llx_user.sql
index ce804d005ae..50019bc38d3 100644
--- a/mysql/tables/llx_user.sql
+++ b/mysql/tables/llx_user.sql
@@ -50,14 +50,14 @@ create table llx_user
   datepreviouslogin datetime,
   egroupware_id     integer,
   ldap_sid          varchar(255) DEFAULT NULL,
-  statut			tinyint DEFAULT 1,
+  statut            tinyint DEFAULT 1,
   lang              varchar(6)
 )type=innodb;
 
 -- 
 -- List of codes for the field entity
 --
--- 0 : common user
+-- 0 : superadmin or global user
 -- 1 : first company user
 -- 2 : second company user
 -- 3 : etc...
diff --git a/mysql/tables/llx_user_param.key.sql b/mysql/tables/llx_user_param.key.sql
new file mode 100644
index 00000000000..6acb2db4585
--- /dev/null
+++ b/mysql/tables/llx_user_param.key.sql
@@ -0,0 +1,22 @@
+-- ============================================================================
+-- Copyright (C) 2009 Regis Houssin <regis@dolibarr.fr>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+--
+-- $Id$
+-- ===========================================================================
+
+
+ALTER TABLE llx_user_param ADD UNIQUE INDEX uk_user_param (fk_user,param,entity);
diff --git a/mysql/tables/llx_user_param.sql b/mysql/tables/llx_user_param.sql
index c0ee64140c3..666ec20b54b 100644
--- a/mysql/tables/llx_user_param.sql
+++ b/mysql/tables/llx_user_param.sql
@@ -1,6 +1,7 @@
 -- ============================================================================
 -- Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
 -- Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -22,8 +23,15 @@
 create table llx_user_param
 (
   fk_user       integer      NOT NULL,
+  entity        integer DEFAULT 1 NOT NULL,	-- multi company id
   param         varchar(64)  NOT NULL,
-  value         varchar(255) NOT NULL,
-
-  UNIQUE (fk_user,param)
+  value         varchar(255) NOT NULL
 )type=innodb;
+
+-- 
+-- List of codes for the field entity
+--
+-- 1 : first company param
+-- 2 : second company param
+-- 3 : etc...
+--
\ No newline at end of file
diff --git a/mysql/tables/llx_usergroup.sql b/mysql/tables/llx_usergroup.sql
index 4c004514fb4..bd37ee0e10b 100644
--- a/mysql/tables/llx_usergroup.sql
+++ b/mysql/tables/llx_usergroup.sql
@@ -33,7 +33,7 @@ create table llx_usergroup
 -- 
 -- List of codes for the field entity
 --
--- 0 : common group
+-- 0 : global group
 -- 1 : first company group
 -- 2 : second company group
 -- 3 : etc...