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 '
';
/*
* 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 ' | '.$actionstatic->getNomUrl(1,16).' | ';
@@ -611,7 +612,7 @@ function show_actions_done($conf,$langs,$db,$objsoc,$objcon='')
print '';
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);
|