lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Bad translation for actions

Browse Source
This commit is contained in:
Laurent Destailleur 2008-10-20 00:50:56 +00:00
parent 955b263a15
commit bd83f13563
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/comm/index.php
View File

@ -39,7 +39,7 @@ if (!$user->rights->societe->lire)
$langs->load("commercial"); $langs->load("commercial");
$langs->load("orders"); $langs->load("orders");
// Sécurité accés client // S<EFBFBD>curit<EFBFBD> acc<63>s client
$socid=''; $socid='';
if ($_GET["socid"]) { $socid=$_GET["socid"]; } if ($_GET["socid"]) { $socid=$_GET["socid"]; }
if ($user->societe_id > 0) if ($user->societe_id > 0)
@ -232,7 +232,6 @@ if ($conf->commande->enabled && $user->rights->commande->lire)
/* /*
* Bookmark * Bookmark
*
*/ */
if ($conf->bookmark->enabled) if ($conf->bookmark->enabled)
{ {
@ -282,7 +281,6 @@ print '</td><td valign="top" width="70%" class="notopnoleftnoright">';
/* /*
* Actions to do * Actions to do
*
*/ */
if ($user->rights->agenda->myactions->read) if ($user->rights->agenda->myactions->read)
{ {
@ -298,7 +296,7 @@ if ($user->rights->agenda->myactions->read)
} }
/* /*
* Derniers clients enregistrés * Derniers clients enregistr<EFBFBD>s
*/ */
if ($user->rights->societe->lire) if ($user->rights->societe->lire)
{ {
@ -488,7 +486,7 @@ if ($conf->propal->enabled && $user->rights->propale->lire)
} }
/* /*
* Dernières propales fermées * Derni<EFBFBD>res propales ferm<EFBFBD>es
* *
*/ */

7
htdocs/lib/company.lib.php
View File

@ -381,7 +381,8 @@ function show_actions_todo($conf,$langs,$db,$objsoc,$objcon='')
$sql.= " ".$db->pdate("a.datep")." as dp,"; $sql.= " ".$db->pdate("a.datep")." as dp,";
$sql.= " ".$db->pdate("a.datea")." as da,"; $sql.= " ".$db->pdate("a.datea")." as da,";
$sql.= " a.percent,"; $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.= " u.login, u.rowid,";
$sql.= " sp.name, sp.firstname"; $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"; $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 else
{ {
$actionstatic->code=$obj->acode; $actionstatic->type_code=$obj->acode;
$actionstatic->libelle=$obj->libelle; $actionstatic->libelle=$obj->libelle;
$actionstatic->id=$obj->id; $actionstatic->id=$obj->id;
print '<td width="140">'.$actionstatic->getNomUrl(1,16).'</td>'; 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">'; print '<td width="140">';
if ($histo[$key]['type']=='action') if ($histo[$key]['type']=='action')
{ {
$actionstatic->code=$histo[$key]['acode']; $actionstatic->type_code=$histo[$key]['acode'];
$actionstatic->libelle=$histo[$key]['libelle']; $actionstatic->libelle=$histo[$key]['libelle'];
$actionstatic->id=$histo[$key]['id']; $actionstatic->id=$histo[$key]['id'];
print $actionstatic->getNomUrl(1,16); print $actionstatic->getNomUrl(1,16);