diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index eb6446ae13d..992dc5ec739 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -41,15 +41,23 @@ $langs->load("main");
 $langs->load("accountancy");
 
 $action = GETPOST('action');
+
+//Select Box
 $codeventil = GETPOST('codeventil', 'array');
 $mesCasesCochees = GETPOST('mesCasesCochees', 'array');
+
+//Search Getpost
+$search_invoice = GETPOST('search_invoice','alpha');
 $search_ref     = GETPOST('search_ref','alpha');
 $search_label   = GETPOST('search_label','alpha');
 $search_desc    = GETPOST('search_desc','alpha');
+$search_amount  = GETPOST('search_amount','alpha');
+$search_account = GETPOST('search_account','alpha');
+$search_vat     = GETPOST('search_vat','alpha');
 
+//Getpost Order and column and limit page
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
-//Should move to top with all GETPOST
 $page = GETPOST('page');
 if ($page < 0) $page = 0;
 
@@ -61,17 +69,9 @@ if (! empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)) {
 	$limit = $conf->liste_limit;
 }
 $offset = $limit * $page;
-//End Should move to top with all GETPOST
 
-// TODO : remove comment 
-//elarifr we can not use only
-//$sql .= " ORDER BY l.rowid";
-// f.datef will order like FA08 FA09 FA10 FA05 FA06 FA07 FA04...
-// f.facnumber will not order properly invoice / avoir / accompte you can have All AC then All AV and all FA
-// l.rowid when an invoice is edited rowid are added at end of table & facturedet.rowid are not ordered
-//if (! $sortfield) $sortfield="l.rowid";
 if (! $sortfield) $sortfield="f.datef, f.facnumber, l.rowid";
-//if (! $sortorder) $sortorder="DESC";
+
 if (! $sortorder) {
 	if ($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_TODO > 0) {
 		$sortorder = " DESC ";
@@ -86,20 +86,20 @@ if (! $user->rights->accounting->ventilation->dispatch)
 
 $formventilation = new FormVentilation($db);
 
-//Defaut AccountingAccount RowId Product / Service
-//at this time ACCOUNTING_SERVICE_SOLD_ACCOUNT & ACCOUNTING_PRODUCT_SOLD_ACCOUNT are account number not accountingacount rowid
-//so we need to get those default value rowid first
 $accounting = new AccountingAccount($db);
-//TODO: we should need to check if result is a really exist accountaccount rowid.....
 $aarowid_s = $accounting->fetch('', ACCOUNTING_SERVICE_SOLD_ACCOUNT);
 $aarowid_p = $accounting->fetch('', ACCOUNTING_PRODUCT_SOLD_ACCOUNT);
 
 // Purge search criteria
-if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) 
 {
     $search_ref='';
+    $search_invoice='';
     $search_label='';
     $search_desc='';
+    $search_amount='';
+    $search_account='';
+    $search_vat='';
 }
 /*
  * View
@@ -107,10 +107,6 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both
 
 llxHeader('', $langs->trans("Ventilation"));
 
-//debug
-//print_r($aarowid_s);
-//print_r($aarowid_p);
-
 print  '<script type="text/javascript">
 			$(function () {
 				$(\'#select-all\').click(function(event) {
@@ -139,7 +135,6 @@ if ($action == 'ventil') {
 		$mesCodesVentilChoisis = $codeventil;
 		$cpt = 0;
 		foreach ( $mesCasesCochees as $maLigneCochee ) {
-			// print '<div><font color="red">id selectionnee : '.$monChoix."</font></div>";
 			$maLigneCourante = explode("_", $maLigneCochee);
 			$monId = $maLigneCourante[0];
 			$monNumLigne = $maLigneCourante[1];
@@ -167,29 +162,12 @@ if ($action == 'ventil') {
 /*
  * Customer Invoice lines
  */
-$page = GETPOST('page');
-if ($page < 0)
-	$page = 0;
 
-if (! empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)) {
-	$limit = $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION;
-} else if ($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION <= 0) {
-	$limit = $conf->liste_limit;
-} else {
-	$limit = $conf->liste_limit;
-}
 
