diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php
index 3651a98857b..fff4bab9491 100644
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@@ -52,55 +52,85 @@ if ($action == 'addconst')
 
 if ($action == 'add')
 {
-	$sql = "SELECT rowid";
-	$sql.= " FROM ".MAIN_DB_PREFIX."boxes";
-	$sql.= " WHERE fk_user = 0";
-	$sql.= " AND box_id = ".$_POST["boxid"];
-	$sql.= " AND position = ".$_POST["pos"];
+    $error=0;
 
-	$resql = $db->query($sql);
-	dol_syslog("boxes.php::search if box active sql=".$sql);
-	if ($resql)
+    $db->begin();
+
+	// Initialize distinctfkuser with all already existing values of fk_user (user that use a personalized view of boxes for pos)
+	$distinctfkuser=array();
+	if (! $error)
 	{
-		$num = $db->num_rows($resql);
-		if ($num == 0)
+		$sql = "SELECT fk_user";
+		$sql.= " FROM ".MAIN_DB_PREFIX."user_param";
+		$sql.= " WHERE param = 'MAIN_BOXES_".$db->escape(GETPOST("pos","alpha"))."' AND value = '1'";
+		$sql.= " AND entity = ".$conf->entity;
+		$resql = $db->query($sql);
+		dol_syslog("boxes.php search fk_user to activate box for sql=".$sql);
+		if ($resql)
 		{
-			$db->begin();
-
-			// Si la boite n'est pas deja active, insert with box_order=''
-			$sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes (";
-			$sql.= "box_id";
-			$sql.= ", position";
-			$sql.= ", box_order";
-			$sql.= ", fk_user";
-			$sql.= ") values (";
-			$sql.= $_POST["boxid"];
-			$sql.= ", ".$_POST["pos"];
-			$sql.= ", ''";
-			$sql.= ", 0";
-			$sql.= ")";
-
-			dol_syslog("boxes.php activate box sql=".$sql);
-			$resql = $db->query($sql);
-
-			// Remove all personalized setup when a box is activated or disabled (to be sure user see new box)
-			// TODO Disable this when adding combo will be available on home page for each user.
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_param WHERE param LIKE 'MAIN_BOXES_%'";
-			dol_syslog("boxes.php delete user_param sql=".$sql);
-			$resql = $db->query($sql);
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes WHERE fk_user != 0";
-			dol_syslog("boxes.php delete user_param sql=".$sql);
-			$resql = $db->query($sql);
-
-			$db->commit();
+		    $num = $db->num_rows($resql);
+            $i=0;
+		    while ($i < $num)
+		    {
+		        $obj=$db->fetch_object($resql);
+		        $distinctfkuser[$obj->fk_user]=$obj->fk_user;
+		        $i++;
+		    }
 		}
+		else
+		{
+		    $errmesg=$db->lasterror();
+		    $error++;
+		}
+	}
 
+	foreach($distinctfkuser as $fk_user)
+	{
+	    if (! $error && $fk_user != 0)    // We will add fk_user = 0 later.
+	    {
+	        $sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes (";
+	        $sql.= "box_id, position, box_order, fk_user";
+	        $sql.= ") values (";
+	        $sql.= GETPOST("boxid","int").", ".GETPOST("pos","alpha").", 'A01', ".$fk_user;
+	        $sql.= ")";
+
+	        dol_syslog("boxes.php activate box sql=".$sql);
+	        $resql = $db->query($sql);
+	        if (! $resql)
+	        {
+		        $errmesg=$db->lasterror();
+	            $error++;
+	        }
+	    }
+	}
+
+	// If value 0 was not included, we add it.
+	if (! $error)
+	{
+	    $sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes (";
+	    $sql.= "box_id, position, box_order, fk_user";
+	    $sql.= ") values (";
+	    $sql.= GETPOST("boxid","int").", ".GETPOST("pos","alpha").", 'A01', 0";
+	    $sql.= ")";
+
+	    dol_syslog("boxes.php activate box sql=".$sql);
+	    $resql = $db->query($sql);
+        if (! $resql)
+        {
+		    $errmesg=$db->lasterror();
+            $error++;
+        }
+	}
+
+	if (! $error)
+	{
 		Header("Location: boxes.php");
+	    $db->commit();
 		exit;
 	}
 	else
 	{
-		dol_print_error($db);
+	    $db->rollback();
 	}
 }
 
@@ -176,6 +206,8 @@ print_fiche_titre($langs->trans("Boxes"),'','setup');
 
 print $langs->trans("BoxesDesc")." ".$langs->trans("OnlyActiveElementsAreShown")."<br>\n";
 
+dol_htmloutput_errors($errmesg);
+
 
 /*
  * Recherche des boites actives par defaut pour chaque position possible
@@ -212,7 +244,7 @@ if ($resql)
 		// This occurs just after an insert.
 		if ($decalage)
 		{
-			$sql="UPDATE ".MAIN_DB_PREFIX."boxes set box_order=".$decalage." WHERE rowid=".$obj->rowid;
+			$sql="UPDATE ".MAIN_DB_PREFIX."boxes set box_order='".$decalage."' WHERE rowid=".$obj->rowid;
 			$db->query($sql);
 		}
 	}
@@ -236,13 +268,13 @@ if ($resql)
 					if (preg_match("/[13579]{1}/",substr($record['box_order'],-1)))
 					{
 						$box_order = "A0".$record['box_order'];
-						$sql="UPDATE ".MAIN_DB_PREFIX."boxes SET box_order = '".$box_order."' WHERE box_order = ".$record['box_order'];
+						$sql="UPDATE ".MAIN_DB_PREFIX."boxes SET box_order = '".$box_order."' WHERE box_order = '".$record['box_order']."'";
 						$resql = $db->query($sql);
 					}
 					else if (preg_match("/[02468]{1}/",substr($record['box_order'],-1)))
 					{
 						$box_order = "B0".$record['box_order'];
-						$sql="UPDATE ".MAIN_DB_PREFIX."boxes SET box_order = '".$box_order."' WHERE box_order = ".$record['box_order'];
+						$sql="UPDATE ".MAIN_DB_PREFIX."boxes SET box_order = '".$box_order."' WHERE box_order = '".$record['box_order']."'";
 						$resql = $db->query($sql);
 					}
 				}
@@ -251,13 +283,13 @@ if ($resql)
 					if (preg_match("/[13579]{1}/",substr($record['box_order'],-1)))
 					{
 						$box_order = "A".$record['box_order'];
-						$sql="UPDATE ".MAIN_DB_PREFIX."boxes SET box_order = '".$box_order."' WHERE box_order = ".$record['box_order'];
+						$sql="UPDATE ".MAIN_DB_PREFIX."boxes SET box_order = '".$box_order."' WHERE box_order = '".$record['box_order']."'";
 						$resql = $db->query($sql);
 					}
 					else if (preg_match("/[02468]{1}/",substr($record['box_order'],-1)))
 					{
 						$box_order = "B".$record['box_order'];
-						$sql="UPDATE ".MAIN_DB_PREFIX."boxes SET box_order = '".$box_order."' WHERE box_order = ".$record['box_order'];
+						$sql="UPDATE ".MAIN_DB_PREFIX."boxes SET box_order = '".$box_order."' WHERE box_order = '".$record['box_order']."'";
 						$resql = $db->query($sql);
 					}
 				}
diff --git a/htdocs/boxes.php b/htdocs/boxes.php
index 6f78d65075e..b9652de140a 100644
--- a/htdocs/boxes.php
+++ b/htdocs/boxes.php
@@ -27,49 +27,41 @@
 
 
 /**
- * 		Show a HTML Tab with boxes of a particular area including personalized choices of user
+ * 	Show a HTML Tab with boxes of a particular area including personalized choices of user
  *
- * 		@param	   User         $user		 Object User
- * 		@param	   String       $areacode    Code of area for pages (0=value for Home page)
- * 		@return    int                       <0 if KO, Nb of boxes shown of OK (0 to n)
+ * 	@param	   User         $user		 Object User
+ * 	@param	   String       $areacode    Code of area for pages (0=value for Home page)
+ * 	@return    int                       <0 if KO, Nb of boxes shown of OK (0 to n)
  */
 function printBoxesArea($user,$areacode)
 {
     global $conf,$langs,$db;
 
     $infobox=new InfoBox($db);
-    $boxarray=$infobox->listboxes('activated',$areacode,$user);
+    $boxactivated=$infobox->listboxes('activated',$areacode,$user);
+    $arrayboxactivatedid=array();
+    foreach($boxactivated as $box) $arrayboxactivatedid[$box->id]=$box->id;
 
     $selectboxlist='';
-    /*
     if ($conf->use_javascript_ajax)
     {
-        $sql = "SELECT rowid, file, note, tms";
-        $sql.= " FROM ".MAIN_DB_PREFIX."boxes_def";
-        $sql.= " WHERE entity = ".$conf->entity;
-        $resql = $db->query($sql);
-        $var=true;
+        $emptyuser=new User($db);
+        $boxavailable=$infobox->listboxes('available',$areacode,$emptyuser,$arrayboxactivatedid);
 
-        if ($resql)
+        $arrayboxtoactivatelabel=array();
+        foreach($boxavailable as $box)
         {
-            $num = $db->num_rows($resql);
-            $i = 0;
-
-            // Boucle sur toutes les boites
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($resql);
-
-
-
-            }
+            $arrayboxtoactivatelabel[$box->id]=$box->boxlabel;
         }
-    }*/
+        $form=new Form($db);
+        // TODO enable
+        //$selectboxlist=$form->selectarray('boxcombo', $arrayboxtoactivatelabel);
+    }
 
-    if (count($boxarray))
+    print load_fiche_titre($langs->trans("OtherInformationsBoxes"),$selectboxlist,'','','otherboxes');
+
+    if (count($boxactivated))
     {
-        print load_fiche_titre($langs->trans("OtherInformationsBoxes"),$selectboxlist,'','','otherboxes');
-
         print '<table width="100%" class="notopnoleftnoright">';
         print '<tr><td class="notopnoleftnoright">'."\n";
 
@@ -83,13 +75,13 @@ function printBoxesArea($user,$areacode)
         if (! empty($conf->global->MAIN_BOXES_MAXLINES)) $box_max_lines=$conf->global->MAIN_BOXES_MAXLINES;
 
         $ii=0;
-        foreach ($boxarray as $key => $box)
+        foreach ($boxactivated as $key => $box)
         {
             if (preg_match('/^A/i',$box->box_order)) // column A
             {
                 $ii++;
-                //print 'box_id '.$boxarray[$ii]->box_id.' ';
-                //print 'box_order '.$boxarray[$ii]->box_order.'<br>';
+                //print 'box_id '.$boxactivated[$ii]->box_id.' ';
+                //print 'box_order '.$boxactivated[$ii]->box_order.'<br>';
                 // Affichage boite key
                 $box->loadBox($box_max_lines);
                 $box->showBox();
@@ -111,13 +103,13 @@ function printBoxesArea($user,$areacode)
         print '<div id="right" class="connectedSortable">'."\n";
 
         $ii=0;
-        foreach ($boxarray as $key => $box)
+        foreach ($boxactivated as $key => $box)
         {
             if (preg_match('/^B/i',$box->box_order)) // colonne B
             {
                 $ii++;
-                //print 'box_id '.$boxarray[$ii]->box_id.' ';
-                //print 'box_order '.$boxarray[$ii]->box_order.'<br>';
+                //print 'box_id '.$boxactivated[$ii]->box_id.' ';
+                //print 'box_order '.$boxactivated[$ii]->box_order.'<br>';
                 // Affichage boite key
                 $box->loadBox($box_max_lines);
                 $box->showBox();
@@ -143,6 +135,7 @@ function printBoxesArea($user,$areacode)
         {
             print "\n";
             print '<script type="text/javascript" language="javascript">';
+            // For moving
             print 'jQuery(function() {
                         jQuery("#left, #right").sortable({
                             /* placeholder: \'ui-state-highlight\', */
@@ -152,25 +145,32 @@ function printBoxesArea($user,$areacode)
                             containment: \'.fiche\',
                             connectWith: \'.connectedSortable\',
                             stop: function(event, ui) {
-                                updateOrder();
+                                updateOrder(0);
                             }
                         });
                     });
-            ';
-            print "\n";
-            print 'function updateOrder(){'."\n";
-            print 'var left_list = cleanSerialize(jQuery("#left").sortable("serialize" ));'."\n";
-            print 'var right_list = cleanSerialize(jQuery("#right").sortable("serialize" ));'."\n";
-            print 'var boxorder = \'A:\' + left_list + \'-B:\' + right_list;'."\n";
-            //print 'alert(\'boxorder=\' + boxorder);';
-            print 'var userid = \''.$user->id.'\';'."\n";
-            print 'jQuery.get(\'core/ajax/box.php?boxorder=\'+boxorder+\'&userid=\'+'.$user->id.');'."\n";
-            print '}'."\n";
+            '."\n";
+            print 'function updateOrder() {
+            		var left_list = cleanSerialize(jQuery("#left").sortable("serialize" ));
+            		var right_list = cleanSerialize(jQuery("#right").sortable("serialize" ));
+            		var boxorder = \'A:\' + left_list + \'-B:\' + right_list;
+                    var userid = \''.$user->id.'\';
+					jQuery.get(\''.DOL_URL_ROOT.'/core/ajax/box.php?boxorder=\'+boxorder+\'&userid=\'+'.$user->id.');
+            		}'."\n";
+            // For closing
+            print 'jQuery(document).ready(function() {
+                      	jQuery(".boxclose").click(function() {
+                      		var self = this;	// because JQuery can modify this
+                          	var boxid=self.id.substring(8);
+                            jQuery(\'#boxto_\'+boxid).remove();
+                            updateOrder();
+                       	});
+                   });'."\n";
             print '</script>'."\n";
         }
     }
 
-    return count($boxarray);
+    return count($boxactivated);
 }
 
 
@@ -199,7 +199,7 @@ class InfoBox
      *  @param	string	$mode			'available' or 'activated'
      *  @param	string	$zone			Name or area (-1 for all, 0 for Homepage, 1 for xxx, ...)
      *  @param  User    $user	  		Objet user to filter (used only if $zone >= 0)
-     *  @param	array	$excludelist	Array of box.box_id = boxes_def.rowid to exclude
+     *  @param	array	$excludelist	Array of box id (box.box_id = boxes_def.rowid) to exclude
      *  @return array               	Array of boxes
      */
     function listBoxes($mode,$zone,$user,$excludelist=array())
@@ -259,6 +259,7 @@ class InfoBox
 
                         // box properties
                         $box->rowid=$obj->rowid;
+                        $box->id=$obj->box_id;
                         $box->position=$obj->position;
                         $box->box_order=$obj->box_order;
                         $box->fk_user=$obj->fk_user;
@@ -302,14 +303,13 @@ class InfoBox
     }
 
 
-
     /**
-     *      Save order of boxes for area and user
+     *  Save order of boxes for area and user
      *
-     *      @param      string     $zone       Name of area (0 for Homepage, ...)
-     *      @param      string     $boxorder   List of boxes with correct order 'A:123,456,...-B:789,321...'
-     *      @param      int        $userid     Id of user
-     *      @return     int                    <0 if KO, >= 0 if OK
+     *  @param	string	$zone       		Name of area (0 for Homepage, ...)
+     *  @param  string  $boxorder   		List of boxes with correct order 'A:123,456,...-B:789,321...'
+     *  @param  int     $userid     		Id of user
+     *  @return int                   		<0 if KO, >= 0 if OK
      */
     function saveboxorder($zone,$boxorder,$userid=0)
     {
@@ -319,7 +319,7 @@ class InfoBox
 
         require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
 
-        dol_syslog(get_class($this)."::saveboxorder zone=".$zone." user=".$userid);
+        dol_syslog(get_class($this)."::saveboxorder zone=".$zone." userid=".$userid);
 
         if (! $userid || $userid == 0) return 0;
 
@@ -328,7 +328,7 @@ class InfoBox
 
         $this->db->begin();
 
-        // Sauve parametre indiquant que le user a une
+        // Sauve parametre indiquant que le user a une config dediee
         $confuserzone='MAIN_BOXES_'.$zone;
         $tab[$confuserzone]=1;
         if (dol_set_user_param($this->db, $conf, $user, $tab) < 0)
@@ -338,6 +338,7 @@ class InfoBox
             return -3;
         }
 
+        // Delete all lines
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes";
         $sql.= " USING ".MAIN_DB_PREFIX."boxes, ".MAIN_DB_PREFIX."boxes_def";
         $sql.= " WHERE ".MAIN_DB_PREFIX."boxes.box_id = ".MAIN_DB_PREFIX."boxes_def.rowid";
@@ -355,7 +356,7 @@ class InfoBox
                 $part=explode(':',$collist);
                 $colonne=$part[0];
                 $list=$part[1];
-                dol_syslog('InfoBox::saveboxorder column='.$colonne.' list='.$list);
+                dol_syslog(get_class($this)."::saveboxorder column=".$colonne.' list='.$list);
 
                 $i=0;
                 $listarray=explode(',',$list);
diff --git a/htdocs/core/ajax/box.php b/htdocs/core/ajax/box.php
index 0ee675434b9..4e424a605c1 100644
--- a/htdocs/core/ajax/box.php
+++ b/htdocs/core/ajax/box.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
- * Copyright (C) 2007-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2007-2012 Laurent Destailleur  <eldy@users.sourceforge.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
@@ -18,7 +18,7 @@
 
 /**
  *       \file       htdocs/core/ajax/box.php
- *       \brief      File to return Ajax response on Box move
+ *       \brief      File to return Ajax response on Box move or close
  */
 
 if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
@@ -45,14 +45,14 @@ top_httphead();
 
 print '<!-- Ajax page called with url '.$_SERVER["PHP_SELF"].'?'.$_SERVER["QUERY_STRING"].' -->'."\n";
 
-// Registering the location of boxes
-if((isset($_GET['boxorder']) && !empty($_GET['boxorder'])) && (isset($_GET['userid']) && !empty($_GET['userid'])))
+// Registering the location of boxes after a move
+if (GETPOST('boxorder') && GETPOST('userid'))
 {
 	// boxorder value is the target order: "A:idboxA1,idboxA2,A-B:idboxB1,idboxB2,B"
-	dol_syslog("AjaxBox boxorder=".$_GET['boxorder']." userid=".$_GET['userid'], LOG_DEBUG);
+	dol_syslog("AjaxBox boxorder=".GETPOST('boxorder')." userid=".GETPOST('userid'), LOG_DEBUG);
 
 	$infobox=new InfoBox($db);
-	$result=$infobox->saveboxorder("0",$_GET['boxorder'],$_GET['userid']);
+	$result=$infobox->saveboxorder("0",GETPOST('boxorder'),GETPOST('userid'));
 }
 
 ?>
diff --git a/htdocs/core/boxes/box_actions.php b/htdocs/core/boxes/box_actions.php
index f95c077999d..c4b10f1bf02 100644
--- a/htdocs/core/boxes/box_actions.php
+++ b/htdocs/core/boxes/box_actions.php
@@ -50,7 +50,7 @@ class box_actions extends ModeleBoxes
 		global $langs;
 		$langs->load("boxes");
 
-		$this->boxlabel=$langs->trans("BoxLastActions");
+		$this->boxlabel=$langs->transnoentitiesnoconv("BoxLastActions");
 	}
 
 	/**
diff --git a/htdocs/core/boxes/box_bookmarks.php b/htdocs/core/boxes/box_bookmarks.php
index 7af510379f1..bda9ccaeeb1 100644
--- a/htdocs/core/boxes/box_bookmarks.php
+++ b/htdocs/core/boxes/box_bookmarks.php
@@ -46,7 +46,7 @@ class box_bookmarks extends ModeleBoxes
 		global $langs;
 		$langs->load("boxes");
 
-		$this->boxlabel=$langs->trans("BoxMyLastBookmarks");
+		$this->boxlabel=$langs->transnoentitiesnoconv("BoxMyLastBookmarks");
 	}
 
 	/**
diff --git a/htdocs/core/boxes/box_clients.php b/htdocs/core/boxes/box_clients.php
index 633440275f9..8b087463e83 100644
--- a/htdocs/core/boxes/box_clients.php
+++ b/htdocs/core/boxes/box_clients.php
@@ -50,7 +50,7 @@ class box_clients extends ModeleBoxes
 		global $langs;
 		$langs->load("boxes");
 
-		$this->boxlabel=$langs->trans("BoxLastCustomers");
+		$this->boxlabel=$langs->transnoentitiesnoconv("BoxLastCustomers");
 	}
 
 	/**
diff --git a/htdocs/core/boxes/box_commandes.php b/htdocs/core/boxes/box_commandes.php
index 4104426864b..a54d2eda2ba 100644
--- a/htdocs/core/boxes/box_commandes.php
+++ b/htdocs/core/boxes/box_commandes.php
@@ -50,7 +50,7 @@ class box_commandes extends ModeleBoxes
         global $langs;
         $langs->load("boxes");
 
-        $this->boxlabel=$langs->trans("BoxLastCustomerOrders");
+        $this->boxlabel=$langs->transnoentitiesnoconv("BoxLastCustomerOrders");
     }
 
     /**
diff --git a/htdocs/core/boxes/box_comptes.php b/htdocs/core/boxes/box_comptes.php
index 55c673225b5..e23f51971c4 100644
--- a/htdocs/core/boxes/box_comptes.php
+++ b/htdocs/core/boxes/box_comptes.php
@@ -51,7 +51,7 @@ class box_comptes extends ModeleBoxes
 		global $langs;
 		$langs->load("boxes");
 
-		$this->boxlabel=$langs->trans('BoxCurrentAccounts');
+		$this->boxlabel=$langs->transnoentitiesnoconv('BoxCurrentAccounts');
 	}
 
 	/**
diff --git a/htdocs/core/boxes/box_contacts.php b/htdocs/core/boxes/box_contacts.php
index c9e216de25f..3f952eea6f1 100755
--- a/htdocs/core/boxes/box_contacts.php
+++ b/htdocs/core/boxes/box_contacts.php
@@ -51,7 +51,7 @@ class box_contacts extends ModeleBoxes
 		global $langs;
 		$langs->load("boxes");
 
-		$this->boxlabel=$langs->trans("BoxLastContacts");
+		$this->boxlabel=$langs->transnoentitiesnoconv("BoxLastContacts");
 	}
 
 	/**
diff --git a/htdocs/core/boxes/box_contracts.php b/htdocs/core/boxes/box_contracts.php
index 6c4a57b5466..72901e87a18 100644
--- a/htdocs/core/boxes/box_contracts.php
+++ b/htdocs/core/boxes/box_contracts.php
@@ -50,7 +50,7 @@ class box_contracts extends ModeleBoxes
 
     	$langs->load("contracts");
 
-    	$this->boxlabel=$langs->trans("BoxLastContracts");
+    	$this->boxlabel=$langs->transnoentitiesnoconv("BoxLastContracts");
     }
 
     /**
diff --git a/htdocs/core/boxes/box_external_rss.php b/htdocs/core/boxes/box_external_rss.php
index 61ec5c75b2f..8a3e57a2141 100644
--- a/htdocs/core/boxes/box_external_rss.php
+++ b/htdocs/core/boxes/box_external_rss.php
@@ -57,7 +57,7 @@ class box_external_rss extends ModeleBoxes
 		$this->db=$db;
 		$this->param=$param;
 
-        $this->boxlabel=$langs->trans("BoxLastRssInfos");
+        $this->boxlabel=$langs->transnoentitiesnoconv("BoxLastRssInfos");
     }
 
     /**
diff --git a/htdocs/core/boxes/box_factures.php b/htdocs/core/boxes/box_factures.php
index 624f633442e..fc18d2ee453 100644
--- a/htdocs/core/boxes/box_factures.php
+++ b/htdocs/core/boxes/box_factures.php
@@ -49,7 +49,7 @@ class box_factures extends ModeleBoxes
 		global $langs;
 		$langs->load("boxes");
 
-		$this->boxlabel=$langs->trans("BoxLastCustomerBills");
+		$this->boxlabel=$langs->transnoentitiesnoconv("BoxLastCustomerBills");
 	}
 
 	/**
diff --git a/htdocs/core/boxes/box_factures_fourn.php b/htdocs/core/boxes/box_factures_fourn.php
index 03725161a23..394934438fd 100644
--- a/htdocs/core/boxes/box_factures_fourn.php
+++ b/htdocs/core/boxes/box_factures_fourn.php
@@ -49,7 +49,7 @@ class box_factures_fourn extends ModeleBoxes
 		global $langs;
 		$langs->load("boxes");
 
-		$this->boxlabel=$langs->trans("BoxLastSupplierBills");
+		$this->boxlabel=$langs->transnoentitiesnoconv("BoxLastSupplierBills");
 	}
 
 	/**
diff --git a/htdocs/core/boxes/box_factures_fourn_imp.php b/htdocs/core/boxes/box_factures_fourn_imp.php
index bf2228d752a..ebbba5def70 100644
--- a/htdocs/core/boxes/box_factures_fourn_imp.php
+++ b/htdocs/core/boxes/box_factures_fourn_imp.php
@@ -49,7 +49,7 @@ class box_factures_fourn_imp extends ModeleBoxes
 		global $langs;
 		$langs->load("boxes");
 
-		$this->boxlabel=$langs->trans("BoxOldestUnpaidSupplierBills");
+		$this->boxlabel=$langs->transnoentitiesnoconv("BoxOldestUnpaidSupplierBills");
 	}
 
 	/**
diff --git a/htdocs/core/boxes/box_factures_imp.php b/htdocs/core/boxes/box_factures_imp.php
index 30f18ad02f0..a98ec274bfc 100644
--- a/htdocs/core/boxes/box_factures_imp.php
+++ b/htdocs/core/boxes/box_factures_imp.php
@@ -52,7 +52,7 @@ class box_factures_imp extends ModeleBoxes
 		global $langs;
 		$langs->load("boxes");
 
-		$this->boxlabel=$langs->trans("BoxOldestUnpaidCustomerBills");
+		$this->boxlabel=$langs->transnoentitiesnoconv("BoxOldestUnpaidCustomerBills");
 	}
 
 	/**
diff --git a/htdocs/core/boxes/box_fournisseurs.php b/htdocs/core/boxes/box_fournisseurs.php
index 8e579f79731..0b275f25e4d 100644
--- a/htdocs/core/boxes/box_fournisseurs.php
+++ b/htdocs/core/boxes/box_fournisseurs.php
@@ -49,7 +49,7 @@ class box_fournisseurs extends ModeleBoxes
         global $langs;
         $langs->load("boxes");
 
-        $this->boxlabel=$langs->trans("BoxLastSuppliers");
+        $this->boxlabel=$langs->transnoentitiesnoconv("BoxLastSuppliers");
     }
 
     /**
diff --git a/htdocs/core/boxes/box_members.php b/htdocs/core/boxes/box_members.php
index 7625ab8bc2e..d1fc2b2e78b 100755
--- a/htdocs/core/boxes/box_members.php
+++ b/htdocs/core/boxes/box_members.php
@@ -50,7 +50,7 @@ class box_members extends ModeleBoxes
 		global $langs;
 		$langs->load("boxes");
 
-		$this->boxlabel=$langs->trans("BoxLastMembers");
+		$this->boxlabel=$langs->transnoentitiesnoconv("BoxLastMembers");
 	}
 
 	/**
diff --git a/htdocs/core/boxes/box_osc_client.php b/htdocs/core/boxes/box_osc_client.php
index 725a156d9f6..c2a4a0d00ea 100644
--- a/htdocs/core/boxes/box_osc_client.php
+++ b/htdocs/core/boxes/box_osc_client.php
@@ -49,7 +49,7 @@ class box_osc_clients extends ModeleBoxes
         global $langs;
         $langs->load("boxes");
 
-        $this->boxlabel=$langs->trans("BoxNbOfCustomers");
+        $this->boxlabel=$langs->transnoentitiesnoconv("BoxNbOfCustomers");
     }
 
     /**
diff --git a/htdocs/core/boxes/box_produits.php b/htdocs/core/boxes/box_produits.php
index 20b23316952..a45900672b6 100644
--- a/htdocs/core/boxes/box_produits.php
+++ b/htdocs/core/boxes/box_produits.php
@@ -52,7 +52,7 @@ class box_produits extends ModeleBoxes
 		global $langs;
 		$langs->load("boxes");
 
-		$this->boxlabel=$langs->trans("BoxLastProducts");
+		$this->boxlabel=$langs->transnoentitiesnoconv("BoxLastProducts");
 	}
 
 	/**
diff --git a/htdocs/core/boxes/box_propales.php b/htdocs/core/boxes/box_propales.php
index 3ff01e3cc54..dee694e72f6 100644
--- a/htdocs/core/boxes/box_propales.php
+++ b/htdocs/core/boxes/box_propales.php
@@ -51,7 +51,7 @@ class box_propales extends ModeleBoxes
     	global $langs;
       $langs->load("boxes");
 
-      $this->boxlabel=$langs->trans("BoxLastProposals");
+      $this->boxlabel=$langs->transnoentitiesnoconv("BoxLastProposals");
     }
 
     /**
diff --git a/htdocs/core/boxes/box_prospect.php b/htdocs/core/boxes/box_prospect.php
index f1f6ae393bc..e532f005091 100644
--- a/htdocs/core/boxes/box_prospect.php
+++ b/htdocs/core/boxes/box_prospect.php
@@ -55,7 +55,7 @@ class box_prospect extends ModeleBoxes
 		$this->db=$DB;
 		$this->param=$param;
 
-		$this->boxlabel=$langs->trans("BoxLastProspects");
+		$this->boxlabel=$langs->transnoentitiesnoconv("BoxLastProspects");
 	}
 
 	/**
diff --git a/htdocs/core/boxes/box_services_contracts.php b/htdocs/core/boxes/box_services_contracts.php
index c696306a1cf..a706254ee0b 100644
--- a/htdocs/core/boxes/box_services_contracts.php
+++ b/htdocs/core/boxes/box_services_contracts.php
@@ -50,7 +50,7 @@ class box_services_contracts extends ModeleBoxes
 		global $langs;
 		$langs->load("boxes");
 
-		$this->boxlabel=$langs->trans("BoxLastProductsInContract");
+		$this->boxlabel=$langs->transnoentitiesnoconv("BoxLastProductsInContract");
 	}
 
 	/**
diff --git a/htdocs/core/boxes/box_services_expired.php b/htdocs/core/boxes/box_services_expired.php
index ab648d44ec4..b8a42fe8f03 100644
--- a/htdocs/core/boxes/box_services_expired.php
+++ b/htdocs/core/boxes/box_services_expired.php
@@ -51,7 +51,7 @@ class box_services_expired extends ModeleBoxes
 
     	$langs->load("contracts");
 
-    	$this->boxlabel=$langs->trans("BoxOldestExpiredServices");
+    	$this->boxlabel=$langs->transnoentitiesnoconv("BoxOldestExpiredServices");
     }
 
     /**
diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php
index 08a4d0cef86..419ac40dd20 100644
--- a/htdocs/core/boxes/modules_boxes.php
+++ b/htdocs/core/boxes/modules_boxes.php
@@ -148,9 +148,10 @@ class ModeleBoxes    // Can't be abtract as it is instanciated to build "empty"
 			}
 			if ($conf->use_javascript_ajax)
 			{
-				print '</td><td class="nocellnopadd" width="14">';
+				print '</td><td class="nocellnopadd" width="30" nowrap="nowrap">';
 				// The image must have the class 'boxhandle' beause it's value used in DOM draggable objects to define the area used to catch the full object
-				print img_picto($langs->trans("MoveBox",$this->box_id),'uparrow','class="boxhandle" style="cursor:move;"');
+				print img_picto($langs->trans("MoveBox",$this->box_id),'grip','class="boxhandle" style="cursor:move;"');
+				print img_picto($langs->trans("Close",$this->box_id),'close','class="boxclose" style="cursor:pointer;" id="imgclose'.$this->box_id.'"');
 				print '</td></tr></table>';
 			}
 			print '</td>';
@@ -226,17 +227,6 @@ class ModeleBoxes    // Can't be abtract as it is instanciated to build "empty"
 					print "</tr>\n";
 				}
 			}
-
-			// Complete line to max
-			/*
-			while ($i < $this->max)
-			{
-				$var=!$var;
-				print '<tr '.$bcx[$var].'><td colspan="'.$nbcol.'">&nbsp;</td></tr>';
-				$i++;
-			}*/
-
-			//print "</table>\n";
 		}
 
 		if (! empty($head['text']) || ! empty($head['sublink']) || $nblines)
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 8dddbd2c2a1..5ba0935124f 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -613,7 +613,7 @@ abstract class DolibarrModules
                             $lastid=$this->db->last_insert_id(MAIN_DB_PREFIX."boxes_def","rowid");
 
                             $sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes (box_id,position,box_order,fk_user)";
