From 89c9996b224c4b5a85b7dea2c89a4b4d73f569fc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 4 May 2015 09:50:49 +0200
Subject: [PATCH] Fix translation of status

---
 htdocs/admin/commande.php      | 1 -
 htdocs/comm/index.php          | 6 +++---
 htdocs/langs/en_US/orders.lang | 1 +
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index 364b87a2d35..a569632cc02 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -264,7 +264,6 @@ $form=new Form($db);
 
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print_fiche_titre($langs->trans("OrdersSetup"),$linkback,'title_setup');
-print '<br>';
 
 $head = order_admin_prepare_head();
 
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index 3924774f7fc..6766bd1f868 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -585,9 +585,9 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
  */
 if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
 {
-	$langs->load("order");
+	$langs->load("orders");
 
-	$sql = "SELECT s.nom as name, s.rowid, c.rowid as commandeid, c.total_ttc, c.total_ht, c.tva as total_tva, c.ref, c.ref_client, c.fk_statut, c.date_valid as dv ";
+	$sql = "SELECT s.nom as name, s.rowid, c.rowid as commandeid, c.total_ttc, c.total_ht, c.tva as total_tva, c.ref, c.ref_client, c.fk_statut, c.date_valid as dv, c.facture as billed";
 	$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 	$sql.= ", ".MAIN_DB_PREFIX."commande as c";
 	if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -654,7 +654,7 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
 				print '<td align="right">';
 				print dol_print_date($db->jdate($obj->dp),'day').'</td>'."\n";
 				print '<td align="right">'.price($obj->total_ttc).'</td>';
-				print '<td align="center" width="14">'.$orderstatic->LibStatut($obj->fk_statut,3).'</td>'."\n";
+				print '<td align="center" width="14">'.$orderstatic->LibStatut($obj->fk_statut,$obj->billed,3).'</td>'."\n";
 				print '</tr>'."\n";
 				$i++;
 				$total += $obj->total_ttc;
diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang
index 7f2902a96e6..e418b5ec2b9 100644
--- a/htdocs/langs/en_US/orders.lang
+++ b/htdocs/langs/en_US/orders.lang
@@ -75,6 +75,7 @@ AddToMyOrders=Add to my orders
 AddToOtherOrders=Add to other orders
 AddToDraftOrders=Add to draft order
 ShowOrder=Show order
+OrdersOpened=Orders to process
 NoOpenedOrders=No open orders
 NoOtherOpenedOrders=No other open orders
 NoDraftOrders=No draft orders