Merge remote-tracking branch 'origin/3.7' into develop

Conflicts:
	htdocs/admin/tools/eaccelerator.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/dispatch.php

htdocs/core/class/commonobject.class.php

@@ -833,7 +833,7 @@ abstract class CommonObject
      *	Update a specific field into database
      *
      *	@param	string	$field		Field to update
-     *	@param	mixte	$value		New value
+     *	@param	mixed	$value		New value
      *	@param	string	$table		To force other table element or element line (should not be used)
      *	@param	int		$id			To force other object id (should not be used)
      *	@param	string	$format		Data format ('text', 'date'). 'text' is used if not defined
@@ -2442,7 +2442,7 @@ abstract class CommonObject
      *  TODO Move this into html.class.php
      *  But for the moment we don't know if it's possible as we keep a method available on overloaded objects.
      *
-     *  @return	void
+     *  @return	int
      */
     function showLinkedObjectBlock()
     {