-                            $sql.= " VALUES (".$lastid.", 0, 0, 0)";
+                            $sql.= " VALUES (".$lastid.", 0, '0', 0)";
 
                             dol_syslog(get_class($this)."::insert_boxes sql=".$sql);
                             $resql=$this->db->query($sql);
diff --git a/htdocs/theme/auguria/img/close.png b/htdocs/theme/auguria/img/close.png
new file mode 100644
index 00000000000..aacac9fc423
Binary files /dev/null and b/htdocs/theme/auguria/img/close.png differ
diff --git a/htdocs/theme/bureau2crea/img/close.png b/htdocs/theme/bureau2crea/img/close.png
new file mode 100644
index 00000000000..aacac9fc423
Binary files /dev/null and b/htdocs/theme/bureau2crea/img/close.png differ
diff --git a/htdocs/theme/cameleo/img/close.png b/htdocs/theme/cameleo/img/close.png
new file mode 100644
index 00000000000..aacac9fc423
Binary files /dev/null and b/htdocs/theme/cameleo/img/close.png differ
diff --git a/htdocs/theme/eldy/img/close.png b/htdocs/theme/eldy/img/close.png
new file mode 100644
index 00000000000..aacac9fc423
Binary files /dev/null and b/htdocs/theme/eldy/img/close.png differ
diff --git a/htdocs/theme/phones/smartphone/theme/default/img/close.png b/htdocs/theme/phones/smartphone/theme/default/img/close.png
new file mode 100644
index 00000000000..aacac9fc423
Binary files /dev/null and b/htdocs/theme/phones/smartphone/theme/default/img/close.png differ