diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 4841e9be410..bbdf59a295c 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -468,8 +468,8 @@ if ($resql)
 	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 	print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
 	print '<input type="hidden" name="socid" value="'.$socid.'">';
-	
-	
+
+
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_commercial.png', 0, $newcardbutton, '', $limit);
 
 	$topicmail="SendOrderRef";
diff --git a/htdocs/core/tpl/extrafields_list_search_sql.tpl.php b/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
index a8e43d6429f..8492160c185 100644
--- a/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
@@ -17,13 +17,17 @@ if (! empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_
 		$crit=$val;
 		$tmpkey=preg_replace('/search_options_/','',$key);
 		$typ=$extrafields->attributes[$extrafieldsobjectkey]['type'][$tmpkey];
-
-		$mode_search=0;
-		if (in_array($typ, array('int','double','real'))) $mode_search=1;								// Search on a numeric
-		if (in_array($typ, array('sellist','link')) && $crit != '0' && $crit != '-1') $mode_search=2;	// Search on a foreign key int
-		if (in_array($typ, array('chkbxlst','checkbox'))) $mode_search=4;	                            // Search on a multiselect field with sql type = text
-		if ($crit != '' && (! in_array($typ, array('select','sellist')) || $crit != '0') && (! in_array($typ, array('link')) || $crit != '-1'))
+		if ($crit != '' && in_array($typ, array('date', 'datetime', 'timestamp')))
 		{
+			$sql .= " AND ef.".$tmpkey." = '".$db->idate($crit)."'";
+		}
+		elseif ($crit != '' && (! in_array($typ, array('select','sellist')) || $crit != '0') && (! in_array($typ, array('link')) || $crit != '-1'))
+		{
+			$mode_search=0;
+			if (in_array($typ, array('int','double','real'))) $mode_search=1;								// Search on a numeric
+			if (in_array($typ, array('sellist','link')) && $crit != '0' && $crit != '-1') $mode_search=2;	// Search on a foreign key int
+			if (in_array($typ, array('chkbxlst','checkbox'))) $mode_search=4;	                            // Search on a multiselect field with sql type = text
+
 			$sql .= natural_search('ef.'.$tmpkey, $crit, $mode_search);
 		}
 	}