diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php
index 2602d00a216..2b396fe6006 100644
--- a/htdocs/compta/tva/index.php
+++ b/htdocs/compta/tva/index.php
@@ -4,8 +4,9 @@
  * Copyright (C) 2004-2018 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2014      Ferran Marcet        <fmarcet@2byte.es>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
- * Copyright (C) 2021       Gauthier VERDOL         <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2018      Frédéric France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2021      Gauthier VERDOL      <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2021      Open-Dsi             <support@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
@@ -43,61 +44,89 @@ if (empty($conf->global->SOCIETE_FISCAL_MONTH_START)) {
 	$conf->global->SOCIETE_FISCAL_MONTH_START = 1;
 }
 
-// Date range
-$year = GETPOST("year", "int");
-if (empty($year)) {
-	$year_current = $current_date['year'];
-	$year_start = $year_current;
-} else {
-	$year_current = $year;
-	$year_start = $year;
-}
-$date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"));
-$date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"));
-// Set default period if not defined
-if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
-	$q = GETPOST("q", "int");
-	if (empty($q)) {
-		if (GETPOST("month", "int")) {
-			$date_start = dol_get_first_day($year_start, GETPOST("month", "int"), false);
-			$date_end = dol_get_last_day($year_start, GETPOST("month", "int"), false);
+$refresh = GETPOSTISSET('submit') ? true : false;
+
+if ($refresh === false) {
+	$year_current = dol_print_date('%Y', $now);
+	$month_current = dol_print_date('%m', $now);
+
+	// 1 : Monthly (by default)
+	// 2 : Quarterly
+	// 3 : Annual
+	if ($conf->global->MAIN_INFO_VAT_RETURN == 2) {
+		// quarterly
+		$year = $year_current;
+		if ($month_current >= 7 && $month_current <= 9) {
+			$month_start = 4;
+			$month_end = 6;
+		} elseif ($month_current >= 10 && $month_current <= 12) {
+			$month_start = 7;
+			$month_end = 9;
+		} elseif ($month_current >= 1 && $month_current <= 3) {
+			$month_start = 10;
+			$month_end = 12;
+			$year--;
 		} else {
-			if (empty($conf->global->MAIN_INFO_VAT_RETURN) || $conf->global->MAIN_INFO_VAT_RETURN == 2) { // quaterly vat, we take last past complete quarter
-				$date_start = dol_time_plus_duree(dol_get_first_day($year_start, $current_date['mon'], false), -3 - (($current_date['mon'] - $conf->global->SOCIETE_FISCAL_MONTH_START) % 3), 'm');
-				$date_end = dol_time_plus_duree($date_start, 3, 'm') - 1;
-			} elseif ($conf->global->MAIN_INFO_VAT_RETURN == 3) { // yearly vat
-				if ($current_date['mon'] < $conf->global->SOCIETE_FISCAL_MONTH_START) {
-					if (($conf->global->SOCIETE_FISCAL_MONTH_START - $current_date['mon']) > 6) {	// If period started from less than 6 years, we show past year
-						$year_start--;
-					}
-				} else {
-					if (($current_date['mon'] - $conf->global->SOCIETE_FISCAL_MONTH_START) < 6) {	// If perdio started from less than 6 years, we show past year
-						$year_start--;
-					}
-				}
+			$month_start = 1;
+			$month_end = 3;
+		}
+		$date_start = dol_get_first_day($year, $month_start);
+		$date_end = dol_get_last_day($year, $month_end);
+	} elseif ($conf->global->MAIN_INFO_VAT_RETURN == 3) {
+		// annual
+		$date_start = dol_get_first_day($year_current, 1);
+		$date_end = dol_get_last_day($year_current, 12);
+	} else {
+		// monthly by default
+		$year = $year_current;
+		$month_last = $month_current - 1;
+		if ($month_last <= 0) {
+			$month_last = $month_last + 12;
+			$year--;
+		}
+		$date_start = dol_get_first_day($year, $month_last);
+		$date_end = dol_get_last_day($year, $month_last);
+	}
+} else {
+	// Date range
+	$year = GETPOST("year", "int");
+	if (empty($year)) {
+		$year_current = dol_print_date(dol_now(), "%Y");
+		if ($conf->global->SOCIETE_FISCAL_MONTH_START > dol_print_date(dol_now(), "%m")) $year_current--;
+		$year_start = $year_current;
+	} else {
+		$year_current = $year;
+		$year_start = $year;
+	}
+	$date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"));
+	$date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"));
+	if (empty($date_start) || empty($date_end)) {// We define date_start and date_end
+		$q = GETPOST("q", "int");
+		if (empty($q)) {
+			if (GETPOST("month", "int")) {
+				$date_start = dol_get_first_day($year_start, GETPOST("month", "int"), false);
+				$date_end = dol_get_last_day($year_start, GETPOST("month", "int"), false);
+			} else {
 				$date_start = dol_get_first_day($year_start, $conf->global->SOCIETE_FISCAL_MONTH_START, false);
 				$date_end = dol_time_plus_duree($date_start, 1, 'y') - 1;
-			} elseif ($conf->global->MAIN_INFO_VAT_RETURN == 1) {	// monthly vat, we take last past complete month
-				$date_start = dol_time_plus_duree(dol_get_first_day($year_start, $current_date['mon'], false), -1, 'm');
-				$date_end = dol_time_plus_duree($date_start, 1, 'm') - 1;
 			}
-		}
-	} else {
-		if ($q == 1) {
-			$date_start = dol_get_first_day($year_start, 1, false);
-			$date_end = dol_get_last_day($year_start, 3, false);
-		}
-		if ($q == 2) {
-			$date_start = dol_get_first_day($year_start, 4, false);
-			$date_end = dol_get_last_day($year_start, 6, false);
-		}
-		if ($q == 3) {
-			$date_start = dol_get_first_day($year_start, 7, false);
-			$date_end = dol_get_last_day($year_start, 9, false);
-		}
-		if ($q == 4) {
-			$date_start = dol_get_first_day($year_start, 10, false);
-			$date_end = dol_get_last_day($year_start, 12, false);
+		} else {
+			if ($q == 1) {
+				$date_start = dol_get_first_day($year_start, 1, false);
+				$date_end = dol_get_last_day($year_start, 3, false);
+			}
+			if ($q == 2) {
+				$date_start = dol_get_first_day($year_start, 4, false);
+				$date_end = dol_get_last_day($year_start, 6, false);
+			}
+			if ($q == 3) {
+				$date_start = dol_get_first_day($year_start, 7, false);
+				$date_end = dol_get_last_day($year_start, 9, false);
+			}
+			if ($q == 4) {
+				$date_start = dol_get_first_day($year_start, 10, false);
+				$date_end = dol_get_last_day($year_start, 12, false);
+			}
 		}
 	}
 }
@@ -286,319 +315,319 @@ report_header($name, '', $period, $periodlink, $description, $builddate, $export
 
 print '<br>';
 
-print '<div class="fichecenter"><div class="fichethirdleft">';
+if ($refresh === true) {
+	print '<div class="fichecenter"><div class="fichethirdleft">';
 
-print load_fiche_titre($langs->trans("VATSummary"), '', '');
+	print load_fiche_titre($langs->trans("VATSummary"), '', '');
 
-print '<table class="noborder centpercent">';
-print '<tr class="liste_titre">';
-print '<td width="30%">'.$langs->trans("Year")." ".$y.'</td>';
-print '<td class="right">'.$langs->trans("VATToPay").'</td>';
-print '<td class="right">'.$langs->trans("VATToCollect").'</td>';
-print '<td class="right">'.$langs->trans("Balance").'</td>';
-print '<td>&nbsp;</td>'."\n";
-print '</tr>'."\n";
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<td width="30%">' . $langs->trans("Year") . " " . $y . '</td>';
+	print '<td class="right">' . $langs->trans("VATToPay") . '</td>';
+	print '<td class="right">' . $langs->trans("VATToCollect") . '</td>';
+	print '<td class="right">' . $langs->trans("Balance") . '</td>';
+	print '<td>&nbsp;</td>' . "\n";
+	print '</tr>' . "\n";
 
-$tmp = dol_getdate($date_start);
-$y = $tmp['year'];
-$m = $tmp['mon'];
-$tmp = dol_getdate($date_end);
-$yend = $tmp['year'];
-$mend = $tmp['mon'];
+	$tmp = dol_getdate($date_start);
+	$y = $tmp['year'];
+	$m = $tmp['mon'];
+	$tmp = dol_getdate($date_end);
+	$yend = $tmp['year'];
+	$mend = $tmp['mon'];
 //var_dump($m);
-$total = 0;
-$subtotalcoll = 0;
-$subtotalpaye = 0;
-$subtotal = 0;
-$i = 0;
-$mcursor = 0;
+	$total = 0;
+	$subtotalcoll = 0;
+	$subtotalpaye = 0;
+	$subtotal = 0;
+	$i = 0;
+	$mcursor = 0;
 
-while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000) {	// $mcursor is to avoid too large loop
-	//$m = $conf->global->SOCIETE_FISCAL_MONTH_START + ($mcursor % 12);
-	if ($m == 13) {
-		$y++;
-	}
-	if ($m > 12) {
-		$m -= 12;
-	}
-	$mcursor++;
-
-	$x_coll = tax_by_rate('vat', $db, $y, 0, 0, 0, $modetax, 'sell', $m);
-	$x_paye = tax_by_rate('vat', $db, $y, 0, 0, 0, $modetax, 'buy', $m);
-
-	$x_both = array();
-	//now, from these two arrays, get another array with one rate per line
-	foreach (array_keys($x_coll) as $my_coll_rate) {
-		$x_both[$my_coll_rate]['coll']['totalht'] = $x_coll[$my_coll_rate]['totalht'];
-		$x_both[$my_coll_rate]['coll']['vat'] = $x_coll[$my_coll_rate]['vat'];
-		$x_both[$my_coll_rate]['paye']['totalht'] = 0;
-		$x_both[$my_coll_rate]['paye']['vat'] = 0;
-		$x_both[$my_coll_rate]['coll']['links'] = '';
-		$x_both[$my_coll_rate]['coll']['detail'] = array();
-		foreach ($x_coll[$my_coll_rate]['facid'] as $id => $dummy) {
-			//$invoice_customer->id=$x_coll[$my_coll_rate]['facid'][$id];
-			//$invoice_customer->ref=$x_coll[$my_coll_rate]['facnum'][$id];
-			//$invoice_customer->type=$x_coll[$my_coll_rate]['type'][$id];
-			//$company_static->fetch($x_coll[$my_coll_rate]['company_id'][$id]);
-			$x_both[$my_coll_rate]['coll']['detail'][] = array(
-			'id'        =>$x_coll[$my_coll_rate]['facid'][$id],
-			'descr'     =>$x_coll[$my_coll_rate]['descr'][$id],
-			'pid'       =>$x_coll[$my_coll_rate]['pid'][$id],
-			'pref'      =>$x_coll[$my_coll_rate]['pref'][$id],
-			'ptype'     =>$x_coll[$my_coll_rate]['ptype'][$id],
-			'payment_id'=>$x_coll[$my_coll_rate]['payment_id'][$id],
-			'payment_amount'=>$x_coll[$my_coll_rate]['payment_amount'][$id],
-			'ftotal_ttc'=>$x_coll[$my_coll_rate]['ftotal_ttc'][$id],
-			'dtotal_ttc'=>$x_coll[$my_coll_rate]['dtotal_ttc'][$id],
-			'dtype'     =>$x_coll[$my_coll_rate]['dtype'][$id],
-			'datef'     =>$x_coll[$my_coll_rate]['datef'][$id],
-			'datep'     =>$x_coll[$my_coll_rate]['datep'][$id],
-			//'company_link'=>$company_static->getNomUrl(1,'',20),
-			'ddate_start'=>$x_coll[$my_coll_rate]['ddate_start'][$id],
-			'ddate_end'  =>$x_coll[$my_coll_rate]['ddate_end'][$id],
-			'totalht'   =>$x_coll[$my_coll_rate]['totalht_list'][$id],
-			'vat'       =>$x_coll[$my_coll_rate]['vat_list'][$id],
-			//'link'      =>$invoice_customer->getNomUrl(1,'',12)
-			);
+	while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000) {    // $mcursor is to avoid too large loop
+		//$m = $conf->global->SOCIETE_FISCAL_MONTH_START + ($mcursor % 12);
+		if ($m == 13) {
+			$y++;
 		}
-	}
-
-	// tva paid
-	foreach (array_keys($x_paye) as $my_paye_rate) {
-		$x_both[$my_paye_rate]['paye']['totalht'] = $x_paye[$my_paye_rate]['totalht'];
-		$x_both[$my_paye_rate]['paye']['vat'] = $x_paye[$my_paye_rate]['vat'];
-		if (!isset($x_both[$my_paye_rate]['coll']['totalht'])) {
-			$x_both[$my_paye_rate]['coll']['totalht'] = 0;
-			$x_both[$my_paye_rate]['coll']['vat'] = 0;
+		if ($m > 12) {
+			$m -= 12;
 		}
-		$x_both[$my_paye_rate]['paye']['links'] = '';
-		$x_both[$my_paye_rate]['paye']['detail'] = array();
+		$mcursor++;
 
-		foreach ($x_paye[$my_paye_rate]['facid'] as $id => $dummy) {
-			// ExpenseReport
-			if ($x_paye[$my_paye_rate]['ptype'][$id] == 'ExpenseReportPayment') {
-				//$expensereport->id=$x_paye[$my_paye_rate]['facid'][$id];
-				//$expensereport->ref=$x_paye[$my_paye_rate]['facnum'][$id];
-				//$expensereport->type=$x_paye[$my_paye_rate]['type'][$id];
+		$x_coll = tax_by_rate('vat', $db, $y, 0, 0, 0, $modetax, 'sell', $m);
+		$x_paye = tax_by_rate('vat', $db, $y, 0, 0, 0, $modetax, 'buy', $m);
 
-				$x_both[$my_paye_rate]['paye']['detail'][] = array(
-				'id'				=>$x_paye[$my_paye_rate]['facid'][$id],
-				'descr'				=>$x_paye[$my_paye_rate]['descr'][$id],
-				'pid'				=>$x_paye[$my_paye_rate]['pid'][$id],
-				'pref'				=>$x_paye[$my_paye_rate]['pref'][$id],
-				'ptype'				=>$x_paye[$my_paye_rate]['ptype'][$id],
-				'payment_id'		=>$x_paye[$my_paye_rate]['payment_id'][$id],
-				'payment_amount'	=>$x_paye[$my_paye_rate]['payment_amount'][$id],
-				'ftotal_ttc'		=>price2num($x_paye[$my_paye_rate]['ftotal_ttc'][$id]),
-				'dtotal_ttc'		=>price2num($x_paye[$my_paye_rate]['dtotal_ttc'][$id]),
-				'dtype'				=>$x_paye[$my_paye_rate]['dtype'][$id],
-				'ddate_start'		=>$x_paye[$my_paye_rate]['ddate_start'][$id],
-				'ddate_end'			=>$x_paye[$my_paye_rate]['ddate_end'][$id],
-				'totalht'			=>price2num($x_paye[$my_paye_rate]['totalht_list'][$id]),
-				'vat'				=>$x_paye[$my_paye_rate]['vat_list'][$id],
-				//'link'				=>$expensereport->getNomUrl(1)
-				);
-			} else {
-				//$invoice_supplier->id=$x_paye[$my_paye_rate]['facid'][$id];
-				//$invoice_supplier->ref=$x_paye[$my_paye_rate]['facnum'][$id];
-				//$invoice_supplier->type=$x_paye[$my_paye_rate]['type'][$id];
-				//$company_static->fetch($x_paye[$my_paye_rate]['company_id'][$id]);
-				$x_both[$my_paye_rate]['paye']['detail'][] = array(
-				'id'        =>$x_paye[$my_paye_rate]['facid'][$id],
-				'descr'     =>$x_paye[$my_paye_rate]['descr'][$id],
-				'pid'       =>$x_paye[$my_paye_rate]['pid'][$id],
-				'pref'      =>$x_paye[$my_paye_rate]['pref'][$id],
-				'ptype'     =>$x_paye[$my_paye_rate]['ptype'][$id],
-				'payment_id'=>$x_paye[$my_paye_rate]['payment_id'][$id],
-				'payment_amount'=>$x_paye[$my_paye_rate]['payment_amount'][$id],
-				'ftotal_ttc'=>price2num($x_paye[$my_paye_rate]['ftotal_ttc'][$id]),
-				'dtotal_ttc'=>price2num($x_paye[$my_paye_rate]['dtotal_ttc'][$id]),
-				'dtype'     =>$x_paye[$my_paye_rate]['dtype'][$id],
-				'datef'     =>$x_paye[$my_paye_rate]['datef'][$id],
-				'datep'     =>$x_paye[$my_paye_rate]['datep'][$id],
-				//'company_link'=>$company_static->getNomUrl(1,'',20),
-				'ddate_start'=>$x_paye[$my_paye_rate]['ddate_start'][$id],
-				'ddate_end'  =>$x_paye[$my_paye_rate]['ddate_end'][$id],
-				'totalht'   =>price2num($x_paye[$my_paye_rate]['totalht_list'][$id]),
-				'vat'       =>$x_paye[$my_paye_rate]['vat_list'][$id],
-				//'link'      =>$invoice_supplier->getNomUrl(1,'',12)
+		$x_both = array();
+		//now, from these two arrays, get another array with one rate per line
+		foreach (array_keys($x_coll) as $my_coll_rate) {
+			$x_both[$my_coll_rate]['coll']['totalht'] = $x_coll[$my_coll_rate]['totalht'];
+			$x_both[$my_coll_rate]['coll']['vat'] = $x_coll[$my_coll_rate]['vat'];
+			$x_both[$my_coll_rate]['paye']['totalht'] = 0;
+			$x_both[$my_coll_rate]['paye']['vat'] = 0;
+			$x_both[$my_coll_rate]['coll']['links'] = '';
+			$x_both[$my_coll_rate]['coll']['detail'] = array();
+			foreach ($x_coll[$my_coll_rate]['facid'] as $id => $dummy) {
+				//$invoice_customer->id=$x_coll[$my_coll_rate]['facid'][$id];
+				//$invoice_customer->ref=$x_coll[$my_coll_rate]['facnum'][$id];
+				//$invoice_customer->type=$x_coll[$my_coll_rate]['type'][$id];
+				//$company_static->fetch($x_coll[$my_coll_rate]['company_id'][$id]);
+				$x_both[$my_coll_rate]['coll']['detail'][] = array(
+					'id' => $x_coll[$my_coll_rate]['facid'][$id],
+					'descr' => $x_coll[$my_coll_rate]['descr'][$id],
+					'pid' => $x_coll[$my_coll_rate]['pid'][$id],
+					'pref' => $x_coll[$my_coll_rate]['pref'][$id],
+					'ptype' => $x_coll[$my_coll_rate]['ptype'][$id],
+					'payment_id' => $x_coll[$my_coll_rate]['payment_id'][$id],
+					'payment_amount' => $x_coll[$my_coll_rate]['payment_amount'][$id],
+					'ftotal_ttc' => $x_coll[$my_coll_rate]['ftotal_ttc'][$id],
+					'dtotal_ttc' => $x_coll[$my_coll_rate]['dtotal_ttc'][$id],
+					'dtype' => $x_coll[$my_coll_rate]['dtype'][$id],
+					'datef' => $x_coll[$my_coll_rate]['datef'][$id],
+					'datep' => $x_coll[$my_coll_rate]['datep'][$id],
+					//'company_link'=>$company_static->getNomUrl(1,'',20),
+					'ddate_start' => $x_coll[$my_coll_rate]['ddate_start'][$id],
+					'ddate_end' => $x_coll[$my_coll_rate]['ddate_end'][$id],
+					'totalht' => $x_coll[$my_coll_rate]['totalht_list'][$id],
+					'vat' => $x_coll[$my_coll_rate]['vat_list'][$id],
+					//'link'      =>$invoice_customer->getNomUrl(1,'',12)
 				);
 			}
 		}
-	}
-	//now we have an array (x_both) indexed by rates for coll and paye
 
-	$action = "tva";
-	$object = array(&$x_coll, &$x_paye, &$x_both);
-	$parameters["mode"] = $modetax;
-	$parameters["year"] = $y;
-	$parameters["month"] = $m;
-	$parameters["type"] = 'vat';
+		// tva paid
+		foreach (array_keys($x_paye) as $my_paye_rate) {
+			$x_both[$my_paye_rate]['paye']['totalht'] = $x_paye[$my_paye_rate]['totalht'];
+			$x_both[$my_paye_rate]['paye']['vat'] = $x_paye[$my_paye_rate]['vat'];
+			if (!isset($x_both[$my_paye_rate]['coll']['totalht'])) {
+				$x_both[$my_paye_rate]['coll']['totalht'] = 0;
+				$x_both[$my_paye_rate]['coll']['vat'] = 0;
+			}
+			$x_both[$my_paye_rate]['paye']['links'] = '';
+			$x_both[$my_paye_rate]['paye']['detail'] = array();
 
-	// Initialize technical object to manage hooks of expenses. Note that conf->hooks_modules contains array array
-	$hookmanager->initHooks(array('externalbalance'));
-	$reshook = $hookmanager->executeHooks('addVatLine', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+			foreach ($x_paye[$my_paye_rate]['facid'] as $id => $dummy) {
+				// ExpenseReport
+				if ($x_paye[$my_paye_rate]['ptype'][$id] == 'ExpenseReportPayment') {
+					//$expensereport->id=$x_paye[$my_paye_rate]['facid'][$id];
+					//$expensereport->ref=$x_paye[$my_paye_rate]['facnum'][$id];
+					//$expensereport->type=$x_paye[$my_paye_rate]['type'][$id];
 
-	if (!is_array($x_coll) && $coll_listbuy == -1) {
-		$langs->load("errors");
-		print '<tr><td colspan="5">'.$langs->trans("ErrorNoAccountancyModuleLoaded").'</td></tr>';
-		break;
-	}
-	if (!is_array($x_paye) && $coll_listbuy == -2) {
-		print '<tr><td colspan="5">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
-		break;
-	}
-
-
-	print '<tr class="oddeven">';
-	print '<td class="nowrap"><a href="'.DOL_URL_ROOT.'/compta/tva/quadri_detail.php?leftmenu=tax_vat&month='.$m.'&year='.$y.'">'.dol_print_date(dol_mktime(0, 0, 0, $m, 1, $y), "%b %Y").'</a></td>';
-
-	$x_coll_sum = 0;
-	foreach (array_keys($x_coll) as $rate) {
-		$subtot_coll_total_ht = 0;
-		$subtot_coll_vat = 0;
-
-		foreach ($x_both[$rate]['coll']['detail'] as $index => $fields) {
-			// Payment
-			$ratiopaymentinvoice = 1;
-			if ($modetax != 1) {
-				// Define type
-				// We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
-				$type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
-				// Try to enhance type detection using date_start and date_end for free lines where type
-				// was not saved.
-				if (!empty($fields['ddate_start'])) {
-					$type = 1;
-				}
-				if (!empty($fields['ddate_end'])) {
-					$type = 1;
-				}
-
-				if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
-					|| ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice')) {
-					//print $langs->trans("NA");
+					$x_both[$my_paye_rate]['paye']['detail'][] = array(
+						'id' => $x_paye[$my_paye_rate]['facid'][$id],
+						'descr' => $x_paye[$my_paye_rate]['descr'][$id],
+						'pid' => $x_paye[$my_paye_rate]['pid'][$id],
+						'pref' => $x_paye[$my_paye_rate]['pref'][$id],
+						'ptype' => $x_paye[$my_paye_rate]['ptype'][$id],
+						'payment_id' => $x_paye[$my_paye_rate]['payment_id'][$id],
+						'payment_amount' => $x_paye[$my_paye_rate]['payment_amount'][$id],
+						'ftotal_ttc' => price2num($x_paye[$my_paye_rate]['ftotal_ttc'][$id]),
+						'dtotal_ttc' => price2num($x_paye[$my_paye_rate]['dtotal_ttc'][$id]),
+						'dtype' => $x_paye[$my_paye_rate]['dtype'][$id],
+						'ddate_start' => $x_paye[$my_paye_rate]['ddate_start'][$id],
+						'ddate_end' => $x_paye[$my_paye_rate]['ddate_end'][$id],
+						'totalht' => price2num($x_paye[$my_paye_rate]['totalht_list'][$id]),
+						'vat' => $x_paye[$my_paye_rate]['vat_list'][$id],
+						//'link'				=>$expensereport->getNomUrl(1)
+					);
 				} else {
-					if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
-						$ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
-					}
+					//$invoice_supplier->id=$x_paye[$my_paye_rate]['facid'][$id];
+					//$invoice_supplier->ref=$x_paye[$my_paye_rate]['facnum'][$id];
+					//$invoice_supplier->type=$x_paye[$my_paye_rate]['type'][$id];
+					//$company_static->fetch($x_paye[$my_paye_rate]['company_id'][$id]);
+					$x_both[$my_paye_rate]['paye']['detail'][] = array(
+						'id' => $x_paye[$my_paye_rate]['facid'][$id],
+						'descr' => $x_paye[$my_paye_rate]['descr'][$id],
+						'pid' => $x_paye[$my_paye_rate]['pid'][$id],
+						'pref' => $x_paye[$my_paye_rate]['pref'][$id],
+						'ptype' => $x_paye[$my_paye_rate]['ptype'][$id],
+						'payment_id' => $x_paye[$my_paye_rate]['payment_id'][$id],
+						'payment_amount' => $x_paye[$my_paye_rate]['payment_amount'][$id],
+						'ftotal_ttc' => price2num($x_paye[$my_paye_rate]['ftotal_ttc'][$id]),
+						'dtotal_ttc' => price2num($x_paye[$my_paye_rate]['dtotal_ttc'][$id]),
+						'dtype' => $x_paye[$my_paye_rate]['dtype'][$id],
+						'datef' => $x_paye[$my_paye_rate]['datef'][$id],
+						'datep' => $x_paye[$my_paye_rate]['datep'][$id],
+						//'company_link'=>$company_static->getNomUrl(1,'',20),
+						'ddate_start' => $x_paye[$my_paye_rate]['ddate_start'][$id],
+						'ddate_end' => $x_paye[$my_paye_rate]['ddate_end'][$id],
+						'totalht' => price2num($x_paye[$my_paye_rate]['totalht_list'][$id]),
+						'vat' => $x_paye[$my_paye_rate]['vat_list'][$id],
+						//'link'      =>$invoice_supplier->getNomUrl(1,'',12)
+					);
 				}
 			}
-			//var_dump('type='.$type.' '.$fields['totalht'].' '.$ratiopaymentinvoice);
-			$temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
-			$temp_vat = $fields['vat'] * $ratiopaymentinvoice;
-			$subtot_coll_total_ht += $temp_ht;
-			$subtot_coll_vat      += $temp_vat;
-			$x_coll_sum           += $temp_vat;
 		}
-	}
-	print '<td class="nowrap right">'.price(price2num($x_coll_sum, 'MT')).'</td>';
+		//now we have an array (x_both) indexed by rates for coll and paye
 
-	$x_paye_sum = 0;
-	foreach (array_keys($x_paye) as $rate) {
-		$subtot_paye_total_ht = 0;
-		$subtot_paye_vat = 0;
+		$action = "tva";
+		$object = array(&$x_coll, &$x_paye, &$x_both);
+		$parameters["mode"] = $modetax;
+		$parameters["year"] = $y;
+		$parameters["month"] = $m;
+		$parameters["type"] = 'vat';
 
-		foreach ($x_both[$rate]['paye']['detail'] as $index => $fields) {
-			// Payment
-			$ratiopaymentinvoice = 1;
-			if ($modetax != 1) {
-				// Define type
-				// We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
-				$type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
-				// Try to enhance type detection using date_start and date_end for free lines where type
-				// was not saved.
-				if (!empty($fields['ddate_start'])) {
-					$type = 1;
-				}
-				if (!empty($fields['ddate_end'])) {
-					$type = 1;
-				}
+		// Initialize technical object to manage hooks of expenses. Note that conf->hooks_modules contains array array
+		$hookmanager->initHooks(array('externalbalance'));
+		$reshook = $hookmanager->executeHooks('addVatLine', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
-				if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
-					|| ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice')) {
-					//print $langs->trans("NA");
-				} else {
-					if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
-						$ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
+		if (!is_array($x_coll) && $coll_listbuy == -1) {
+			$langs->load("errors");
+			print '<tr><td colspan="5">' . $langs->trans("ErrorNoAccountancyModuleLoaded") . '</td></tr>';
+			break;
+		}
+		if (!is_array($x_paye) && $coll_listbuy == -2) {
+			print '<tr><td colspan="5">' . $langs->trans("FeatureNotYetAvailable") . '</td></tr>';
+			break;
+		}
+
+
+		print '<tr class="oddeven">';
+		print '<td class="nowrap"><a href="' . DOL_URL_ROOT . '/compta/tva/quadri_detail.php?leftmenu=tax_vat&month=' . $m . '&year=' . $y . '">' . dol_print_date(dol_mktime(0, 0, 0, $m, 1, $y), "%b %Y") . '</a></td>';
+
+		$x_coll_sum = 0;
+		foreach (array_keys($x_coll) as $rate) {
+			$subtot_coll_total_ht = 0;
+			$subtot_coll_vat = 0;
+
+			foreach ($x_both[$rate]['coll']['detail'] as $index => $fields) {
+				// Payment
+				$ratiopaymentinvoice = 1;
+				if ($modetax != 1) {
+					// Define type
+					// We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
+					$type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
+					// Try to enhance type detection using date_start and date_end for free lines where type
+					// was not saved.
+					if (!empty($fields['ddate_start'])) {
+						$type = 1;
+					}
+					if (!empty($fields['ddate_end'])) {
+						$type = 1;
+					}
+
+					if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
+						|| ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice')) {
+						//print $langs->trans("NA");
+					} else {
+						if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
+							$ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
+						}
 					}
 				}
+				//var_dump('type='.$type.' '.$fields['totalht'].' '.$ratiopaymentinvoice);
+				$temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
+				$temp_vat = $fields['vat'] * $ratiopaymentinvoice;
+				$subtot_coll_total_ht += $temp_ht;
+				$subtot_coll_vat += $temp_vat;
+				$x_coll_sum += $temp_vat;
 			}
-			//var_dump('type='.$type.' '.$fields['totalht'].' '.$ratiopaymentinvoice);
-			$temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
-			$temp_vat = $fields['vat'] * $ratiopaymentinvoice;
-			$subtot_paye_total_ht += $temp_ht;
-			$subtot_paye_vat      += $temp_vat;
-			$x_paye_sum           += $temp_vat;
+		}
+		print '<td class="nowrap right">' . price(price2num($x_coll_sum, 'MT')) . '</td>';
+
+		$x_paye_sum = 0;
+		foreach (array_keys($x_paye) as $rate) {
+			$subtot_paye_total_ht = 0;
+			$subtot_paye_vat = 0;
+
+			foreach ($x_both[$rate]['paye']['detail'] as $index => $fields) {
+				// Payment
+				$ratiopaymentinvoice = 1;
+				if ($modetax != 1) {
+					// Define type
+					// We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
+					$type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
+					// Try to enhance type detection using date_start and date_end for free lines where type
+					// was not saved.
+					if (!empty($fields['ddate_start'])) {
+						$type = 1;
+					}
+					if (!empty($fields['ddate_end'])) {
+						$type = 1;
+					}
+
+					if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
+						|| ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice')) {
+						//print $langs->trans("NA");
+					} else {
+						if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
+							$ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
+						}
+					}
+				}
+				//var_dump('type='.$type.' '.$fields['totalht'].' '.$ratiopaymentinvoice);
+				$temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
+				$temp_vat = $fields['vat'] * $ratiopaymentinvoice;
+				$subtot_paye_total_ht += $temp_ht;
+				$subtot_paye_vat += $temp_vat;
+				$x_paye_sum += $temp_vat;
+			}
+		}
+		print '<td class="nowrap right">' . price(price2num($x_paye_sum, 'MT')) . '</td>';
+
+		$subtotalcoll = $subtotalcoll + $x_coll_sum;
+		$subtotalpaye = $subtotalpaye + $x_paye_sum;
+
+		$diff = $x_coll_sum - $x_paye_sum;
+		$total = $total + $diff;
+		$subtotal = price2num($subtotal + $diff, 'MT');
+
+		print '<td class="nowrap right">' . price(price2num($diff, 'MT')) . '</td>' . "\n";
+		print "<td>&nbsp;</td>\n";
+		print "</tr>\n";
+
+		$i++;
+		$m++;
+		if ($i > 2) {
+			print '<tr class="liste_total">';
+			print '<td class="right"><a href="quadri_detail.php?leftmenu=tax_vat&q=' . round($m / 3) . '&year=' . $y . '">' . $langs->trans("SubTotal") . '</a>:</td>';
+			print '<td class="nowrap right">' . price(price2num($subtotalcoll, 'MT')) . '</td>';
+			print '<td class="nowrap right">' . price(price2num($subtotalpaye, 'MT')) . '</td>';
+			print '<td class="nowrap right">' . price(price2num($subtotal, 'MT')) . '</td>';
+			print '<td>&nbsp;</td></tr>';
+			$i = 0;
+			$subtotalcoll = 0;
+			$subtotalpaye = 0;
+			$subtotal = 0;
 		}
 	}
-	print '<td class="nowrap right">'.price(price2num($x_paye_sum, 'MT')).'</td>';
-
-	$subtotalcoll = $subtotalcoll + $x_coll_sum;
-	$subtotalpaye = $subtotalpaye + $x_paye_sum;
-
-	$diff = $x_coll_sum - $x_paye_sum;
-	$total = $total + $diff;
-	$subtotal = price2num($subtotal + $diff, 'MT');
-
-	print '<td class="nowrap right">'.price(price2num($diff, 'MT')).'</td>'."\n";
+	print '<tr class="liste_total"><td class="right" colspan="3">' . $langs->trans("TotalToPay") . ':</td><td class="nowrap right">' . price(price2num($total, 'MT')) . '</td>';
 	print "<td>&nbsp;</td>\n";
-	print "</tr>\n";
+	print '</tr>';
 
-	$i++;
-	$m++;
-	if ($i > 2) {
-		print '<tr class="liste_total">';
-		print '<td class="right"><a href="quadri_detail.php?leftmenu=tax_vat&q='.round($m / 3).'&year='.$y.'">'.$langs->trans("SubTotal").'</a>:</td>';
-		print '<td class="nowrap right">'.price(price2num($subtotalcoll, 'MT')).'</td>';
-		print '<td class="nowrap right">'.price(price2num($subtotalpaye, 'MT')).'</td>';
-		print '<td class="nowrap right">'.price(price2num($subtotal, 'MT')).'</td>';
-		print '<td>&nbsp;</td></tr>';
-		$i = 0;
-		$subtotalcoll = 0;
-		$subtotalpaye = 0;
-		$subtotal = 0;
-	}
+	print '</table>';
+
+
+	print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+
+
+	/*
+	 * Paid
+	 */
+	print load_fiche_titre($langs->trans("VATPaid"), '', '');
+
+	$sql = '';
+
+	$sql .= "SELECT SUM(amount) as mm, date_format(tva.datev,'%Y-%m') as dm, 'claimed' as mode";
+	$sql .= " FROM " . MAIN_DB_PREFIX . "tva as tva";
+	$sql .= " WHERE tva.entity = " . $conf->entity;
+	$sql .= " AND (tva.datev >= '" . $db->idate($date_start) . "' AND tva.datev <= '" . $db->idate($date_end) . "')";
+	$sql .= " GROUP BY dm";
+
+	$sql .= " UNION ";
+
+	$sql .= "SELECT SUM(ptva.amount) as mm, date_format(tva.datev,'%Y-%m') as dm, 'paid' as mode";
+	$sql .= " FROM " . MAIN_DB_PREFIX . "tva as tva";
+	$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "payment_vat as ptva ON (tva.rowid = ptva.fk_tva)";
+	$sql .= " WHERE tva.entity = " . $conf->entity;
+	$sql .= " AND (tva.datev >= '" . $db->idate($date_start) . "' AND tva.datev <= '" . $db->idate($date_end) . "')";
+	$sql .= " GROUP BY dm";
+
+	$sql .= " ORDER BY dm ASC, mode ASC";
+	//print $sql;
+
+	pt($db, $sql, $langs->trans("Month"));
+
+	print '</div></div>';
 }
-print '<tr class="liste_total"><td class="right" colspan="3">'.$langs->trans("TotalToPay").':</td><td class="nowrap right">'.price(price2num($total, 'MT')).'</td>';
-print "<td>&nbsp;</td>\n";
-print '</tr>';
-
-print '</table>';
-
-
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
-
-
-
-/*
- * VAT Paid
- */
-
-print load_fiche_titre($langs->trans("VATPaid"), '', '');
-
-$sql = '';
-
-$sql .= "SELECT SUM(amount) as mm, date_format(tva.datev,'%Y-%m') as dm, 'claimed' as mode";
-$sql .= " FROM ".MAIN_DB_PREFIX."tva as tva";
-$sql .= " WHERE tva.entity = ".$conf->entity;
-$sql .= " AND (tva.datev >= '".$db->idate($date_start)."' AND tva.datev <= '".$db->idate($date_end)."')";
-$sql .= " GROUP BY dm";
-
-$sql .= " UNION ";
-
-$sql .= "SELECT SUM(ptva.amount) as mm, date_format(tva.datev,'%Y-%m') as dm, 'paid' as mode";
-$sql .= " FROM ".MAIN_DB_PREFIX."tva as tva";
-$sql .= " INNER JOIN ".MAIN_DB_PREFIX."payment_vat as ptva ON (tva.rowid = ptva.fk_tva)";
-$sql .= " WHERE tva.entity = ".$conf->entity;
-$sql .= " AND (tva.datev >= '".$db->idate($date_start)."' AND tva.datev <= '".$db->idate($date_end)."')";
-$sql .= " GROUP BY dm";
-
-$sql .= " ORDER BY dm ASC, mode ASC";
-//print $sql;
-
-pt($db, $sql, $langs->trans("Month"));
-
-print '</div></div>';
 
 llxFooter();
 $db->close();
diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php
index c1f89dd3bbc..590999c7b31 100644
--- a/htdocs/compta/tva/quadri_detail.php
+++ b/htdocs/compta/tva/quadri_detail.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2014       Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2018-2021  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2019       Eric Seigne             <eric.seigne@cap-rel.fr>
+ * Copyright (C) 2021       Open-Dsi                <support@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
@@ -45,70 +46,68 @@ require_once DOL_DOCUMENT_ROOT.'/expensereport/class/paymentexpensereport.class.
 $langs->loadLangs(array("other", "compta", "banks", "bills", "companies", "product", "trips", "admin"));
 
 $now = dol_now();
-$current_date = dol_getdate($now);
-if (empty($conf->global->SOCIETE_FISCAL_MONTH_START)) {
-	$conf->global->SOCIETE_FISCAL_MONTH_START = 1;
-}
-
-// Date range
-$year = GETPOST("year", "int");
-if (empty($year)) {
-	$year_current = $current_date['year'];
-	$year_start = $year_current;
+$refresh = GETPOSTISSET('submit') ? true : false;
+$invoice_type = GETPOSTISSET('invoice_type') ? GETPOST('invoice_type', 'alpha') : '';
+$vat_rate_show = GETPOSTISSET('vat_rate_show') ? GETPOST('vat_rate_show', 'int') : -1;
+$year_current = GETPOSTISSET('year') ? GETPOST('year', 'int') : intval(strftime('%Y', $now));
+$year_start = $year_current;
+$month_current = GETPOSTISSET('month') ? GETPOST('month', 'int') : intval(strftime('%m', $now));
+$month_start = $month_current;
+if ($refresh === false) {
+	$date_start = dol_get_first_day($year_start, $month_start);
+	$date_end = dol_get_last_day($year_start, $month_start);
 } else {
-	$year_current = $year;
-	$year_start = $year;
-}
-$date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"));
-$date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"));
-// Set default period if not defined
-if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
-	$q = GETPOST("q", "int");
-	if (empty($q)) {
-		if (GETPOST("month", "int")) {
-			$date_start = dol_get_first_day($year_start, GETPOST("month", "int"), false);
-			$date_end = dol_get_last_day($year_start, GETPOST("month", "int"), false);
-		} else {
-			if (empty($conf->global->MAIN_INFO_VAT_RETURN) || $conf->global->MAIN_INFO_VAT_RETURN == 2) { // quaterly vat, we take last past complete quarter
-				$date_start = dol_time_plus_duree(dol_get_first_day($year_start, $current_date['mon'], false), -3 - (($current_date['mon'] - $conf->global->SOCIETE_FISCAL_MONTH_START) % 3), 'm');
-				$date_end = dol_time_plus_duree($date_start, 3, 'm') - 1;
-			} elseif ($conf->global->MAIN_INFO_VAT_RETURN == 3) { // yearly vat
-				if ($current_date['mon'] < $conf->global->SOCIETE_FISCAL_MONTH_START) {
-					if (($conf->global->SOCIETE_FISCAL_MONTH_START - $current_date['mon']) > 6) {	// If period started from less than 6 years, we show past year
-						$year_start--;
-					}
-				} else {
-					if (($current_date['mon'] - $conf->global->SOCIETE_FISCAL_MONTH_START) < 6) {	// If perdio started from less than 6 years, we show past year
-						$year_start--;
-					}
+	// Date range
+	//$year=GETPOST("year", "int");
+	//if (empty($year))
+	//{
+	//    $year_current = strftime("%Y", dol_now());
+	//    $year_start = $year_current;
+	//} else {
+	//    $year_current = $year;
+	//    $year_start = $year;
+	//}
+
+	$date_start=dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"));
+	$date_end=dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"));
+	// Quarter
+	if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
+		$q=GETPOST("q", "int");
+		if (empty($q)) {
+			if (GETPOST("month", "int")) {
+				$date_start=dol_get_first_day($year_start, GETPOST("month", "int"), false);
+				$date_end=dol_get_last_day($year_start, GETPOST("month", "int"), false);
+			} else {
+				$date_start=dol_get_first_day($year_start, empty($conf->global->SOCIETE_FISCAL_MONTH_START)?1:$conf->global->SOCIETE_FISCAL_MONTH_START, false);
+				if (empty($conf->global->MAIN_INFO_VAT_RETURN) || $conf->global->MAIN_INFO_VAT_RETURN == 2) {
+					$date_end=dol_time_plus_duree($date_start, 3, 'm') - 1;
+				} elseif ($conf->global->MAIN_INFO_VAT_RETURN == 3) {
+					$date_end = dol_time_plus_duree($date_start, 1, 'y') - 1;
+				} elseif ($conf->global->MAIN_INFO_VAT_RETURN == 1) {
+					$date_end = dol_time_plus_duree($date_start, 1, 'm') - 1;
 				}
-				$date_start = dol_get_first_day($year_start, $conf->global->SOCIETE_FISCAL_MONTH_START, false);
-				$date_end = dol_time_plus_duree($date_start, 1, 'y') - 1;
-			} elseif ($conf->global->MAIN_INFO_VAT_RETURN == 1) {	// monthly vat, we take last past complete month
-				$date_start = dol_time_plus_duree(dol_get_first_day($year_start, $current_date['mon'], false), -1, 'm');
-				$date_end = dol_time_plus_duree($date_start, 1, 'm') - 1;
 			}
-		}
-	} else {
-		if ($q == 1) {
-			$date_start = dol_get_first_day($year_start, 1, false);
-			$date_end = dol_get_last_day($year_start, 3, false);
-		}
-		if ($q == 2) {
-			$date_start = dol_get_first_day($year_start, 4, false);
-			$date_end = dol_get_last_day($year_start, 6, false);
-		}
-		if ($q == 3) {
-			$date_start = dol_get_first_day($year_start, 7, false);
-			$date_end = dol_get_last_day($year_start, 9, false);
-		}
-		if ($q == 4) {
-			$date_start = dol_get_first_day($year_start, 10, false);
-			$date_end = dol_get_last_day($year_start, 12, false);
+		} else {
+			if ($q == 1) {
+				$date_start=dol_get_first_day($year_start, 1, false); $date_end=dol_get_last_day($year_start, 3, false);
+			}
+			if ($q == 2) {
+				$date_start=dol_get_first_day($year_start, 4, false); $date_end=dol_get_last_day($year_start, 6, false);
+			}
+			if ($q == 3) {
+				$date_start=dol_get_first_day($year_start, 7, false); $date_end=dol_get_last_day($year_start, 9, false);
+			}
+			if ($q == 4) {
+				$date_start=dol_get_first_day($year_start, 10, false); $date_end=dol_get_last_day($year_start, 12, false);
+			}
 		}
 	}
 }
 
+$month_start = strftime('%m', $date_start);
+$year_start  = strftime('%Y', $date_start);
+
+
 $min = price2num(GETPOST("min", "alpha"));
 if (empty($min)) {
 	$min = 0;
@@ -428,7 +427,10 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
 		if (is_array($x_both[$rate]['coll']['detail'])) {
 			// VAT Rate
 			print "<tr>";
-			print '<td class="tax_rate">'.$langs->trans("Rate").': '.vatrate($rate).'%</td><td colspan="'.($span + 1).'"></td>';
+			print '<td class="tax_rate" colspan="' . ($span+1) . '">';
+			print $langs->trans('Rate') . ' : ' . vatrate($rate) . '%';
+			print ' - <a href="' . DOL_URL_ROOT . '/compta/tva/quadri_detail.php?invoice_type=customer&amp;vat_rate_show=' . urlencode($rate) . '&amp;year=' . urlencode($year_start) . '&amp;month=' . urlencode($month_start) . '">' . img_picto('', 'chevron-down', 'class="paddingrightonly"') . $langs->trans('VATReportShowByRateDetails') . '</a>';
+			print '</td>';
 			print '</tr>'."\n";
 
 			foreach ($x_both[$rate]['coll']['detail'] as $index => $fields) {
@@ -444,112 +446,149 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
 					$type = 1;
 				}
 
-
-				print '<tr class="oddeven">';
-
-				// Ref
-				print '<td class="nowrap left">'.$fields['link'].'</td>';
-
-				// Invoice date
-				print '<td class="left">'.dol_print_date($fields['datef'], 'day').'</td>';
-
-				// Payment date
-				if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') {
-					print '<td class="left">'.dol_print_date($fields['datep'], 'day').'</td>';
-				} else {
-					print '<td></td>';
-				}
-
-				// Company name
-				print '<td class="left">'.$fields['company_link'].'</td>';
-
-				// Description
-				print '<td class="left">';
-				if ($fields['pid']) {
-					$product_static->id = $fields['pid'];
-					$product_static->ref = $fields['pref'];
-					$product_static->type = $fields['dtype']; // We force with the type of line to have type how line is registered
-					print $product_static->getNomUrl(1);
-					if (dol_string_nohtmltag($fields['descr'])) {
-						print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
-					}
-				} else {
-					if ($type) {
-						$text = img_object($langs->trans('Service'), 'service');
-					} else {
-						$text = img_object($langs->trans('Product'), 'product');
-					}
-					if (preg_match('/^\((.*)\)$/', $fields['descr'], $reg)) {
-						if ($reg[1] == 'DEPOSIT') {
-							$fields['descr'] = $langs->transnoentitiesnoconv('Deposit');
-						} elseif ($reg[1] == 'CREDIT_NOTE') {
-							$fields['descr'] = $langs->transnoentitiesnoconv('CreditNote');
-						} else {
-							$fields['descr'] = $langs->transnoentitiesnoconv($reg[1]);
-						}
-					}
-					print $text.' '.dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
-
-					// Show range
-					print_date_range($fields['ddate_start'], $fields['ddate_end']);
-				}
-				print '</td>';
-
-				// Total HT
-				if ($modetax != 1) {
-					print '<td class="nowrap right">';
-					print price($fields['totalht']);
-					if (price2num($fields['ftotal_ttc'])) {
-						//print $fields['dtotal_ttc']."/".$fields['ftotal_ttc']." - ";
-						$ratiolineinvoice = ($fields['dtotal_ttc'] / $fields['ftotal_ttc']);
-						//print ' ('.round($ratiolineinvoice*100,2).'%)';
-					}
-					print '</td>';
-				}
-
 				// Payment
-				$ratiopaymentinvoice = 1;
+				$ratiopaymentinvoice=1;
 				if ($modetax != 1) {
-					print '<td class="nowrap right">';
-					//print $fields['totalht']."-".$fields['payment_amount']."-".$fields['ftotal_ttc'];
-					if ($fields['payment_amount'] && $fields['ftotal_ttc']) {
-						$payment_static->id = $fields['payment_id'];
-						print $payment_static->getNomUrl(2);
-					}
 					if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
 						|| ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice')) {
-						print $langs->trans("NA");
 					} else {
 						if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
-							$ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
-						}
-						print price(price2num($fields['payment_amount'], 'MT'));
-						if (isset($fields['payment_amount'])) {
-							print ' ('.round($ratiopaymentinvoice * 100, 2).'%)';
+							$ratiopaymentinvoice=($fields['payment_amount']/$fields['ftotal_ttc']);
 						}
 					}
-					print '</td>';
 				}
 
 				// Total collected
-				print '<td class="nowrap right">';
-				$temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
-				print price(price2num($temp_ht, 'MT'), 1);
-				print '</td>';
+				$temp_ht=$fields['totalht']*$ratiopaymentinvoice;
 
 				// VAT
-				print '<td class="nowrap right">';
-				$temp_vat = $fields['vat'] * $ratiopaymentinvoice;
-				print price(price2num($temp_vat, 'MT'), 1);
-				//print price($fields['vat']);
-				print '</td>';
-				print '</tr>';
+				$temp_vat=$fields['vat']*$ratiopaymentinvoice;
 
 				$subtot_coll_total_ht += $temp_ht;
 				$subtot_coll_vat      += $temp_vat;
 				$x_coll_sum           += $temp_vat;
 			}
 		}
+
+		if ($invoice_type == 'customer' && $vat_rate_show == $rate) {
+			if (is_array($x_both[$rate]['coll']['detail'])) {
+				foreach ($x_both[$rate]['coll']['detail'] as $index => $fields) {
+					// Define type
+					// We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
+					$type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
+					// Try to enhance type detection using date_start and date_end for free lines where type
+					// was not saved.
+					if (!empty($fields['ddate_start'])) {
+						$type = 1;
+					}
+					if (!empty($fields['ddate_end'])) {
+						$type = 1;
+					}
+
+
+					print '<tr class="oddeven">';
+
+					// Ref
+					print '<td class="nowrap left">' . $fields['link'] . '</td>';
+
+					// Invoice date
+					print '<td class="left">' . dol_print_date($fields['datef'], 'day') . '</td>';
+
+					// Payment date
+					if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') print '<td class="left">' . dol_print_date($fields['datep'], 'day') . '</td>';
+					else print '<td></td>';
+
+					// Company name
+					print '<td class="left">' . $fields['company_link'] . '</td>';
+
+					// Description
+					print '<td class="left">';
+					if ($fields['pid']) {
+						$product_static->id = $fields['pid'];
+						$product_static->ref = $fields['pref'];
+						$product_static->type = $fields['dtype'];        // We force with the type of line to have type how line is registered
+						print $product_static->getNomUrl(1);
+						if (dol_string_nohtmltag($fields['descr'])) {
+							print ' - ' . dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
+						}
+					} else {
+						if ($type) {
+							$text = img_object($langs->trans('Service'), 'service');
+						} else {
+							$text = img_object($langs->trans('Product'), 'product');
+						}
+						if (preg_match('/^\((.*)\)$/', $fields['descr'], $reg)) {
+							if ($reg[1] == 'DEPOSIT') {
+								$fields['descr'] = $langs->transnoentitiesnoconv('Deposit');
+							} elseif ($reg[1] == 'CREDIT_NOTE') {
+								$fields['descr'] = $langs->transnoentitiesnoconv('CreditNote');
+							} else {
+								$fields['descr'] = $langs->transnoentitiesnoconv($reg[1]);
+							}
+						}
+						print $text . ' ' . dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
+
+						// Show range
+						print_date_range($fields['ddate_start'], $fields['ddate_end']);
+					}
+					print '</td>';
+
+					// Total HT
+					if ($modetax != 1) {
+						print '<td class="nowrap right">';
+						print price($fields['totalht']);
+						if (price2num($fields['ftotal_ttc'])) {
+							//print $fields['dtotal_ttc']."/".$fields['ftotal_ttc']." - ";
+							$ratiolineinvoice = ($fields['dtotal_ttc'] / $fields['ftotal_ttc']);
+							//print ' ('.round($ratiolineinvoice*100,2).'%)';
+						}
+						print '</td>';
+					}
+
+					// Payment
+					$ratiopaymentinvoice = 1;
+					if ($modetax != 1) {
+						print '<td class="nowrap right">';
+						//print $fields['totalht']."-".$fields['payment_amount']."-".$fields['ftotal_ttc'];
+						if ($fields['payment_amount'] && $fields['ftotal_ttc']) {
+							$payment_static->id = $fields['payment_id'];
+							print $payment_static->getNomUrl(2);
+						}
+						if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
+							|| ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice')) {
+							print $langs->trans("NA");
+						} else {
+							if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
+								$ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
+							}
+							print price(price2num($fields['payment_amount'], 'MT'));
+							if (isset($fields['payment_amount'])) {
+								print ' (' . round($ratiopaymentinvoice * 100, 2) . '%)';
+							}
+						}
+						print '</td>';
+					}
+
+					// Total collected
+					print '<td class="nowrap right">';
+					$temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
+					print price(price2num($temp_ht, 'MT'), 1);
+					print '</td>';
+
+					// VAT
+					print '<td class="nowrap right">';
+					$temp_vat = $fields['vat'] * $ratiopaymentinvoice;
+					print price(price2num($temp_vat, 'MT'), 1);
+					//print price($fields['vat']);
+					print '</td>';
+					print '</tr>';
+
+					//$subtot_coll_total_ht += $temp_ht;
+					//$subtot_coll_vat      += $temp_vat;
+					//$x_coll_sum           += $temp_vat;
+				}
+			}
+		}
 		// Total customers for this vat rate
 		print '<tr class="liste_total">';
 		print '<td colspan="4"></td>';
@@ -577,17 +616,14 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
 	}
 
 	// Blank line
-	print '<tr><td colspan="'.($span + 2).'">&nbsp;</td></tr>';
+	print '<tr><td colspan="'.($span+2).'">&nbsp;</td></tr>';
 
 	// Print table headers for this quadri - expenses now
 	print '<tr class="liste_titre liste_titre_topborder">';
 	print '<td class="left">'.$elementsup.'</td>';
 	print '<td class="left">'.$langs->trans("DateInvoice").'</td>';
-	if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') {
-		print '<td class="left">'.$langs->trans("DatePayment").'</td>';
-	} else {
-		print '<td></td>';
-	}
+	if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') print '<td class="left">'.$langs->trans("DatePayment").'</td>';
+	else print '<td></td>';
 	print '<td class="left">'.$namesup.'</td>';
 	print '<td class="left">'.$productsup.'</td>';
 	if ($modetax != 1) {
@@ -604,7 +640,10 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
 
 		if (is_array($x_both[$rate]['paye']['detail'])) {
 			print "<tr>";
-			print '<td class="tax_rate">'.$langs->trans("Rate").': '.vatrate($rate).'%</td><td colspan="'.($span + 1).'"></td>';
+			print '<td class="tax_rate" colspan="' . ($span+1) . '">';
+			print $langs->trans('Rate') . ' : ' . vatrate($rate) . '%';
+			print ' - <a href="' . dol_buildpath('/compta/tva/quadri_detail.php', 1) . '?invoice_type=supplier&amp;vat_rate_show=' . $rate . '&amp;year=' . $year_start . '&amp;month=' . $month_start . '">' . img_picto('', 'chevron-down', 'class="paddingrightonly"') . $langs->trans('VATReportShowByRateDetails') . '</a>';
+			print '</td>';
 			print '</tr>'."\n";
 
 			foreach ($x_both[$rate]['paye']['detail'] as $index => $fields) {
@@ -620,112 +659,151 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
 					$type = 1;
 				}
 
-
-				print '<tr class="oddeven">';
-
-				// Ref
-				print '<td class="nowrap left">'.$fields['link'].'</td>';
-
-				// Invoice date
-				print '<td class="left">'.dol_print_date($fields['datef'], 'day').'</td>';
-
-				// Payment date
-				if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') {
-					print '<td class="left">'.dol_print_date($fields['datep'], 'day').'</td>';
-				} else {
-					print '<td></td>';
-				}
-
-				// Company name
-				print '<td class="left">'.$fields['company_link'].'</td>';
-
-				// Description
-				print '<td class="left">';
-				if ($fields['pid']) {
-					$product_static->id = $fields['pid'];
-					$product_static->ref = $fields['pref'];
-					$product_static->type = $fields['dtype']; // We force with the type of line to have type how line is registered
-					print $product_static->getNomUrl(1);
-					if (dol_string_nohtmltag($fields['descr'])) {
-						print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
-					}
-				} else {
-					if ($type) {
-						$text = img_object($langs->trans('Service'), 'service');
-					} else {
-						$text = img_object($langs->trans('Product'), 'product');
-					}
-					if (preg_match('/^\((.*)\)$/', $fields['descr'], $reg)) {
-						if ($reg[1] == 'DEPOSIT') {
-							$fields['descr'] = $langs->transnoentitiesnoconv('Deposit');
-						} elseif ($reg[1] == 'CREDIT_NOTE') {
-							$fields['descr'] = $langs->transnoentitiesnoconv('CreditNote');
-						} else {
-							$fields['descr'] = $langs->transnoentitiesnoconv($reg[1]);
-						}
-					}
-					print $text.' '.dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
-
-					// Show range
-					print_date_range($fields['ddate_start'], $fields['ddate_end']);
-				}
-				print '</td>';
-
-				// Total HT
-				if ($modetax != 1) {
-					print '<td class="nowrap right">';
-					print price($fields['totalht']);
-					if (price2num($fields['ftotal_ttc'])) {
-						//print $fields['dtotal_ttc']."/".$fields['ftotal_ttc']." - ";
-						$ratiolineinvoice = ($fields['dtotal_ttc'] / $fields['ftotal_ttc']);
-						//print ' ('.round($ratiolineinvoice*100,2).'%)';
-					}
-					print '</td>';
-				}
-
 				// Payment
 				$ratiopaymentinvoice = 1;
 				if ($modetax != 1) {
-					print '<td class="nowrap right">';
-					if ($fields['payment_amount'] && $fields['ftotal_ttc']) {
-						$paymentfourn_static->id = $fields['payment_id'];
-						print $paymentfourn_static->getNomUrl(2);
-					}
-
 					if (($type == 0 && $conf->global->TAX_MODE_BUY_PRODUCT == 'invoice')
 						|| ($type == 1 && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice')) {
-						print $langs->trans("NA");
 					} else {
 						if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) {
 							$ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
 						}
-						print price(price2num($fields['payment_amount'], 'MT'));
-						if (isset($fields['payment_amount'])) {
-							print ' ('.round($ratiopaymentinvoice * 100, 2).'%)';
-						}
 					}
-					print '</td>';
 				}
 
 				// VAT paid
-				print '<td class="nowrap right">';
 				$temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
-				print price(price2num($temp_ht, 'MT'), 1);
-				print '</td>';
 
 				// VAT
-				print '<td class="nowrap right">';
 				$temp_vat = $fields['vat'] * $ratiopaymentinvoice;
-				print price(price2num($temp_vat, 'MT'), 1);
-				//print price($fields['vat']);
-				print '</td>';
-				print '</tr>';
 
 				$subtot_paye_total_ht += $temp_ht;
 				$subtot_paye_vat += $temp_vat;
 				$x_paye_sum += $temp_vat;
 			}
+
+			if ($invoice_type == 'supplier' && $vat_rate_show == $rate) {
+				foreach ($x_both[$rate]['paye']['detail'] as $index => $fields) {
+					// Define type
+					// We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
+					$type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
+					// Try to enhance type detection using date_start and date_end for free lines where type
+					// was not saved.
+					if (!empty($fields['ddate_start'])) {
+						$type = 1;
+					}
+					if (!empty($fields['ddate_end'])) {
+						$type = 1;
+					}
+
+
+					print '<tr class="oddeven">';
+
+					// Ref
+					print '<td class="nowrap left">' . $fields['link'] . '</td>';
+
+					// Invoice date
+					print '<td class="left">' . dol_print_date($fields['datef'], 'day') . '</td>';
+
+					// Payment date
+					if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') {
+						print '<td class="left">' . dol_print_date($fields['datep'], 'day') . '</td>';
+					} else {
+						print '<td></td>';
+					}
+
+					// Company name
+					print '<td class="left">' . $fields['company_link'] . '</td>';
+
+					// Description
+					print '<td class="left">';
+					if ($fields['pid']) {
+						$product_static->id = $fields['pid'];
+						$product_static->ref = $fields['pref'];
+						$product_static->type = $fields['dtype'];        // We force with the type of line to have type how line is registered
+						print $product_static->getNomUrl(1);
+						if (dol_string_nohtmltag($fields['descr'])) {
+							print ' - ' . dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
+						}
+					} else {
+						if ($type) {
+							$text = img_object($langs->trans('Service'), 'service');
+						} else {
+							$text = img_object($langs->trans('Product'), 'product');
+						}
+						if (preg_match('/^\((.*)\)$/', $fields['descr'], $reg)) {
+							if ($reg[1] == 'DEPOSIT') {
+								$fields['descr'] = $langs->transnoentitiesnoconv('Deposit');
+							} elseif ($reg[1] == 'CREDIT_NOTE') {
+								$fields['descr'] = $langs->transnoentitiesnoconv('CreditNote');
+							} else {
+								$fields['descr'] = $langs->transnoentitiesnoconv($reg[1]);
+							}
+						}
+						print $text . ' ' . dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
+
+						// Show range
+						print_date_range($fields['ddate_start'], $fields['ddate_end']);
+					}
+					print '</td>';
+
+					// Total HT
+					if ($modetax != 1) {
+						print '<td class="nowrap right">';
+						print price($fields['totalht']);
+						if (price2num($fields['ftotal_ttc'])) {
+							//print $fields['dtotal_ttc']."/".$fields['ftotal_ttc']." - ";
+							$ratiolineinvoice = ($fields['dtotal_ttc'] / $fields['ftotal_ttc']);
+							//print ' ('.round($ratiolineinvoice*100,2).'%)';
+						}
+						print '</td>';
+					}
+
+					// Payment
+					$ratiopaymentinvoice = 1;
+					if ($modetax != 1) {
+						print '<td class="nowrap right">';
+						if ($fields['payment_amount'] && $fields['ftotal_ttc']) {
+							$paymentfourn_static->id = $fields['payment_id'];
+							print $paymentfourn_static->getNomUrl(2);
+						}
+
+						if (($type == 0 && $conf->global->TAX_MODE_BUY_PRODUCT == 'invoice')
+							|| ($type == 1 && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice')) {
+							print $langs->trans("NA");
+						} else {
+							if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) {
+								$ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
+							}
+							print price(price2num($fields['payment_amount'], 'MT'));
+							if (isset($fields['payment_amount'])) {
+								print ' (' . round($ratiopaymentinvoice * 100, 2) . '%)';
+							}
+						}
+						print '</td>';
+					}
+
+					// VAT paid
+					print '<td class="nowrap right">';
+					$temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
+					print price(price2num($temp_ht, 'MT'), 1);
+					print '</td>';
+
+					// VAT
+					print '<td class="nowrap right">';
+					$temp_vat = $fields['vat'] * $ratiopaymentinvoice;
+					print price(price2num($temp_vat, 'MT'), 1);
+					//print price($fields['vat']);
+					print '</td>';
+					print '</tr>';
+
+					//$subtot_paye_total_ht += $temp_ht;
+					//$subtot_paye_vat += $temp_vat;
+					//$x_paye_sum += $temp_vat;
+				}
+			}
 		}
+
 		// Total suppliers for this vat rate
 		print '<tr class="liste_total">';
 		print '<td colspan="4"></td>';
diff --git a/htdocs/core/lib/tax.lib.php b/htdocs/core/lib/tax.lib.php
index e2257369865..c66d16b6736 100644
--- a/htdocs/core/lib/tax.lib.php
+++ b/htdocs/core/lib/tax.lib.php
@@ -1,11 +1,12 @@
 <?php
-/* Copyright (C) 2004-2009 Laurent Destailleur	<eldy@users.sourceforge.net>
- * Copyright (C) 2006-2007 Yannick Warnier		<ywarnier@beeznest.org>
- * Copyright (C) 2011	   Regis Houssin		<regis.houssin@inodbox.com>
- * Copyright (C) 2012-2017 Juanjo Menent		<jmenent@2byte.es>
- * Copyright (C) 2012      Cédric Salvador      <csalvador@gpcsolutions.fr>
- * Copyright (C) 2012-2014 Raphaël Doursenaud   <rdoursenaud@gpcsolutions.fr>
- * Copyright (C) 2015      Marcos García        <marcosgdf@gmail.com>
+/* Copyright (C) 2004-2009  Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2006-2007  Yannick Warnier     <ywarnier@beeznest.org>
+ * Copyright (C) 2011	    Regis Houssin       <regis.houssin@inodbox.com>
+ * Copyright (C) 2012-2017  Juanjo Menent       <jmenent@2byte.es>
+ * Copyright (C) 2012       Cédric Salvador     <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2012-2014  Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) 2015       Marcos García       <marcosgdf@gmail.com>
+ * Copyright (C) 2021       Open-Dsi            <support@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
@@ -642,9 +643,9 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 		$sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
 		$sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
 		$sql .= " 0 as payment_id, 0 as payment_amount";
-		$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
-		$sql .= " ".MAIN_DB_PREFIX."societe as s,";
-		$sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f";
+		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
+		$sql .= " INNER JOIN ".MAIN_DB_PREFIX.$invoicedettable." as d ON d.".$fk_facture."=f.rowid";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
 		$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
 		$sql .= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
@@ -653,8 +654,6 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 		} else {
 			$sql .= " AND f.type IN (0,1,2,3,5)";
 		}
-		$sql .= " AND f.rowid = d.".$fk_facture;
-		$sql .= " AND s.rowid = f.fk_soc";
 		if ($y && $m) {
 			$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
 			$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
@@ -683,11 +682,11 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 		$sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
 		$sql .= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";
 		$sql .= " pa.datep as datep";
-		$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
-		$sql .= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";
-		$sql .= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";
-		$sql .= " ".MAIN_DB_PREFIX."societe as s,";
-		$sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f";
+		$sql .= " INNER JOIN ".MAIN_DB_PREFIX.$paymentfacturetable." as pf ON pf.".$fk_facture2." = f.rowid";;
+		$sql .= " INNER JOIN ".MAIN_DB_PREFIX.$paymenttable." as pa ON pa.rowid = pf.".$fk_payment;
+		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
+		$sql .= " INNER JOIN ".MAIN_DB_PREFIX.$invoicedettable." as d ON d.".$fk_facture." = f.rowid";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
 		$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
 		$sql .= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
@@ -696,10 +695,6 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 		} else {
 			$sql .= " AND f.type IN (0,1,2,3,5)";
 		}
-		$sql .= " AND f.rowid = d.".$fk_facture;
-		$sql .= " AND s.rowid = f.fk_soc";
-		$sql .= " AND pf.".$fk_facture2." = f.rowid";
-		$sql .= " AND pa.rowid = pf.".$fk_payment;
 		if ($y && $m) {
 			$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
 			$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
@@ -805,9 +800,9 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 		$sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
 		$sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
 		$sql .= " 0 as payment_id, 0 as payment_amount";
-		$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
-		$sql .= " ".MAIN_DB_PREFIX."societe as s,";
-		$sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f";
+		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
+		$sql .= " INNER JOIN ".MAIN_DB_PREFIX.$invoicedettable." as d ON d.".$fk_facture." = f.rowid";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
 		$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
 		$sql .= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
@@ -816,8 +811,6 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 		} else {
 			$sql .= " AND f.type IN (0,1,2,3,5)";
 		}
-		$sql .= " AND f.rowid = d.".$fk_facture;
-		$sql .= " AND s.rowid = f.fk_soc";
 		if ($y && $m) {
 			$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
 			$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
@@ -846,11 +839,11 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 		$sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
 		$sql .= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";
 		$sql .= " pa.datep as datep";
-		$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
-		$sql .= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";
-		$sql .= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";
-		$sql .= " ".MAIN_DB_PREFIX."societe as s,";
-		$sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f";
+		$sql .= " INNER JOIN ".MAIN_DB_PREFIX.$paymentfacturetable." as pf ON pf.".$fk_facture2." = f.rowid";
+		$sql .= " INNER JOIN ".MAIN_DB_PREFIX.$paymenttable." as pa ON pa.rowid = pf.".$fk_payment;
+		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
+		$sql .= " INNER JOIN ".MAIN_DB_PREFIX.$invoicedettable." as d ON d.".$fk_facture." = f.rowid";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
 		$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
 		$sql .= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
@@ -859,10 +852,6 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 		} else {
 			$sql .= " AND f.type IN (0,1,2,3,5)";
 		}
-		$sql .= " AND f.rowid = d.".$fk_facture;
-		$sql .= " AND s.rowid = f.fk_soc";
-		$sql .= " AND pf.".$fk_facture2." = f.rowid";
-		$sql .= " AND pa.rowid = pf.".$fk_payment;
 		if ($y && $m) {
 			$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
 			$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
@@ -967,9 +956,9 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 		$sql .= " e.date_debut as date_start, e.date_fin as date_end, e.fk_user_author,";
 		$sql .= " e.ref as facnum, e.total_ttc as ftotal_ttc, e.date_create, d.fk_c_type_fees as type,";
 		$sql .= " p.fk_bank as payment_id, p.amount as payment_amount, p.rowid as pid, e.ref as pref";
-		$sql .= " FROM ".MAIN_DB_PREFIX."expensereport as e ";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."expensereport_det as d ON d.fk_expensereport = e.rowid ";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."payment_expensereport as p ON p.fk_expensereport = e.rowid ";
+		$sql .= " FROM ".MAIN_DB_PREFIX."expensereport as e";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."expensereport_det as d ON d.fk_expensereport = e.rowid";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."payment_expensereport as p ON p.fk_expensereport = e.rowid";
 		$sql .= " WHERE e.entity = ".$conf->entity;
 		$sql .= " AND e.fk_statut in (6)";
 		if ($y && $m) {
diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang
index 35b785c1f7c..3f892e3b29c 100644
--- a/htdocs/langs/en_US/compta.lang
+++ b/htdocs/langs/en_US/compta.lang
@@ -195,6 +195,7 @@ VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=Report tax 2 by rate
 LT2ReportByQuarters=Report tax 3 by rate
 LT1ReportByQuartersES=Report by RE rate