diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php
index 13c5aa77226..fea0d14f3c2 100644
--- a/htdocs/compta/tva/clients.php
+++ b/htdocs/compta/tva/clients.php
@@ -23,7 +23,7 @@
  *	    \file       htdocs/compta/tva/clients.php
  *      \ingroup    tax
  *		\brief      Page des societes
- *		\version    $Id: clients.php,v 1.31 2011/07/18 11:11:19 eldy Exp $
+ *		\version    $Id$
  */
 
 require('../../main.inc.php');
@@ -38,7 +38,7 @@ $langs->load("companies");
 $langs->load("products");
 
 // Date range
-$year=GETPOST("year");
+$year=$_REQUEST["year"];
 if (empty($year))
 {
 	$year_current = strftime("%Y",dol_now());
@@ -52,26 +52,24 @@ $date_end=dol_mktime(23,59,59,$_REQUEST["date_endmonth"],$_REQUEST["date_endday"
 // Quarter
 if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 {
-    $q=GETPOST("q");
-    if (empty($q))
+	$q=(! empty($_REQUEST["q"]))?$_REQUEST["q"]:0;
+	if ($q==0)
 	{
 		if (isset($_REQUEST["month"])) { $date_start=dol_get_first_day($year_start,$_REQUEST["month"],false); $date_end=dol_get_last_day($year_start,$_REQUEST["month"],false); }
-		else
-		{
-		    $month_current = strftime("%m",dol_now());
-		    if ($month_current >= 10) $q=4;
-            elseif ($month_current >= 7) $q=3;
-            elseif ($month_current >= 4) $q=2;
-            else $q=1;
-		}
+		else $q=1;
 	}
 	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
+{
+	// TODO We define q
 
-$min = GETPOST("min");
+}
+
+$min = $_REQUEST["min"];
 if (empty($min)) $min = 0;
 
 // Define modetax (0 or 1)
@@ -80,7 +78,7 @@ $modetax = $conf->global->TAX_MODE;
 if (isset($_REQUEST["modetax"])) $modetax=$_REQUEST["modetax"];
 
 // Security check
-$socid = GETPOST("socid");
+$socid = isset($_REQUEST["socid"])?$_REQUEST["socid"]:'';
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'tax', '', '', 'charges');
 
@@ -106,7 +104,7 @@ $fsearch.='<br>';
 $fsearch.='  <input type="hidden" name="year" value="'.$year.'">';
 $fsearch.='  <input type="hidden" name="modetax" value="'.$modetax.'">';
 $fsearch.='  '.$langs->trans("SalesTurnover").' '.$langs->trans("Minimum").': ';
-$fsearch.='  <input type="text" name="min" id="min" value="'.$min.'" size="6">';
+$fsearch.='  <input type="text" name="min" value="'.$min.'">';
 
 // Affiche en-tete du rapport
 if ($modetax==1)	// Calculate on invoice for goods and services
@@ -117,8 +115,7 @@ if ($modetax==1)	// Calculate on invoice for goods and services
     //$periodlink=($year_start?"<a href='".$_SERVER["PHP_SELF"]."?year=".($year_start-1)."&modetax=".$modetax."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year_start+1)."&modetax=".$modetax."'>".img_next()."</a>":"");
     $description=$langs->trans("RulesVATDue");
     //if ($conf->global->MAIN_MODULE_COMPTABILITE || $conf->global->MAIN_MODULE_ACCOUNTING) $description.='<br>'.img_warning().' '.$langs->trans('OptionVatInfoModuleComptabilite');
-    if ($conf->global->MAIN_MODULE_COMPTABILITE) $description.='<br>'.$langs->trans("WarningDepositsNotIncluded");
-    $description.=$fsearch;
+	$description.=$fsearch;
     $description.='<br>('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')';
 	$builddate=time();
     //$exportlink=$langs->trans("NotYetAvailable");
@@ -140,10 +137,9 @@ if ($modetax==0) 	// Invoice for goods, payment for services
     //$periodlink=($year_start?"<a href='".$_SERVER["PHP_SELF"]."?year=".($year_start-1)."&modetax=".$modetax."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year_start+1)."&modetax=".$modetax."'>".img_next()."</a>":"");
     $description=$langs->trans("RulesVATIn");
     //if ($conf->global->MAIN_MODULE_COMPTABILITE || $conf->global->MAIN_MODULE_ACCOUNTING) $description.='<br>'.img_warning().' '.$langs->trans('OptionVatInfoModuleComptabilite');
-    if ($conf->global->MAIN_MODULE_COMPTABILITE) $description.='<br>'.$langs->trans("WarningDepositsNotIncluded");
-    $description.=$fsearch;
+	$description.=$fsearch;
     $description.='<br>('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')';
-    $builddate=time();
+	$builddate=time();
     //$exportlink=$langs->trans("NotYetAvailable");
 
 	$elementcust=$langs->trans("CustomersInvoices");
@@ -171,7 +167,7 @@ print "<tr class=\"liste_titre\">";
 print '<td align="left">'.$langs->trans("Num")."</td>";
 print '<td align="left">'.$langs->trans("Customer")."</td>";
 print "<td>".$langs->trans("VATIntra")."</td>";
-print "<td align=\"right\">".$langs->trans("AmountHTVATRealReceived")."</td>";
+print "<td align=\"right\">".$langs->trans("SalesTurnover")." ".$langs->trans("HT")."</td>";
 print "<td align=\"right\">".$vatcust."</td>";
 print "</tr>\n";
 
@@ -179,7 +175,7 @@ $coll_list = vat_by_thirdparty($db,0,$date_start,$date_end,$modetax,'sell');
 if (is_array($coll_list))
 {
 	$var=true;
-	$total = 0;  $totalamount = 0;
+	$total = 0;  $subtotal = 0;
 	$i = 1;
 	foreach($coll_list as $coll)
 	{
@@ -195,11 +191,10 @@ if (is_array($coll_list))
 				}
 				else
 				{
-					//$intra = $langs->trans('NotRegistered');
-					$intra = '';
+					$intra = $langs->trans('NotRegistered');
 				}
 			}
-			print "<tr ".$bc[$var].">";
+			print "<tr $bc[$var]>";
 			print "<td nowrap>".$i."</td>";
 			$company_static->id=$coll->socid;
 			$company_static->nom=$coll->nom;
@@ -209,17 +204,13 @@ if (is_array($coll_list))
 			print "<td nowrap>".$intra."</td>";
 			print "<td nowrap align=\"right\">".price($coll->amount)."</td>";
 			print "<td nowrap align=\"right\">".price($coll->tva)."</td>";
-            $totalamount = $totalamount + $coll->amount;
 			$total = $total + $coll->tva;
 			print "</tr>\n";
 			$i++;
 		}
 	}
-    $x_coll_sum = $total;
 
-	print '<tr class="liste_total"><td align="right" colspan="3">'.$langs->trans("Total").':</td>';
-    print '<td nowrap align="right">'.price($totalamount).'</td>';
-	print '<td nowrap align="right">'.price($total).'</td>';
+	print '<tr class="liste_total"><td align="right" colspan="4">'.$langs->trans("Total").':</td><td nowrap align="right"><b>'.price($total).'</b></td>';
 	print '</tr>';
 }
 else