-$offset = $limit * $page;
-
-$sql = "SELECT f.facnumber, f.rowid as facid, l.fk_product, l.description, l.total_ht, l.rowid, l.fk_code_ventilation,";
-$sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type, p.accountancy_code_sell as code_sell";
-// A REVOIR elarifr si vraiment necessaire de rajouter , p.fk_product_type as type. le type produit / service est de facto defini pour chaque ligne de facturedet.product_type
-// il est donc plus logique de se servir de l.product_type au lieu de p.fk_product_type
+$sql = "SELECT f.facnumber, f.rowid as facid, f.datef, f.type as ftype, l.fk_product, l.description, l.total_ht, l.rowid, l.fk_code_ventilation,";
+$sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type, p.accountancy_code_sell as code_sell, p.tva_tx as tva_tx_prod";
 $sql .= " , aa.rowid as aarowid";
-// we need f.datef to reorder lines
-$sql .= " , f.datef";
-// we need to use llx_facturedet l.product_type as used at the time on invoice. if llx_product fk_product_type is changed later it could not change the sell already made !
-$sql .= " , l.product_type as type_l";
+$sql .= " , l.product_type as type_l, l.tva_tx as tva_tx_line";
 $sql .= " FROM " . MAIN_DB_PREFIX . "facture as f";
 $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "facturedet as l ON f.rowid = l.fk_facture";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON p.rowid = l.fk_product";
@@ -197,7 +175,12 @@ $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accountingaccount as aa ON p.accountan
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_system as accsys ON accsys.pcg_version = aa.fk_pcg_version";
 $sql .= " WHERE f.fk_statut > 0 AND fk_code_ventilation <= 0";
 $sql .= " AND (accsys.rowid='" . $conf->global->CHARTOFACCOUNTS . "' OR p.accountancy_code_sell IS NULL OR p.accountancy_code_sell ='')";
+
 // Add search filter like
+if (strlen(trim($search_invoice)))
+{
+	$sql .= " AND (f.facnumber like '%" . $search_invoice . "%')";
+}
 if (strlen(trim($search_ref))) {
 	$sql .= " AND (p.ref like '%" . $search_ref . "%')";
 }
