Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0

Conflicts: htdocs/commande/list.php
2017-03-05 22:03:38 +01:00 · 2017-03-05 22:03:38 +01:00 · 6e2aaf7408
commit 6e2aaf7408
parent f2c7b7da7e ee25a412dd
1 changed files with 1 additions and 0 deletions
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@ -627,6 +627,7 @@ if ($resql)
    if ($show_files)            $param.='&show_files=' .$show_files;
    if ($optioncss != '')       $param.='&optioncss='.$optioncss;
 	if ($billed != '')			$param.='&billed='.$billed;
+
 	// Add $param from extra fields
 	foreach ($search_array_options as $key => $val)
 	{