From bd83f13563fe3ec7f8ea07c71a37a2765fefd927 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 20 Oct 2008 00:50:56 +0000
Subject: [PATCH] Fix: Bad translation for actions

---
 htdocs/comm/index.php      | 8 +++-----
 htdocs/lib/company.lib.php | 7 ++++---
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index 98e8ca19ecb..09fa18eaf60 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -39,7 +39,7 @@ if (!$user->rights->societe->lire)
 $langs->load("commercial");
 $langs->load("orders");
 
-// Sécurité accés client
+// S�curit� acc�s client
 $socid='';
 if ($_GET["socid"]) { $socid=$_GET["socid"]; }
 if ($user->societe_id > 0) 
@@ -232,7 +232,6 @@ if ($conf->commande->enabled && $user->rights->commande->lire)
 
 /*
  * Bookmark
- *
  */
  if ($conf->bookmark->enabled)
  {
@@ -282,7 +281,6 @@ print '</td><td valign="top" width="70%" class="notopnoleftnoright">';
 
 /*
  * Actions to do
- *
  */
 if ($user->rights->agenda->myactions->read)
 {
@@ -298,7 +296,7 @@ if ($user->rights->agenda->myactions->read)
 }
 
 /*
- * Derniers clients enregistrés
+ * Derniers clients enregistr�s
  */
 if ($user->rights->societe->lire)
 {
@@ -488,7 +486,7 @@ if ($conf->propal->enabled && $user->rights->propale->lire)
 }
 
 /*
- * Dernières propales fermées
+ * Derni�res propales ferm�es
  *
  */
 
diff --git a/htdocs/lib/company.lib.php b/htdocs/lib/company.lib.php
index b0c9b3d77eb..15754597fe6 100644
--- a/htdocs/lib/company.lib.php
+++ b/htdocs/lib/company.lib.php
@@ -381,7 +381,8 @@ function show_actions_todo($conf,$langs,$db,$objsoc,$objcon='')
 		$sql.= " ".$db->pdate("a.datep")." as dp,";
 		$sql.= " ".$db->pdate("a.datea")." as da,";
 		$sql.= " a.percent,";
-		$sql.= " c.code as acode, c.libelle, a.propalrowid, a.fk_user_author, a.fk_contact,";
+		$sql.= " a.propalrowid, a.fk_user_author, a.fk_contact,";
+		$sql.= " c.code as acode, c.libelle,";
 		$sql.= " u.login, u.rowid,";
 		$sql.= " sp.name, sp.firstname";
 		$sql.= " FROM ".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."user as u, ".MAIN_DB_PREFIX."actioncomm as a";
@@ -426,7 +427,7 @@ function show_actions_todo($conf,$langs,$db,$objsoc,$objcon='')
 					}
 					else
 					{
-						$actionstatic->code=$obj->acode;
+						$actionstatic->type_code=$obj->acode;
 						$actionstatic->libelle=$obj->libelle;
 						$actionstatic->id=$obj->id;
 						print '<td width="140">'.$actionstatic->getNomUrl(1,16).'</td>';
@@ -611,7 +612,7 @@ function show_actions_done($conf,$langs,$db,$objsoc,$objcon='')
 			print '<td width="140">';
 			if ($histo[$key]['type']=='action')
 			{
-				$actionstatic->code=$histo[$key]['acode'];
+				$actionstatic->type_code=$histo[$key]['acode'];
 				$actionstatic->libelle=$histo[$key]['libelle'];
 				$actionstatic->id=$histo[$key]['id'];
 				print $actionstatic->getNomUrl(1,16);