diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 93a04a4f809..61afd19ddd7 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -3279,7 +3279,6 @@ else $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; } if ($socid) $sql .= ' AND s.rowid = '.$socid; - if ($month > 0) $sql .= ' AND date_format(f.datef, \'%m\') = '.$month; if ($_GET['filtre']) { $filtrearr = split(',', $_GET['filtre']); @@ -3305,6 +3304,13 @@ else { $sql .= ' AND f.total_ttc = \''.addslashes(trim($_GET['search_montant_ttc'])).'\''; } + if ($month > 0) + { + if ($year > 0) + $sql .= " AND date_format(f.datef, '%Y-%m') = '$year-$month'"; + else + $sql .= " AND date_format(f.datef, '%m') = '$month'"; + } if ($year > 0) { $sql .= ' AND date_format(f.datef, \'%Y\') = '.$year; @@ -3317,7 +3323,7 @@ else { $sql .= ' AND (s.nom like \'%'.addslashes($sall).'%\' OR f.facnumber like \'%'.addslashes($sall).'%\' OR f.note like \'%'.addslashes($sall).'%\' OR fd.description like \'%'.addslashes($sall).'%\')'; } - + $sql .= ' GROUP BY f.rowid'; $sql .= ' ORDER BY '; @@ -3345,13 +3351,14 @@ else print '