From 7640752feea781dec66702f051c086e34af8688a Mon Sep 17 00:00:00 2001
From: eldy <eldy@destailleur.fr>
Date: Fri, 12 Aug 2011 23:31:11 +0200
Subject: [PATCH] Fix: Translation of proposal status in combo list

---
 htdocs/comm/propal.php                |  2 +-
 htdocs/core/class/html.form.class.php | 22 +++++++++++++++++++---
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index dfb3f6e15aa..fe017ff92c5 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -1873,7 +1873,7 @@ else
 		print '</td>';
 		print '<td class="liste_titre">&nbsp;</td>';
 		print '<td class="liste_titre" align="right">';
-		$html->select_propal_statut($viewstatut);
+		$html->select_propal_statut($viewstatut,1);
 		print '</td>';
 		print '<td class="liste_titre" align="right"><input class="liste_titre" type="image" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/search.png" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
 		print '</td>';
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index d56dc9d2f51..828c7155912 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1730,6 +1730,7 @@ class Form
         if ($user->admin && ! $noadmininfo) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
     }
 
+
     /**
      *      \brief      Selection HT ou TTC
      *      \param      selected        Id pre-selectionne
@@ -1740,6 +1741,7 @@ class Form
         print $this->load_PriceBaseType($selected,$htmlname);
     }
 
+
     /**
      *      \brief      Selection HT ou TTC
      *      \param      selected        Id pre-selectionne
@@ -1773,12 +1775,15 @@ class Form
         return $return;
     }
 
+
     /**
      *    Return combo list of differents status of a proposal
      *    Values are id of table c_propalst
-     *    @param      selected    etat pre-selectionne
+     *
+     *    @param    selected    etat pre-selectionne
+     *    @param	short		Use short labels
      */
-    function select_propal_statut($selected='')
+    function select_propal_statut($selected='',$short=0)
     {
         global $langs;
 
@@ -1806,7 +1811,17 @@ class Form
                     {
                         print '<option value="'.$obj->id.'">';
                     }
-                    print ($langs->trans("PropalStatus".$obj->code)!="PropalStatus".$obj->code)?$langs->trans("PropalStatus".$obj->code):$obj->label;
+                    $key=$obj->code;
+                    if ($langs->trans("PropalStatus".$key.($short?'Short':'')) != "PropalStatus".$key.($short?'Short':''))
+                    {
+                        print $langs->trans("PropalStatus".$key.($short?'Short':''));
+                    }
+                    else
+                    {
+                        $conv_to_new_code=array('PR_DRAFT'=>'Draft','PR_OPEN'=>'Opened','PR_CLOSED'=>'Closed','PR_SIGNED'=>'Signed','PR_NOTSIGNED'=>'NotSigned','PR_FAC'=>'Billed');
+                        if (! empty($conv_to_new_code[$obj->code])) $key=$conv_to_new_code[$obj->code];
+                        print ($langs->trans("PropalStatus".$key.($short?'Short':''))!="PropalStatus".$key.($short?'Short':''))?$langs->trans("PropalStatus".$key.($short?'Short':'')):$obj->label;
+                    }
                     print '</option>';
                     $i++;
                 }
@@ -1822,6 +1837,7 @@ class Form
 
     /**
      *    Return a HTML select list of bank accounts
+     *
      *    @param      selected          Id account pre-selected
      *    @param      htmlname          Name of select zone
      *    @param      statut            Status of searched accounts (0=open, 1=closed)