diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 69d8adc7352..da63720a69c 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1615,9 +1615,11 @@ class Form
      *  @param		int			$hidelabel				Hide label (0=no, 1=yes, 2=show search icon (before) and placeholder, 3 search icon after)
      *  @param		array		$ajaxoptions			Options for ajax_autocompleter
      *  @param      int			$socid					Thirdparty Id (to get also price dedicated to this customer)
+     *  @param		string		$showempty				'' to not show empty line. Translation key to show an empty line. '1' show empty line with no text.
+     * 	@param		int			$forcecombo				Force to use combo box
      *  @return		void
      */
-    function select_produits($selected='', $htmlname='productid', $filtertype='', $limit=20, $price_level=0, $status=1, $finished=2, $selected_input_value='', $hidelabel=0, $ajaxoptions=array(), $socid=0)
+    function select_produits($selected='', $htmlname='productid', $filtertype='', $limit=20, $price_level=0, $status=1, $finished=2, $selected_input_value='', $hidelabel=0, $ajaxoptions=array(), $socid=0, $showempty='1', $forcecombo=0)
     {
         global $langs,$conf;
 
@@ -1650,14 +1652,14 @@ class Form
             		print img_picto($langs->trans("Search"), 'search');
             	}
             }
-            print '<input type="text" size="20" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' '.(!empty($conf->global->PRODUCT_SEARCH_AUTOFOCUS) ? 'autofocus' : '').' />';
+            print '<input type="text" class="minwidth100" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' '.(!empty($conf->global->PRODUCT_SEARCH_AUTOFOCUS) ? 'autofocus' : '').' />';
             if ($hidelabel == 3) {
             	print img_picto($langs->trans("Search"), 'search');
             }
         }
         else
 		{
-            print $this->select_produits_list($selected,$htmlname,$filtertype,$limit,$price_level,'',$status,$finished,0,$socid);
+            print $this->select_produits_list($selected,$htmlname,$filtertype,$limit,$price_level,'',$status,$finished,0,$socid,$showempty,$forcecombo);
         }
     }
 
@@ -1674,9 +1676,11 @@ class Form
      *  @param      int		$finished       Filter on finished field: 2=No filter
      *  @param      int		$outputmode     0=HTML select string, 1=Array
      *  @param      int		$socid     		Thirdparty Id (to get also price dedicated to this customer)
+     *  @param		string	$showempty		'' to not show empty line. Translation key to show an empty line. '1' show empty line with no text.
+     * 	@param		int		$forcecombo		Force to use combo box
      *  @return     array    				Array of keys for json
      */
-    function select_produits_list($selected='',$htmlname='productid',$filtertype='',$limit=20,$price_level=0,$filterkey='',$status=1,$finished=2,$outputmode=0,$socid=0)
+    function select_produits_list($selected='',$htmlname='productid',$filtertype='',$limit=20,$price_level=0,$filterkey='',$status=1,$finished=2,$outputmode=0,$socid=0,$showempty='1',$forcecombo=0)
     {
         global $langs,$conf,$user,$db;
 
@@ -1767,8 +1771,27 @@ class Form
             require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';
             $num = $this->db->num_rows($result);
 
-            $out.='<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'">';
-            $out.='<option value="0" selected>&nbsp;</option>';
+            $events=null;
+            
+            if ($conf->use_javascript_ajax && ! $forcecombo)
+            {
+				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+            	$comboenhancement =ajax_combobox($htmlname, $events, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT);
+            	$out.= $comboenhancement;
+            	$nodatarole=($comboenhancement?' data-role="none"':'');
+            }
+            
+            $out.='<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'"'.$nodatarole.'>';
+            
+            $textifempty='';
+            // Do not use textifempty = ' ' or '&nbsp;' here, or search on key will search on ' key'.
+            //if (! empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';
+            if (! empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT))
+            {
+                if ($showempty && ! is_numeric($showempty)) $textifempty=$langs->trans($showempty);
+                else $textifempty.=$langs->trans("All");
+            }
+            if ($showempty) $out.='<option value="0" selected>'.$textifempty.'</option>';
 
             $i = 0;
             while ($num && $i < $num)
@@ -4518,7 +4541,7 @@ class Form
             }
         }
 
-        if ($d && $h) $retstring.='&nbsp;';
+        if ($d && $h) $retstring.=($h==2?'<br>':' ');
 
         if ($h)
         {
@@ -4685,7 +4708,7 @@ class Form
         }
         elseif ($typehour=='text')
         {
-        	$retstring.='<input type="text" size="2" name="'.$prefix.'hour"'.($disabled?' disabled':'').' class="flat" value="'.($hourSelected?((int) $hourSelected):'').'">';
+        	$retstring.='<input type="text" size="1" name="'.$prefix.'hour"'.($disabled?' disabled':'').' class="flat" value="'.($hourSelected?((int) $hourSelected):'').'">';
         }
         else return 'BadValueForParameterTypeHour';
 
@@ -4708,7 +4731,7 @@ class Form
         }
         elseif ($typehour=='text')
         {
-        	$retstring.='<input type="text" size="2" name="'.$prefix.'min"'.($disabled?' disabled':'').' class="flat" value="'.($minSelected?((int) $minSelected):'').'">';
+        	$retstring.='<input type="text" size="1" name="'.$prefix.'min"'.($disabled?' disabled':'').' class="flat" value="'.($minSelected?((int) $minSelected):'').'">';
         }
         $retstring.=' '.$langs->trans('MinuteShort');
         $retstring.="&nbsp;";
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index d009ac793a0..173aee8ce26 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -406,14 +406,14 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 				// Title of task
 				print "<td>";
 				if ($showlineingray) print '<i>';
-				else print '<a href="'.DOL_URL_ROOT.'/projet/tasks/task.php?id='.$lines[$i]->id.'&withproject=1">';
+				//else print '<a href="'.DOL_URL_ROOT.'/projet/tasks/task.php?id='.$lines[$i]->id.'&withproject=1">';
 				for ($k = 0 ; $k < $level ; $k++)
 				{
 					print "&nbsp; &nbsp; &nbsp;";
 				}
 				print $lines[$i]->label;
 				if ($showlineingray) print '</i>';
-				else print '</a>';
+				//else print '</a>';
 				print "</td>\n";
 
 				// Date start
diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php
index a6091f8ebb0..06eb19de48e 100644
--- a/htdocs/core/lib/sendings.lib.php
+++ b/htdocs/core/lib/sendings.lib.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
  */
 function shipping_prepare_head($object)
 {
-	global $langs, $conf, $user;
+	global $db, $langs, $conf, $user;
 
 	$langs->load("sendings");
 	$langs->load("deliveries");
@@ -64,7 +64,13 @@ function shipping_prepare_head($object)
 
 	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
 	{
-	    $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
+	    $objectsrc = $object;
+	    if ($object->origin == 'commande' && $object->origin_id > 0)
+	    {
+	        $objectsrc = new Commande($db);
+	        $objectsrc->fetch($object->origin_id);
+	    }
+	    $nbContact = count($objectsrc->liste_contact(-1,'internal')) + count($objectsrc->liste_contact(-1,'external'));
 	    $head[$h][0] = DOL_URL_ROOT."/expedition/contact.php?id=".$object->id;
     	$head[$h][1] = $langs->trans("ContactsAddresses");
 		if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 37b9f8a7248..fb45993f567 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -1295,7 +1295,7 @@ else if ($id || $ref)
 		$totalVolume=$tmparray['volume'];
 		
 		
-		// Warehouse card
+		// Shipment card
 		$linkback = '<a href="'.DOL_URL_ROOT.'/expedition/list.php">'.$langs->trans("BackToList").'</a>';
 		
 		$morehtmlref='<div class="refidno">';
@@ -1348,18 +1348,6 @@ else if ($id || $ref)
     	
 		print '<table class="border" width="100%">';
 
-		// Ref
-		/*
-		print '<tr><td width="20%">'.$langs->trans("Ref").'</td>';
-		print '<td colspan="3">';
-		print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref');
-		print '</td></tr>';
-
-		// Customer
-		print '<tr><td width="20%">'.$langs->trans("Customer").'</td>';
-		print '<td colspan="3">'.$soc->getNomUrl(1).'</td>';
-		print "</tr>";*/
-
 		// Linked documents
 		if ($typeobject == 'commande' && $object->$typeobject->id && ! empty($conf->commande->enabled))
 		{
diff --git a/htdocs/expedition/contact.php b/htdocs/expedition/contact.php
index 039af2cd0ec..65a44cb64f9 100644
--- a/htdocs/expedition/contact.php
+++ b/htdocs/expedition/contact.php
@@ -155,83 +155,99 @@ if ($id > 0 || ! empty($ref))
 	dol_fiche_head($head, 'contact', $langs->trans("Shipment"), 0, 'sending');
 
 
-   /*
-	*   Facture synthese pour rappel
-	*/
-	print '<table class="border" width="100%">';
-
+	// Shipment card
 	$linkback = '<a href="'.DOL_URL_ROOT.'/expedition/list.php">'.$langs->trans("BackToList").'</a>';
+	
+	$morehtmlref='<div class="refidno">';
+	// Ref customer shipment
+	$morehtmlref.=$form->editfieldkey("RefCustomer", '', $object->ref_customer, $object, $user->rights->expedition->creer, 'string', '', 0, 1);
+	$morehtmlref.=$form->editfieldval("RefCustomer", '', $object->ref_customer, $object, $user->rights->expedition->creer, 'string', '', null, null, '', 1);
+	// Thirdparty
+    $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
+    // Project
+    /*
+    if (! empty($conf->projet->enabled)) {
+        $langs->load("projects");
+        $morehtmlref .= '<br>' . $langs->trans('Project') . ' ';
+        if ($user->rights->supplier_proposal->creer) {
+            if ($action != 'classify') {
+                $morehtmlref .= '<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+            }
+            if ($action == 'classify') {
+                // $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+                $morehtmlref .= '<form method="post" action="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '">';
+                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
+                $morehtmlref .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+                $morehtmlref .= '<input type="submit" class="button" value="' . $langs->trans("Modify") . '">';
+                $morehtmlref .= '</form>';
+            } else {
+                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+            }
+        } else {
+            if (! empty($object->fk_project)) {
+                $proj = new Project($db);
+                $proj->fetch($object->fk_project);
+                $morehtmlref .= '<a href="' . DOL_URL_ROOT . '/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
+                $morehtmlref .= $proj->ref;
+                $morehtmlref .= '</a>';
+            } else {
+                $morehtmlref .= '';
+            }
+        }
+    }*/
+	$morehtmlref.='</div>';
+	
+	
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+	
+	
+	print '<div class="fichecenter">';
+    //print '<div class="fichehalfleft">';
+	print '<div class="underbanner clearboth"></div>';
 
-	// Ref
-	print '<tr><td width="18%">'.$langs->trans("Ref").'</td><td colspan="3">';
-	print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref');
-	print "</td></tr>";
+    print '<table class="border centpercent">';
 
-	// Customer
-	print '<tr><td width="20%">'.$langs->trans("Customer").'</td>';
-	print '<td colspan="3">'.$object->thirdparty->getNomUrl(1).'</td>';
-	print "</tr>";
-
-	// Linked documents
+    // Linked documents
 	if ($typeobject == 'commande' && $object->$typeobject->id && ! empty($conf->commande->enabled))
 	{
-		print '<tr><td>';
-		$objectsrc=new Commande($db);
-		$objectsrc->fetch($object->$typeobject->id);
-		print $langs->trans("RefOrder").'</td>';
-		print '<td colspan="3">';
-		print $objectsrc->getNomUrl(1,'commande');
-		print "</td>\n";
-		print '</tr>';
+	    print '<tr><td class="titlefield">';
+	    $objectsrc=new Commande($db);
+	    $objectsrc->fetch($object->$typeobject->id);
+	    print $langs->trans("RefOrder").'</td>';
+	    print '<td colspan="3">';
+	    print $objectsrc->getNomUrl(1,'commande');
+	    print "</td>\n";
+	    print '</tr>';
 	}
 	if ($typeobject == 'propal' && $object->$typeobject->id && ! empty($conf->propal->enabled))
 	{
-		print '<tr><td>';
-		$objectsrc=new Propal($db);
-		$objectsrc->fetch($object->$typeobject->id);
-		print $langs->trans("RefProposal").'</td>';
-		print '<td colspan="3">';
-		print $objectsrc->getNomUrl(1,'expedition');
-		print "</td>\n";
-		print '</tr>';
+	    print '<tr><td class="titlefield">';
+	    $objectsrc=new Propal($db);
+	    $objectsrc->fetch($object->$typeobject->id);
+	    print $langs->trans("RefProposal").'</td>';
+	    print '<td colspan="3">';
+	    print $objectsrc->getNomUrl(1,'expedition');
+	    print "</td>\n";
+	    print '</tr>';
 	}
-
-	// Ref expedition client
-	print '<tr><td>';
-    print '<table class="nobordernopadding" width="100%"><tr><td class="nowrap">';
-	print $langs->trans('RefCustomer').'</td><td align="left">';
-    print '</td>';
-    print '</tr></table>';
-    print '</td><td colspan="3">';
-	print $objectsrc->ref_client;
-	print '</td>';
-	print '</tr>';
-
-	// Delivery address
-	if (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT))
-	{
-		print '<tr><td>';
-		print '<table class="nobordernopadding" width="100%"><tr><td>';
-		print $langs->trans('DeliveryAddress');
-		print '</td>';
-
-		if ($action != 'editdelivery_address' && $object->brouillon) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdelivery_address&amp;socid='.$object->socid.'&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetDeliveryAddress'),1).'</a></td>';
-		print '</tr></table>';
-		print '</td><td colspan="3">';
-
-		if ($action == 'editdelivery_address')
-		{
-			$formother->form_address($_SERVER['PHP_SELF'].'?id='.$object->id,$object->fk_delivery_address,$object->socid,'fk_address','shipping',$object->id);
-		}
-		else
-		{
-			$formother->form_address($_SERVER['PHP_SELF'].'?id='.$object->id,$object->fk_delivery_address,$object->socid,'none','shipping',$object->id);
-		}
-		print '</td></tr>';
-	}
-
+	
 	print "</table>";
 
+	
+	//print '</div>';
+	//print '<div class="fichehalfright">';
+	//print '<div class="ficheaddleft">';
+	//print '<div class="underbanner clearboth"></div>';
+	
+	
+	//print '</div>';
+	//print '</div>';
+	print '</div>';
+		
+	print '<div class="clearboth"></div>';
+	
+	
 	dol_fiche_end();
 
 	// Lignes de contacts
diff --git a/htdocs/expedition/note.php b/htdocs/expedition/note.php
index 652b09453f7..849ec6e66bc 100644
--- a/htdocs/expedition/note.php
+++ b/htdocs/expedition/note.php
@@ -20,9 +20,9 @@
 
 /**
  *      \file       htdocs/expedition/note.php
-*      \ingroup    expedition
-*      \brief      Note card expedition
-*/
+ *      \ingroup    expedition
+ *      \brief      Note card expedition
+ */
 
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
@@ -99,65 +99,57 @@ if ($id > 0 || ! empty($ref))
 	$head=shipping_prepare_head($object);
     dol_fiche_head($head, 'note', $langs->trans("Shipment"), 0, 'sending');
 
-	print '<table class="border" width="100%">';
-
-	$linkback = '<a href="'.DOL_URL_ROOT.'/expedition/list.php">'.$langs->trans("BackToList").'</a>';
-
-	// Ref
-	print '<tr><td width="20%">'.$langs->trans("Ref").'</td>';
-	print '<td colspan="3">';
-	print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref');
-	print '</td></tr>';
-
-	// Customer
-	print '<tr><td width="20%">'.$langs->trans("Customer").'</td>';
-	print '<td colspan="3">'.$soc->getNomUrl(1).'</td>';
-	print "</tr>";
-
-	// Linked documents
-	if ($typeobject == 'commande' && $object->$typeobject->id && ! empty($conf->commande->enabled))
-	{
-		print '<tr><td>';
-		$objectsrc=new Commande($db);
-		$objectsrc->fetch($object->$typeobject->id);
-		print $langs->trans("RefOrder").'</td>';
-		print '<td colspan="3">';
-		print $objectsrc->getNomUrl(1,'commande');
-		print "</td>\n";
-		print '</tr>';
-	}
-	if ($typeobject == 'propal' && $object->$typeobject->id && ! empty($conf->propal->enabled))
-	{
-		print '<tr><td>';
-		$objectsrc=new Propal($db);
-		$objectsrc->fetch($object->$typeobject->id);
-		print $langs->trans("RefProposal").'</td>';
-		print '<td colspan="3">';
-		print $objectsrc->getNomUrl(1,'expedition');
-		print "</td>\n";
-		print '</tr>';
-	}
-
-	// Ref customer
-	print '<tr><td>'.$langs->trans("RefCustomer").'</td>';
-	print '<td colspan="3">'.$object->ref_customer."</a></td>\n";
-	print '</tr>';
-
-	// Date creation
-	print '<tr><td>'.$langs->trans("DateCreation").'</td>';
-	print '<td colspan="3">'.dol_print_date($object->date_creation,"day")."</td>\n";
-	print '</tr>';
-
-	// Delivery date planed
-	print '<tr><td>'.$langs->trans("DateDeliveryPlanned").'</td>';
-	print '<td colspan="3">'.dol_print_date($object->date_delivery,"dayhourtext")."</td>\n";
-	print '</tr>';
-
-	print '</table>';
-
-	print '<br>';
-
-	$colwidth=20;
+    
+    // Shipment card
+    $linkback = '<a href="'.DOL_URL_ROOT.'/expedition/list.php">'.$langs->trans("BackToList").'</a>';
+    
+    $morehtmlref='<div class="refidno">';
+    // Ref customer shipment
+    $morehtmlref.=$form->editfieldkey("RefCustomer", '', $object->ref_customer, $object, $user->rights->expedition->creer, 'string', '', 0, 1);
+    $morehtmlref.=$form->editfieldval("RefCustomer", '', $object->ref_customer, $object, $user->rights->expedition->creer, 'string', '', null, null, '', 1);
+    // Thirdparty
+    $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
+    // Project
+    /*
+     if (! empty($conf->projet->enabled)) {
+     $langs->load("projects");
+     $morehtmlref .= '<br>' . $langs->trans('Project') . ' ';
+     if ($user->rights->supplier_proposal->creer) {
+     if ($action != 'classify') {
+     $morehtmlref .= '<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+     }
+     if ($action == 'classify') {
+     // $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+     $morehtmlref .= '<form method="post" action="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '">';
+     $morehtmlref .= '<input type="hidden" name="action" value="classin">';
+     $morehtmlref .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+     $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+     $morehtmlref .= '<input type="submit" class="button" value="' . $langs->trans("Modify") . '">';
+     $morehtmlref .= '</form>';
+     } else {
+     $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+     }
+     } else {
+     if (! empty($object->fk_project)) {
+     $proj = new Project($db);
+     $proj->fetch($object->fk_project);
+     $morehtmlref .= '<a href="' . DOL_URL_ROOT . '/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
+     $morehtmlref .= $proj->ref;
+     $morehtmlref .= '</a>';
+     } else {
+     $morehtmlref .= '';
+     }
+     }
+     }*/
+    $morehtmlref.='</div>';
+    
+    
+    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+    
+    
+    print '<div class="underbanner clearboth"></div>';
+    
+	$cssclass='titlefield';
 	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
 	dol_fiche_end();
diff --git a/htdocs/expedition/stats/index.php b/htdocs/expedition/stats/index.php
index cc5e770d02a..a8a19582b43 100644
--- a/htdocs/expedition/stats/index.php
+++ b/htdocs/expedition/stats/index.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -234,7 +234,8 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 	// Show filter box
 	print '<form name="stats" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 	print '<input type="hidden" name="mode" value="'.$mode.'">';
-	print '<table class="border" width="100%">';
+
+	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
 	// Company
 	print '<tr><td align="left">'.$langs->trans("ThirdParty").'</td><td align="left">';
@@ -259,8 +260,8 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 	print '<br><br>';
 //}
 
-print '<table class="border" width="100%">';
-print '<tr height="24">';
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre" height="24">';
 print '<td align="center">'.$langs->trans("Year").'</td>';
 print '<td align="center">'.$langs->trans("NbOfSendings").'</td>';
 /*print '<td align="center">'.$langs->trans("AmountTotal").'</td>';
@@ -268,13 +269,16 @@ print '<td align="center">'.$langs->trans("AmountAverage").'</td>';*/
 print '</tr>';
 
 $oldyear=0;
+$var=true;
 foreach ($data as $val)
 {
 	$year = $val['year'];
 	while (! empty($year) && $oldyear > $year+1)
 	{ // If we have empty year
 		$oldyear--;
-		print '<tr height="24">';
+		
+		$var=!$var;
+		print '<tr '.$bc[$var].' height="24">';
 		print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'&amp;mode='.$mode.'">'.$oldyear.'</a></td>';
 	
 		print '<td align="right">0</td>';
@@ -283,7 +287,8 @@ foreach ($data as $val)
 		print '</tr>';
 	}
 
-	print '<tr height="24">';
+	$var=!$var;
+	print '<tr '.$bc[$var].' height="24">';
 	print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&amp;mode='.$mode.'">'.$year.'</a></td>';
 	print '<td align="right">'.$val['nb'].'</td>';
 	/*print '<td align="right">'.price(price2num($val['total'],'MT'),1).'</td>';
diff --git a/htdocs/ftp/admin/ftpclient.php b/htdocs/ftp/admin/ftpclient.php
index 6f71e964321..01ada4f3185 100644
--- a/htdocs/ftp/admin/ftpclient.php
+++ b/htdocs/ftp/admin/ftpclient.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2011 	   Juanjo Menent		<jmenent@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -37,7 +37,12 @@ $lastftpentry=0;
 $action = GETPOST('action','alpha');
 $entry = GETPOST('numero_entry','alpha');
 
-// Positionne la variable pour le nombre de rss externes
+
+/*
+ * Action
+ */
+
+// Get value for $lastftpentry
 $sql ="select MAX(name) as name from ".MAIN_DB_PREFIX."const";
 $sql.=" WHERE name like 'FTP_SERVER_%'";
 $result=$db->query($sql);
@@ -210,8 +215,6 @@ else
 
 	<?php
 
-	print '<table class="noborder" width="100%">'."\n";
-
 	$sql ="select name, value, note from ".MAIN_DB_PREFIX."const";
 	$sql.=" WHERE name like 'FTP_SERVER_%'";
 	$sql.=" ORDER BY name";
@@ -235,9 +238,13 @@ else
 
 			print "<form name=\"externalrssconfig\" action=\"".$_SERVER["PHP_SELF"]."\" method=\"post\">";
 			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+			print '<input type="hidden" name="numero_entry" value="'.$idrss.'">';
+			
+			print '<table class="noborder" width="100%">'."\n";
 
-			print "<tr class=\"liste_titre\">";
-			print "<td colspan=\"2\">".$langs->trans("FTP")." ".($idrss)."</td>";
+			print '<tr class="liste_titre">';
+			print '<td class="fieldtitle">'.$langs->trans("FTP")." ".($idrss)."</td>";
+			print '<td></td>';
 			print "</tr>";
 
 			$var=!$var;
@@ -281,12 +288,14 @@ else
 			print "<input type=\"submit\" class=\"button\" name=\"modify\" value=\"".$langs->trans("Modify")."\">";
 			print " &nbsp; ";
 			print "<input type=\"submit\" class=\"button\" name=\"delete\" value=\"".$langs->trans("Delete")."\">";
-			print "<input type=\"hidden\" name=\"numero_entry\"  value=\"".$idrss."\">";
 			print "</td>";
 			print "</tr>";
 
+			print '</table>';
+			
 			print "</form>";
-
+			print '<br>';
+			
 			$i++;
 		}
 	}
@@ -294,9 +303,6 @@ else
 	{
 		dol_print_error($db);
 	}
-
-	print '</table>';
-
 }
 
 llxFooter();
diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php
index b3dc15125a5..4658e9d09ec 100644
--- a/htdocs/ftp/index.php
+++ b/htdocs/ftp/index.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2008-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2008-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2008-2009 Regis Houssin        <regis.houssin@capnetworks.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -20,7 +20,6 @@
  *	\file       htdocs/ftp/index.php
  *	\ingroup    ftp
  *	\brief      Main page for FTP section area
- *	\author		Laurent Destailleur
  */
 
 require('../main.inc.php');
@@ -418,7 +417,6 @@ else
 		if ($action == 'delete_section')
 		{
 			print $form->formconfirm($_SERVER["PHP_SELF"].'?numero_ftp='.$numero_ftp.'&section='.urlencode($_REQUEST["section"]).'&file='.urlencode($_GET["file"]), $langs->trans('DeleteSection'), $langs->trans('ConfirmDeleteSection',$ecmdir->label), 'confirm_deletesection','','',1);
-			
 		}
 
 		print $langs->trans("Server").': <b>'.$ftp_server.'</b><br>';
@@ -646,8 +644,21 @@ else
 	}
 	else
 	{
-	    $s_ftp_server='FTP_SERVER_1';
-	    if (empty($s_ftp_server))
+		$foundsetup=false;
+		$MAXFTP=20;
+		$i=1;
+		while ($i <= $MAXFTP)
+		{
+			$paramkey='FTP_NAME_'.$i;
+			//print $paramkey;
+			if (! empty($conf->global->$paramkey))
+			{
+				$foundsetup=true;
+				break;
+			}
+			$i++;
+		}		
+	    if (! $foundsetup)
 	    {
             print $langs->trans("SetupOfFTPClientModuleNotComplete");
 	    }
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index ca53bc971a9..ad8f09205b7 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -58,8 +58,8 @@ ErrorCodeCantContainZero=Code can't contain value 0
 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
 UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
-DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties, but it is less convenient)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact, but it is less convenient)
 NumberOfKeyToSearch=Nbr of characters to trigger search: %s
 NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
 AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
