From c0e5cacafcb9cfa31c77d38e19936a3473f6f3ab Mon Sep 17 00:00:00 2001
From: simnandez <jmenent@2byte.es>
Date: Fri, 15 Mar 2013 16:18:14 +0100
Subject: [PATCH] Fix: Bad orders list viewstatut filter if expeditons module
 is disabled

---
 htdocs/core/menus/standard/eldy.lib.php | 2 +-
 htdocs/index.php                        | 2 +-
 htdocs/langs/ca_ES/orders.lang          | 2 +-
 htdocs/langs/es_ES/orders.lang          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 7ce259573be..e33c307d367 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -857,7 +857,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after)
                 if ($leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=0", $langs->trans("StatusOrderDraftShort"), 2, $user->rights->commande->lire);
                 if ($leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=1", $langs->trans("StatusOrderValidated"), 2, $user->rights->commande->lire);
                 if ($leftmenu=="orders" && ! empty($conf->expedition->enabled)) $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=2", $langs->trans("StatusOrderOnProcessShort"), 2, $user->rights->commande->lire);
-                if ($leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=".($conf->expedition->enabled?"3":"-2"), $langs->trans("StatusOrderToBill"), 2, $user->rights->commande->lire);
+                if ($leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=".($conf->expedition->enabled?"3":"-3"), $langs->trans("StatusOrderToBill"), 2, $user->rights->commande->lire);
                 if ($leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=4", $langs->trans("StatusOrderProcessed"), 2, $user->rights->commande->lire);
                 if ($leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=-1", $langs->trans("StatusOrderCanceledShort"), 2, $user->rights->commande->lire);
                 $newmenu->add("/commande/stats/index.php?leftmenu=orders", $langs->trans("Statistics"), 1, $user->rights->commande->lire);
diff --git a/htdocs/index.php b/htdocs/index.php
index bb5a6bf8178..b42117e1c3b 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -308,7 +308,7 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
     $board->load_board($user);
     $board->warning_delay=$conf->commande->client->warning_delay/60/60/24;
     $board->label=$langs->trans("OrdersToProcess");
-    $board->url=DOL_URL_ROOT.'/commande/liste.php?viewstatut=-2';
+    $board->url=DOL_URL_ROOT.'/commande/liste.php?viewstatut=-3';
     $board->img=img_object($langs->trans("Orders"),"order");
     $rowspan++;
     $dashboardlines[]=$board;
diff --git a/htdocs/langs/ca_ES/orders.lang b/htdocs/langs/ca_ES/orders.lang
index 15fd9b6c9a1..c63981ccf2e 100644
--- a/htdocs/langs/ca_ES/orders.lang
+++ b/htdocs/langs/ca_ES/orders.lang
@@ -28,7 +28,7 @@ SuppliersOrdersToProcess=Comandes a proveïdors a processar
 StatusOrderCanceledShort=Anul·lada
 StatusOrderDraftShort=Esborrany
 StatusOrderValidatedShort=Validada
-StatusOrderOnProcessShort=Per rebre
+StatusOrderOnProcessShort=En procés
 StatusOrderSentShort=Expedició en curs
 StatusOrderSent=Enviament en curs
 StatusOrderProcessedShort=Processada
diff --git a/htdocs/langs/es_ES/orders.lang b/htdocs/langs/es_ES/orders.lang
index 13710c240b7..51bfbd082a2 100644
--- a/htdocs/langs/es_ES/orders.lang
+++ b/htdocs/langs/es_ES/orders.lang
@@ -28,7 +28,7 @@ SuppliersOrdersToProcess=Pedidos a proveedores a procesar
 StatusOrderCanceledShort=Anulado
 StatusOrderDraftShort=Borrador
 StatusOrderValidatedShort=Validado
-StatusOrderOnProcessShort=Pdte. Recibir
+StatusOrderOnProcessShort=En proceso
 StatusOrderSentShort=Expedición en curso
 StatusOrderSent=Envío en curso
 StatusOrderProcessedShort=Procesado