From d05bd5e400741dfdcbb24b9570384f59bab37afd Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Fri, 30 Mar 2007 11:55:36 +0000
Subject: [PATCH] simplification du code

---
 htdocs/commande/liste.php | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/htdocs/commande/liste.php b/htdocs/commande/liste.php
index 54601b7f9e7..9335c209d0a 100644
--- a/htdocs/commande/liste.php
+++ b/htdocs/commande/liste.php
@@ -92,25 +92,21 @@ if ($socid)
 {
 	$sql .= ' AND s.idp = '.$socid;
 }
-if ($viewstatut <> '' && $viewstatut < 4)
+if ($viewstatut <> '')
 {
-	if ($viewstatut == 3)
+	if ($viewstatut < 4)
 	{
-		$sql .= ' AND c.fk_statut ='.$viewstatut.' AND c.facture = 0';
+		$sql .= ' AND c.fk_statut ='.$viewstatut; // brouillon, validée, en cours, annulée
+		if ($viewstatut == 3)
+		{
+			$sql .= ' AND c.facture = 0'; // à facturer
+		}
 	}
-	else
+	else if ($viewstatut == 4)
 	{
-		$sql .= ' AND c.fk_statut ='.$viewstatut;
+		$sql .= ' AND c.facture = 1'; // facturée
 	}
 }
-if ($viewstatut <> '' && $viewstatut == 4)
-{
-	$sql .= ' AND c.facture = 1';
-}
-else if (isset($_GET['afacturer']) && $_GET['afacturer'] == 1)
-{
-	$sql .= ' AND c.facture = 0';
-}
 if ($_GET['month'] > 0)
 {
 	$sql .= " AND date_format(c.date_commande, '%Y-%m') = '$year-$month'";