From 6a39c5f29046d9558d5b22b544aa969540284f5e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Fri, 8 Aug 2008 17:58:50 +0000
Subject: [PATCH] Patch sladame

---
 htdocs/commande/liste.php      | 27 ++++++++++++++++++++++-----
 htdocs/index.php               |  6 +++---
 htdocs/langs/fr_FR/orders.lang |  1 +
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/htdocs/commande/liste.php b/htdocs/commande/liste.php
index 88f0a083e2e..695795449c5 100644
--- a/htdocs/commande/liste.php
+++ b/htdocs/commande/liste.php
@@ -48,7 +48,7 @@ $result = restrictedArea($user, 'commande', $orderid,'');
 
 
 /*
- * Affichage page
+ * View
  */
  
 $html = new Form($db);
@@ -91,7 +91,7 @@ if ($socid)
 }
 if ($viewstatut <> '')
 {
-	if ($viewstatut < 4)
+	if ($viewstatut < 4 && $viewstatut > -2)
 	{
 		$sql .= ' AND c.fk_statut ='.$viewstatut; // brouillon, validée, en cours, annulée
 		if ($viewstatut == 3)
@@ -99,10 +99,14 @@ if ($viewstatut <> '')
 			$sql .= ' AND c.facture = 0'; // à facturer
 		}
 	}
-	else if ($viewstatut == 4)
+	if ($viewstatut == 4)
 	{
 		$sql .= ' AND c.facture = 1'; // facturée
 	}
+	if ($viewstatut == -2)
+	{
+		$sql .= ' AND c.fk_statut >= 0 and c.fk_statut <= 3 and c.facture = 0';
+	}
 }
 if ($_GET['month'] > 0)
 {
@@ -142,8 +146,21 @@ if ($resql)
 	{
 		$title = $langs->trans('ListOfOrders');
 	}
-	if ($_GET['status'] == 3)
-		$title.=' - '.$langs->trans('StatusOrderToBill');
+	if (strval($_GET['viewstatut']) == '0')
+		$title.=' - '.$langs->trans('StatusOrderDraftShort');
+	if ($_GET['viewstatut'] == 1)
+		$title.=' - '.$langs->trans('StatusOrderValidatedShort');
+	if ($_GET['viewstatut'] == 2)
+		$title.=' - '.$langs->trans('StatusOrderOnProcessShort');
+	if ($_GET['viewstatut'] == 3)
+		$title.=' - '.$langs->trans('StatusOrderToBillShort');
+	if ($_GET['viewstatut'] == 4)
+		$title.=' - '.$langs->trans('StatusOrderProcessedShort');
+	if ($_GET['viewstatut'] == -1)
+		$title.=' - '.$langs->trans('StatusOrderCanceledShort');
+	if ($_GET['viewstatut'] == -2)
+		$title.=' - '.$langs->trans('StatusOrderToProcessShort');
+		
 	$num = $db->num_rows($resql);
 	print_barre_liste($title, $_GET['page'], 'liste.php','&amp;socid='.$socid.'&amp;viewstatut='.$viewstatut,$sortfield,$sortorder,'',$num);
 	$i = 0;
diff --git a/htdocs/index.php b/htdocs/index.php
index d076a5e2fd4..118d991030d 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -291,7 +291,7 @@ if ($conf->agenda->enabled && $user->rights->agenda->myactions->read)
 print "\n";
 }
 
-// Nbre commandes clients à honorer
+// Nbre commandes clients à traiter
 if ($conf->commande->enabled && $user->rights->commande->lire)
 {
   include_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php");
@@ -300,9 +300,9 @@ if ($conf->commande->enabled && $user->rights->commande->lire)
 
   $var=!$var;
   print '<tr '.$bc[$var].'><td width="16">'.img_object($langs->trans("Orders"),"order").'</td><td>'.$langs->trans("OrdersToProcess").'</td>';
-  print '<td align="right"><a href="'.DOL_URL_ROOT.'/commande/liste.php">'.$board->nbtodo.'</a></td>';
+  print '<td align="right"><a href="'.DOL_URL_ROOT.'/commande/liste.php?viewstatut=-2">'.$board->nbtodo.'</a></td>';
   print '<td align="right">';
-  print '<a href="'.DOL_URL_ROOT.'/commande/liste.php">';
+  print '<a href="'.DOL_URL_ROOT.'/commande/liste.php?viewstatut=-2">';
   print $board->nbtodolate;
   print '</a></td><td nowrap align="right">';
   print ' (>'.ceil($conf->commande->traitement->warning_delay/60/60/24).' '.$langs->trans("days").')';
diff --git a/htdocs/langs/fr_FR/orders.lang b/htdocs/langs/fr_FR/orders.lang
index c75c23d9f89..b4a4cda3225 100755
--- a/htdocs/langs/fr_FR/orders.lang
+++ b/htdocs/langs/fr_FR/orders.lang
@@ -28,6 +28,7 @@ StatusOrderProcessedShort=Trait
 StatusOrderToBillShort=À facturer
 StatusOrderApprovedShort=Approuvée
 StatusOrderRefusedShort=Refusée
+StatusOrderToProcessShort=A traiter
 StatusOrderReceivedPartiallyShort=Reçu partiellement
 StatusOrderReceivedAllShort=Reçu complètement
 StatusOrderCanceled=Annulée