@@ -1320,7 +1320,7 @@ ViewProductDescInFormAbility=Visualization of product descriptions in the forms
 MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
 ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
+UseSearchToSelectProduct=Wait you press a key before loading content of product combo list (This may increase performance if you have a large number of products, but it is less convenient)
 SetDefaultBarcodeTypeProducts=Default barcode type to use for products
 SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
 UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php
index 14a5219d31c..2675e3c95b0 100644
--- a/htdocs/margin/agentMargins.php
+++ b/htdocs/margin/agentMargins.php
@@ -94,7 +94,7 @@ dol_fiche_head($head, 'agentMargins', $titre, 0, $picto);
 print '<table class="border" width="100%">';
 
 print '<tr><td class="titlefield">'.$langs->trans('SalesRepresentative').'</td>';
-print '<td colspan="4">';
+print '<td class="maxwidthonsmartphone" colspan="4">';
 print $form->select_dolusers($agentid, 'agentid', 1, '', $user->rights->margins->read->all ? 0 : 1, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
 print '</td></tr>';
 
diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
index 54b83aca42c..34463db14e2 100644
--- a/htdocs/margin/customerMargins.php
+++ b/htdocs/margin/customerMargins.php
@@ -90,7 +90,7 @@ if ($socid > 0) {
 	if ($soc->client)
 	{
 		print '<tr><td class="titlefield">'.$langs->trans('ThirdPartyName').'</td>';
-		print '<td colspan="4">';
+		print '<td class="maxwidthonsmartphone" colspan="4">';
 		print $form->select_company($socid, 'socid', 'client=1 OR client=3', 1, 0, 0);
 		//$form->form_thirdparty($_SERVER['PHP_SELF'].'?socid='.$socid,$socid,'socid','client=1 OR client=3',1,0,1);
 		print '</td></tr>';
@@ -102,7 +102,7 @@ if ($socid > 0) {
 }
 else {
 	print '<tr><td class="titlefield">'.$langs->trans('ThirdPartyName').'</td>';
-	print '<td colspan="4">';
+	print '<td class="maxwidthonsmartphone" colspan="4">';
 	print $form->select_company(null, 'socid', 'client=1 OR client=3', 1, 0, 0);
 	//$form->form_thirdparty($_SERVER['PHP_SELF'],null,'socid','client=1 OR client=3',1,0,1);
 	print '</td></tr>';
diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php
index 7a2ac98a5f8..24150a1050c 100644
--- a/htdocs/margin/productMargins.php
+++ b/htdocs/margin/productMargins.php
@@ -105,20 +105,17 @@ print '<table class="border" width="100%">';
 if ($id > 0) {
 
   print '<tr><td class="titlefield">'.$langs->trans('ChooseProduct/Service').'</td>';
-  print '<td colspan="4">';
-  print $form->select_produits($id,'id','',20,0,1,2,'',1);
+  print '<td class="maxwidthonsmartpone" colspan="4">';
+  print $form->select_produits($id,'id','',20,0,1,2,'',1, array(), 0, 'All');
   print '</td></tr>';
 
-  print '<tr><td>'.$langs->trans('AllProducts').'</td>';
-  print '<td colspan="4"><input type="checkbox" id="all" /></td></tr>';
-
   if (! $sortorder) $sortorder="DESC";
   if (! $sortfield) $sortfield="f.datef";
 }
 else {
 	print '<tr><td class="titlefield">'.$langs->trans('ChooseProduct/Service').'</td>';
-	print '<td colspan="4">';
-	print $form->select_produits('','id','',20,0,1,2,'',1);
+	print '<td class="maxwidthonsmartphone" colspan="4">';
+	print $form->select_produits('','id','',20,0,1,2,'',1, array(), 0, 'All');
 	print '</td></tr>';
 
 }
@@ -339,10 +336,6 @@ print '
 <script type="text/javascript">
 $(document).ready(function() {
 
-  $("#all").change(function() {
-    $("#id").val(\'\').change();
-  });
-
   $("#id").change(function() {
      $("div.fiche form").submit();
   });
diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index d1fe225ba0e..8ae04e61c91 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -105,7 +105,7 @@ class FormProduct
 		
 		if(!empty($exclude)) $sql.= ' AND e.rowid NOT IN('.implode(',', $exclude).')';
 		
-		if ($sumStock && empty($fk_product)) $sql.= " GROUP BY e.rowid, e.label, e.description";
+		if ($sumStock && empty($fk_product)) $sql.= " GROUP BY e.rowid, e.label, e.description, e.fk_parent";
 		$sql.= " ORDER BY e.label";
 
 		dol_syslog(get_class($this).'::loadWarehouses', LOG_DEBUG);
diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php
index e1644c241e5..230a3dbee23 100644
--- a/htdocs/product/composition/card.php
+++ b/htdocs/product/composition/card.php
@@ -205,14 +205,18 @@ if ($id > 0 || ! empty($ref))
 	{
         $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
 	    
-        dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref');
+        dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref', '', '', '', 0, '', '', 1);
 		
-		print '<table class="noborder tableforfield" width="100%">';
-
+        if ($object->type!=Product::TYPE_SERVICE || empty($conf->global->PRODUIT_MULTIPRICES))
+        {
+    	    print '<div class="underbanner clearboth"></div>';	
+            print '<table class="border tableforfield" width="100%">';
+        }
+        
 		// Nature
-		if($object->type!=Product::TYPE_SERVICE)
+		if ($object->type!=Product::TYPE_SERVICE)
 		{
-			print '<tr><td>'.$langs->trans("Nature").'</td><td colspan="2">';
+			print '<tr><td>'.$langs->trans("Nature").'</td><td>';
 			print $object->getLibFinished();
 			print '</td></tr>';
 		}
@@ -244,7 +248,10 @@ if ($id > 0 || ! empty($ref))
 			print '</td></tr>';
 		}
 
-		print '</table>';
+        if ($object->type!=Product::TYPE_SERVICE || empty($conf->global->PRODUIT_MULTIPRICES))
+        {
+		  print '</table>';
+        }
 
 		dol_fiche_end();
 
diff --git a/htdocs/product/stats/card.php b/htdocs/product/stats/card.php
index ebb28b48287..3f92cd11b18 100644
--- a/htdocs/product/stats/card.php
+++ b/htdocs/product/stats/card.php
@@ -124,7 +124,7 @@ if (! empty($id) || ! empty($ref) || GETPOST('id') == 'all')
 
 		$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
 		
-        dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref');
+        dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref', '', '', '', 0, '', '', 1);
         
 		dol_fiche_end();
 	}
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 5adff357db1..f1097b331b9 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -191,7 +191,7 @@ if ($action == 'create')
 	print '<table class="border" width="100%">';
 
 	// Ref
-	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Ref").'</td><td colspan="3"><input name="libelle" size="20" value=""></td></tr>';
+	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Ref").'</td><td><input name="libelle" size="20" value=""></td></tr>';
 
 	print '<tr><td >'.$langs->trans("LocationSummary").'</td><td colspan="3"><input name="lieu" size="40" value="'.(!empty($object->lieu)?$object->lieu:'').'"></td></tr>';
 		
@@ -201,31 +201,32 @@ if ($action == 'create')
 	print '</td></tr>';
 
 	// Description
-	print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td colspan="3">';
+	print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>';
 	// Editeur wysiwyg
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 	$doleditor=new DolEditor('desc',(!empty($object->description)?$object->description:''),'',180,'dolibarr_notes','In',false,true,$conf->fckeditor->enabled,5,70);
 	$doleditor->Create();
 	print '</td></tr>';
 
-	print '<tr><td>'.$langs->trans('Address').'</td><td colspan="3"><textarea name="address" class="quatrevingtpercent" rows="3" wrap="soft">';
+	print '<tr><td>'.$langs->trans('Address').'</td><td><textarea name="address" class="quatrevingtpercent" rows="3" wrap="soft">';
 	print (!empty($object->address)?$object->address:'');
 	print '</textarea></td></tr>';
 
 	// Zip / Town
 	print '<tr><td>'.$langs->trans('Zip').'</td><td>';
 	print $formcompany->select_ziptown((!empty($object->zip)?$object->zip:''),'zipcode',array('town','selectcountry_id','state_id'),6);
-	print '</td><td>'.$langs->trans('Town').'</td><td>';
+	print '</td></tr>';
+	print '<tr><td>'.$langs->trans('Town').'</td><td>';
 	print $formcompany->select_ziptown((!empty($object->town)?$object->town:''),'town',array('zipcode','selectcountry_id','state_id'));
 	print '</td></tr>';
 
 	// Country
-	print '<tr><td>'.$langs->trans('Country').'</td><td colspan="3">';
+	print '<tr><td>'.$langs->trans('Country').'</td><td>';
 	print $form->select_country((!empty($object->country_id)?$object->country_id:$mysoc->country_code),'country_id');
 	if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
 	print '</td></tr>';
 	// Status
-	print '<tr><td>'.$langs->trans("Status").'</td><td colspan="3">';
+	print '<tr><td>'.$langs->trans("Status").'</td><td>';
 	print '<select name="statut" class="flat">';
 	foreach ($object->statuts as $key => $value)
 	{
@@ -295,51 +296,12 @@ else
 			// Warehouse card
 			$linkback = '<a href="'.DOL_URL_ROOT.'/product/stock/list.php">'.$langs->trans("BackToList").'</a>';
 			
-
 			$morehtmlref='<div class="refidno">';
 			$morehtmlref.=$langs->trans("LocationSummary").' : '.$object->lieu;
-            /*
-			// Ref supplier
-        	//$morehtmlref.=$form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->fournisseur->commande->creer, 'string', '', 0, 1);
-        	//$morehtmlref.=$form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->fournisseur->commande->creer, 'string', '', null, null, '', 1);
-        	// Thirdparty
-        	//$morehtmlref.=$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
-        	// Project
-        	if (! empty($conf->projet->enabled))
-        	{
-        	    $langs->load("projects");
-        	    $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
-        	    if ($user->rights->supplier_proposal->creer)
-        	    {
-        	        if ($action != 'classify')
-        	            $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-        	            if ($action == 'classify') {
-        	                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-        	                $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-        	                $morehtmlref.='<input type="hidden" name="action" value="classin">';
-        	                $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-        	                $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-        	                $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-        	                $morehtmlref.='</form>';
-        	            } else {
-        	                $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-        	            }
-        	    } else {
-        	        if (! empty($object->fk_project)) {
-        	            $proj = new Project($db);
-        	            $proj->fetch($object->fk_project);
-        	            $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-        	            $morehtmlref.=$proj->ref;
-        	            $morehtmlref.='</a>';
-        	        } else {
-        	            $morehtmlref.='';
-        	        }
-        	    }
-        	}*/
         	$morehtmlref.='</div>';
         	
         	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'libelle', $morehtmlref);
-        	
+        	 
         	
         	print '<div class="fichecenter">';
         	print '<div class="fichehalfleft">';
@@ -347,15 +309,6 @@ else
         	
         	print '<table class="border" width="100%">';
 
-
-			// Ref
-			/*
-			print '<tr><td width="25%">'.$langs->trans("Ref").'</td><td colspan="3">';
-			print $form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'libelle');
-			print '</td>';*/
-
-			//print '<tr><td>'.$langs->trans("LocationSummary").'</td><td colspan="3">'.$object->lieu.'</td></tr>';
-
 			// Parent entrepot
 			$e = new Entrepot($db);
 			if(!empty($object->fk_parent) && $e->fetch($object->fk_parent) > 0) {
@@ -367,30 +320,7 @@ else
 			}
 
 			// Description
-			print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>'.nl2br($object->description).'</td></tr>';
-
-			// Address
-			/*
-			print '<tr><td>'.$langs->trans('Address').'</td><td>';
-			print $object->address;
-			print '</td></tr>';
-
-			// Town
-			print '<tr><td>'.$langs->trans('Zip').'</td><td>'.$object->zip.'</td></tr>';
-			print '<tr><td>'.$langs->trans('Town').'</td><td>'.$object->town.'</td></tr>';
-
-			// Country
-			print '<tr><td>'.$langs->trans('Country').'</td><td>';
-			if (! empty($object->country_code))
-			{
-				$img=picto_from_langcode($object->country_code);
-				print ($img?$img.' ':'');
-			}
-			print $object->country;
-			print '</td></tr>';*/
-
-			// Status
-			//print '<tr><td>'.$langs->trans("Status").'</td><td colspan="3">'.$object->getLibStatut(4).'</td></tr>';
+			print '<tr><td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>'.nl2br($object->description).'</td></tr>';
 
 			$calcproductsunique=$object->nb_different_products();
 			$calcproducts=$object->nb_products();
@@ -415,7 +345,7 @@ else
 			print '<table class="border centpercent">';
 				
 			// Value
-			print '<tr><td>'.$langs->trans("EstimatedStockValueShort").'</td><td>';
+			print '<tr><td class="titlefield">'.$langs->trans("EstimatedStockValueShort").'</td><td>';
 			print price((empty($calcproducts['value'])?'0':price2num($calcproducts['value'],'MT')), 0, $langs, 0, -1, -1, $conf->currency);
 			print "</td></tr>";
 			
diff --git a/htdocs/product/stock/info.php b/htdocs/product/stock/info.php
index f9c5e163f4d..7f6a9f6031b 100644
--- a/htdocs/product/stock/info.php
+++ b/htdocs/product/stock/info.php
@@ -39,18 +39,30 @@ $result=restrictedArea($user,'stock');
 $help_url='EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
 llxHeader("",$langs->trans("Stocks"),$help_url);
 
-$entrepot = new Entrepot($db);
-$entrepot->fetch($_GET["id"]);
-$entrepot->info($_GET["id"]);
+$object = new Entrepot($db);
+$object->fetch($_GET["id"]);
+$object->info($_GET["id"]);
 
-$head = stock_prepare_head($entrepot);
+$head = stock_prepare_head($object);
 
 dol_fiche_head($head, 'info', $langs->trans("Warehouse"), 0, 'stock');
 
 
-print '<table width="100%"><tr><td>';
-dol_print_object_info($entrepot);
-print '</td></tr></table>';
+$linkback = '<a href="'.DOL_URL_ROOT.'/product/stock/list.php">'.$langs->trans("BackToList").'</a>';
+
+$morehtmlref='<div class="refidno">';
+$morehtmlref.=$langs->trans("LocationSummary").' : '.$object->lieu;
+$morehtmlref.='</div>';
+
+dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'libelle', $morehtmlref);
+
+ 
+print '<div class="fichecenter">';
+print '<div class="underbanner clearboth"></div>';
+
+print '<br>';
+
+dol_print_object_info($object);
 
 print '</div>';
 
diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php
index 49b27e0fc74..2e7c470639c 100644
--- a/htdocs/product/stock/mouvement.php
+++ b/htdocs/product/stock/mouvement.php
@@ -410,8 +410,8 @@ if ($resql)
 
     if ($id > 0)
     {
-        $entrepot = new Entrepot($db);
-        $result = $entrepot->fetch($id);
+        $object = new Entrepot($db);
+        $result = $object->fetch($id);
         if ($result < 0)
         {
             dol_print_error($db);
@@ -430,69 +430,60 @@ if ($resql)
      */
     if ($id)
     {
-        $head = stock_prepare_head($entrepot);
+        $head = stock_prepare_head($object);
 
         dol_fiche_head($head, 'movements', $langs->trans("Warehouse"), 0, 'stock');
 
-
+        
+        $linkback = '<a href="'.DOL_URL_ROOT.'/product/stock/list.php">'.$langs->trans("BackToList").'</a>';
+        
+        $morehtmlref='<div class="refidno">';
+        $morehtmlref.=$langs->trans("LocationSummary").' : '.$object->lieu;
+        $morehtmlref.='</div>';
+        
+        dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'libelle', $morehtmlref);
+        
+         
+        print '<div class="fichecenter">';
+        print '<div class="fichehalfleft">';
+        print '<div class="underbanner clearboth"></div>';
+         
         print '<table class="border" width="100%">';
 
-        $linkback = '<a href="'.DOL_URL_ROOT.'/product/stock/list.php">'.$langs->trans("BackToList").'</a>';
-
-        // Ref
-        print '<tr><td width="25%">'.$langs->trans("Ref").'</td><td colspan="3">';
-        print $form->showrefnav($entrepot, 'id', $linkback, 1, 'rowid', 'libelle');
-        print '</td>';
-
-        print '<tr><td>'.$langs->trans("LocationSummary").'</td><td colspan="3">'.$entrepot->lieu.'</td></tr>';
-
         // Description
-        print '<tr><td valign="top">'.$langs->trans("Description").'</td><td colspan="3">'.dol_htmlentitiesbr($entrepot->description).'</td></tr>';
+        print '<tr><td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>'.dol_htmlentitiesbr($object->description).'</td></tr>';
 
-        // Address
-        print '<tr><td>'.$langs->trans('Address').'</td><td colspan="3">';
-        print $entrepot->address;
-        print '</td></tr>';
-
-        // Town
-        print '<tr><td width="25%">'.$langs->trans('Zip').'</td><td width="25%">'.$entrepot->zip.'</td>';
-        print '<td width="25%">'.$langs->trans('Town').'</td><td width="25%">'.$entrepot->town.'</td></tr>';
-
-        // Country
-        print '<tr><td>'.$langs->trans('Country').'</td><td colspan="3">';
-        if (! empty($entrepot->country_code))
-        {
-        	$img=picto_from_langcode($entrepot->country_code);
-        	print ($img?$img.' ':'');
-        	print $entrepot->country;
-        }
-        print '</td></tr>';
-
-        // Status
-        print '<tr><td>'.$langs->trans("Status").'</td><td colspan="3">'.$entrepot->getLibStatut(4).'</td></tr>';
-
-        $calcproductsunique=$entrepot->nb_different_products();
-        $calcproducts=$entrepot->nb_products();
+        $calcproductsunique=$object->nb_different_products();
+        $calcproducts=$object->nb_products();
 
         // Total nb of different products
-        print '<tr><td valign="top">'.$langs->trans("NumberOfDifferentProducts").'</td><td colspan="3">';
+        print '<tr><td>'.$langs->trans("NumberOfDifferentProducts").'</td><td>';
         print empty($calcproductsunique['nb'])?'0':$calcproductsunique['nb'];
         print "</td></tr>";
 
         // Nb of products
-        print '<tr><td valign="top">'.$langs->trans("NumberOfProducts").'</td><td colspan="3">';
+        print '<tr><td>'.$langs->trans("NumberOfProducts").'</td><td>';
         print empty($calcproducts['nb'])?'0':$calcproducts['nb'];
         print "</td></tr>";
 
+        print '</table>';
+        	
+        print '</div>';
+        print '<div class="fichehalfright">';
+        print '<div class="ficheaddleft">';
+        print '<div class="underbanner clearboth"></div>';
+        	
+        print '<table class="border centpercent">';
+        
         // Value
-        print '<tr><td valign="top">'.$langs->trans("EstimatedStockValueShort").'</td><td colspan="3">';
+        print '<tr><td class="titlefield">'.$langs->trans("EstimatedStockValueShort").'</td><td>';
         print price((empty($calcproducts['value'])?'0':price2num($calcproducts['value'],'MT')), 0, $langs, 0, -1, -1, $conf->currency);
         print "</td></tr>";
 
         // Last movement
         $sql = "SELECT MAX(m.datem) as datem";
         $sql .= " FROM ".MAIN_DB_PREFIX."stock_mouvement as m";
-        $sql .= " WHERE m.fk_entrepot = '".$entrepot->id."'";
+        $sql .= " WHERE m.fk_entrepot = '".$object->id."'";
         $resqlbis = $db->query($sql);
         if ($resqlbis)
         {
@@ -504,7 +495,7 @@ if ($resql)
             dol_print_error($db);
         }
 
-        print '<tr><td valign="top">'.$langs->trans("LastMovement").'</td><td colspan="3">';
+        print '<tr><td>'.$langs->trans("LastMovement").'</td><td>';
         if ($lastmovementdate)
         {
             print dol_print_date($lastmovementdate,'dayhour');
@@ -517,6 +508,12 @@ if ($resql)
 
         print "</table>";
 
+        print '</div>';
+        print '</div>';
+        print '</div>';
+        	
+        print '<div class="clearboth"></div>';
+        
         dol_fiche_end();
     }
 
@@ -526,7 +523,6 @@ if ($resql)
 	 */
 	if ($action == "correction")
 	{
-		if ($id) $object=$entrepot;
 		include DOL_DOCUMENT_ROOT.'/product/stock/tpl/stockcorrection.tpl.php';
 		print '<br>';
 	}
@@ -536,7 +532,6 @@ if ($resql)
 	 */
 	if ($action == "transfert")
 	{
-		if ($id) $object=$entrepot;
 		include DOL_DOCUMENT_ROOT.'/product/stock/tpl/stocktransfer.tpl.php';
 		print '<br>';
 	}
@@ -651,7 +646,7 @@ if ($resql)
     // Warehouse
     if (! $id > 0) 
     {
-        print '<td class="liste_titre" align="left">';
+        print '<td class="liste_titre maxwidthonsmartphone" align="left">';
         //print '<input class="flat" type="text" size="8" name="search_warehouse" value="'.($search_warehouse).'">';
         print $formproduct->selectWarehouses($search_warehouse, 'search_warehouse', '', 1);
         print '</td>';
diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index 3a9b601c2ec..a9b2dc57b1b 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -438,11 +438,15 @@ print '<input type="hidden" name="sref" value="'.$sref.'">';
 print '<input type="hidden" name="snom" value="'.$snom.'">';
 print '<input type="hidden" name="salert" value="'.$salert.'">';
 print '<input type="hidden" name="mode" value="'.$mode.'">';
-print $langs->trans('Warehouse').' : '.$formproduct->selectWarehouses($fk_entrepot, 'fk_entrepot', '', 1);
-print '<br />';
-print $langs->trans('Supplier').' : '.$form->select_company($fk_supplier, 'fk_supplier', 'fournisseur=1', 1);
-print '<br />';
-print ' <input class="button" type="submit" name="valid" value="'.$langs->trans('ToFilter').'">';
+print '<div class="inline-block valignmiddle" style="padding-right: 20px;">';
+print $langs->trans('Warehouse').' '.$formproduct->selectWarehouses($fk_entrepot, 'fk_entrepot', '', 1);
+print '</div>';
+print '<div class="inline-block valignmiddle" style="padding-right: 20px;">';
+print $langs->trans('Supplier').' '.$form->select_company($fk_supplier, 'fk_supplier', 'fournisseur=1', 1);
+print '</div>';
+print '<div class="inline-block valignmiddle">';
+print '<input class="button" type="submit" name="valid" value="'.$langs->trans('ToFilter').'">';
+print '</div>';
 print '</form>';
 
 if ($sref || $snom || $sall || $salert || GETPOST('search', 'alpha')) {
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 8f1d77b7b6c..f4c5d871fc6 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -494,7 +494,7 @@ if ($action == 'create' && $user->rights->projet->creer)
     // Thirdparty
     if ($conf->societe->enabled)
     {
-        print '<tr><td>'.$langs->trans("ThirdParty").'</td><td>';
+        print '<tr><td>'.$langs->trans("ThirdParty").'</td><td class="maxwidthonsmartphone">';
         $filteronlist='';
         if (! empty($conf->global->PROJECT_FILTER_FOR_THIRDPARTY_LIST)) $filteronlist=$conf->global->PROJECT_FILTER_FOR_THIRDPARTY_LIST;
        	$text=$form->select_thirdparty_list(GETPOST('socid','int'), 'socid', $filteronlist, 'SelectThirdParty', 1, 0, array(), '', 0, 0, 'minwidth300');
@@ -517,8 +517,8 @@ if ($action == 'create' && $user->rights->projet->creer)
 	    print '</td></tr>';
     }
 
-    // Public
-    print '<tr><td>'.$langs->trans("Visibility").'</td><td>';
+    // Visibility
+    print '<tr><td>'.$langs->trans("Visibility").'</td><td class="maxwidthonsmartphone">';
     $array=array();
     if (empty($conf->global->PROJECT_DISABLE_PRIVATE_PROJECT)) $array[0] = $langs->trans("PrivateProject");
     if (empty($conf->global->PROJECT_DISABLE_PUBLIC_PROJECT)) $array[1] = $langs->trans("SharedProject");
@@ -539,13 +539,13 @@ if ($action == 'create' && $user->rights->projet->creer)
     {
 	    // Opportunity status
 	    print '<tr><td>'.$langs->trans("OpportunityStatus").'</td>';
-	    print '<td>';
+	    print '<td class="maxwidthonsmartphone">';
 	    print $formproject->selectOpportunityStatus('opp_status', GETPOST('opp_status')?GETPOST('opp_status'):$object->opp_status);
 	    print '</tr>';
 
 	    // Opportunity probability
 	    print '<tr><td>'.$langs->trans("OpportunityProbability").'</td>';
-	    print '<td><input size="5" type="text" id="opp_percent" name="opp_percent" value="'.(GETPOST('opp_percent')!=''?price(GETPOST('opp_percent')):'').'"> %';
+	    print '<td><input size="5" type="text" id="opp_percent" name="opp_percent" value="'.(GETPOST('opp_percent')!=''?price(GETPOST('opp_percent')):'').'"><span class="hideonsmartphone"> %</span>';
 	    print '<input type="hidden" name="opp_percent_not_set" id="opp_percent_not_set" value="'.(GETPOST('opp_percent')!=''?'0':'1').'">';
 	    print '</td>';
 	    print '</tr>';
diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php
index c4f1f7df615..d5768c355a2 100644
--- a/htdocs/projet/document.php
+++ b/htdocs/projet/document.php
@@ -137,8 +137,8 @@ if ($object->id > 0)
 	print '<table class="border" width="100%">';
 
 	// Files infos
-	print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
+	print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td>'.count($filearray).'</td></tr>';
+	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td>'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
 
 	print "</table>\n";
 	
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 1041f95640a..276fc1cd722 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -510,7 +510,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 			print '<table class="noborder nohover" width="100%">';
 
 			print '<tr class="liste_titre">';
-			print '<td width="100">'.$langs->trans("Date").'</td>';
+			print '<td>'.$langs->trans("Date").'</td>';
 			print '<td>'.$langs->trans("By").'</td>';
 			print '<td>'.$langs->trans("Note").'</td>';
 			print '<td>'.$langs->trans("ProgressDeclared").'</td>';
@@ -520,20 +520,20 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 			print '<tr '.$bc[false].'>';
 
 			// Date
-			print '<td class="nowrap">';
+			print '<td class="maxwidthonsmartphone">';
 			//$newdate=dol_mktime(12,0,0,$_POST["timemonth"],$_POST["timeday"],$_POST["timeyear"]);
 			$newdate='';
-			print $form->select_date($newdate,'time',1,1,2,"timespent_date",1,0,1);
+			print $form->select_date($newdate, 'time', ($conf->browser->layout == 'phone'?2:1), 1, 2, "timespent_date", 1, 0, 1);
 			print '</td>';
 
 			// Contributor
-			print '<td class="nowrap">';
+			print '<td class="maxwidthonsmartphone">';
 			print img_object('','user','class="hideonsmartphone"');
 			$contactsoftask=$object->getListContactId('internal');
 			if (count($contactsoftask)>0)
 			{
 				$userid=$contactsoftask[0];
-				print $form->select_dolusers((GETPOST('userid')?GETPOST('userid'):$userid), 'userid', 0, '', 0, '', $contactsoftask, 0, 0, 0, '', 0, $langs->trans("ResourceNotAssignedToTheTask"));
+				print $form->select_dolusers((GETPOST('userid')?GETPOST('userid'):$userid), 'userid', 0, '', 0, '', $contactsoftask, 0, 0, 0, '', 0, $langs->trans("ResourceNotAssignedToTheTask"), 'maxwidth200');
 			}
 			else
 			{
@@ -542,8 +542,8 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 			print '</td>';
 
 			// Note
-			print '<td class="nowrap">';
-			print '<textarea name="timespent_note" width="95%" rows="'.ROWS_2.'">'.($_POST['timespent_note']?$_POST['timespent_note']:'').'</textarea>';
+			print '<td>';
+			print '<textarea name="timespent_note" class="maxwidth100onsmartphone" rows="'.ROWS_2.'">'.($_POST['timespent_note']?$_POST['timespent_note']:'').'</textarea>';
 			print '</td>';
 
 			// Progress declared
@@ -582,7 +582,8 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 	    $arrayfields['t.task_date']=array('label'=>$langs->trans("Date"), 'checked'=>1);
 		if ((empty($id) && empty($ref)) || ! empty($projectidforalltimes))   // Not a dedicated task
 	    {
-    	    $arrayfields['t.task_ref']=array('label'=>$langs->trans("Task"), 'checked'=>1);
+    	    $arrayfields['t.task_ref']=array('label'=>$langs->trans("RefTask"), 'checked'=>1);
+    	    $arrayfields['t.task_label']=array('label'=>$langs->trans("LabelTask"), 'checked'=>1);
 	    }
 	    $arrayfields['author']=array('label'=>$langs->trans("By"), 'checked'=>1);
 	    $arrayfields['t.note']=array('label'=>$langs->trans("Note"), 'checked'=>1);
@@ -710,6 +711,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 		if ((empty($id) && empty($ref)) || ! empty($projectidforalltimes))   // Not a dedicated task
         {
             if (! empty($arrayfields['t.task_ref']['checked'])) print_liste_field_titre($arrayfields['t.task_ref']['label'],$_SERVER['PHP_SELF'],'pt.ref','',$params,'',$sortfield,$sortorder);            
+            if (! empty($arrayfields['t.task_label']['checked'])) print_liste_field_titre($arrayfields['t.task_label']['label'],$_SERVER['PHP_SELF'],'pt.label','',$params,'',$sortfield,$sortorder);            
         }
         if (! empty($arrayfields['author']['checked'])) print_liste_field_titre($arrayfields['author']['label'],$_SERVER['PHP_SELF'],'','',$params,'',$sortfield,$sortorder);
 		if (! empty($arrayfields['t.note']['checked'])) print_liste_field_titre($arrayfields['t.note']['label'],$_SERVER['PHP_SELF'],'t.note','',$params,'',$sortfield,$sortorder);
@@ -742,9 +744,10 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 		if ((empty($id) && empty($ref)) || ! empty($projectidforalltimes))   // Not a dedicated task
         {
             if (! empty($arrayfields['t.task_ref']['checked'])) print '<td class="liste_titre"></td>';
+            if (! empty($arrayfields['t.task_label']['checked'])) print '<td class="liste_titre"></td>';
         }
         if (! empty($arrayfields['author']['checked'])) print '<td class="liste_titre"></td>';
-		if (! empty($arrayfields['t.note']['checked'])) print '<td class="liste_titre"><input type="text" class="flat" name="search_note" value="'.$search_note.'" size="10"></td>';
+		if (! empty($arrayfields['t.note']['checked'])) print '<td class="liste_titre"><input type="text" class="flat" name="search_note" value="'.$search_note.'"></td>';
 		if (! empty($arrayfields['t.task_duration']['checked'])) print '<td class="liste_titre right"></td>';
 		if (! empty($arrayfields['value']['checked'])) print '<td class="liste_titre"></td>';
 		// Extra fields
@@ -812,7 +815,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
     			if (! $i) $totalarray['nbfield']++;
 			}
 
-			// Task
+			// Task ref
             if (! empty($arrayfields['t.task_ref']['checked']))
             {
         		if ((empty($id) && empty($ref)) || ! empty($projectidforalltimes))   // Not a dedicated task
@@ -827,7 +830,19 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
     			}
             }
             
-			// User
+			// Task label
+            if (! empty($arrayfields['t.task_label']['checked']))
+            {
+        		if ((empty($id) && empty($ref)) || ! empty($projectidforalltimes))   // Not a dedicated task
+    			{
+        			print '<td class="nowrap">';
+        			print $task_time->label;	
+        			print '</td>';
+        			if (! $i) $totalarray['nbfield']++;
+    			}
+            }
+            
+            // User
             if (! empty($arrayfields['author']['checked'])) 
             {
                 print '<td>';
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 6da9077d5d2..c805106d784 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -4574,9 +4574,6 @@ img.demothumb {
     	background-size: 20px auto;
     	margin-top: 2px;
 	}
-	select {
-		width: 100%;
-	}
 }
 /* rule to reduce top menu - 3rd reduction */
 @media only screen and (max-width: <?php echo round($nbtopmenuentries * $fontsize * 3.4, 0) + 8; ?>px)
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 016cb4f05c3..d97f73045bc 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -4445,6 +4445,11 @@ img.demothumb {
 		position: absolute;
 		width: <?php print dol_size(300,'width'); ?>px;
 	}
+	select {
+		width: 100%;
+		max-width: 100px;
+		min-width: 0 !important;
+	}
 	div.divphotoref {
 		padding-right: 5px;	
 	}
diff --git a/htdocs/user/info.php b/htdocs/user/info.php
index 1d10875b3eb..e27fcf56266 100644
--- a/htdocs/user/info.php
+++ b/htdocs/user/info.php
@@ -76,7 +76,6 @@ $object->info($id); // This overwrite ->ref with login instead of id
 
 
 print '<div class="fichecenter">';
-
 print '<div class="underbanner clearboth"></div>';
 
 print '<br>';