From 55649152543bea426c57d5289fb7c4b7ce2159df Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Sat, 8 Dec 2007 22:35:30 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20on=20inclus=20les=20commandes=20clients?=
 =?UTF-8?q?=20valid=E9es=20pas=20encore=20exp=E9di=E9es=20dans=20l'onglet?=
 =?UTF-8?q?=20stock?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/langs/en_US/orders.lang   | 1 +
 htdocs/langs/fr_FR/orders.lang   | 1 +
 htdocs/product.class.php         | 2 +-
 htdocs/product/stock/product.php | 4 ++--
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang
index 6199d7fd014..1c7a87bfbd9 100755
--- a/htdocs/langs/en_US/orders.lang
+++ b/htdocs/langs/en_US/orders.lang
@@ -40,6 +40,7 @@ StatusOrderRefused=Refused
 StatusOrderReceivedPartially=Partially received
 StatusOrderReceivedAll=Everything received
 DraftOrWaitingApproved=Draft or approved not yet ordered
+DraftOrWaitingShipped=Draft or validated not yet shipped
 MenuOrdersToBill=Orders to bill
 SearchOrder=Search order
 Sending=Sending
diff --git a/htdocs/langs/fr_FR/orders.lang b/htdocs/langs/fr_FR/orders.lang
index 296a122af0f..0de6dc0861a 100755
--- a/htdocs/langs/fr_FR/orders.lang
+++ b/htdocs/langs/fr_FR/orders.lang
@@ -40,6 +40,7 @@ StatusOrderRefused=Refus
 StatusOrderReceivedPartially=Reçu partiellement
 StatusOrderReceivedAll=Reçu complètement
 DraftOrWaitingApproved=Brouillon ou approuvée pas encore commandée
+DraftOrWaitingShipped=Brouillon ou validée pas encore expédiée
 SearchOrder=Rechercher une commande
 MenuOrdersToBill=Commandes à facturer
 Sending=Expédition
diff --git a/htdocs/product.class.php b/htdocs/product.class.php
index eaa787261e5..997e4920124 100644
--- a/htdocs/product.class.php
+++ b/htdocs/product.class.php
@@ -1059,7 +1059,7 @@ class Product extends CommonObject
 
     if ($filtrestatut <> '')
       {
-	$sql.= " AND c.fk_statut = ".$filtrestatut;
+	$sql.= " AND c.fk_statut in (".$filtrestatut.")";
       }
 
     $result = $this->db->query($sql) ;
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 23477eea2b8..6407f9c54ee 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -164,9 +164,9 @@ if ($_GET["id"] || $_GET["ref"])
 	    print '<tr><td>'.$langs->trans("CustomersOrdersRunning").'</td>';
 	    print '<td>';
 	    print $product->stats_commande['qty'];
-	    $result=$product->load_stats_commande(0,'0');
+	    $result=$product->load_stats_commande(0,'0,1');
 	    if ($result < 0) dolibarr_print_error($db,$product->error);
-	    print ' ('.$langs->trans("Draft").': '.$product->stats_commande['qty'].')';
+	    print ' ('.$langs->trans("DraftOrWaitingShipped").': '.$product->stats_commande['qty'].')';
 	    print '</td></tr>';
 	  }