@@ -246,7 +237,7 @@ print "<tr class=\"liste_titre\">";
 print '<td align="left">'.$langs->trans("Num")."</td>";
 print '<td align="left">'.$langs->trans("Supplier")."</td>";
 print "<td>".$langs->trans("VATIntra")."</td>";
-print "<td align=\"right\">".$langs->trans("AmountHTVATRealPaid")."</td>";
+print "<td align=\"right\">".$langs->trans("Outcome")." ".$langs->trans("HT")."</td>";
 print "<td align=\"right\">".$vatsup."</td>";
 print "</tr>\n";
 
@@ -256,7 +247,7 @@ $coll_list = vat_by_thirdparty($db,0,$date_start,$date_end,$modetax,'buy');
 if (is_array($coll_list))
 {
 	$var=true;
-	$total = 0;  $totalamount = 0;
+	$total = 0;  $subtotal = 0;
 	$i = 1;
 	foreach($coll_list as $coll)
 	{
@@ -272,8 +263,7 @@ if (is_array($coll_list))
 				}
 				else
 				{
-					//$intra = $langs->trans('NotRegistered');
-					$intra = '';
+					$intra = $langs->trans('NotRegistered');
 				}
 			}
 			print "<tr $bc[$var]>";
@@ -286,30 +276,14 @@ if (is_array($coll_list))
 			print "<td nowrap>".$intra."</td>";
 			print "<td nowrap align=\"right\">".price($coll->amount)."</td>";
 			print "<td nowrap align=\"right\">".price($coll->tva)."</td>";
