diff --git a/htdocs/core/lib/tax.lib.php b/htdocs/core/lib/tax.lib.php
index 7d9ee545dea..cac356b5a8f 100644
--- a/htdocs/core/lib/tax.lib.php
+++ b/htdocs/core/lib/tax.lib.php
@@ -265,98 +265,74 @@ function vat_by_date($db, $y, $q, $date_start, $date_end, $modetax, $direction,
     $sql='';
     if ($modetax == 1)  // Option vat on delivery for goods (payment) and debit invoice for services
     {
-        if (! empty($conf->global->MAIN_MODULE_ACCOUNTING))
+        // Count on delivery date (use invoice date as delivery is unknown)
+        $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.tva_tx as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
+        $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+        $sql.= " d.date_start as date_start, d.date_end as date_end,";
+        $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.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+        $sql.= " WHERE f.entity = " . $conf->entity;
+        $sql.= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
+        if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
+        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)
         {
-            // TODO a ce jour on se sait pas la compter car le montant tva d'un payment
-            // n'est pas stocke dans la table des payments.
-            // Seul le module compta expert peut resoudre ce probleme.
-            // (Il faut quand un payment a lieu, stocker en plus du montant du paiement le
-            // detail part tva et part ht).
-            $sql='TODO';
+            $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))."'";
         }
-        if (! empty($conf->global->MAIN_MODULE_COMPTABILITE))
+        else if ($y)
         {
-            // Count on delivery date (use invoice date as delivery is unknown)
-            $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.tva_tx as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
-            $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
-            $sql.= " d.date_start as date_start, d.date_end as date_end,";
-            $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.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
-            $sql.= " WHERE f.entity = " . $conf->entity;
-            $sql.= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
-            if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
-			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))."'";
-            }
-            else if ($y)
-            {
-                $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,1,false))."'";
-                $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,12,false))."'";
-            }
-            if ($q) $sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3)." AND date_format(f.datef,'%m') <= ".($q*3).")";
-            if ($date_start && $date_end) $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
-            $sql.= " AND (d.product_type = 0";                              // Limit to products
-            $sql.= " AND d.date_start is null AND d.date_end IS NULL)";     // enhance detection of service
-            $sql.= " ORDER BY d.rowid, d.".$fk_facture;
+            $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,1,false))."'";
+            $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,12,false))."'";
         }
+        if ($q) $sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3)." AND date_format(f.datef,'%m') <= ".($q*3).")";
+        if ($date_start && $date_end) $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+        $sql.= " AND (d.product_type = 0";                              // Limit to products
+        $sql.= " AND d.date_start is null AND d.date_end IS NULL)";     // enhance detection of service
+        $sql.= " ORDER BY d.rowid, d.".$fk_facture;
     }
     else    // Option vat on delivery for goods (payments) and payments for services
     {
-        if (! empty($conf->global->MAIN_MODULE_ACCOUNTING))
+        // Count on delivery date (use invoice date as delivery is unknown)
+        $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.tva_tx as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
+        $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+        $sql.= " d.date_start as date_start, d.date_end as date_end,";
+        $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef as date_f, 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.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+        $sql.= " WHERE f.entity = " . $conf->entity;
+        $sql.= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
+        if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
+        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)
         {
-            // TODO a ce jour on se sait pas la compter car le montant tva d'un payment
-            // n'est pas stocke dans la table des payments.
-            // Seul le module compta expert peut resoudre ce probleme.
-            // (Il faut quand un payment a lieu, stocker en plus du montant du paiement le
-            // detail part tva et part ht).
-            $sql='TODO';
+            $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))."'";
         }
-        if (! empty($conf->global->MAIN_MODULE_COMPTABILITE))
+        else if ($y)
         {
-            // Count on delivery date (use invoice date as delivery is unknown)
-            $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.tva_tx as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
-            $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
-            $sql.= " d.date_start as date_start, d.date_end as date_end,";
-            $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef as date_f, 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.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
-            $sql.= " WHERE f.entity = " . $conf->entity;
-            $sql.= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
-        	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
-			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))."'";
-            }
-            else if ($y)
-            {
-                $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,1,false))."'";
-                $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,12,false))."'";
-            }
-            if ($q) $sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3)." AND date_format(f.datef,'%m') <= ".($q*3).")";
-            if ($date_start && $date_end) $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
-            $sql.= " AND (d.product_type = 0";                              // Limit to products
-            $sql.= " AND d.date_start is null AND d.date_end IS NULL)";     // enhance detection of service
-            $sql.= " ORDER BY d.rowid, d.".$fk_facture;
-            //print $sql;
+            $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,1,false))."'";
+            $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,12,false))."'";
         }
