From 3ef86dedec08900ae0ccd0cc7c54b5c1c05b36f4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 17 Dec 2009 15:52:37 +0000
Subject: [PATCH] Qual: Translation of status must be in the "view" functions.

---
 htdocs/comm/mailing/mailing.class.php         |  41 ++--
 htdocs/compta/prelevement/fiche.php           |   8 +-
 .../prelevement/ligne-prelevement.class.php   |  18 +-
 htdocs/compta/prelevement/ligne.php           |   8 +-
 htdocs/expedition/expedition.class.php        |  37 ++--
 htdocs/fichinter/fichinter.class.php          |  32 ++-
 htdocs/fourn/commande/index.php               |   2 +-
 htdocs/fourn/fournisseur.commande.class.php   | 101 +++++----
 htdocs/fourn/index.php                        |   2 +-
 htdocs/langs/en_US/sendings.lang              |   2 +
 htdocs/langs/fr_FR/sendings.lang              |   2 +
 htdocs/livraison/livraison.class.php          | 205 +++++++++---------
 htdocs/product/stock/entrepot.class.php       |  36 +--
 13 files changed, 243 insertions(+), 251 deletions(-)

diff --git a/htdocs/comm/mailing/mailing.class.php b/htdocs/comm/mailing/mailing.class.php
index a58ed75324a..174d24a20da 100644
--- a/htdocs/comm/mailing/mailing.class.php
+++ b/htdocs/comm/mailing/mailing.class.php
@@ -65,16 +65,14 @@ class Mailing extends CommonObject
 	 */
 	function Mailing($DB)
 	{
-		global $langs;
-		$langs->load("mails");
-
 		$this->db = $DB ;
 		$this->db_table = MAIN_DB_PREFIX."mailing";
 
-		$this->statuts[0]  = $langs->trans("MailingStatusDraft");
-		$this->statuts[1]  = $langs->trans("MailingStatusValidated");
-		$this->statuts[2]  = $langs->trans("MailingStatusSentPartialy");
-		$this->statuts[3]  = $langs->trans("MailingStatusSentCompletely");
+		// List of language codes for status
+		$this->statuts[0] = 'MailingStatusDraft';
+		$this->statuts[1] = 'MailingStatusValidated';
+		$this->statuts[2] = 'MailingStatusSentPartialy';
+		$this->statuts[3] = 'MailingStatusSentCompletely';
 	}
 
 	/**
@@ -402,18 +400,18 @@ class Mailing extends CommonObject
 
 		if ($mode == 0)
 		{
-			return $this->statuts[$statut];
+			return $langs->trans($this->statuts[$statut]);
 		}
 		if ($mode == 1)
 		{
-			return $this->statuts[$statut];
+			return $langs->trans($this->statuts[$statut]);
 		}
 		if ($mode == 2)
 		{
-			if ($statut == 0) return img_picto($langs->trans($this->statuts[$statut]),'statut0').' '.$this->statuts[$statut];
-			if ($statut == 1) return img_picto($langs->trans($this->statuts[$statut]),'statut1').' '.$this->statuts[$statut];
-			if ($statut == 2) return img_picto($langs->trans($this->statuts[$statut]),'statut3').' '.$this->statuts[$statut];
-			if ($statut == 3) return img_picto($langs->trans($this->statuts[$statut]),'statut6').' '.$this->statuts[$statut];
+			if ($statut == 0) return img_picto($langs->trans($this->statuts[$statut]),'statut0').' '.$langs->trans($this->statuts[$statut]);
+			if ($statut == 1) return img_picto($langs->trans($this->statuts[$statut]),'statut1').' '.$langs->trans($this->statuts[$statut]);
+			if ($statut == 2) return img_picto($langs->trans($this->statuts[$statut]),'statut3').' '.$langs->trans($this->statuts[$statut]);
+			if ($statut == 3) return img_picto($langs->trans($this->statuts[$statut]),'statut6').' '.$langs->trans($this->statuts[$statut]);
 		}
 		if ($mode == 3)
 		{
@@ -424,19 +422,18 @@ class Mailing extends CommonObject
 		}
 		if ($mode == 4)
 		{
-			if ($statut == 0) return img_picto($langs->trans($this->statuts[$statut]),'statut0').' '.$this->statuts[$statut];
-			if ($statut == 1) return img_picto($langs->trans($this->statuts[$statut]),'statut1').' '.$this->statuts[$statut];
-			if ($statut == 2) return img_picto($langs->trans($this->statuts[$statut]),'statut3').' '.$this->statuts[$statut];
-			if ($statut == 3) return img_picto($langs->trans($this->statuts[$statut]),'statut6').' '.$this->statuts[$statut];
+			if ($statut == 0) return img_picto($langs->trans($this->statuts[$statut]),'statut0').' '.$langs->trans($this->statuts[$statut]);
+			if ($statut == 1) return img_picto($langs->trans($this->statuts[$statut]),'statut1').' '.$langs->trans($this->statuts[$statut]);
+			if ($statut == 2) return img_picto($langs->trans($this->statuts[$statut]),'statut3').' '.$langs->trans($this->statuts[$statut]);
+			if ($statut == 3) return img_picto($langs->trans($this->statuts[$statut]),'statut6').' '.$langs->trans($this->statuts[$statut]);
 		}
 		if ($mode == 5)
 		{
-			if ($statut == 0)  return $this->statuts[$statut].' '.img_picto($langs->trans($this->statuts[$statut]),'statut0');
-			if ($statut == 1)  return $this->statuts[$statut].' '.img_picto($langs->trans($this->statuts[$statut]),'statut1');
-			if ($statut == 2)  return $this->statuts[$statut].' '.img_picto($langs->trans($this->statuts[$statut]),'statut3');
-			if ($statut == 3)  return $this->statuts[$statut].' '.img_picto($langs->trans($this->statuts[$statut]),'statut6');
+			if ($statut == 0)  return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut0');
+			if ($statut == 1)  return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut1');
+			if ($statut == 2)  return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut3');
+			if ($statut == 3)  return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut6');
 		}
-
 	}
 
 }
diff --git a/htdocs/compta/prelevement/fiche.php b/htdocs/compta/prelevement/fiche.php
index 51a3d2abe7d..1bc8bedcb31 100644
--- a/htdocs/compta/prelevement/fiche.php
+++ b/htdocs/compta/prelevement/fiche.php
@@ -167,9 +167,9 @@ if ($_GET["id"])
 
 		print '</td></tr>';
 
-		print '<tr><td width="20%">Statut</td><td>';
-		print '<img src="./statut'.$bon->statut.'.png">&nbsp;';
-		print $lipre->statuts[$lipre->statut].'</td></tr>';
+		print '<tr><td width="20%">'.$langs->trans('Status').'</td><td>';
+		print '<img src="./statut'.$bon->statut.'.png"> ';
+		print $langs->trans($lipre->statuts[$lipre->statut]).'</td></tr>';
 
 		if($bon->date_trans <> 0)
 		{
@@ -220,7 +220,7 @@ if ($_GET["id"])
 			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 			print '<input type="hidden" name="action" value="infocredit">';
 			print '<table class="border" width="100%">';
-			print '<tr><td width="20%">Crédité le</td><td>';
+			print '<tr><td width="20%">Cr�dit� le</td><td>';
 			print $html->select_date('','','','','',"infocredit");
 			print '</td></tr>';
 			print '<tr><td colspan="2" align="center">';
diff --git a/htdocs/compta/prelevement/ligne-prelevement.class.php b/htdocs/compta/prelevement/ligne-prelevement.class.php
index 3477acfc595..41d2bca9b2d 100644
--- a/htdocs/compta/prelevement/ligne-prelevement.class.php
+++ b/htdocs/compta/prelevement/ligne-prelevement.class.php
@@ -30,16 +30,18 @@
 
 
 /**
-        \class      LignePrelevement
-        \brief      Classe permettant la gestion des prelevements
-*/
+ *       \class      LignePrelevement
+ *       \brief      Classe permettant la gestion des prelevements
+ */
 
 class LignePrelevement
 {
   var $id;
   var $db;
 
-
+  var $statuts = array();
+  
+  
   /**
    *    \brief      Constructeur de la classe
    *    \param      DB          Handler acces base de donnees
@@ -50,10 +52,10 @@ class LignePrelevement
     $this->db = $DB ;
     $this->user = $user;
 
-    $this->statuts = array();
-    $this->statuts[0] = "En attente";
-    $this->statuts[2] = "Credite";
-    $this->statuts[3] = "Rejete";
+    // List of language codes for status
+    $this->statuts[0] = "Waiting";
+    $this->statuts[2] = "Credited";
+    $this->statuts[3] = "Refused";
   }
 
   /**
diff --git a/htdocs/compta/prelevement/ligne.php b/htdocs/compta/prelevement/ligne.php
index e61d4753aa6..5485a43bd1f 100644
--- a/htdocs/compta/prelevement/ligne.php
+++ b/htdocs/compta/prelevement/ligne.php
@@ -100,8 +100,8 @@ if ($_GET["id"])
 		print '<a href="fiche.php?id='.$lipre->bon_rowid.'">'.$lipre->bon_ref.'</a></td></tr>';
 		print '<tr><td width="20%">'.$langs->trans("Amount").'</td><td>'.price($lipre->amount).'</td></tr>';
 		print '<tr><td width="20%">'.$langs->trans("Status").'</td><td>';
-		print '<img src="./statut'.$lipre->statut.'.png">&nbsp;';
-		print $lipre->statuts[$lipre->statut].'</td></tr>';
+		print '<img src="./statut'.$lipre->statut.'.png"> ';
+		print $langs->trans($lipre->statuts[$lipre->statut]).'</td></tr>';
 
 		if ($lipre->statut == 3)
 		{
@@ -151,8 +151,8 @@ if ($_GET["id"])
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 		print '<input type="hidden" name="action" value="confirm_rejet">';
 		print '<table class="border" width="100%">';
-		print '<tr><td colspan="3">Rejet de prélèvement</td></tr>';
-		print '<tr><td class="valid">Etes-vous sûr de vouloir saisir un rejet de prélèvement pour la société '.$soc->nom.' ?</td>';
+		print '<tr><td colspan="3">Rejet de pr�l�vement</td></tr>';
+		print '<tr><td class="valid">Etes-vous s�r de vouloir saisir un rejet de pr�l�vement pour la soci�t� '.$soc->nom.' ?</td>';
 		print '<td colspan="2" class="valid">';
 		print '<select name="confirm">';
 		print '<option value="yes">oui</option>';
diff --git a/htdocs/expedition/expedition.class.php b/htdocs/expedition/expedition.class.php
index b13865a456b..069de60e5ae 100644
--- a/htdocs/expedition/expedition.class.php
+++ b/htdocs/expedition/expedition.class.php
@@ -54,20 +54,17 @@ class Expedition extends CommonObject
 
 	/**
 	 * Initialisation
-	 *
 	 */
 	function Expedition($DB)
 	{
-		global $langs;
-
 		$this->db = $DB;
 		$this->lignes = array();
-
-		$this->statuts[-1] = $langs->trans("Canceled");
-		$this->statuts[0]  = $langs->trans("Draft");
-		$this->statuts[1]  = $langs->trans("Validated");
-
 		$this->products = array();
+		
+		// List of long language codes for status
+		$this->statuts[-1] = 'StatusSendingCanceled';
+		$this->statuts[0]  = 'StatusSendingDraft';
+		$this->statuts[1]  = 'StatusSendingValidated';
 	}
 
 	/**
@@ -690,10 +687,10 @@ class Expedition extends CommonObject
 	}
 
 	/**
-	 *		\brief      Renvoi le libelle d'un statut donne
-	 *    	\param      statut      Id statut
-	 *    	\param      mode        0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
-	 *    	\return     string		Libelle
+	 *    	\brief      Return label of a status
+	 * 		\param      statut		Id statut
+	 *    	\param      mode        0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto
+	 *    	\return     string		Label of status
 	 */
 	function LibStatut($statut,$mode)
 	{
@@ -701,23 +698,23 @@ class Expedition extends CommonObject
 
 		if ($mode==0)
 		{
-			if ($statut==0) return $this->statuts[$statut];
-			if ($statut==1) return $this->statuts[$statut];
+			if ($statut==0) return $langs->trans($this->statuts[$statut]);
+			if ($statut==1) return $langs->trans($this->statuts[$statut]);
 		}
 		if ($mode==1)
 		{
-			if ($statut==0) return $this->statuts[$statut];
-			if ($statut==1) return $this->statuts[$statut];
+			if ($statut==0) return $langs->trans($this->statuts[$statut]);
+			if ($statut==1) return $langs->trans($this->statuts[$statut]);
 		}
 		if ($mode == 4)
 		{
-			if ($statut==0) return img_picto($langs->trans('StatusSendingDraft'),'statut0').' '.$langs->trans('StatusSendingDraft');
-			if ($statut==1) return img_picto($langs->trans('StatusSendingValidated'),'statut4').' '.$langs->trans('StatusSendingValidated');
+			if ($statut==0) return img_picto(this->statuts[$statut],'statut0').' '.$langs->trans($this->statuts[$statut]);
+			if ($statut==1) return img_picto(this->statuts[$statut],'statut4').' '.$langs->trans($this->statuts[$statut]);
 		}
 		if ($mode == 5)
 		{
-			if ($statut==0) return $langs->trans('StatusSendingDraftShort').' '.img_picto($langs->trans('StatusSendingDraft'),'statut0');
-			if ($statut==1) return $langs->trans('StatusSendingValidatedShort').' '.img_picto($langs->trans('StatusSendingValidated'),'statut4');
+			if ($statut==0) return $langs->trans('StatusSendingDraftShort').' '.img_picto($langs->trans($this->statuts[$statut]),'statut0');
+			if ($statut==1) return $langs->trans('StatusSendingValidatedShort').' '.img_picto($langs->trans($this->statuts[$statut]),'statut4');
 		}
 	}
 
diff --git a/htdocs/fichinter/fichinter.class.php b/htdocs/fichinter/fichinter.class.php
index e5bde83cd17..2278d0c4ebc 100644
--- a/htdocs/fichinter/fichinter.class.php
+++ b/htdocs/fichinter/fichinter.class.php
@@ -66,18 +66,16 @@ class Fichinter extends CommonObject
 	 */
 	function Fichinter($DB, $socid="")
 	{
-		global $langs;
-
 		$this->db = $DB ;
 		$this->socid = $socid;
 		$this->products = array();
 		$this->projet_id = 0;
 
-		// Statut 0=brouillon, 1=valide
-		$this->statuts[0]=$langs->trans("Draft");
-		$this->statuts[1]=$langs->trans("Validated");
-		$this->statuts_short[0]=$langs->trans("Draft");
-		$this->statuts_short[1]=$langs->trans("Validated");
+		// List of language codes for status
+		$this->statuts[0]='Draft';
+		$this->statuts[1]='Validated';
+		$this->statuts_short[0]='Draft';
+		$this->statuts_short[1]='Validated';
 	}
 
 
@@ -340,31 +338,31 @@ class Fichinter extends CommonObject
 	{
 		if ($mode == 0)
 		{
-			return $this->statuts[$statut];
+			return $langs->trans($this->statuts[$statut]);
 		}
 		if ($mode == 1)
 		{
-			return $this->statuts_short[$statut];
+			return $langs->trans($this->statuts_short[$statut]);
 		}
 		if ($mode == 2)
 		{
-			if ($statut==0) return img_picto($this->statuts_short[$statut],'statut0').' '.$this->statuts_short[$statut];
-			if ($statut==1) return img_picto($this->statuts_short[$statut],'statut6').' '.$this->statuts_short[$statut];
+			if ($statut==0) return img_picto($langs->trans($this->statuts_short[$statut]),'statut0').' '.$langs->trans($this->statuts_short[$statut]);
+			if ($statut==1) return img_picto($langs->trans($this->statuts_short[$statut]),'statut6').' '.$langs->trans($this->statuts_short[$statut]);
 		}
 		if ($mode == 3)
 		{
-			if ($statut==0) return img_picto($this->statuts_short[$statut],'statut0');
-			if ($statut==1) return img_picto($this->statuts_short[$statut],'statut6');
+			if ($statut==0) return img_picto($langs->trans($this->statuts_short[$statut]),'statut0');
+			if ($statut==1) return img_picto($langs->trans($this->statuts_short[$statut]),'statut6');
 		}
 		if ($mode == 4)
 		{
-			if ($statut==0) return img_picto($this->statuts_short[$statut],'statut0').' '.$this->statuts[$statut];
-			if ($statut==1) return img_picto($this->statuts_short[$statut],'statut6').' '.$this->statuts[$statut];
+			if ($statut==0) return img_picto($langs->trans($this->statuts_short[$statut]),'statut0').' '.$langs->trans($this->statuts[$statut]);
+			if ($statut==1) return img_picto($langs->trans($this->statuts_short[$statut]),'statut6').' '.$langs->trans($this->statuts[$statut]);
 		}
 		if ($mode == 5)
 		{
-			if ($statut==0) return $this->statuts_short[$statut].' '.img_picto($this->statuts_short[$statut],'statut0');
-			if ($statut==1) return $this->statuts_short[$statut].' '.img_picto($this->statuts_short[$statut],'statut6');
+			if ($statut==0) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut0');
+			if ($statut==1) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut6');
 		}
 	}
 
diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php
index cba756eb8c1..33e8aea9d77 100644
--- a/htdocs/fourn/commande/index.php
+++ b/htdocs/fourn/commande/index.php
@@ -97,7 +97,7 @@ if ($resql)
       $var=!$var;
 
       print "<tr $bc[$var]>";
-      print '<td>'.$commande->statuts[$row[1]].'</td>';
+      print '<td>'.$langs->trans($commande->statuts[$row[1]]).'</td>';
       print '<td align="right"><a href="liste.php?statut='.$row[1].'">'.$row[0].' '.$commande->LibStatut($row[1],3).'</a></td>';
 
       print "</tr>\n";
diff --git a/htdocs/fourn/fournisseur.commande.class.php b/htdocs/fourn/fournisseur.commande.class.php
index 9bd25f94fdf..8a4c9f2b2c2 100644
--- a/htdocs/fourn/fournisseur.commande.class.php
+++ b/htdocs/fourn/fournisseur.commande.class.php
@@ -56,20 +56,17 @@ class CommandeFournisseur extends Commande
 	function CommandeFournisseur($DB)
 	{
 		$this->db = $DB;
-
-		global $langs;
-		$langs->load('orders');
-
-		$this->statuts[0] = $langs->trans('StatusOrderDraft');
-		$this->statuts[1] = $langs->trans('StatusOrderValidated');
-		$this->statuts[2] = $langs->trans('StatusOrderApproved');
-		$this->statuts[3] = $langs->trans('StatusOrderOnProcess');
-		$this->statuts[4] = $langs->trans('StatusOrderReceivedPartially');
-		$this->statuts[5] = $langs->trans('StatusOrderReceivedAll');
-		$this->statuts[6] = $langs->trans('StatusOrderCanceled');
-		$this->statuts[9] = $langs->trans('StatusOrderRefused');
-
 		$this->products = array();
+		
+		// List of language codes for status
+		$this->statuts[0] = 'StatusOrderDraft';
+		$this->statuts[1] = 'StatusOrderValidated';
+		$this->statuts[2] = 'StatusOrderApproved';
+		$this->statuts[3] = 'StatusOrderOnProcess';
+		$this->statuts[4] = 'StatusOrderReceivedPartially';
+		$this->statuts[5] = 'StatusOrderReceivedAll';
+		$this->statuts[6] = 'StatusOrderCanceled';
+		$this->statuts[9] = 'StatusOrderRefused';
 	}
 
 
@@ -365,9 +362,9 @@ class CommandeFournisseur extends Commande
 
 
 	/**
-	 *    \brief      Retourne le libelle du statut d'une commande (brouillon, validee, abandonnee, payee
-	 *    \param      mode          0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long
-	 *    \return     string        Libelle
+	 *    \brief      Return label of the status of object
+	 *    \param      mode          0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label
+	 *    \return     string        Label
 	 */
 	function getLibStatut($mode=0)
 	{
@@ -375,10 +372,10 @@ class CommandeFournisseur extends Commande
 	}
 
 	/**
-	 *    	\brief      Renvoi le libelle d'un statut donne
-	 *		\param      statut        	Id statut
-	 *    	\param      mode          	0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
-	 *    	\return     string			Libelle du statut
+	 *    	\brief      Return label of a status
+	 * 		\param      statut		Id statut
+	 *    	\param      mode        0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto
+	 *    	\return     string		Label of status
 	 */
 	function LibStatut($statut,$mode=0)
 	{
@@ -387,58 +384,58 @@ class CommandeFournisseur extends Commande
 
 		if ($mode == 0)
 		{
-			return $this->statuts[$statut];
+			return $langs->trans($this->statuts[$statut]);
 		}
 		if ($mode == 1)
 		{
-			return $this->statuts[$statut];
+			return $langs->trans($this->statuts[$statut]);
 		}
 		if ($mode == 2)
 		{
-			return $this->statuts[$statut];
+			return $langs->trans($this->statuts[$statut]);
 		}
 		if ($mode == 3)
 		{
-			if ($statut==0) return img_picto($langs->trans('StatusOrderDraft'),'statut0');
-			if ($statut==1) return img_picto($langs->trans('StatusOrderValidated'),'statut1');
-			if ($statut==2) return img_picto($langs->trans('StatusOrderApproved'),'statut3');
-			if ($statut==3) return img_picto($langs->trans('StatusOrderOnProcess'),'statut3');
-			if ($statut==4) return img_picto($langs->trans('StatusOrderReceivedPartially'),'statut3');
-			if ($statut==5) return img_picto($langs->trans('StatusOrderProcessed'),'statut6');
-			if ($statut==6) return img_picto($langs->trans('StatusOrderCanceled'),'statut5');
-			if ($statut==9) return img_picto($langs->trans('StatusOrderRefused'),'statut5');
+			if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut0');
+			if ($statut==1) return img_picto($langs->trans($this->statuts[$statut]),'statut1');
+			if ($statut==2) return img_picto($langs->trans($this->statuts[$statut]),'statut3');
+			if ($statut==3) return img_picto($langs->trans($this->statuts[$statut]),'statut3');
+			if ($statut==4) return img_picto($langs->trans($this->statuts[$statut]),'statut3');
+			if ($statut==5) return img_picto($langs->trans($this->statuts[$statut]),'statut6');
+			if ($statut==6) return img_picto($langs->trans($this->statuts[$statut]),'statut5');
+			if ($statut==9) return img_picto($langs->trans($this->statuts[$statut]),'statut5');
 		}
 		if ($mode == 4)
 		{
-			if ($statut==0) return img_picto($langs->trans('StatusOrderDraft'),'statut0').' '.$this->statuts[$statut];
-			if ($statut==1) return img_picto($langs->trans('StatusOrderValidated'),'statut1').' '.$this->statuts[$statut];
-			if ($statut==2) return img_picto($langs->trans('StatusOrderApproved'),'statut3').' '.$this->statuts[$statut];
-			if ($statut==3) return img_picto($langs->trans('StatusOrderOnProcess'),'statut3').' '.$this->statuts[$statut];
-			if ($statut==4) return img_picto($langs->trans('StatusOrderReceivedPartially'),'statut3').' '.$this->statuts[$statut];
-			if ($statut==5) return img_picto($langs->trans('StatusOrderProcessed'),'statut6').' '.$this->statuts[$statut];
-			if ($statut==6) return img_picto($langs->trans('StatusOrderCanceled'),'statut5').' '.$this->statuts[$statut];
-			if ($statut==9) return img_picto($langs->trans('StatusOrderRefused'),'statut5').' '.$this->statuts[$statut];
+			if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut0').' '.$langs->trans($this->statuts[$statut]);
+			if ($statut==1) return img_picto($langs->trans($this->statuts[$statut]),'statut1').' '.$langs->trans($this->statuts[$statut]);
+			if ($statut==2) return img_picto($langs->trans($this->statuts[$statut]),'statut3').' '.$langs->trans($this->statuts[$statut]);
+			if ($statut==3) return img_picto($langs->trans($this->statuts[$statut]),'statut3').' '.$langs->trans($this->statuts[$statut]);
+			if ($statut==4) return img_picto($langs->trans($this->statuts[$statut]),'statut3').' '.$langs->trans($this->statuts[$statut]);
+			if ($statut==5) return img_picto($langs->trans($this->statuts[$statut]),'statut6').' '.$langs->trans($this->statuts[$statut]);
+			if ($statut==6) return img_picto($langs->trans($this->statuts[$statut]),'statut5').' '.$langs->trans($this->statuts[$statut]);
+			if ($statut==9) return img_picto($langs->trans($this->statuts[$statut]),'statut5').' '.$langs->trans($this->statuts[$statut]);
 		}
 		if ($mode == 5)
 		{
-			if ($statut==0) return $this->statuts[$statut].' '.img_picto($langs->trans('StatusOrderDraft'),'statut0');
-			if ($statut==1) return $this->statuts[$statut].' '.img_picto($langs->trans('StatusOrderValidated'),'statut1');
-			if ($statut==2) return $this->statuts[$statut].' '.img_picto($langs->trans('StatusOrderApproved'),'statut3');
-			if ($statut==3) return $this->statuts[$statut].' '.img_picto($langs->trans('StatusOrderOnProcess'),'statut3');
-			if ($statut==4) return $this->statuts[$statut].' '.img_picto($langs->trans('StatusOrderReceivedPartially'),'statut3');
-			if ($statut==5) return $this->statuts[$statut].' '.img_picto($langs->trans('StatusOrderProcessed'),'statut6');
-			if ($statut==6) return $this->statuts[$statut].' '.img_picto($langs->trans('StatusOrderCanceled'),'statut5');
-			if ($statut==9) return $this->statuts[$statut].' '.img_picto($langs->trans('StatusOrderRefused'),'statut5');
+			if ($statut==0) return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut0');
+			if ($statut==1) return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut1');
+			if ($statut==2) return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut3');
+			if ($statut==3) return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut3');
+			if ($statut==4) return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut3');
+			if ($statut==5) return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut6');
+			if ($statut==6) return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut5');
+			if ($statut==9) return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut5');
 		}
 	}
 
 
 	/**
-		\brief      Renvoie nom clicable (avec eventuellement le picto)
-		\param		withpicto		0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul
-		\param		option			Sur quoi pointe le lien
-		\return		string			Chaine avec URL
-		*/
+	 *	\brief      Renvoie nom clicable (avec eventuellement le picto)
+	 *	\param		withpicto		0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul
+	 *	\param		option			Sur quoi pointe le lien
+	 *	\return		string			Chaine avec URL
+	 */
 	function getNomUrl($withpicto=0,$option='')
 	{
 		global $langs;
diff --git a/htdocs/fourn/index.php b/htdocs/fourn/index.php
index 30a3dc0a02a..e8fa8f63911 100644
--- a/htdocs/fourn/index.php
+++ b/htdocs/fourn/index.php
@@ -83,7 +83,7 @@ if ($resql)
 		$var=!$var;
 
 		print "<tr $bc[$var]>";
-		print '<td>'.$commande->statuts[$row[1]].'</td>';
+		print '<td>'.$langs->trans($commande->statuts[$row[1]]).'</td>';
 		print '<td align="center">'.$row[0].'</td>';
 		print '<td align="center"><a href="'.DOL_URL_ROOT.'/fourn/commande/liste.php?statut='.$row[1].'">'.$commande->LibStatut($row[1],3).'</a></td>';
 
diff --git a/htdocs/langs/en_US/sendings.lang b/htdocs/langs/en_US/sendings.lang
index d0189d34d51..058e6b82ba0 100644
--- a/htdocs/langs/en_US/sendings.lang
+++ b/htdocs/langs/en_US/sendings.lang
@@ -27,8 +27,10 @@ DateSendingShort=Date sending order
 SendingsForSameOrder=Shipments for this order
 SendingsAndReceivingForSameOrder=Shipments and receivings for this order
 SendingsToValidate=Sending to validate
+StatusSendingCanceled=Canceled
 StatusSendingDraft=Draft
 StatusSendingValidated=Validated (products to ship or already shipped)
+StatusSendingCanceledShort=Canceled
 StatusSendingDraftShort=Draft
 StatusSendingValidatedShort=Validated
 SendingSheet=Sending sheet
diff --git a/htdocs/langs/fr_FR/sendings.lang b/htdocs/langs/fr_FR/sendings.lang
index a8665a33917..fa418433a58 100644
--- a/htdocs/langs/fr_FR/sendings.lang
+++ b/htdocs/langs/fr_FR/sendings.lang
@@ -27,8 +27,10 @@ DateSendingShort=Date ordre expéd.
 SendingsForSameOrder=Expéditions pour cette commande
 SendingsAndReceivingForSameOrder=Expéditions et réceptions pour cette commande
 SendingsToValidate=Expéditions à valider
+StatusSendingCanceled=Annulée
 StatusSendingDraft=Brouillon
 StatusSendingValidated=Validée (produits à envoyer ou envoyés)
+StatusSendingCanceledShort=Annulée
 StatusSendingDraftShort=Brouillon
 StatusSendingValidatedShort=Validée
 SendingSheet=Bordereau d'expédition
diff --git a/htdocs/livraison/livraison.class.php b/htdocs/livraison/livraison.class.php
index 0b57fc47058..a4c919d51e8 100644
--- a/htdocs/livraison/livraison.class.php
+++ b/htdocs/livraison/livraison.class.php
@@ -20,11 +20,11 @@
  */
 
 /**
-        \file       htdocs/livraison/livraison.class.php
-        \ingroup    livraison
-        \brief      Fichier de la classe de gestion des bons de livraison
-        \version    $Id$
-*/
+ \file       htdocs/livraison/livraison.class.php
+ \ingroup    livraison
+ \brief      Fichier de la classe de gestion des bons de livraison
+ \version    $Id$
+ */
 
 require_once(DOL_DOCUMENT_ROOT."/commonobject.class.php");
 require_once(DOL_DOCUMENT_ROOT."/expedition/expedition.class.php");
@@ -34,9 +34,9 @@ if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/commande
 
 
 /**
-        \class      Livraison
-		\brief      Classe de gestion des bons de livraison
-*/
+ \class      Livraison
+ \brief      Classe de gestion des bons de livraison
+ */
 class Livraison extends CommonObject
 {
 	var $db;
@@ -60,28 +60,25 @@ class Livraison extends CommonObject
 
 
 	/**
-	* Initialisation
-	*
-	*/
+	 * Initialisation
+	 */
 	function Livraison($DB)
-    {
-    	global $langs;
-
+	{
 		$this->db = $DB;
 		$this->lignes = array();
-
-		$this->statuts[-1] = $langs->trans("Canceled");
-		$this->statuts[0]  = $langs->trans("Draft");
-		$this->statuts[1]  = $langs->trans("Validated");
-
 		$this->products = array();
-    }
+		
+		// List of short language codes for status
+		$this->statuts[-1] = 'StatusSendingCanceled';
+		$this->statuts[0]  = 'StatusSendingDraft';
+		$this->statuts[1]  = 'StatusSendingValidated';
+	}
 
 	/**
 	 *    \brief      Create delivery receipt in database
 	 *    \param      user        Objet du user qui cree
 	 *    \return     int         <0 si erreur, id livraison cree si ok
-	*/
+	 */
 	function create($user)
 	{
 		global $conf;
@@ -143,8 +140,8 @@ class Livraison extends CommonObject
 
 
 				/*
-				*  Insertion des produits dans la base
-				*/
+				 *  Insertion des produits dans la base
+				 */
 				for ($i = 0 ; $i < sizeof($this->lignes) ; $i++)
 				{
 					$origin_id=$this->lignes[$i]->origin_line_id;
@@ -163,7 +160,7 @@ class Livraison extends CommonObject
 					{
 						$error++;
 					}
-					
+						
 					if (! $conf->expedition_bon->enabled)
 					{
 						if ($conf->commande->enabled)
@@ -216,9 +213,9 @@ class Livraison extends CommonObject
 	}
 
 	/**
-	*
-	*
-	*/
+	 *
+	 *
+	 */
 	function create_line($transaction, $commande_ligne_id, $qty, $fk_product=0, $description)
 	{
 		$error = 0;
@@ -244,9 +241,9 @@ class Livraison extends CommonObject
 		}
 	}
 
-   /**
-	* 	\brief			Read a delivery receipt
-	*/
+	/**
+	 * 	\brief			Read a delivery receipt
+	 */
 	function fetch($id)
 	{
 		global $conf;
@@ -296,23 +293,23 @@ class Livraison extends CommonObject
 					{
 						$this->origin = "propal";
 					}
-			  }
+				}
 
-			  if ($this->statut == 0) $this->brouillon = 1;
+				if ($this->statut == 0) $this->brouillon = 1;
 
-			  $file = $conf->livraison->dir_output . "/" .get_exdir($livraison->id,2) . "/" . $this->id.".pdf";
-			  $this->pdf_filename = $file;
+				$file = $conf->livraison->dir_output . "/" .get_exdir($livraison->id,2) . "/" . $this->id.".pdf";
+				$this->pdf_filename = $file;
 
-			  /*
-			   * Lignes
-			   */
-			  $result=$this->fetch_lignes();
-			  if ($result < 0)
-			  {
-			  	return -3;
-			  }
+				/*
+				 * Lignes
+				 */
+				$result=$this->fetch_lignes();
+				if ($result < 0)
+				{
+					return -3;
+				}
 
-			  return 1;
+				return 1;
 			}
 			else
 			{
@@ -330,10 +327,10 @@ class Livraison extends CommonObject
 	}
 
 	/**
-	*        \brief      Valide l'expedition, et met a jour le stock si stock gere
-	*        \param      user        Objet de l'utilisateur qui valide
-	*        \return     int
-	*/
+	 *        \brief      Valide l'expedition, et met a jour le stock si stock gere
+	 *        \param      user        Objet de l'utilisateur qui valide
+	 *        \return     int
+	 */
 	function valid($user)
 	{
 		global $conf;
@@ -368,17 +365,17 @@ class Livraison extends CommonObject
 					}
 
 					// Tester si non deja au statut valide. Si oui, on arrete afin d'eviter
-          // de decrementer 2 fois le stock.
-          $sql = "SELECT ref FROM ".MAIN_DB_PREFIX."livraison where ref='".$this->ref."' AND fk_statut <> 0";
-          $resql=$this->db->query($sql);
-          if ($resql)
-          {
-          	$num = $this->db->num_rows($resql);
-           	if ($num > 0)
-          	{
-           		return 0;
-           	}
-          }
+					// de decrementer 2 fois le stock.
+					$sql = "SELECT ref FROM ".MAIN_DB_PREFIX."livraison where ref='".$this->ref."' AND fk_statut <> 0";
+					$resql=$this->db->query($sql);
+					if ($resql)
+					{
+						$num = $this->db->num_rows($resql);
+						if ($num > 0)
+						{
+							return 0;
+						}
+					}
 
 					$sql = "UPDATE ".MAIN_DB_PREFIX."livraison ";
 					$sql.= " SET ref='".addslashes($this->ref)."', fk_statut = 1, date_valid = ".$this->db->idate(mktime()).", fk_user_valid = ".$user->id;
@@ -486,7 +483,7 @@ class Livraison extends CommonObject
 	/**     \brief      Cree le bon de livraison depuis une expedition existante
 	 *		\param      user            Utilisateur qui cree
 	 *		\param      sending_id      Id de l'expedition qui sert de modele
-	*/
+	 */
 	function create_from_sending($user, $sending_id)
 	{
 		$expedition = new Expedition($this->db);
@@ -522,9 +519,9 @@ class Livraison extends CommonObject
 
 
 	/**
-	* Ajoute une ligne
-	*
-	*/
+	 * Ajoute une ligne
+	 *
+	 */
 	function addline( $id, $qty )
 	{
 		$num = sizeof($this->lignes);
@@ -537,9 +534,9 @@ class Livraison extends CommonObject
 	}
 
 	/**
-	*
-	*
-	*/
+	 *
+	 *
+	 */
 	function delete_line($idligne)
 	{
 		if ($this->statut == 0)
@@ -561,9 +558,9 @@ class Livraison extends CommonObject
 	}
 
 	/**
-	* Supprime la fiche
-	*
-	*/
+	 * Supprime la fiche
+	 *
+	 */
 	function delete()
 	{
 		$this->db->begin();
@@ -617,10 +614,10 @@ class Livraison extends CommonObject
 		}
 	}
 
-   /**
-	*
-	*
-	*/
+	/**
+	 *
+	 *
+	 */
 	function fetch_lignes()
 	{
 		$this->lignes = array();
@@ -669,14 +666,14 @@ class Livraison extends CommonObject
 	}
 
 
-    /**
-     *    \brief      Retourne le libelle du statut d'une expedition
-     *    \return     string      Libelle
-     */
-    function getLibStatut($mode=0)
-    {
-    	return $this->LibStatut($this->statut,$mode);
-    }
+	/**
+	 *    \brief      Retourne le libelle du statut d'une expedition
+	 *    \return     string      Libelle
+	 */
+	function getLibStatut($mode=0)
+	{
+		return $this->LibStatut($this->statut,$mode);
+	}
 
 	/**
 	 *		\brief      Renvoi le libelle d'un statut donne
@@ -684,29 +681,29 @@ class Livraison extends CommonObject
 	 *    	\param      mode        0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
 	 *    	\return     string		Libelle
 	 */
-    function LibStatut($statut,$mode)
-    {
+	function LibStatut($statut,$mode)
+	{
 		global $langs;
 
-    	if ($mode==0)
-    	{
-        	if ($statut==-1) return $this->statuts[$statut];
-        	if ($statut==0) return $this->statuts[$statut];
-        	if ($statut==1) return $this->statuts[$statut];
-    	}
-    	if ($mode==1)
-    	{
-        	if ($statut==-1) return $this->statuts[$statut];
-        	if ($statut==0) return $this->statuts[$statut];
-        	if ($statut==1) return $this->statuts[$statut];
-    	}
-      if ($mode == 4)
-      {
-        	if ($statut==-1) return img_picto($langs->trans('StatusSendingCanceled'),'statut5').' '.$langs->trans('StatusSendingDraft');
-        	if ($statut==0) return img_picto($langs->trans('StatusSendingDraft'),'statut0').' '.$langs->trans('StatusSendingDraft');
-        	if ($statut==1) return img_picto($langs->trans('StatusSendingValidated'),'statut4').' '.$langs->trans('StatusSendingValidated');
-		  }
-    }
+		if ($mode==0)
+		{
+			if ($statut==-1) return $langs->trans('StatusSendingCanceled');
+			if ($statut==0)  return $langs->trans('StatusSendingDraft');
+			if ($statut==1)  return $langs->trans('StatusSendingValidated')
+		}
+		if ($mode==1)
+		{
+			if ($statut==-1) return $langs->trans($this->statuts[$statut]);
+			if ($statut==0)  return $langs->trans($this->statuts[$statut]);
+			if ($statut==1)  return $langs->trans($this->statuts[$statut]);
+		}
+		if ($mode == 4)
+		{
+			if ($statut==-1) return img_picto($langs->trans('StatusSendingCanceled'),'statut5').' '.$langs->trans('StatusSendingCanceled');
+			if ($statut==0)  return img_picto($langs->trans('StatusSendingDraft'),'statut0').' '.$langs->trans('StatusSendingDraft');
+			if ($statut==1)  return img_picto($langs->trans('StatusSendingValidated'),'statut4').' '.$langs->trans('StatusSendingValidated');
+		}
+	}
 
 
 	/**
@@ -787,9 +784,9 @@ class Livraison extends CommonObject
 
 
 /**
-        \class      LivraisonLigne
-		\brief      Classe de gestion des lignes de bons de livraison
-*/
+ \class      LivraisonLigne
+ \brief      Classe de gestion des lignes de bons de livraison
+ */
 class LivraisonLigne
 {
 	var $db;
diff --git a/htdocs/product/stock/entrepot.class.php b/htdocs/product/stock/entrepot.class.php
index c2a68cb82c5..88780fc97ce 100644
--- a/htdocs/product/stock/entrepot.class.php
+++ b/htdocs/product/stock/entrepot.class.php
@@ -52,22 +52,22 @@ class Entrepot extends CommonObject
 	var $ville;
 	var $pays_id;
 
-	/*
+	/**
 	 *    \brief      Constructeur de l'objet entrepot
 	 *    \param      DB      Handler d'acc�s � la base de donn�e
 	 */
 	function Entrepot($DB)
 	{
-		global $langs;
 		$this->db = $DB;
 
-		$this->statuts[0] = $langs->trans("Closed2");
-		$this->statuts[1] = $langs->trans("Opened");
+		// List of short language codes for status
+		$this->statuts[0] = 'Closed2';
+		$this->statuts[1] = 'Opened';
 	}
 
-	/*
+	/**
 	 *    \brief      Creation d'un entrepot en base
-	 *    \param      Objet user qui cr�e l'entrepot
+	 *    \param      Objet user qui cree l'entrepot
 	 */
 	function create($user)
 	{
@@ -412,37 +412,37 @@ class Entrepot extends CommonObject
 		if ($mode == 0)
 		{
 			$prefix='';
-			if ($statut == 0) return $langs->trans('Closed2');
-			if ($statut == 1) return $langs->trans('Opened');
+			if ($statut == 0) return $langs->trans($this->statuts[$statut]);
+			if ($statut == 1) return $langs->trans($this->statuts[$statut]);
 		}
 		if ($mode == 1)
 		{
 			$prefix='Short';
-			if ($statut == 0) return $langs->trans('Closed2');
-			if ($statut == 1) return $langs->trans('Opened');
+			if ($statut == 0) return $langs->trans($this->statuts[$statut]);
+			if ($statut == 1) return $langs->trans($this->statuts[$statut]);
 		}
 		if ($mode == 2)
 		{
 			$prefix='Short';
-			if ($statut == 0) return img_picto($langs->trans('Closed2'),'statut5').' '.$langs->trans('Closed2');
-			if ($statut == 1) return img_picto($langs->trans('Opened'),'statut4').' '.$langs->trans('Opened');
+			if ($statut == 0) return img_picto($langs->trans($this->statuts[$statut]),'statut5').' '.$langs->trans($this->statuts[$statut]);
+			if ($statut == 1) return img_picto($langs->trans($this->statuts[$statut]),'statut4').' '.$langs->trans($this->statuts[$statut]);
 		}
 		if ($mode == 3)
 		{
 			$prefix='Short';
-			if ($statut == 0) return img_picto($langs->trans('Closed2'),'statut5');
-			if ($statut == 1) return img_picto($langs->trans('Opened'),'statut4');
+			if ($statut == 0) return img_picto($langs->trans($this->statuts[$statut]),'statut5');
+			if ($statut == 1) return img_picto($langs->trans($this->statuts[$statut]),'statut4');
 		}
 		if ($mode == 4)
 		{
-			if ($statut == 0) return img_picto($langs->trans('Closed2'),'statut5').' '.$langs->trans('Closed2');
-			if ($statut == 1) return img_picto($langs->trans('Opened'),'statut4').' '.$langs->trans('Opened');
+			if ($statut == 0) return img_picto($langs->trans($this->statuts[$statut]),'statut5').' '.$langs->trans($this->statuts[$statut]);
+			if ($statut == 1) return img_picto($langs->trans($this->statuts[$statut]),'statut4').' '.$langs->trans($this->statuts[$statut]);
 		}
 		if ($mode == 5)
 		{
 			$prefix='Short';
-			if ($statut == 0) return $langs->trans('Closed2').' '.img_picto($langs->trans('Closed2'),'statut5');
-			if ($statut == 1) return $langs->trans('Opened').' '.img_picto($langs->trans('Opened'),'statut4');
+			if ($statut == 0) return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut5');
+			if ($statut == 1) return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut4');
 		}
 	}