-            $totalamount = $totalamount + $coll->amount;
 			$total = $total + $coll->tva;
 			print "</tr>\n";
 			$i++;
 		}
 	}
-    $x_paye_sum = $total;
 
-	print '<tr class="liste_total"><td align="right" colspan="3">'.$langs->trans("Total").':</td>';
-    print '<td nowrap align="right">'.price($totalamount).'</td>';
-	print '<td nowrap align="right">'.price($total).'</td>';
+	print '<tr class="liste_total"><td align="right" colspan="4">'.$langs->trans("Total").':</td><td nowrap align="right"><b>'.price($total).'</b></td>';
 	print '</tr>';
-
-	print '</table>';
-
-    // Total to pay
-    print '<br><br>';
-    print '<table class="noborder" width="100%">';
-    $diff = $x_coll_sum - $x_paye_sum;
-    print '<tr class="liste_total">';
-    print '<td class="liste_total" colspan="4">'.$langs->trans("TotalToPay").($q?', '.$langs->trans("Quadri").' '.$q:'').'</td>';
-    print '<td class="liste_total" nowrap="nowrap" align="right"><b>'.price(price2num($diff,'MT'))."</b></td>\n";
-    print "</tr>\n";
-
 }
 else
 {
@@ -327,5 +301,5 @@ print '</table>';
 
 $db->close();
 
-llxFooter('$Date: 2011/07/18 11:11:19 $ - $Revision: 1.31 $');
+llxFooter('$Date$ - $Revision$');
 ?>
diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php
index 315069dc086..cecc88d2e9f 100644
--- a/htdocs/compta/tva/quadri_detail.php
+++ b/htdocs/compta/tva/quadri_detail.php
@@ -23,7 +23,7 @@
  *	    \file       htdocs/compta/tva/quadri_detail.php
  *      \ingroup    tax
  *		\brief      Trimestrial page - detailed version
- *		\version    $Id: quadri_detail.php,v 1.43 2011/07/18 11:11:19 eldy Exp $
+ *		\version    $Id$
  *		\todo 		Deal with recurrent invoices as well
  */
 
@@ -44,7 +44,7 @@ $langs->load("companies");
 $langs->load("products");
 
 // Date range
-$year=GETPOST("year");
+$year=$_REQUEST["year"];
 if (empty($year))
 {
 	$year_current = strftime("%Y",dol_now());
@@ -58,26 +58,24 @@ $date_end=dol_mktime(23,59,59,$_REQUEST["date_endmonth"],$_REQUEST["date_endday"
 // Quarter
 if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 {
-	$q=GETPOST("q");
-	if (empty($q))
+	$q=(! empty($_REQUEST["q"]))?$_REQUEST["q"]:0;
+	if ($q==0)
 	{
 		if (isset($_REQUEST["month"])) { $date_start=dol_get_first_day($year_start,$_REQUEST["month"],false); $date_end=dol_get_last_day($year_start,$_REQUEST["month"],false); }
-		else
-		{
-            $month_current = strftime("%m",dol_now());
-            if ($month_current >= 10) $q=4;
-            elseif ($month_current >= 7) $q=3;
-            elseif ($month_current >= 4) $q=2;
-            else $q=1;
-		}
+		else $q=1;
 	}
 	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
+{
+	// TODO We define q
 
-$min = GETPOST("min");
+}
+
+$min = $_REQUEST["min"];
 if (empty($min)) $min = 0;
 
 // Define modetax (0 or 1)
@@ -87,7 +85,7 @@ if (isset($_REQUEST["modetax"])) $modetax=$_REQUEST["modetax"];
 if (empty($modetax)) $modetax=0;
 
 // Security check
-$socid = GETPOST("socid");
+$socid = isset($_REQUEST["socid"])?$_REQUEST["socid"]:'';
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'tax', '', '', 'charges');
 
@@ -136,10 +134,9 @@ if ($modetax==1)	// Calculate on invoice for goods and services
 	else { $nextquarter=1; $nextyear++; }
 	//$periodlink=($prevyear?"<a href='".$_SERVER["PHP_SELF"]."?year=".$prevyear."&q=".$prevquarter."&modetax=".$modetax."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".$nextyear."&q=".$nextquarter."&modetax=".$modetax."'>".img_next()."</a>":"");
     $description=$langs->trans("RulesVATDue");
-    //if ($conf->global->MAIN_MODULE_COMPTABILITE || $conf->global->MAIN_MODULE_ACCOUNTING) $description.='<br>'.img_warning().' '.$langs->trans('OptionVatInfoModuleComptabilite');
-    if ($conf->global->MAIN_MODULE_COMPTABILITE) $description.='<br>'.$langs->trans("WarningDepositsNotIncluded");
     $description.='<br>('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')';
-    $description.=$fsearch;
+    //if ($conf->global->MAIN_MODULE_COMPTABILITE || $conf->global->MAIN_MODULE_ACCOUNTING) $description.='<br>'.img_warning().' '.$langs->trans('OptionVatInfoModuleComptabilite');
+	$description.=$fsearch;
     $builddate=time();
     //$exportlink=$langs->trans("NotYetAvailable");
 
@@ -167,8 +164,7 @@ if ($modetax==0) 	// Invoice for goods, payment for services
 	//$periodlink=($prevyear?"<a href='".$_SERVER["PHP_SELF"]."?year=".$prevyear."&q=".$prevquarter."&modetax=".$modetax."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".$nextyear."&q=".$nextquarter."&modetax=".$modetax."'>".img_next()."</a>":"");
     $description=$langs->trans("RulesVATIn");
     //if ($conf->global->MAIN_MODULE_COMPTABILITE || $conf->global->MAIN_MODULE_ACCOUNTING) $description.='<br>'.img_warning().' '.$langs->trans('OptionVatInfoModuleComptabilite');
-    if ($conf->global->MAIN_MODULE_COMPTABILITE) $description.='<br>'.$langs->trans("WarningDepositsNotIncluded");
-    $description.=$fsearch;
+	$description.=$fsearch;
     $description.='<br>('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')';
 	$builddate=time();
     //$exportlink=$langs->trans("NotYetAvailable");
@@ -192,10 +188,14 @@ $vatsup=$langs->trans("VATPaid");
 
 // VAT Received and paid
 
+//print "<br>";
+//print_titre($vatcust);
+
 echo '<table class="noborder" width="100%">';
 
 $y = $year_current;
 $total = 0;
+$subtotal = 0;
 $i=0;
 
 // Load arrays of datas
@@ -416,36 +416,21 @@ else
 				$x_coll_sum           += $temp_vat;
 			}
 		}
-        // Total customers for this vat rate
-        print '<tr class="liste_total">';
-        print '<td></td>';
-        print '<td align="right">'.$langs->trans("Total").':</td>';
-        if ($modetax == 0)
-        {
-            print '<td nowrap align="right">&nbsp;</td>';
-            print '<td align="right">&nbsp;</td>';
-        }
-        print '<td align="right">'.price(price2num($subtot_coll_total_ht,'MT')).'</td>';
-        print '<td nowrap align="right">'.price(price2num($subtot_coll_vat,'MT')).'</td>';
-        print '</tr>';
+
+		// Total customers
+		print '<tr class="liste_total">';
+		print '<td></td>';
+		print '<td align="right">'.$langs->trans("Total").':</td>';
+		if ($modetax == 0)
+		{
+			print '<td nowrap align="right">&nbsp;</td>';
+			print '<td align="right">&nbsp;</td>';
+		}
+		print '<td align="right">'.price(price2num($subtot_coll_total_ht,'MT')).'</td>';
+		print '<td nowrap align="right">'.price(price2num($subtot_coll_vat,'MT')).'</td>';
+		print '</tr>';
 	}
 
-    if (count($x_coll) == 0)   // Show a total ine if nothing shown
-    {
-        print '<tr class="liste_total">';
-        print '<td>&nbsp;</td>';
-        print '<td align="right">'.$langs->trans("Total").':</td>';
-        if ($modetax == 0)
-        {
-            print '<td nowrap align="right">&nbsp;</td>';
-            print '<td align="right">&nbsp;</td>';
-        }
-        print '<td align="right">'.price(price2num(0,'MT')).'</td>';
-        print '<td nowrap align="right">'.price(price2num(0,'MT')).'</td>';
-        print '</tr>';
-    }
-
-    // Blank line
 	print '<tr><td colspan="'.($span+1).'">&nbsp;</td></tr>';
 
 	//print table headers for this quadri - expenses now
@@ -567,51 +552,41 @@ else
 				$x_paye_sum           += $temp_vat;
 			}
 		}
