diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index 5cd27be9e20..b826e4f266d 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -33,6 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 
 $langs->load('bills');
 $langs->load('compta');
@@ -50,6 +51,19 @@ if ($action == "create" || $action == "add") $objecttype = '';
 $result = restrictedArea($user, 'facture', $id, $objecttype);
 $projectid = GETPOST('projectid','int');
 
+$search_ref=GETPOST('search_ref');
+$search_societe=GETPOST('search_societe');
+$search_montant_ht=GETPOST('search_montant_ht');
+$search_montant_vat=GETPOST('search_montant_vat');
+$search_montant_ttc=GETPOST('search_montant_ttc');
+$day=GETPOST('day');
+$year=GETPOST('year');
+$month=GETPOST('month');
+$day_date_when=GETPOST('day_date_when');
+$year_date_when=GETPOST('year_date_when');
+$month_date_when=GETPOST('month_date_when');
+$search_frequency=GETPOST('search_frequency');
+
 $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
@@ -73,11 +87,37 @@ if (($id > 0 || $ref) && $action != 'create' && $action != 'add')
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
 $hookmanager->initHooks(array('invoicecard','globalcard'));
+$extrafields = new ExtraFields($db);
+
+// fetch optionals attributes and labels
+$extralabels = $extrafields->fetch_name_optionals_label('facturerec');
+$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
 
 $permissionnote = $user->rights->facture->creer; // Used by the include of actions_setnotes.inc.php
 $permissiondellink=$user->rights->facture->creer;	// Used by the include of actions_dellink.inc.php
 $permissiontoedit = $user->rights->facture->creer; // Used by the include of actions_lineupdonw.inc.php
 
