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

Conflicts:
	ChangeLog

htdocs/core/lib/functions.lib.php

@@ -1789,6 +1789,8 @@ function dol_trunc($string,$size=40,$trunc='right',$stringencoding='UTF-8',$nodo
 {
 	global $conf;
 
+	if (empty($stringencoding)) $stringencoding='UTF-8';
+
 	if ($size==0 || ! empty($conf->global->MAIN_DISABLE_TRUNC)) return $string;
 	// reduce for small screen
     if ($conf->dol_optimize_smallscreen==1 && $display==1) $size = round($size/3);