-        // Total suppliers for this vat rate
-        print '<tr class="liste_total">';
-        print '<td>&nbsp;</td>';
-        print '<td align="right">'.$langs->trans("Total").':</td>';
-        if ($modetax == 0)
-        {
-            print '<td nowrap align="right">&nbsp;</td>';
-            print '<td align="right">&nbsp;</td>';
-        }
-        print '<td align="right">'.price(price2num($subtot_paye_total_ht,'MT')).'</td>';
-        print '<td nowrap align="right">'.price(price2num($subtot_paye_vat,'MT')).'</td>';
-        print '</tr>';
+
+		// Total suppliers
+		print '<tr class="liste_total">';
+		print '<td>&nbsp;</td>';
+		print '<td align="right">'.$langs->trans("Total").':</td>';
+		if ($modetax == 0)
+		{
+			print '<td nowrap align="right">&nbsp;</td>';
+			print '<td align="right">&nbsp;</td>';
+		}
+		print '<td align="right">'.price(price2num($subtot_paye_total_ht,'MT')).'</td>';
+		print '<td nowrap align="right">'.price(price2num($subtot_paye_vat,'MT')).'</td>';
+		print '</tr>';
 	}
 
-	if (count($x_paye) == 0)   // Show a total ine if nothing shown
-	{
-        print '<tr class="liste_total">';
-        print '<td>&nbsp;</td>';
-        print '<td align="right">'.$langs->trans("Total").':</td>';
-        if ($modetax == 0)
-        {
-            print '<td nowrap align="right">&nbsp;</td>';
-            print '<td align="right">&nbsp;</td>';
-        }
-        print '<td align="right">'.price(price2num(0,'MT')).'</td>';
-        print '<td nowrap align="right">'.price(price2num(0,'MT')).'</td>';
-        print '</tr>';
-	}
-
-    print '</table>';
+	print '<tr><td colspan="'.($span+1).'">&nbsp;</td></tr>';
 
 	// Total to pay
