diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 75945106b72..2d06fa1f557 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -13,6 +13,7 @@
  * Copyright (C) 2015-2016 Ferran Marcet         <fmarcet@2byte.es>
  * Copyright (C) 2017      Josep Lluís Amador    <joseplluis@lliuretic.cat>
  * Copyright (C) 2018      Charlene Benke        <charlie@patas-monkey.com>
+ * Copyright (C) 2019	   Alexandre Spangaro	 <aspangaro@open-dsi.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -98,12 +99,10 @@ $search_country=GETPOST("search_country", 'int');
 $search_type_thirdparty=GETPOST("search_type_thirdparty", 'int');
 $search_user = GETPOST('search_user', 'int');
 $search_sale = GETPOST('search_sale', 'int');
-$search_day	= GETPOST('search_day', 'int');
-$search_month	= GETPOST('search_month', 'int');
-$search_year	= GETPOST('search_year', 'int');
-$search_day_lim		= GETPOST('search_day_lim', 'int');
-$search_month_lim	= GETPOST('search_month_lim', 'int');
-$search_year_lim	= GETPOST('search_year_lim', 'int');
+$search_date_start = dol_mktime(0, 0, 0, GETPOST('search_date_startmonth', 'int'), GETPOST('search_date_startday', 'int'), GETPOST('search_date_startyear', 'int'));
+$search_date_end = dol_mktime(23, 59, 59, GETPOST('search_date_endmonth', 'int'), GETPOST('search_date_endday', 'int'), GETPOST('search_date_endyear', 'int'));
+$search_datelimit_start = dol_mktime(0, 0, 0, GETPOST('search_datelimit_startmonth', 'int'), GETPOST('search_datelimit_startday', 'int'), GETPOST('search_datelimit_startyear', 'int'));
+$search_datelimit_end = dol_mktime(23, 59, 59, GETPOST('search_datelimit_endmonth', 'int'), GETPOST('search_datelimit_endday', 'int'), GETPOST('search_datelimit_endyear', 'int'));
 $search_categ_cus=trim(GETPOST("search_categ_cus", 'int'));
 $search_btn=GETPOST('button_search', 'alpha');
 $search_remove_btn=GETPOST('button_removefilter', 'alpha');
@@ -248,14 +247,12 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter',
 	$search_type='';
 	$search_country='';
 	$search_type_thirdparty='';
-	$search_day='';
-	$search_year='';
-	$search_month='';
+	$search_date_start='';
+	$search_date_end='';
+	$search_datelimit_start='';
+	$search_datelimit_end='';
 	$option='';
 	$filter='';
-	$search_day_lim='';
-	$search_year_lim='';
-	$search_month_lim='';
 	$toselect='';
 	$search_array_options=array();
 	$search_categ_cus=0;
@@ -445,47 +442,49 @@ if ($filtre)
 		$sql .= ' AND ' . $db->escape(trim($filt[0])) . ' = ' . $db->escape(trim($filt[1]));
 	}
 }
-if ($search_ref) $sql .= natural_search('f.ref', $search_ref);
-if ($search_refcustomer) $sql .= natural_search('f.ref_client', $search_refcustomer);
+if ($search_ref)					$sql .= natural_search('f.ref', $search_ref);
+if ($search_refcustomer)			$sql .= natural_search('f.ref_client', $search_refcustomer);
 if ($search_type != '' && $search_type != '-1') $sql.=" AND f.type IN (".$db->escape($search_type).")";