@@ -207,15 +190,23 @@ if (strlen(trim($search_label))) {
 if (strlen(trim($search_desc))) {
 	$sql .= " AND (l.description like '%" . $search_desc . "%')";
 }
+if (strlen(trim($search_amount))) 
+{
+	$sql .= " AND l.total_ht like '" . $search_amount . "%'";
+}
+if (strlen(trim($search_account))) 
+{
+	$sql .= " AND aa.account_number like '%" . $search_account . "%'";
+}
+if (strlen(trim($search_vat))) 
+{
+	$sql .= " AND (l.tva_tx like '" . $search_vat . "%')";
+}
+
 if (! empty($conf->multicompany->enabled)) {
 	$sql .= " AND f.entity IN (" . getEntity("facture", 1) . ")";
 }
-//TODO: Remove comment
-//replaced by default value $sortfield,$sortorder
-//$sql .= " ORDER BY l.rowid";
-//if ($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_TODO > 0) {
-//	$sql .= " DESC ";
-//}
+
 $sql.= $db->order($sortfield,$sortorder);
 
 $sql .= $db->plimit($limit + 1, $offset);
@@ -226,10 +217,11 @@ if ($result) {
 	$num_lines = $db->num_rows($result);
 	$i = 0;
 
-	// TODO : print_barre_liste always use $conf->liste_limit and do not care about custom limit in list...
 	print_barre_liste($langs->trans("InvoiceLines"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num_lines);
-
 	print '<br><b>' . $langs->trans("DescVentilTodoCustomer") . '</b></br>';
+	print_liste_field_titre($langs->trans("Date"), $_SERVER["PHP_SELF"],"f.datef","",$param,'',$sortfield,$sortorder);
+	print '&nbsp;&nbsp;';
+	print_liste_field_titre($langs->trans("RowId"), $_SERVER["PHP_SELF"],"l.rowid","",$param,'',$sortfield,$sortorder);	
 
 	print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">' . "\n";
 	print '<input type="hidden" name="action" value="ventil">';
@@ -240,7 +232,8 @@ if ($result) {
 	print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"],"p.ref","",$param,'',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Label"), $_SERVER["PHP_SELF"],"p.label","",$param,'',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Description"), $_SERVER["PHP_SELF"],"l.description","",$param,'',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Amount"),'','','','','align="right"');
+  print_liste_field_titre($langs->trans("Amount"),'','','','','align="right"');
+	print_liste_field_titre($langs->trans("VATRate"), $_SERVER["PHP_SELF"],"l.tva_tx","",$param,'align="center"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("AccountAccounting"),'','','','','align="center"');
 	print_liste_field_titre($langs->trans("IntoAccount"),'','','','','align="center"');
 	print_liste_field_titre('');
@@ -248,21 +241,23 @@ if ($result) {
 	print '</tr>';
 
 //	We add search filter
-/*	But Hit Enter will validate ventilation....
-	print '<tr class="liste_titre">';
-	print '<td class="liste_titre" >&nbsp;</td>';
-	print '<td class="liste_titre"><input type="text" class="flat" size="10" name="search_ref" value="' . $search_ref . '"></td>';
-	print '<td class="liste_titre"><input type="text" class="flat" size="20" name="search_label" value="' . $search_label . '"></td>';
-	print '<td class="liste_titre"><input type="text" class="flat" size="30" name="search_desc" value="' . $search_desc . '"></td>';
 
-	print '<td class="liste_titre" colspan="3">&nbsp;</td>';
+	print '<tr class="liste_titre">';
+	print '<td class="liste_titre"><input type="text" class="flat" size="10" name="search_invoice" value="' . $search_invoice . '"></td>';
+	print '<td class="liste_titre">%<input type="text" class="flat" size="15" name="search_ref" value="' . $search_ref . '"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat" size="20" name="search_label" value="' . $search_label . '"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat" size="20" name="search_desc" value="' . $search_desc . '"></td>';
+	print '<td class="liste_titre" align="right"><input type="text" class="flat" size="10" name="search_amount" value="' . $search_amount. '"></td>';
+	print '<td class="liste_titre" align="center">%<input type="text" class="flat" size="5" name="search_vat" value="' . $search_vat . '"></td>';
+	print '<td class="liste_titre" align="center">&nbsp;</td>';
+	print '<td class="liste_titre">&nbsp;</td>';
 	print '<td align="right" colspan="2" class="liste_titre">';
 	print '<input type="image" class="liste_titre" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" name="button_search" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
 	print '&nbsp;';
 	print '<input type="image" class="liste_titre" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" name="button_removefilter" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
 	print '</td>';
 	print '</tr>';
-*/
+
 	$facture_static = new Facture($db);
 	$product_static = new Product($db);
 	$form = new Form($db);
@@ -272,21 +267,11 @@ if ($result) {
 		$objp = $db->fetch_object($result);
 		$var = ! $var;
 
-		// product_type: 0 = service ? 1 = product
-		// C'est le contraire dans les base !!!!!!  IT IS INVERTED IN LLX_PRODUCT & LLX_FACTUREDET
-		// elarifr define account numbercode comptable si pas defini dans la fiche produit a partir des lignes de facturation
-		// product_type: 1 = service ? 0 = product
-		// because some modules like subtotal module l.product_type can be other than 0 or 1   ! and we don't put in account lines with product_type=9
-		// first we check product.fk_product_type as type and l.product_type as type_l
-		// if product does not exist we use the value of l.product_type provided in facturedet to define if this is a product or service
-		// issue : if we change product_type value in product DB it should differ from the value stored in facturedet DB ! so we report both and user make choice of accounting account.
 		$objp->code_sell_l = '';
 		$objp->code_sell_p = '';
 		$objp->aarowid_suggest = '';
 		$code_sell_p_l_differ = '';
 
-		//check if code_sell defined in product or set default value according p.fk_product_type do not care lines when product_type value not 0 || 1
-		//and we set suggested accounting account rowid as $objp->aarowid_s
 		$code_sell_p_notset = '';
 		$objp->aarowid_suggest = $objp->aarowid;
 		if ( ! empty($objp->code_sell)) {
@@ -300,10 +285,6 @@ if ($result) {
 				$objp->code_sell_p = (! empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
 			}
 		}
-		// check facturedet.product_type & set default value according l.type_l, do not care lines when product_type value not 0 || 1
-//		if ( ! empty($objp->type_l)) {
-//			$objp->code_sell_l = $objp->type_l;
-//		} else {
 			if ($objp->type_l == 1) {
 				$objp->code_sell_l = (! empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
 				if ($objp->aarowid == '') $objp->aarowid_suggest = $aarowid_s;
@@ -312,10 +293,6 @@ if ($result) {
 				$objp->code_sell_l = (! empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
 				if ($objp->aarowid == '') $objp->aarowid_suggest = $aarowid_p;
 			}
-//		}
-
-
-		//if not same code for product fk_prouct_type and facturedet.product_type, product has been change after sale and must report
 		if ($objp->code_sell_l <> $objp->code_sell_p) $code_sell_p_l_differ = 'color:red';
 
 		print "<tr $bc[$var]>";
@@ -324,7 +301,7 @@ if ($result) {
 		$facture_static->ref = $objp->facnumber;
 		$facture_static->id = $objp->facid;
 		print '<td>' . $facture_static->getNomUrl(1) . '</td>';
-		// Ref Customer Invoice
+		// Ref Product
 		$product_static->ref = $objp->product_ref;
 		$product_static->id = $objp->product_id;
 		$product_static->type = $objp->type;
@@ -336,16 +313,12 @@ if ($result) {
 		print '</td>';
 
 		print '<td style="' . $code_sell_p_l_differ . '">' . dol_trunc($objp->product_label, 24) . '</td>';
-		//TODO: we should set a user defined value to adjust user square / wide screen size
 		$trunclength = defined('ACCOUNTING_LENGTH_DESCRIPTION') ? ACCOUNTING_LENGTH_DESCRIPTION : 32;
 		print '<td style="' . $code_sell_p_l_differ . '">' . nl2br(dol_trunc($objp->description, $trunclength)) . '</td>';
-
 		print '<td align="right">';
 		print price($objp->total_ht);
 		print '</td>';
-
 		print '<td align="center" style="' . $code_sell_p_notset . '">';
-		// if not same kind of product_type stored in product & facturedet we display both account and let user choose
 		if ($objp->code_sell_l == $objp->code_sell_p) {
 			print $objp->code_sell_l;
 		} else {
@@ -353,21 +326,13 @@ if ($result) {
 		}
 		print '</td>';
 
-		// Colonne choix du compte
 		print '<td align="center">';
-		// TODO: we should set a user defined value to adjust user square / wide screen size
-		// $trunclengthform = defined('ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT') ? ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT : 50;
 		print $formventilation->select_account($objp->aarowid_suggest, 'codeventil[]', 1);
 		print '</td>';
-
 		print '<td align="center">' . $objp->rowid . '</td>';
-		// Colonne choix ligne a ventiler
 		print '<td align="center">';
-		//TODO checked only if account exist in product, if only suggested do not check, user must validate 
-		print '<input type="checkbox" name="mesCasesCochees[]" value="' . $objp->rowid . "_" . $i . '"' . ($objp->aarowid_suggest ? "checked" : "") . '/>';
+		print '<input type="checkbox" name="mesCasesCochees[]" value="' . $objp->rowid . "_" . $i . '"' . ($objp->aarowid ? "checked" : "") . '/>';
 		print '</td>';
-//debug
-//print '</tr><tr><td colspan=6>Product: p.type='. $objp->type .' - p.code_sell='. $objp->code_sell .'  --- Check code_sell_product=' . $objp->code_sell_p .'  ---Check facturedet l.type_l='. $objp->type_l .' - code_sell_lines=' . $objp->code_sell_l . '  -- aarowid_suggest=' . $objp->aarowid_suggest.'</td>';
 		print '</tr>';
 		$i ++;
 	}