-    print '<br><br>';
-    print '<table class="noborder" width="100%">';
-    $diff = $x_coll_sum - $x_paye_sum;
+	print '<tr class="liste_titre">';
+	print '<td class="liste_titre" colspan="'.($span-1).'"></td><td class="liste_titre" align="right" colspan="2">'.$langs->trans("TotalToPay").($q?', '.$langs->trans("Quadri").' '.$q:'').':</td>';
+	print '</tr>'."\n";
+
+	$diff = $x_coll_sum - $x_paye_sum;
 	print '<tr class="liste_total">';
-	print '<td class="liste_total" colspan="'.$span.'">'.$langs->trans("TotalToPay").($q?', '.$langs->trans("Quadri").' '.$q:'').'</td>';
+	print '<td class="liste_total" colspan="'.$span.'"></td>';
 	print '<td class="liste_total" nowrap="nowrap" align="right"><b>'.price(price2num($diff,'MT'))."</b></td>\n";
 	print "</tr>\n";
 
+	//print '<tr><td colspan="'.($span+1).'">&nbsp;</td></tr>'."\n";
+
 	$i++;
 }
 echo '</table>';
 
 $db->close();
 
-llxFooter('$Date: 2011/07/18 11:11:19 $ - $Revision: 1.43 $');
+llxFooter('$Date$ - $Revision$');
 ?>
diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang
index 50c3f887959..a08d440d5ef 100644
--- a/htdocs/langs/en_US/compta.lang
+++ b/htdocs/langs/en_US/compta.lang
@@ -128,4 +128,3 @@ InvoiceRef=Invoice ref.
 CodeNotDef=Not defined
 AddRemind=Dispatch available amount
 RemainToDivide= Remain to dispatch :
-WarningDepositsNotIncluded=Deposits invoices are not included in this version with this accountancy module.
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang
index f2d91f35f70..143737924e3 100644
--- a/htdocs/langs/fr_FR/compta.lang
+++ b/htdocs/langs/fr_FR/compta.lang
@@ -139,5 +139,4 @@ COMPTA_VAT_ACCOUNT=Code comptable par défaut pour TVA (si non défini dans dict
 COMPTA_ACCOUNT_CUSTOMER=Code comptable client par défaut (si non défini sur fiche tiers)
 COMPTA_ACCOUNT_SUPPLIER=Code comptable fournisseur par défaut (si non défini sur fiche tiers)
 AddRemind=Ventiler montant disponible
-RemainToDivide=Reste à répartir :
-WarningDepositsNotIncluded=Les factures d'accomptes ne sont pas encore prises en compte dans cette version avec ce module de comptabilité.
\ No newline at end of file
+RemainToDivide=Reste à répartir :
\ No newline at end of file
diff --git a/htdocs/lib/tax.lib.php b/htdocs/lib/tax.lib.php
index 82e5cad0bc2..3a1ad141ebd 100644
--- a/htdocs/lib/tax.lib.php
+++ b/htdocs/lib/tax.lib.php
@@ -21,7 +21,7 @@
  *      \file       htdocs/lib/tax.lib.php
  *      \ingroup    tax
  *      \brief      Library for tax module
- *      \version    $Id: tax.lib.php,v 1.21 2011/07/18 11:11:19 eldy Exp $
+ *      \version    $Id: tax.lib.php,v 1.20 2011/07/04 09:01:37 eldy Exp $
  */
 
 
@@ -142,8 +142,8 @@ function vat_by_thirdparty($db, $y, $date_start, $date_end, $modetax, $direction
     }
 
     if (! $sql) return -1;
-    if ($sql == 'TODO') return -2;
-    if ($sql != 'TODO')
+    if ($sql && $sql=='TODO') return -2;
+    if ($sql && $sql!='TODO')
     {
         dol_syslog("Tax.lib:thirdparty sql=".$sql);
         $resql = $db->query($sql);
@@ -316,8 +316,8 @@ function vat_by_date($db, $y, $q, $date_start, $date_end, $modetax, $direction,
 
     //print $sql.'<br>';
     if (! $sql) return -1;
-    if ($sql == 'TODO') return -2;
-    if ($sql != 'TODO')
+    if ($sql && $sql=='TODO') return -2;
+    if ($sql && $sql!='TODO')
     {
         dol_syslog("Tax.lib.php::vat_by_date sql=".$sql);
 
@@ -477,8 +477,8 @@ function vat_by_date($db, $y, $q, $date_start, $date_end, $modetax, $direction,
         dol_syslog("Tax.lib.php::vat_by_date no accountancy module enabled".$sql,LOG_ERR);
         return -1;  // -1 = Not accountancy module enabled
     }
-    if ($sql == 'TODO') return -2; // -2 = Feature not yet available
-    if ($sql != 'TODO')
+    if ($sql && $sql=='TODO') return -2; // -2 = Feature not yet available
+    if ($sql && $sql!='TODO')
     {
         dol_syslog("Tax.lib.php::vat_by_date sql=".$sql);
         $resql = $db->query($sql);