+$arrayfields=array(
+    'f.titre'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
+    's.nom'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1),
+    'f.total'=>array('label'=>$langs->trans("AmountHT"), 'checked'=>1),
+    'f.tva'=>array('label'=>$langs->trans("AmountVAT"), 'checked'=>1),
+    'f.total_ttc'=>array('label'=>$langs->trans("AmountTTC"), 'checked'=>1),
+    'f.frequency'=>array('label'=>$langs->trans("RecurringInvoiceTemplate"), 'checked'=>1),
+    'f.date_last_gen'=>array('label'=>$langs->trans("DateLastGeneration"), 'checked'=>1),
+    'f.date_when'=>array('label'=>$langs->trans("NextDateToExecution"), 'checked'=>1),
+    'f.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
+    'f.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
+);
+// Extra fields
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+{
+    foreach($extrafields->attribute_label as $key => $val)
+    {
+        $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+    }
+}
+
 
 /*
  * Actions
@@ -575,6 +615,24 @@ if ($action == 'addline' && $user->rights->facture->creer)
     }
 }
 
+// Do we click on purge search criteria ?
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+{
+    $search_ref='';
+    $search_societe='';
+    $search_montant_ht='';
+    $search_montant_vat='';
+    $search_montant_ttc='';
+    $day='';
+    $year='';
+    $month='';
+    $day_date_when='';
+    $year_date_when='';
+    $month_date_when='';
+    $search_frequency='';
+    $search_array_options=array();
+}
+
 
 
 /*
@@ -584,6 +642,7 @@ if ($action == 'addline' && $user->rights->facture->creer)
 llxHeader('',$langs->trans("RepeatableInvoices"),'ch-facture.html#s-fac-facture-rec');
 
 $form = new Form($db);
+$formother = new FormOther($db);
 $companystatic = new Societe($db);
 
 $now = dol_now();
@@ -1318,9 +1377,40 @@ else
 		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture_rec as f";
 		$sql.= " WHERE f.fk_soc = s.rowid";
 		$sql.= " AND f.entity = ".$conf->entity;
-		if ($socid)	$sql .= " AND s.rowid = ".$socid;
-        
-        $nbtotalofrecords = 0;
+		if ($search_ref) $sql .= natural_search('f.titre', $search_ref);
+		if ($search_societe) $sql .= natural_search('s.nom', $search_societe);
+		if ($search_frequency) $sql .= natural_search('f.frequency', $search_frequency);
+		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_ttc != '') $sql.= natural_search('f.total_ttc', $search_montant_ttc, 1);
+		if ($month > 0)
+		{
+		    if ($year > 0 && empty($day))
+		        $sql.= " AND f.date_last_gen BETWEEN '".$db->idate(dol_get_first_day($year,$month,false))."' AND '".$db->idate(dol_get_last_day($year,$month,false))."'";
+		        else if ($year > 0 && ! empty($day))
+		            $sql.= " AND f.date_last_gen BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."' AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."'";
+		            else
+		                $sql.= " AND date_format(f.date_last_gen, '%m') = '".$month."'";
+		}
+		else if ($year > 0)
+		{
+		    $sql.= " AND f.date_last_gen BETWEEN '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."'";
+		}
+		if ($month_date_when > 0)
+		{
+		    if ($year_date_when > 0 && empty($day_date_when))
+		        $sql.= " AND f.date_when BETWEEN '".$db->idate(dol_get_first_day($year_date_when,$month_date_when,false))."' AND '".$db->idate(dol_get_last_day($year_date_when,$month_date_when,false))."'";
+		        else if ($year_date_when > 0 && ! empty($day_date_when))
+		            $sql.= " AND f.date_date_when_reglement BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month_date_when, $day_date_when, $year_date_when))."' AND '".$db->idate(dol_mktime(23, 59, 59, $month_date_when, $day_date_when, $year_date_when))."'";
+		            else
+		                $sql.= " AND date_format(f.date_when, '%m') = '".$month_date_when."'";
+		}
+		else if ($year_date_when > 0)
+		{
+		    $sql.= " AND f.date_when BETWEEN '".$db->idate(dol_get_first_day($year_date_when,1,false))."' AND '".$db->idate(dol_get_last_day($year_date_when,12,false))."'";
+		}        
+
+		$nbtotalofrecords = 0;
         if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
         {
         	$result = $db->query($sql);
@@ -1337,6 +1427,29 @@ else
 			
 			$param='&socid='.$socid;
 			if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+			if ($day)                $param.='&day='.$day;
+			if ($month)              $param.='&month='.$month;
+			if ($year)               $param.='&year=' .$year;
+			if ($day_date_when)      $param.='&day_date_when='.$day_date_when;
+			if ($month_date_when)    $param.='&month_date_when='.$month_date_when;
+			if ($year_date_when)     $param.='&year_date_when=' .$year_date_when;
+			if ($search_ref)         $param.='&search_ref=' .$search_ref;
+			if ($search_societe)     $param.='&search_societe=' .$search_societe;
+			if ($search_montant_ht != '')  $param.='&search_montant_ht='.$search_montant_ht;
+			if ($search_montant_vat != '')  $param.='&search_montant_vat='.$search_montant_vat;
+			if ($search_montant_ttc != '') $param.='&search_montant_ttc='.$search_montant_ttc;
+			if ($search_frequency)         $param.='&search_frequency=' .$search_frequency;
+			if ($option)             $param.="&option=".$option;
+			if ($optioncss != '')    $param.='&optioncss='.$optioncss;
+			// Add $param from extra fields
+			foreach ($search_array_options as $key => $val)
+			{
+			    $crit=$val;
+			    $tmpkey=preg_replace('/search_options_/','',$key);
+			    if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
+			}
+			
+			$massactionbutton=$form->selectMassAction('', $massaction == 'presend' ? array() : array('presend'=>$langs->trans("SendByMail"), 'builddoc'=>$langs->trans("PDFMerge")));
 				
             print '<form method="POST" name="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
             if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -1364,6 +1477,114 @@ else
 			print_liste_field_titre('');		// Field may contains ling text
 			print "</tr>\n";
 
+			
+			// Filters lines
+			print '<tr class="liste_titre">';
+			// Ref
+			if (! empty($arrayfields['f.titre']['checked']))
+			{
+			    print '<td class="liste_titre" align="left">';
+			    print '<input class="flat" size="6" type="text" name="search_ref" value="'.$search_ref.'">';
+			    print '</td>';
+			}
+			// Thirpdarty
+			if (! empty($arrayfields['s.nom']['checked']))
+			{
+			    print '<td class="liste_titre" align="left"><input class="flat" type="text" size="8" name="search_societe" value="'.$search_societe.'"></td>';
+			}
+			if (! empty($arrayfields['f.total']['checked']))
+			{
+			    // Amount
+			    print '<td class="liste_titre" align="right">';
+			    print '<input class="flat" type="text" size="5" name="search_montant_ht" value="'.$search_montant_ht.'">';
+			    print '</td>';
+			}
+			if (! empty($arrayfields['f.tva']['checked']))
+			{
+			    // Amount
+			    print '<td class="liste_titre" align="right">';
+			    print '<input class="flat" type="text" size="5" name="search_montant_vat" value="'.$search_montant_vat.'">';
+			    print '</td>';
+			}
+			if (! empty($arrayfields['f.total_ttc']['checked']))
+			{
+			    // Amount
+			    print '<td class="liste_titre" align="right">';
+			    print '<input class="flat" type="text" size="5" name="search_montant_ttc" value="'.$search_montant_ttc.'">';
+			    print '</td>';
+			}
+			if (! empty($arrayfields['f.frequency']['checked']))
+			{
+			    // Amount
+			    print '<td class="liste_titre" align="right">';
+			    //print '<input class="flat" type="text" size="5" name="search_frequency" value="'.$search_frequency.'">';
+			    print '</td>';
+			}
+			// Date invoice
+			if (! empty($arrayfields['f.date_last_gen']['checked']))
+			{
+			    print '<td class="liste_titre" align="center">';
+			    if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day" value="'.$day.'">';
+			    print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';
+			    $formother->select_year($year?$year:-1,'year',1, 20, 5);
+			    print '</td>';
+			}
+			// Date due
+			if (! empty($arrayfields['f.date_when']['checked']))
+			{
+			    print '<td class="liste_titre" align="center">';
+			    if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day_date_when" value="'.$day_date_when.'">';
+			    print '<input class="flat" type="text" size="1" maxlength="2" name="month_date_when" value="'.$month_date_when.'">';
+			    $formother->select_year($year_date_when?$year_date_when:-1,'year_date_when',1, 20, 5);
+			    print '</td>';
+			}
+			// Extra fields
+			if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+			{
+			    foreach($extrafields->attribute_label as $key => $val)
+			    {
+			        if (! empty($arrayfields["ef.".$key]['checked']))
+			        {
+			            $align=$extrafields->getAlignFlag($key);
+			            $typeofextrafield=$extrafields->attribute_type[$key];
+			            print '<td class="liste_titre'.($align?' '.$align:'').'">';
+			            if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')))
+			            {
+			                $crit=$val;
+			                $tmpkey=preg_replace('/search_options_/','',$key);
+			                $searchclass='';
+			                if (in_array($typeofextrafield, array('varchar', 'select'))) $searchclass='searchstring';
+			                if (in_array($typeofextrafield, array('int', 'double'))) $searchclass='searchnum';
+			                print '<input class="flat'.($searchclass?' '.$searchclass:'').'" size="4" type="text" name="search_options_'.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options['search_options_'.$tmpkey]).'">';
+			            }
+			            print '</td>';
+			        }
+			    }
+			}
+			// Fields from hook
+			$parameters=array('arrayfields'=>$arrayfields);
+			$reshook=$hookmanager->executeHooks('printFieldListOption',$parameters);    // Note that $action and $object may have been modified by hook
+			print $hookmanager->resPrint;
+			// Date creation
+			if (! empty($arrayfields['f.datec']['checked']))
+			{
+			    print '<td class="liste_titre">';
+			    print '</td>';
+			}
+			// Date modification
+			if (! empty($arrayfields['f.tms']['checked']))
+			{
+			    print '<td class="liste_titre">';
+			    print '</td>';
+			}
+			// Action column
+			print '<td class="liste_titre" align="middle">';
+			$searchpitco=$form->showFilterAndCheckAddButtons(0, 'checkforselect', 1);
+			print $searchpitco;
+			print '</td>';
+			print "</tr>\n";
+			
+			
 			if ($num > 0)
 			{
 				$var=true;
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index e2883081452..75e676b75c5 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -694,7 +694,7 @@ if ($search_country) $sql .= " AND s.fk_pays IN (".$search_country.')';
 if ($search_type_thirdparty) $sql .= " AND s.fk_typent IN (".$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.total', $search_montant_vat, 1);
+if ($search_montant_vat != '') $sql.= natural_search('f.total_vat', $search_montant_vat, 1);
 if ($search_montant_ttc != '') $sql.= natural_search('f.total_ttc', $search_montant_ttc, 1);
 if ($search_status != '' && $search_status >= 0) $sql.= " AND f.fk_statut = ".$db->escape($search_status);
 if ($search_paymentmode > 0) $sql .= " AND f.fk_mode_reglement = ".$search_paymentmode."";