+        if ($q) $sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3)." AND date_format(f.datef,'%m') <= ".($q*3).")";
+        if ($date_start && $date_end) $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+        $sql.= " AND (d.product_type = 0";                              // Limit to products
+        $sql.= " AND d.date_start is null AND d.date_end IS NULL)";     // enhance detection of service
+        $sql.= " ORDER BY d.rowid, d.".$fk_facture;
+        //print $sql;
     }
 
     //print $sql.'<br>';
@@ -429,103 +405,77 @@ function vat_by_date($db, $y, $q, $date_start, $date_end, $modetax, $direction,
     $sql='';
     if ($modetax == 1)  // Option vat on delivery for goods (payment) and debit invoice for services
     {
-        if (! empty($conf->global->MAIN_MODULE_ACCOUNTING))
+        // Count on invoice date
+        $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.tva_tx as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
+        $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+        $sql.= " d.date_start as date_start, d.date_end as date_end,";
+        $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.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+        $sql.= " WHERE f.entity = " . $conf->entity;
+        $sql.= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
+        if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
+		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)
         {
-            // Count on invoice date
-            // TODO a ce jour on se sait pas la compter car le montant tva d'un payment
-            // n'est pas stocke dans la table des payments.
-            // Seul le module compta expert peut resoudre ce probleme.
-            // (Il faut quand un payment a lieu, stocker en plus du montant du paiement le
-            // detail part tva et part ht).
-            $sql='TODO';
+            $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))."'";
         }
-        if (! empty($conf->global->MAIN_MODULE_COMPTABILITE))
+        else if ($y)
         {
-            // Count on invoice date
-            $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.tva_tx as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
-            $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
-            $sql.= " d.date_start as date_start, d.date_end as date_end,";
-            $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.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
-            $sql.= " WHERE f.entity = " . $conf->entity;
-            $sql.= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
-        	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
-			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))."'";
-            }
-            else if ($y)
-            {
-                $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,1,false))."'";
-                $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,12,false))."'";
-            }
-            if ($q) $sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3)." AND date_format(f.datef,'%m') <= ".($q*3).")";
-            if ($date_start && $date_end) $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
-            $sql.= " AND (d.product_type = 1";                              // Limit to services
-            $sql.= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)";       // enhance detection of service
-            $sql.= " ORDER BY d.rowid, d.".$fk_facture;
+            $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,1,false))."'";
+            $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,12,false))."'";
         }
+        if ($q) $sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3)." AND date_format(f.datef,'%m') <= ".($q*3).")";
+        if ($date_start && $date_end) $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+        $sql.= " AND (d.product_type = 1";                              // Limit to services
+        $sql.= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)";       // enhance detection of service
+        $sql.= " ORDER BY d.rowid, d.".$fk_facture; 
     }
     else    // Option vat on delivery for goods (payments) and payments for services
     {
-        if (! empty($conf->global->MAIN_MODULE_ACCOUNTING))
+        // Count on payments date
+        $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.tva_tx as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
+        $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+        $sql.= " d.date_start as date_start, d.date_end as date_end,";
+        $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.= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount";
+        $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.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+        $sql.= " WHERE f.entity = " . $conf->entity;
+        $sql.= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
+        if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
+		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)
         {
-            // Count on payments date
-            // TODO a ce jour on se sait pas la compter car le montant tva d'un payment
-            // n'est pas stocke dans la table des payments.
-            // Seul le module compta expert peut resoudre ce probleme.
-            // (Il faut quand un paiement a lieu, stocker en plus du montant du paiement le
-            // detail part tva et part ht).
-            $sql='TODO';
+            $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))."'";
         }
-        if (! empty($conf->global->MAIN_MODULE_COMPTABILITE))
+        else if ($y)
         {
-            // Count on payments date
-            $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.tva_tx as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
-            $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
-            $sql.= " d.date_start as date_start, d.date_end as date_end,";
-            $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.= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount";
-            $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.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
-            $sql.= " WHERE f.entity = " . $conf->entity;
-            $sql.= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
-        	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
-			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))."'";
-            }
-            else if ($y)
-            {
-                $sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,1,false))."'";
-                $sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,12,false))."'";
-            }
-            if ($q) $sql.= " AND (date_format(pa.datep,'%m') > ".(($q-1)*3)." AND date_format(pa.datep,'%m') <= ".($q*3).")";
-            if ($date_start && $date_end) $sql.= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
-            $sql.= " AND (d.product_type = 1";                              // Limit to services
-            $sql.= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)";       // enhance detection of service
-            $sql.= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
+            $sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,1,false))."'";
+            $sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,12,false))."'";
         }
+        if ($q) $sql.= " AND (date_format(pa.datep,'%m') > ".(($q-1)*3)." AND date_format(pa.datep,'%m') <= ".($q*3).")";
+        if ($date_start && $date_end) $sql.= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
+        $sql.= " AND (d.product_type = 1";                              // Limit to services
+        $sql.= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)";       // enhance detection of service
+        $sql.= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
     }
 
     if (! $sql)