diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php index 79bad772612..daa45df53cb 100644 --- a/htdocs/compta/tva/clients.php +++ b/htdocs/compta/tva/clients.php @@ -65,7 +65,7 @@ function tva_coll($db,$y) $sql = "SELECT s.nom as nom, s.tva_intra as tva_intra, sum(f.total) as amount, sum(f.tva) as tva, s.tva_assuj as assuj, s.idp as id_soc"; $sql.= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s"; $sql.= " WHERE "; - $sql.= " f.fk_statut = 1"; + $sql.= " f.fk_statut in (1,2)"; $sql.= " AND date_format(f.datef,'%Y') = ".$y; $sql.= " AND s.idp = f.fk_soc "; $sql.= " GROUP BY s.idp"; @@ -123,7 +123,7 @@ function tva_paye($db, $y) $sql = "SELECT s.nom as nom, s.tva_intra as tva_intra, sum(f.total_ht) as amount, sum(f.tva) as tva, s.tva_assuj as assuj, s.idp as id_soc"; $sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn as f, ".MAIN_DB_PREFIX."societe as s"; $sql.= " WHERE "; - $sql.= " f.fk_statut = 1"; + $sql.= " f.fk_statut in (1,2)"; $sql.= " AND date_format(f.datef,'%Y') = ".$y; $sql.= " AND s.idp = f.fk_soc "; $sql.= " GROUP BY s.idp"; @@ -149,7 +149,7 @@ function tva_paye($db, $y) $sql = "SELECT sum(f.total_tva) as amount"; $sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn as f"; // $sql.= " WHERE "; - $sql .= " WHERE f.fk_statut = 1"; + $sql .= " WHERE f.fk_statut in (1,2)"; // $sql.= " f.paye = 1"; $sql.= " AND date_format(f.datef,'%Y') = $y"; $sql.= " AND date_format(f.datef,'%m') = $m"; diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php index 896839914c0..5b98e092039 100644 --- a/htdocs/compta/tva/index.php +++ b/htdocs/compta/tva/index.php @@ -61,7 +61,7 @@ function tva_coll($db,$y,$m) $sql = "SELECT sum(f.tva) as amount"; $sql.= " FROM ".MAIN_DB_PREFIX."facture as f"; $sql.= " WHERE "; - $sql.= " f.fk_statut = 1"; + $sql.= " f.fk_statut in (1,2)"; $sql.= " AND date_format(f.datef,'%Y') = ".$y; $sql.= " AND date_format(f.datef,'%m') = ".$m; } @@ -116,7 +116,7 @@ function tva_paye($db, $y,$m) $sql = "SELECT sum(f.total_tva) as amount"; $sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn as f"; $sql.= " WHERE "; - $sql.= " f.fk_statut = 1"; + $sql.= " f.fk_statut in (1,2)"; $sql.= " AND date_format(f.datef,'%Y') = $y"; $sql.= " AND date_format(f.datef,'%m') = $m"; } @@ -141,7 +141,7 @@ function tva_paye($db, $y,$m) $sql = "SELECT sum(f.total_tva) as amount"; $sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn as f"; // $sql.= " WHERE "; - $sql .= " WHERE f.fk_statut = 1"; + $sql .= " WHERE f.fk_statut in (1,2)"; // $sql.= " f.paye = 1"; $sql.= " AND date_format(f.datef,'%Y') = $y"; $sql.= " AND date_format(f.datef,'%m') = $m"; diff --git a/htdocs/compta/tva/quadri.php b/htdocs/compta/tva/quadri.php index a5aa9fe6896..08ba0a48df9 100644 --- a/htdocs/compta/tva/quadri.php +++ b/htdocs/compta/tva/quadri.php @@ -66,7 +66,7 @@ function tva_coll($db,$y,$q) $sql.= " FROM ".MAIN_DB_PREFIX."facture as f, "; $sql.= MAIN_DB_PREFIX."facturedet as d " ; $sql.= " WHERE "; - $sql.= " f.fk_statut = 1 "; + $sql.= " f.fk_statut in (1,2)"; $sql.= " AND f.rowid = d.fk_facture "; $sql.= " AND date_format(f.datef,'%Y') = ".$y; $sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3)." AND date_format(f.datef,'%m') <= ".($q*3).")";