-if ($search_project_ref) $sql .= natural_search('p.ref', $search_project_ref);
-if ($search_project) $sql .= natural_search('p.title', $search_project);
-if ($search_societe) $sql .= natural_search('s.nom', $search_societe);
-if ($search_town)  $sql.= natural_search('s.town', $search_town);
-if ($search_zip)   $sql.= natural_search("s.zip", $search_zip);
-if ($search_state) $sql.= natural_search("state.nom", $search_state);
-if ($search_country) $sql .= " AND s.fk_pays IN (".$db->escape($search_country).')';
-if ($search_type_thirdparty) $sql .= " AND s.fk_typent IN (".$db->escape($search_type_thirdparty).')';
-if ($search_company) $sql .= natural_search('s.nom', $search_company);
-if ($search_montant_ht != '') $sql.= natural_search('f.total', $search_montant_ht, 1);
-if ($search_montant_vat != '') $sql.= natural_search('f.tva', $search_montant_vat, 1);
+if ($search_project_ref)			$sql .= natural_search('p.ref', $search_project_ref);
+if ($search_project)				$sql .= natural_search('p.title', $search_project);
+if ($search_societe)				$sql .= natural_search('s.nom', $search_societe);
+if ($search_town)					$sql.= natural_search('s.town', $search_town);
+if ($search_zip)					$sql.= natural_search("s.zip", $search_zip);
+if ($search_state)					$sql.= natural_search("state.nom", $search_state);
+if ($search_country)				$sql .= " AND s.fk_pays IN (".$db->escape($search_country).')';
+if ($search_type_thirdparty)		$sql .= " AND s.fk_typent IN (".$db->escape($search_type_thirdparty).')';
+if ($search_company)				$sql .= natural_search('s.nom', $search_company);
+if ($search_montant_ht != '')		$sql.= natural_search('f.total', $search_montant_ht, 1);
+if ($search_montant_vat != '')		$sql.= natural_search('f.tva', $search_montant_vat, 1);
 if ($search_montant_localtax1 != '') $sql.= natural_search('f.localtax1', $search_montant_localtax1, 1);
 if ($search_montant_localtax2 != '') $sql.= natural_search('f.localtax2', $search_montant_localtax2, 1);
-if ($search_montant_ttc != '') $sql.= natural_search('f.total_ttc', $search_montant_ttc, 1);
-if ($search_categ_cus > 0) $sql.= " AND cc.fk_categorie = ".$db->escape($search_categ_cus);
-if ($search_categ_cus == -2)   $sql.= " AND cc.fk_categorie IS NULL";
+if ($search_montant_ttc != '')		$sql.= natural_search('f.total_ttc', $search_montant_ttc, 1);
+if ($search_categ_cus > 0)			$sql.= " AND cc.fk_categorie = ".$db->escape($search_categ_cus);
+if ($search_categ_cus == -2)		$sql.= " AND cc.fk_categorie IS NULL";
 if ($search_status != '-1' && $search_status != '')
 {
 	if (is_numeric($search_status) && $search_status >= 0)
 	{
-		if ($search_status == '0') $sql.=" AND f.fk_statut = 0";  // draft
-		if ($search_status == '1') $sql.=" AND f.fk_statut = 1";  // unpayed
-		if ($search_status == '2') $sql.=" AND f.fk_statut = 2";  // payed     Not that some corrupted data may contains f.fk_statut = 1 AND f.paye = 1 (it means payed too but should not happend. If yes, reopen and reclassify billed)
-		if ($search_status == '3') $sql.=" AND f.fk_statut = 3";  // abandonned
+		if ($search_status == '0')	$sql.=" AND f.fk_statut = 0";  // draft
+		if ($search_status == '1')	$sql.=" AND f.fk_statut = 1";  // unpayed
+		if ($search_status == '2')	$sql.=" AND f.fk_statut = 2";  // payed     Not that some corrupted data may contains f.fk_statut = 1 AND f.paye = 1 (it means payed too but should not happend. If yes, reopen and reclassify billed)
+		if ($search_status == '3')	$sql.=" AND f.fk_statut = 3";  // abandonned
 	}
 	else
 	{
 		$sql.= " AND f.fk_statut IN (".$db->escape($search_status).")";	// When search_status is '1,2' for example
 	}
 }
-if ($search_paymentmode > 0)  $sql .= " AND f.fk_mode_reglement = ".$db->escape($search_paymentmode);
-if ($search_paymentterms > 0) $sql .= " AND f.fk_cond_reglement = ".$db->escape($search_paymentterms);
-if ($search_module_source)    $sql .= natural_search("f.module_source", $search_module_source);
-if ($search_pos_source)       $sql .= natural_search("f.pos_source", $search_pos_source);
-$sql.= dolSqlDateFilter("f.datef", $search_day, $search_month, $search_year);
-$sql.= dolSqlDateFilter("f.date_lim_reglement",	$search_day_lim, $search_month_lim, $search_year_lim);
-if ($option == 'late') $sql.=" AND f.date_lim_reglement < '".$db->idate(dol_now() - $conf->facture->client->warning_delay)."'";
-if ($search_sale > 0)  $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .(int) $search_sale;
+if ($search_paymentmode > 0)		$sql .= " AND f.fk_mode_reglement = ".$db->escape($search_paymentmode);
+if ($search_paymentterms > 0)		$sql .= " AND f.fk_cond_reglement = ".$db->escape($search_paymentterms);
+if ($search_module_source)			$sql .= natural_search("f.module_source", $search_module_source);
+if ($search_pos_source)				$sql .= natural_search("f.pos_source", $search_pos_source);
+if ($search_date_start)             $sql.= " AND f.datef >= '" . $db->idate($search_date_start) . "'";
+if ($search_date_end)               $sql.= " AND f.datef <= '" . $db->idate($search_date_end) . "'";
+if ($search_datelimit_start)      	$sql.= " AND f.date_lim_reglement >= '" . $db->idate($search_datelimit_start) . "'";
+if ($search_datelimit_end)    		$sql.= " AND f.date_lim_reglement <= '" . $db->idate($search_datelimit_end) . "'";
+if ($option == 'late')				$sql.=" AND f.date_lim_reglement < '".$db->idate(dol_now() - $conf->facture->client->warning_delay)."'";
+if ($search_sale > 0)				$sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .(int) $search_sale;
 if ($search_user > 0)
 {
 	$sql.= " AND ec.fk_c_type_contact = tc.rowid AND tc.element='facture' AND tc.source='internal' AND ec.element_id = f.rowid AND ec.fk_socpeople = ".$search_user;
@@ -752,20 +751,29 @@ if ($resql)
 	// Date invoice
 	if (! empty($arrayfields['f.date']['checked']))
 	{
-		print '<td class="liste_titre nowraponall" align="center">';
-		if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_day" value="'.dol_escape_htmltag($search_day).'">';
-		print '<input class="flat valignmiddle width25" type="text" size="1" maxlength="2" name="search_month" value="'.dol_escape_htmltag($search_month).'">';
-		$formother->select_year($search_year?$search_year:-1, 'search_year', 1, 20, 5, 0, 0, '', 'widthauto valignmiddle');
+		print '<td class="liste_titre center">';
+		print '<div class="nowrap">';
+		print $langs->trans('From') . ' ';
+		print $form->selectDate($search_date_start?$search_date_start:-1, 'search_date_start', 0, 0, 1);
+		print '</div>';
+		print '<div class="nowrap">';
+		print $langs->trans('to') . ' ';
+		print $form->selectDate($search_date_end?$search_date_end:-1, 'search_date_end', 0, 0, 1);
+		print '</div>';
 		print '</td>';
 	}
 	// Date due
 	if (! empty($arrayfields['f.date_lim_reglement']['checked']))
 	{
-		print '<td class="liste_titre nowraponall" align="center">';
-		if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_day_lim" value="'.dol_escape_htmltag($search_day_lim).'">';
-		print '<input class="flat valignmiddle width25" type="text" size="1" maxlength="2" name="search_month_lim" value="'.dol_escape_htmltag($search_month_lim).'">';
-		$formother->select_year($search_year_lim?$search_year_lim:-1, 'search_year_lim', 1, 20, 5, 0, 0, '', 'widthauto valignmiddle');
-		print '<br><input type="checkbox" name="search_option" value="late"'.($option == 'late'?' checked':'').'> '.$langs->trans("Alert");
+		print '<td class="liste_titre center">';
+		print '<div class="nowrap">';
+		print $langs->trans('From') . ' ';
+		print $form->selectDate($search_datelimit_start?$search_datelimit_start:-1, 'search_datelimit_start', 0, 0, 1);
+		print '</div>';
+		print '<div class="nowrap">';
+		print $langs->trans('to') . ' ';
+		print $form->selectDate($search_datelimit_end?$search_datelimit_end:-1, 'search_datelimit_end', 0, 0, 1);
+		print '</div>';
 		print '</td>';
 	}
 	// Project ref
@@ -778,7 +786,7 @@ if ($resql)
 	{
 	    print '<td class="liste_titre"><input class="flat maxwidth50imp" type="text" name="search_project" value="'.$search_project.'"></td>';
 	}
-	// Thirpdarty
+	// Thirdparty
 	if (! empty($arrayfields['s.nom']['checked']))
 	{
 		print '<td class="liste_titre"><input class="flat maxwidth75imp" type="text" name="search_societe" value="'.$search_societe.'"></td>';